From ab03fc7dbf876e611f43be34faa6945728977056 Mon Sep 17 00:00:00 2001 From: Vadim Rozenfeld Date: Mon, 3 Mar 2014 12:09:17 +0100 Subject: [PATCH 05/12] kvm: make hyperv hypercall and guest os id MSRs migratable. RH-Author: Vadim Rozenfeld Message-id: <1393848564-10511-6-git-send-email-vrozenfe@redhat.com> Patchwork-id: 57961 O-Subject: [RHEL-7.0 qemu-kvm v4 PATCH 05/12] kvm: make hyperv hypercall and guest os id MSRs migratable. Bugzilla: 1004773 RH-Acked-by: Paolo Bonzini RH-Acked-by: Igor Mammedov RH-Acked-by: Eduardo Habkost RH-Acked-by: Juan Quintela Note: The field order in vmstate_msr_hypercall_hypercall follows the same pattern as in RHEL6, but not upstream. Signed-off-by: Vadim Rozenfeld Signed-off-by: Paolo Bonzini (cherry picked from commit 1c90ef2619dd6e5c4fec7e9e18c04c0a08e93aac) Conflicts: target-i386/machine.c --- target-i386/cpu.h | 2 ++ target-i386/kvm.c | 16 ++++++++++++++-- target-i386/machine.c | 23 +++++++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) Signed-off-by: Miroslav Rezanina --- target-i386/cpu.h | 2 ++ target-i386/kvm.c | 16 ++++++++++++++-- target-i386/machine.c | 23 +++++++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 4c4c9ff..4835a64 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -844,6 +844,8 @@ typedef struct CPUX86State { uint64_t msr_fixed_counters[MAX_FIXED_COUNTERS]; uint64_t msr_gp_counters[MAX_GP_COUNTERS]; uint64_t msr_gp_evtsel[MAX_GP_COUNTERS]; + uint64_t msr_hv_hypercall; + uint64_t msr_hv_guest_os_id; /* exception/interrupt handling */ int error_code; diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 495021b..943abe1 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -1198,8 +1198,10 @@ static int kvm_put_msrs(X86CPU *cpu, int level) env->msr_global_ctrl); } if (has_msr_hv_hypercall) { - kvm_msr_entry_set(&msrs[n++], HV_X64_MSR_GUEST_OS_ID, 0); - kvm_msr_entry_set(&msrs[n++], HV_X64_MSR_HYPERCALL, 0); + kvm_msr_entry_set(&msrs[n++], HV_X64_MSR_GUEST_OS_ID, + env->msr_hv_guest_os_id); + kvm_msr_entry_set(&msrs[n++], HV_X64_MSR_HYPERCALL, + env->msr_hv_hypercall); } if (has_msr_hv_vapic) { kvm_msr_entry_set(&msrs[n++], HV_X64_MSR_APIC_ASSIST_PAGE, 0); @@ -1475,6 +1477,10 @@ static int kvm_get_msrs(X86CPU *cpu) } } + if (has_msr_hv_hypercall) { + msrs[n++].index = HV_X64_MSR_HYPERCALL; + msrs[n++].index = HV_X64_MSR_GUEST_OS_ID; + } msr_data.info.nmsrs = n; ret = kvm_vcpu_ioctl(CPU(cpu), KVM_GET_MSRS, &msr_data); if (ret < 0) { @@ -1576,6 +1582,12 @@ static int kvm_get_msrs(X86CPU *cpu) case MSR_P6_EVNTSEL0 ... MSR_P6_EVNTSEL0 + MAX_GP_COUNTERS - 1: env->msr_gp_evtsel[index - MSR_P6_EVNTSEL0] = msrs[i].data; break; + case HV_X64_MSR_HYPERCALL: + env->msr_hv_hypercall = msrs[i].data; + break; + case HV_X64_MSR_GUEST_OS_ID: + env->msr_hv_guest_os_id = msrs[i].data; + break; } } diff --git a/target-i386/machine.c b/target-i386/machine.c index 08b4ed3..817f8e4 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -506,6 +506,26 @@ static const VMStateDescription vmstate_msr_architectural_pmu = { } }; +static bool hyperv_hypercall_enable_needed(void *opaque) +{ + X86CPU *cpu = opaque; + CPUX86State *env = &cpu->env; + + return env->msr_hv_hypercall != 0 || env->msr_hv_guest_os_id != 0; +} + +static const VMStateDescription vmstate_msr_hypercall_hypercall = { + .name = "cpu/msr_hyperv_hypercall", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .fields = (VMStateField []) { + VMSTATE_UINT64(env.msr_hv_guest_os_id, X86CPU), + VMSTATE_UINT64(env.msr_hv_hypercall, X86CPU), + VMSTATE_END_OF_LIST() + } +}; + const VMStateDescription vmstate_x86_cpu = { .name = "cpu", .version_id = 12, @@ -638,6 +658,9 @@ const VMStateDescription vmstate_x86_cpu = { .vmsd = &vmstate_msr_architectural_pmu, .needed = pmu_enable_needed, }, { + .vmsd = &vmstate_msr_hypercall_hypercall, + .needed = hyperv_hypercall_enable_needed, + } , { /* empty */ } } -- 1.7.1