diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2010-02-19 19:38:07 +0100 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-04-25 12:38:28 +0300 |
| commit | 48005f64d0ea965d454e38b5181af4aba9bdef5b (patch) | |
| tree | 15aa4fe79716e3089893c8e9d48d7e0b898d2693 /arch/x86/include/asm/kvm.h | |
| parent | 03b82a30ea8b26199901b219848d706dbd70c609 (diff) | |
| download | blackbird-op-linux-48005f64d0ea965d454e38b5181af4aba9bdef5b.tar.gz blackbird-op-linux-48005f64d0ea965d454e38b5181af4aba9bdef5b.zip | |
KVM: x86: Save&restore interrupt shadow mask
The interrupt shadow created by STI or MOV-SS-like operations is part of
the VCPU state and must be preserved across migration. Transfer it in
the spare padding field of kvm_vcpu_events.interrupt.
As a side effect we now have to make vmx_set_interrupt_shadow robust
against both shadow types being set. Give MOV SS a higher priority and
skip STI in that case to avoid that VMX throws a fault on next entry.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/include/asm/kvm.h')
| -rw-r--r-- | arch/x86/include/asm/kvm.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/include/asm/kvm.h b/arch/x86/include/asm/kvm.h index f46b79f6c16c..fb6117063ea3 100644 --- a/arch/x86/include/asm/kvm.h +++ b/arch/x86/include/asm/kvm.h @@ -257,6 +257,11 @@ struct kvm_reinject_control { /* When set in flags, include corresponding fields on KVM_SET_VCPU_EVENTS */ #define KVM_VCPUEVENT_VALID_NMI_PENDING 0x00000001 #define KVM_VCPUEVENT_VALID_SIPI_VECTOR 0x00000002 +#define KVM_VCPUEVENT_VALID_SHADOW 0x00000004 + +/* Interrupt shadow states */ +#define KVM_X86_SHADOW_INT_MOV_SS 0x01 +#define KVM_X86_SHADOW_INT_STI 0x02 /* for KVM_GET/SET_VCPU_EVENTS */ struct kvm_vcpu_events { @@ -271,7 +276,7 @@ struct kvm_vcpu_events { __u8 injected; __u8 nr; __u8 soft; - __u8 pad; + __u8 shadow; } interrupt; struct { __u8 injected; |
