KVM: x86: no need to inititalize vcpu members to 0

[linux.git] / arch / x86 / kvm / x86.c

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index cd17b7d9a1076c1d28904bc4cd1ea06af5e0f2c0..632561b2a3f66e85902e0eaeec8eb2da51f5cfc8 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -7225,7 +7225,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
        int r;
        sigset_t sigsaved;
 
-       fpu__activate_curr(fpu);
+       fpu__initialize(fpu);
 
        if (vcpu->sigset_active)
                sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);
@@ -7974,16 +7974,11 @@ EXPORT_SYMBOL_GPL(kvm_no_apic_vcpu);
 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
 {
        struct page *page;
-       struct kvm *kvm;
        int r;
 
-       BUG_ON(vcpu->kvm == NULL);
-       kvm = vcpu->kvm;
-
        vcpu->arch.apicv_active = kvm_x86_ops->get_enable_apicv(vcpu);
-       vcpu->arch.pv.pv_unhalted = false;
        vcpu->arch.emulate_ctxt.ops = &emulate_ops;
-       if (!irqchip_in_kernel(kvm) || kvm_vcpu_is_reset_bsp(vcpu))
+       if (!irqchip_in_kernel(vcpu->kvm) || kvm_vcpu_is_reset_bsp(vcpu))
                vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE;
        else
                vcpu->arch.mp_state = KVM_MP_STATE_UNINITIALIZED;
@@ -8001,7 +7996,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
        if (r < 0)
                goto fail_free_pio_data;
 
-       if (irqchip_in_kernel(kvm)) {
+       if (irqchip_in_kernel(vcpu->kvm)) {
                r = kvm_create_lapic(vcpu);
                if (r < 0)
                        goto fail_mmu_destroy;
@@ -8023,10 +8018,6 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
 
        fx_init(vcpu);
 
-       vcpu->arch.ia32_tsc_adjust_msr = 0x0;
-       vcpu->arch.pv_time_enabled = false;
-
-       vcpu->arch.guest_supported_xcr0 = 0;
        vcpu->arch.guest_xstate_size = XSAVE_HDR_SIZE + XSAVE_HDR_OFFSET;
 
        vcpu->arch.maxphyaddr = cpuid_query_maxphyaddr(vcpu);