Commit 26b516bb authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

x86/hyperv: KVM: Rename "hv_enlightenments" to "hv_vmcb_enlightenments" 



Now that KVM isn't littered with "struct hv_enlightenments" casts, rename
the struct to "hv_vmcb_enlightenments" to highlight the fact that the
struct is specifically for SVM's VMCB.

No functional change intended.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Reviewed-by: default avatarMichael Kelley <mikelley@microsoft.com>
Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20221101145426.251680-5-vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 68ae7c7b

arch/x86/include/asm/hyperv-tlfs.h

+1 −1
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ struct hv_enlightened_vmcs { 
 * Hyper-V uses the software reserved 32 bytes in VMCB control area to expose

 * SVM enlightenments to guests.

 */

struct hv_enlightenments {

struct hv_vmcb_enlightenments {

	struct __packed hv_enlightenments_control {

		u32 nested_flush_hypercall:1;

		u32 msr_bitmap:1;

arch/x86/include/asm/svm.h

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ struct __attribute__ ((__packed__)) vmcb_control_area { 
	 * for use by hypervisor/software.

	 */

	union {

		struct hv_enlightenments hv_enlightenments;

		struct hv_vmcb_enlightenments hv_enlightenments;

		u8 reserved_sw[32];

	};

};

arch/x86/kvm/svm/nested.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ void recalc_intercepts(struct vcpu_svm *svm) 
 */

static bool nested_svm_vmrun_msrpm(struct vcpu_svm *svm)

{

	struct hv_enlightenments *hve = &svm->nested.ctl.hv_enlightenments;

	struct hv_vmcb_enlightenments *hve = &svm->nested.ctl.hv_enlightenments;

	int i;



	/*

arch/x86/kvm/svm/svm.h

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ struct vmcb_ctrl_area_cached { 
	u64 virt_ext;

	u32 clean;

	union {

		struct hv_enlightenments hv_enlightenments;

		struct hv_vmcb_enlightenments hv_enlightenments;

		u8 reserved_sw[32];

	};

};

arch/x86/kvm/svm/svm_onhyperv.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


int svm_hv_enable_direct_tlbflush(struct kvm_vcpu *vcpu)

{

	struct hv_enlightenments *hve;

	struct hv_vmcb_enlightenments *hve;

	struct hv_partition_assist_pg **p_hv_pa_pg =

			&to_kvm_hv(vcpu->kvm)->hv_pa_pg;