Revision 31827373
| b/target-i386/cpu.h | ||
|---|---|---|
| 694 | 694 |
|
| 695 | 695 |
/* For KVM */ |
| 696 | 696 |
uint32_t mp_state; |
| 697 |
int32_t exception_injected; |
|
| 697 | 698 |
int32_t interrupt_injected; |
| 698 | 699 |
uint8_t soft_interrupt; |
| 699 | 700 |
uint8_t nmi_injected; |
| b/target-i386/kvm.c | ||
|---|---|---|
| 720 | 720 |
return 0; |
| 721 | 721 |
} |
| 722 | 722 |
|
| 723 |
events.exception.injected = (env->exception_index >= 0);
|
|
| 724 |
events.exception.nr = env->exception_index;
|
|
| 723 |
events.exception.injected = (env->exception_injected >= 0);
|
|
| 724 |
events.exception.nr = env->exception_injected;
|
|
| 725 | 725 |
events.exception.has_error_code = env->has_error_code; |
| 726 | 726 |
events.exception.error_code = env->error_code; |
| 727 | 727 |
|
| ... | ... | |
| 755 | 755 |
if (ret < 0) {
|
| 756 | 756 |
return ret; |
| 757 | 757 |
} |
| 758 |
env->exception_index =
|
|
| 758 |
env->exception_injected =
|
|
| 759 | 759 |
events.exception.injected ? events.exception.nr : -1; |
| 760 | 760 |
env->has_error_code = events.exception.has_error_code; |
| 761 | 761 |
env->error_code = events.exception.error_code; |
| b/target-i386/machine.c | ||
|---|---|---|
| 448 | 448 |
VMSTATE_INT32_V(interrupt_injected, CPUState, 9), |
| 449 | 449 |
VMSTATE_UINT32_V(mp_state, CPUState, 9), |
| 450 | 450 |
VMSTATE_UINT64_V(tsc, CPUState, 9), |
| 451 |
VMSTATE_INT32_V(exception_injected, CPUState, 11), |
|
| 451 | 452 |
VMSTATE_UINT8_V(soft_interrupt, CPUState, 11), |
| 452 | 453 |
VMSTATE_UINT8_V(nmi_injected, CPUState, 11), |
| 453 | 454 |
VMSTATE_UINT8_V(nmi_pending, CPUState, 11), |
Also available in: Unified diff