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/cpu.h | |
| 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/cpu.h')
| -rw-r--r-- | target-i386/cpu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 9ef1be482..afb4da5ea 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -694,6 +694,7 @@ typedef struct CPUX86State { /* For KVM */ uint32_t mp_state; + int32_t exception_injected; int32_t interrupt_injected; uint8_t soft_interrupt; uint8_t nmi_injected; |