diff options
| author |   Jan Kiszka <jan.kiszka@siemens.com> | 2009-12-14 12:26:17 +0100 |
|---|---|---|
| committer |   Anthony Liguori <aliguori@us.ibm.com> | 2009-12-19 08:26:20 -0600 |
| commit | f8051485c119e35f1fb4eaf3f462ff50d1ab75ab (patch) | |
| tree | 1051d023a688dec0bb8bd586807961bbc19a470c /target-i386/machine.c | |
| parent | vnc: hextile: do not generate ForegroundSpecified and SubrectsColoured tiles (diff) | |
| download | qemu-kvm-f8051485c119e35f1fb4eaf3f462ff50d1ab75ab.tar.gz qemu-kvm-f8051485c119e35f1fb4eaf3f462ff50d1ab75ab.tar.bz2 qemu-kvm-f8051485c119e35f1fb4eaf3f462ff50d1ab75ab.zip | |
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>
(cherry picked from commit 31827373f03b0ff1550d45ddef0ca1305a2ae70d)
Diffstat (limited to 'target-i386/machine.c')
| -rw-r--r-- | target-i386/machine.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/target-i386/machine.c b/target-i386/machine.c index 2fb8faba9..567e01ec6 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), |