summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-12-20 12:36:44 +0200
committerAvi Kivity <avi@redhat.com>2009-12-20 12:36:44 +0200
commit842d70aade6915b6ab403366bbdbcbe348809acf (patch)
tree5d566d08e88a93e90c32a24ed21d7fb7160bc9cb /target-i386/machine.c
parentMerge commit '2b311b3cce0e30dc361a4f67948a8ccfe4db248d' into stable-0.12-merge (diff)
parentSupport PCI based option rom loading (diff)
downloadqemu-kvm-842d70aade6915b6ab403366bbdbcbe348809acf.tar.gz
qemu-kvm-842d70aade6915b6ab403366bbdbcbe348809acf.tar.bz2
qemu-kvm-842d70aade6915b6ab403366bbdbcbe348809acf.zip
Merge commit '72bb3c7571226af13cfe9eec020a56add3d30a70' into stable-0.12-merge
* commit '72bb3c7571226af13cfe9eec020a56add3d30a70': Support PCI based option rom loading Fix backcompat for hotplug of SCSI controllers fdc: fix migration from 0.11 Revert "fdc: fix vmstate variable passed" monitor: Accept input only byte-wise Revert "kvm: x86: Save/restore exception_index" vmware: increase cursor buffer size. Conflicts: hw/pci.c hw/pci.h Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'target-i386/machine.c')
-rw-r--r--target-i386/machine.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/target-i386/machine.c b/target-i386/machine.c
index b9d51f414..47ca6e856 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -466,7 +466,6 @@ static const VMStateDescription vmstate_cpu = {
VMSTATE_UINT8_V(nmi_pending, CPUState, 11),
VMSTATE_UINT8_V(has_error_code, CPUState, 11),
VMSTATE_UINT32_V(sipi_vector, CPUState, 11),
- VMSTATE_INT32_V(exception_index, CPUState, 11),
/* MCE */
VMSTATE_UINT64_V(mcg_cap, CPUState, 10),
VMSTATE_UINT64_V(mcg_status, CPUState, 10),