david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kvm: x86: Use separate exception_injected CPUState field

Browse Source 
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>
This commit is contained in:
Jan Kiszka 2009-12-14 12:26:17 +01:00 committed by Anthony Liguori
parent 02c2b87fff
commit 31827373f0
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target-i386/cpu.h
View File

@ -694,6 +694,7 @@ typedef struct CPUX86State {
/* For KVM */ /* For KVM */
uint32_t mp_state; uint32_t mp_state;
int32_t exception_injected;
int32_t interrupt_injected; int32_t interrupt_injected;
uint8_t soft_interrupt; uint8_t soft_interrupt;
uint8_t nmi_injected; uint8_t nmi_injected;

6
target-i386/kvm.c
View File

@ -720,8 +720,8 @@ static int kvm_put_vcpu_events(CPUState *env)
return 0; return 0;
} }
events.exception.injected = (env->exception_index >= 0); events.exception.injected = (env->exception_injected >= 0);
events.exception.nr = env->exception_index; events.exception.nr = env->exception_injected;
events.exception.has_error_code = env->has_error_code; events.exception.has_error_code = env->has_error_code;
events.exception.error_code = env->error_code; events.exception.error_code = env->error_code;
@ -755,7 +755,7 @@ static int kvm_get_vcpu_events(CPUState *env)
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
env->exception_index = env->exception_injected =
events.exception.injected ? events.exception.nr : -1; events.exception.injected ? events.exception.nr : -1;
env->has_error_code = events.exception.has_error_code; env->has_error_code = events.exception.has_error_code;
env->error_code = events.exception.error_code; env->error_code = events.exception.error_code;

1
target-i386/machine.c
View File

@ -448,6 +448,7 @@ static const VMStateDescription vmstate_cpu = {
VMSTATE_INT32_V(interrupt_injected, CPUState, 9), VMSTATE_INT32_V(interrupt_injected, CPUState, 9),
VMSTATE_UINT32_V(mp_state, CPUState, 9), VMSTATE_UINT32_V(mp_state, CPUState, 9),
VMSTATE_UINT64_V(tsc, 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(soft_interrupt, CPUState, 11),
VMSTATE_UINT8_V(nmi_injected, CPUState, 11), VMSTATE_UINT8_V(nmi_injected, CPUState, 11),
VMSTATE_UINT8_V(nmi_pending, CPUState, 11), VMSTATE_UINT8_V(nmi_pending, CPUState, 11),