diff options
| author | Vadim Rozenfeld <vrozenfe@redhat.com> | 2014-01-24 00:40:48 +1100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-02-03 17:33:55 +0100 |
| commit | 5ef68987e5671edf5f51f845d1bbf3e5759a8526 (patch) | |
| tree | be0504035a9595a9bd0caf382a1c52568a16873e | |
| parent | 1c90ef2619dd6e5c4fec7e9e18c04c0a08e93aac (diff) | |
kvm: make hyperv vapic assist page migratable
Signed-off-by: Vadim Rozenfeld <vrozenfe@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | target-i386/cpu.h | 1 | ||||
| -rw-r--r-- | target-i386/kvm.c | 10 | ||||
| -rw-r--r-- | target-i386/machine.c | 22 |
3 files changed, 32 insertions, 1 deletions
diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 3dba5efd96..45bd554f31 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -864,6 +864,7 @@ typedef struct CPUX86State { uint64_t msr_gp_evtsel[MAX_GP_COUNTERS]; uint64_t msr_hv_hypercall; uint64_t msr_hv_guest_os_id; + uint64_t msr_hv_vapic; /* exception/interrupt handling */ int error_code; diff --git a/target-i386/kvm.c b/target-i386/kvm.c index fade2c99a7..ddd437f43c 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -1236,7 +1236,8 @@ static int kvm_put_msrs(X86CPU *cpu, int level) env->msr_hv_hypercall); } if (has_msr_hv_vapic) { - kvm_msr_entry_set(&msrs[n++], HV_X64_MSR_APIC_ASSIST_PAGE, 0); + kvm_msr_entry_set(&msrs[n++], HV_X64_MSR_APIC_ASSIST_PAGE, + env->msr_hv_vapic); } /* Note: MSR_IA32_FEATURE_CONTROL is written separately, see @@ -1526,6 +1527,10 @@ static int kvm_get_msrs(X86CPU *cpu) msrs[n++].index = HV_X64_MSR_HYPERCALL; msrs[n++].index = HV_X64_MSR_GUEST_OS_ID; } + if (has_msr_hv_vapic) { + msrs[n++].index = HV_X64_MSR_APIC_ASSIST_PAGE; + } + msr_data.info.nmsrs = n; ret = kvm_vcpu_ioctl(CPU(cpu), KVM_GET_MSRS, &msr_data); if (ret < 0) { @@ -1639,6 +1644,9 @@ static int kvm_get_msrs(X86CPU *cpu) case HV_X64_MSR_GUEST_OS_ID: env->msr_hv_guest_os_id = msrs[i].data; break; + case HV_X64_MSR_APIC_ASSIST_PAGE: + env->msr_hv_vapic = msrs[i].data; + break; } } diff --git a/target-i386/machine.c b/target-i386/machine.c index 96fd0454d2..e72e27092f 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -574,6 +574,25 @@ static const VMStateDescription vmstate_msr_hypercall_hypercall = { } }; +static bool hyperv_vapic_enable_needed(void *opaque) +{ + X86CPU *cpu = opaque; + CPUX86State *env = &cpu->env; + + return env->msr_hv_vapic != 0; +} + +static const VMStateDescription vmstate_msr_hyperv_vapic = { + .name = "cpu/msr_hyperv_vapic", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .fields = (VMStateField []) { + VMSTATE_UINT64(env.msr_hv_vapic, X86CPU), + VMSTATE_END_OF_LIST() + } +}; + const VMStateDescription vmstate_x86_cpu = { .name = "cpu", .version_id = 12, @@ -711,6 +730,9 @@ const VMStateDescription vmstate_x86_cpu = { }, { .vmsd = &vmstate_msr_hypercall_hypercall, .needed = hyperv_hypercall_enable_needed, + }, { + .vmsd = &vmstate_msr_hyperv_vapic, + .needed = hyperv_vapic_enable_needed, } , { /* empty */ } |