summaryrefslogtreecommitdiff
path: root/target-i386/machine.c
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2009-12-14 12:26:17 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2009-12-18 11:26:25 -0600
commit31827373f03b0ff1550d45ddef0ca1305a2ae70d (patch)
tree77898916e1a3113313231ffe8396889b6acc7394 /target-i386/machine.c
parent02c2b87fff97e77a1f6033fb09f53afa267c0c1e (diff)
downloadqemu-31827373f03b0ff1550d45ddef0ca1305a2ae70d.tar.gz
kvm: x86: Use separate exception_injected CPUState field
Marcelo correctly remarked that there are usage conflicts between QEMU core code and KVM /wrt exception_index. So spend a separate field and also save/restore it properly. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'target-i386/machine.c')
-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 2fb8faba9f..567e01ec6f 100644
--- a/target-i386/machine.c
+++ b/target-i386/machine.c
@@ -448,6 +448,7 @@ static const VMStateDescription vmstate_cpu = {
VMSTATE_INT32_V(interrupt_injected, CPUState, 9),
VMSTATE_UINT32_V(mp_state, CPUState, 9),
VMSTATE_UINT64_V(tsc, CPUState, 9),
+ VMSTATE_INT32_V(exception_injected, CPUState, 11),
VMSTATE_UINT8_V(soft_interrupt, CPUState, 11),
VMSTATE_UINT8_V(nmi_injected, CPUState, 11),
VMSTATE_UINT8_V(nmi_pending, CPUState, 11),