Commit 73e1b8f2 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

target-i386: introduce kvm_put_one_msr 



Avoid further code duplication in the next patch.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a008535b

target-i386/kvm.c

+11 −9
Original line number Diff line number Diff line
@@ -1532,6 +1532,14 @@ static void kvm_msr_entry_add(X86CPU *cpu, uint32_t index, uint64_t value) 
    msrs->nmsrs++;

}



static int kvm_put_one_msr(X86CPU *cpu, int index, uint64_t value)

{

    kvm_msr_buf_reset(cpu);

    kvm_msr_entry_add(cpu, index, value);



    return kvm_vcpu_ioctl(CPU(cpu), KVM_SET_MSRS, cpu->kvm_msr_buf);

}



static int kvm_put_tscdeadline_msr(X86CPU *cpu)

{

    CPUX86State *env = &cpu->env;
@@ -1541,10 +1549,7 @@ static int kvm_put_tscdeadline_msr(X86CPU *cpu) 
        return 0;

    }



    kvm_msr_buf_reset(cpu);

    kvm_msr_entry_add(cpu, MSR_IA32_TSCDEADLINE, env->tsc_deadline);



    ret = kvm_vcpu_ioctl(CPU(cpu), KVM_SET_MSRS, cpu->kvm_msr_buf);

    ret = kvm_put_one_msr(cpu, MSR_IA32_TSCDEADLINE, env->tsc_deadline);

    if (ret < 0) {

        return ret;

    }
@@ -1567,11 +1572,8 @@ static int kvm_put_msr_feature_control(X86CPU *cpu) 
        return 0;

    }



    kvm_msr_buf_reset(cpu);

    kvm_msr_entry_add(cpu, MSR_IA32_FEATURE_CONTROL,

    ret = kvm_put_one_msr(cpu, MSR_IA32_FEATURE_CONTROL,

                          cpu->env.msr_ia32_feature_control);



    ret = kvm_vcpu_ioctl(CPU(cpu), KVM_SET_MSRS, cpu->kvm_msr_buf);

    if (ret < 0) {

        return ret;

    }