Commit 872e0c53 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86: Move get_cs_db_l_bits() helper to SVM 



Move kvm_get_cs_db_l_bits() to SVM and rename it appropriately so that
its svm_x86_ops entry can be filled via kvm-x86-ops, and to eliminate a
superfluous export from KVM x86.

No functional change intended.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20220128005208.4008533-16-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 58fccda4

arch/x86/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -1724,7 +1724,6 @@ int kvm_set_dr(struct kvm_vcpu *vcpu, int dr, unsigned long val); 
void kvm_get_dr(struct kvm_vcpu *vcpu, int dr, unsigned long *val);

unsigned long kvm_get_cr8(struct kvm_vcpu *vcpu);

void kvm_lmsw(struct kvm_vcpu *vcpu, unsigned long msw);

void kvm_get_cs_db_l_bits(struct kvm_vcpu *vcpu, int *db, int *l);

int kvm_emulate_xsetbv(struct kvm_vcpu *vcpu);



int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr);

arch/x86/kvm/svm/svm.c

+10 −1
Original line number Diff line number Diff line
@@ -1531,6 +1531,15 @@ static int svm_get_cpl(struct kvm_vcpu *vcpu) 
	return save->cpl;

}



static void svm_get_cs_db_l_bits(struct kvm_vcpu *vcpu, int *db, int *l)

{

	struct kvm_segment cs;



	svm_get_segment(vcpu, &cs, VCPU_SREG_CS);

	*db = cs.db;

	*l = cs.l;

}



static void svm_get_idt(struct kvm_vcpu *vcpu, struct desc_ptr *dt)

{

	struct vcpu_svm *svm = to_svm(vcpu);
@@ -4510,7 +4519,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { 
	.get_segment = svm_get_segment,

	.set_segment = svm_set_segment,

	.get_cpl = svm_get_cpl,

	.get_cs_db_l_bits = kvm_get_cs_db_l_bits,

	.get_cs_db_l_bits = svm_get_cs_db_l_bits,

	.set_cr0 = svm_set_cr0,

	.post_set_cr3 = svm_post_set_cr3,

	.is_valid_cr4 = svm_is_valid_cr4,

arch/x86/kvm/x86.c

+0 −10
Original line number Diff line number Diff line
@@ -10542,16 +10542,6 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) 
	return 0;

}



void kvm_get_cs_db_l_bits(struct kvm_vcpu *vcpu, int *db, int *l)

{

	struct kvm_segment cs;



	kvm_get_segment(vcpu, &cs, VCPU_SREG_CS);

	*db = cs.db;

	*l = cs.l;

}

EXPORT_SYMBOL_GPL(kvm_get_cs_db_l_bits);



static void __get_sregs_common(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)

{

	struct desc_ptr dt;