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

Commit d3bef15f authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: Move duplicate halt handling code into kvm_main.c 



Will soon have a thid user.

Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent ef9254df

drivers/kvm/kvm.h

+1 −0
Original line number Diff line number Diff line
@@ -504,6 +504,7 @@ int kvm_setup_pio(struct kvm_vcpu *vcpu, struct kvm_run *run, int in, 
		  int size, unsigned long count, int string, int down,

		  gva_t address, int rep, unsigned port);

void kvm_emulate_cpuid(struct kvm_vcpu *vcpu);

int kvm_emulate_halt(struct kvm_vcpu *vcpu);

int emulate_invlpg(struct kvm_vcpu *vcpu, gva_t address);

int emulate_clts(struct kvm_vcpu *vcpu);

int emulator_get_dr(struct x86_emulate_ctxt* ctxt, int dr,

drivers/kvm/kvm_main.c

+11 −0
Original line number Diff line number Diff line
@@ -1285,6 +1285,17 @@ int emulate_instruction(struct kvm_vcpu *vcpu, 
}

EXPORT_SYMBOL_GPL(emulate_instruction);



int kvm_emulate_halt(struct kvm_vcpu *vcpu)

{

	if (vcpu->irq_summary)

		return 1;



	vcpu->run->exit_reason = KVM_EXIT_HLT;

	++vcpu->stat.halt_exits;

	return 0;

}

EXPORT_SYMBOL_GPL(kvm_emulate_halt);



int kvm_hypercall(struct kvm_vcpu *vcpu, struct kvm_run *run)

{

	unsigned long nr, a0, a1, a2, a3, a4, a5, ret;

drivers/kvm/svm.c

+1 −6
Original line number Diff line number Diff line
@@ -1115,12 +1115,7 @@ static int halt_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
{

	vcpu->svm->next_rip = vcpu->svm->vmcb->save.rip + 1;

	skip_emulated_instruction(vcpu);

	if (vcpu->irq_summary)

		return 1;



	kvm_run->exit_reason = KVM_EXIT_HLT;

	++vcpu->stat.halt_exits;

	return 0;

	return kvm_emulate_halt(vcpu);

}



static int vmmcall_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)

drivers/kvm/vmx.c

+1 −6
Original line number Diff line number Diff line
@@ -1896,12 +1896,7 @@ static int handle_interrupt_window(struct kvm_vcpu *vcpu, 
static int handle_halt(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)

{

	skip_emulated_instruction(vcpu);

	if (vcpu->irq_summary)

		return 1;



	kvm_run->exit_reason = KVM_EXIT_HLT;

	++vcpu->stat.halt_exits;

	return 0;

	return kvm_emulate_halt(vcpu);

}



static int handle_vmcall(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)