From b8aa71df9dc7135c4894732449745f1e8a130798 Mon Sep 17 00:00:00 2001 From: Vadim Rozenfeld Date: Mon, 3 Mar 2014 12:09:18 +0100 Subject: [PATCH 06/12] kvm: make hyperv vapic assist page migratable RH-Author: Vadim Rozenfeld Message-id: <1393848564-10511-7-git-send-email-vrozenfe@redhat.com> Patchwork-id: 57962 O-Subject: [RHEL-7.0 qemu-kvm v4 PATCH 06/12] kvm: make hyperv vapic assist page migratable Bugzilla: 1004773 RH-Acked-by: Paolo Bonzini RH-Acked-by: Igor Mammedov RH-Acked-by: Eduardo Habkost RH-Acked-by: Juan Quintela Signed-off-by: Vadim Rozenfeld Signed-off-by: Paolo Bonzini (cherry picked from commit 5ef68987e5671edf5f51f845d1bbf3e5759a8526) --- target-i386/cpu.h | 1 + target-i386/kvm.c | 10 +++++++++- target-i386/machine.c | 22 ++++++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) Signed-off-by: Miroslav Rezanina --- target-i386/cpu.h | 1 + target-i386/kvm.c | 10 +++++++++- 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 4835a64..0773499 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -846,6 +846,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 943abe1..a2946c4 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -1204,7 +1204,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); } } if (env->mcg_cap) { @@ -1481,6 +1482,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) { @@ -1588,6 +1593,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 817f8e4..021390b 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -526,6 +526,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, @@ -660,6 +679,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 */ } -- 1.7.1