Commit 1c90ef26 authored by Vadim Rozenfeld's avatar Vadim Rozenfeld Committed by Paolo Bonzini
Browse files

kvm: make hyperv hypercall and guest os id MSRs migratable. 



Signed-off-by: default avatarVadim Rozenfeld <vrozenfe@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 7bc3d711

target-i386/cpu.h

+2 −0
Original line number Diff line number Diff line
@@ -862,6 +862,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;

target-i386/kvm.c

+14 −2
Original line number Diff line number Diff line
@@ -1230,8 +1230,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);
@@ -1520,6 +1522,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) {
@@ -1627,6 +1633,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;

        }

    }

target-i386/machine.c

+23 −0
Original line number Diff line number Diff line
@@ -554,6 +554,26 @@ static const VMStateDescription vmstate_mpx = { 
    }

};



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_hypercall, X86CPU),

        VMSTATE_UINT64(env.msr_hv_guest_os_id, X86CPU),

        VMSTATE_END_OF_LIST()

    }

};



const VMStateDescription vmstate_x86_cpu = {

    .name = "cpu",

    .version_id = 12,
@@ -688,6 +708,9 @@ const VMStateDescription vmstate_x86_cpu = { 
        } , {

            .vmsd = &vmstate_mpx,

            .needed = mpx_needed,

        }, {

            .vmsd = &vmstate_msr_hypercall_hypercall,

            .needed = hyperv_hypercall_enable_needed,

        } , {

            /* empty */

        }