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 | |
| parent | 807c80b2596ce80c0d7a370932fa71ec475a90a9 (diff) | |
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)
| -rw-r--r-- | target-i386/cpu.h | 1 | ||||
| -rw-r--r-- | target-i386/kvm.c | 6 | ||||
| -rw-r--r-- | target-i386/machine.c | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 9ef1be4828..afb4da5ea4 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; diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 53955b405c..de79eb7607 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -720,8 +720,8 @@ static int kvm_put_vcpu_events(CPUState *env) return 0; } - events.exception.injected = (env->exception_index >= 0); - events.exception.nr = env->exception_index; + events.exception.injected = (env->exception_injected >= 0); + events.exception.nr = env->exception_injected; events.exception.has_error_code = env->has_error_code; events.exception.error_code = env->error_code; @@ -755,7 +755,7 @@ static int kvm_get_vcpu_events(CPUState *env) if (ret < 0) { return ret; } - env->exception_index = + env->exception_injected = events.exception.injected ? events.exception.nr : -1; env->has_error_code = events.exception.has_error_code; env->error_code = events.exception.error_code; 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), |