Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ccf73aaf authored Apr 30, 2015 by Christian Borntraeger Committed by Paolo Bonzini May 07, 2015

KVM: arm/mips/x86/power use __kvm_guest_{enter|exit}



Use __kvm_guest_{enter|exit} instead of kvm_guest_{enter|exit}
where interrupts are disabled.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 0097d12e

arch/arm/kvm/arm.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -553,13 +553,13 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu vcpu, struct kvm_run run)
	* Enter the guest		* Enter the guest
	*/		*/
	trace_kvm_entry(*vcpu_pc(vcpu));		trace_kvm_entry(*vcpu_pc(vcpu));
	kvm_guest_enter();		__kvm_guest_enter();
	vcpu->mode = IN_GUEST_MODE;		vcpu->mode = IN_GUEST_MODE;

	ret = kvm_call_hyp(__kvm_vcpu_run, vcpu);		ret = kvm_call_hyp(__kvm_vcpu_run, vcpu);

	vcpu->mode = OUTSIDE_GUEST_MODE;		vcpu->mode = OUTSIDE_GUEST_MODE;
	kvm_guest_exit();		__kvm_guest_exit();
	trace_kvm_exit(kvm_vcpu_trap_get_class(vcpu), *vcpu_pc(vcpu));		trace_kvm_exit(kvm_vcpu_trap_get_class(vcpu), *vcpu_pc(vcpu));
	/*		/*
	* We may have taken a host interrupt in HYP mode (ie		* We may have taken a host interrupt in HYP mode (ie

arch/mips/kvm/mips.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -393,7 +393,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu vcpu, struct kvm_run run)
	kvm_mips_deliver_interrupts(vcpu,		kvm_mips_deliver_interrupts(vcpu,
	kvm_read_c0_guest_cause(vcpu->arch.cop0));		kvm_read_c0_guest_cause(vcpu->arch.cop0));

	kvm_guest_enter();		__kvm_guest_enter();

	/* Disable hardware page table walking while in guest */		/* Disable hardware page table walking while in guest */
	htw_stop();		htw_stop();
	@@ -403,7 +403,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu vcpu, struct kvm_run run)
	/* Re-enable HTW before enabling interrupts */		/* Re-enable HTW before enabling interrupts */
	htw_start();		htw_start();

	kvm_guest_exit();		__kvm_guest_exit();
	local_irq_enable();		local_irq_enable();

	if (vcpu->sigset_active)		if (vcpu->sigset_active)

arch/powerpc/kvm/powerpc.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -115,7 +115,7 @@ int kvmppc_prepare_to_enter(struct kvm_vcpu *vcpu)
	continue;		continue;
	}		}

	kvm_guest_enter();		__kvm_guest_enter();
	return 1;		return 1;
	}		}

arch/x86/kvm/x86.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6347,7 +6347,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
	if (req_immediate_exit)		if (req_immediate_exit)
	smp_send_reschedule(vcpu->cpu);		smp_send_reschedule(vcpu->cpu);

	kvm_guest_enter();		__kvm_guest_enter();

	if (unlikely(vcpu->arch.switch_db_regs)) {		if (unlikely(vcpu->arch.switch_db_regs)) {
	set_debugreg(0, 7);		set_debugreg(0, 7);