Merge commit '4a942ceac7e38c259116960e45ba9619611d1df9' into upstream-merge
commit303d1f34a55d36c60f1042a868638b19ae3d89f0
authorAvi Kivity <avi@redhat.com>
Mon, 21 Jun 2010 15:18:18 +0000 (21 18:18 +0300)
committerAvi Kivity <avi@redhat.com>
Mon, 21 Jun 2010 15:18:18 +0000 (21 18:18 +0300)
treec5d43328e97031fe4a09a0631856d47eafac6c4a
parent6de75b40ade8b7eac6539c5d62cf14114268f667
parent4a942ceac7e38c259116960e45ba9619611d1df9
Merge commit '4a942ceac7e38c259116960e45ba9619611d1df9' into upstream-merge

* commit '4a942ceac7e38c259116960e45ba9619611d1df9':
  apic: avoid passing CPUState from CPU code
  apic: avoid passing CPUState from devices

Signed-off-by: Avi Kivity <avi@redhat.com>
hw/apic.c
hw/apic.h
hw/pc.c
qemu-kvm-x86.c
target-i386/cpu.h
target-i386/helper.c
target-i386/kvm.c