Commit 25d2e361 authored by Marcelo Tosatti's avatar Marcelo Tosatti
Browse files

kvm: save/restore x86-64 MSRs on x86-64 kernels 



Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 384331a6

target-i386/kvm.c

+20 −10
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <sys/types.h>

#include <sys/ioctl.h>

#include <sys/mman.h>

#include <sys/utsname.h>



#include <linux/kvm.h>
@@ -53,6 +54,8 @@ 
#define BUS_MCEERR_AO 5

#endif



static int lm_capable_kernel;



#ifdef KVM_CAP_EXT_CPUID



static struct kvm_cpuid2 *try_get_cpuid(KVMState *s, int max)
@@ -523,6 +526,11 @@ int kvm_arch_init(KVMState *s, int smp_cpus) 
{

    int ret;



    struct utsname utsname;



    uname(&utsname);

    lm_capable_kernel = strcmp(utsname.machine, "x86_64") == 0;



    /* create vm86 tss.  KVM uses vm86 mode to emulate 16-bit code

     * directly.  In order to use vm86 mode, a TSS is needed.  Since this

     * must be part of guest physical memory, we need to allocate it.  Older
@@ -810,11 +818,12 @@ static int kvm_put_msrs(CPUState *env, int level) 
    if (kvm_has_msr_hsave_pa(env))

        kvm_msr_entry_set(&msrs[n++], MSR_VM_HSAVE_PA, env->vm_hsave);

#ifdef TARGET_X86_64

    /* FIXME if lm capable */

    if (lm_capable_kernel) {

        kvm_msr_entry_set(&msrs[n++], MSR_CSTAR, env->cstar);

        kvm_msr_entry_set(&msrs[n++], MSR_KERNELGSBASE, env->kernelgsbase);

        kvm_msr_entry_set(&msrs[n++], MSR_FMASK, env->fmask);

        kvm_msr_entry_set(&msrs[n++], MSR_LSTAR, env->lstar);

    }

#endif

    if (level == KVM_PUT_FULL_STATE) {

        /*
@@ -1046,11 +1055,12 @@ static int kvm_get_msrs(CPUState *env) 
        msrs[n++].index = MSR_VM_HSAVE_PA;

    msrs[n++].index = MSR_IA32_TSC;

#ifdef TARGET_X86_64

    /* FIXME lm_capable_kernel */

    if (lm_capable_kernel) {

        msrs[n++].index = MSR_CSTAR;

        msrs[n++].index = MSR_KERNELGSBASE;

        msrs[n++].index = MSR_FMASK;

        msrs[n++].index = MSR_LSTAR;

    }

#endif

    msrs[n++].index = MSR_KVM_SYSTEM_TIME;

    msrs[n++].index = MSR_KVM_WALL_CLOCK;