summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-12-14 17:14:50 +0200
committerAvi Kivity <avi@redhat.com>2009-12-14 17:14:50 +0200
commitf63802005a1158a604ca2dbef6e7e40a9c96e3bd (patch)
tree4962ef17fc668c70d8b8b8e670fb25bdbf6187c5 /target-i386
parentMerge commit 'b3dfdb5a3bae5fb3170397440dfebd579a3fcb04' into stable-0.12-merge (diff)
parentmonitor: do_info_cpus(): Use QBool (diff)
downloadqemu-kvm-f63802005a1158a604ca2dbef6e7e40a9c96e3bd.tar.gz
qemu-kvm-f63802005a1158a604ca2dbef6e7e40a9c96e3bd.tar.bz2
qemu-kvm-f63802005a1158a604ca2dbef6e7e40a9c96e3bd.zip
Merge commit 'f883e4f7b8f37b53fc54660d20fd36fbe3383f46' into stable-0.12-merge
* commit 'f883e4f7b8f37b53fc54660d20fd36fbe3383f46': (63 commits) monitor: do_info_cpus(): Use QBool monitor: Fix do_info_commands() output monitor: Fix do_info_balloon() output QDict: Introduce qdict_get_qlist() QDict: Introduce qdict_get_qbool() Makefile: move QObject objs to their own entry Introduce qemu-objects.h header file vnc: fix capslock tracking logic. QemuOpts: allow larger option values. scsi: fix drive hotplug. pci: don't hw_error() when no slot is available. pci: don't abort() when trying to hotplug with acpi off. Set default console to virtio on S390x default devices: virtio consoles. add -qmp convinience switch add new -mon switch rework -monitor handling, switch to QemuOpts un-static qemu_chr_parse_compat() default devices: drives default devices: network ... Conflicts: monitor.c Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'target-i386')
-rw-r--r--target-i386/machine.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/target-i386/machine.c b/target-i386/machine.c
index 402eddc7e..6b10c8702 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -465,6 +465,7 @@ 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),