Commit 82ca2d10 authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: SVM: Fold save_host_msrs() and load_host_msrs() into their callers 



This abstraction only serves to obfuscate.  Remove.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent dacccfdd

arch/x86/kvm/svm.c

+6 −20
Original line number Diff line number Diff line
@@ -187,9 +187,6 @@ static int nested_svm_vmexit(struct vcpu_svm *svm); 
static int nested_svm_check_exception(struct vcpu_svm *svm, unsigned nr,

				      bool has_error_code, u32 error_code);



static void save_host_msrs(struct kvm_vcpu *vcpu);

static void load_host_msrs(struct kvm_vcpu *vcpu);



static inline struct vcpu_svm *to_svm(struct kvm_vcpu *vcpu)

{

	return container_of(vcpu, struct vcpu_svm, vcpu);
@@ -1002,7 +999,9 @@ static void svm_vcpu_load(struct kvm_vcpu *vcpu, int cpu) 
		svm->asid_generation = 0;

	}



	save_host_msrs(vcpu);

#ifdef CONFIG_X86_64

	rdmsrl(MSR_GS_BASE, to_svm(vcpu)->host.gs_base);

#endif

	savesegment(fs, svm->host.fs);

	savesegment(gs, svm->host.gs);

	svm->host.ldt = kvm_read_ldt();
@@ -1371,20 +1370,6 @@ static void svm_guest_debug(struct kvm_vcpu *vcpu, struct kvm_guest_debug *dbg) 
	update_db_intercept(vcpu);

}



static void load_host_msrs(struct kvm_vcpu *vcpu)

{

#ifdef CONFIG_X86_64

	wrmsrl(MSR_GS_BASE, to_svm(vcpu)->host.gs_base);

#endif

}



static void save_host_msrs(struct kvm_vcpu *vcpu)

{

#ifdef CONFIG_X86_64

	rdmsrl(MSR_GS_BASE, to_svm(vcpu)->host.gs_base);

#endif

}



static void new_asid(struct vcpu_svm *svm, struct svm_cpu_data *sd)

{

	if (sd->next_asid > sd->max_asid) {
@@ -3426,8 +3411,9 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu) 
#endif

		);



	load_host_msrs(vcpu);

#ifndef CONFIG_X86_64

#ifdef CONFIG_X86_64

	wrmsrl(MSR_GS_BASE, svm->host.gs_base);

#else

	loadsegment(fs, svm->host.fs);

#endif