mirror of
https://github.com/torvalds/linux.git
synced 2024-12-11 13:41:55 +00:00
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: Sean Christopherson <seanjc@google.com> Reviewed-by: Michael Kelley <mikelley@microsoft.com> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <20221101145426.251680-5-vkuznets@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
68ae7c7bc5
commit
26b516bb39
@ -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;
|
||||
|
@ -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];
|
||||
};
|
||||
};
|
||||
|
@ -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;
|
||||
|
||||
/*
|
||||
|
@ -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];
|
||||
};
|
||||
};
|
||||
|
@ -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;
|
||||
|
||||
|
@ -17,7 +17,7 @@ int svm_hv_enable_direct_tlbflush(struct kvm_vcpu *vcpu);
|
||||
|
||||
static inline void svm_hv_init_vmcb(struct vmcb *vmcb)
|
||||
{
|
||||
struct hv_enlightenments *hve = &vmcb->control.hv_enlightenments;
|
||||
struct hv_vmcb_enlightenments *hve = &vmcb->control.hv_enlightenments;
|
||||
|
||||
BUILD_BUG_ON(sizeof(vmcb->control.hv_enlightenments) !=
|
||||
sizeof(vmcb->control.reserved_sw));
|
||||
@ -62,7 +62,7 @@ static inline void svm_hv_vmcb_dirty_nested_enlightenments(
|
||||
struct kvm_vcpu *vcpu)
|
||||
{
|
||||
struct vmcb *vmcb = to_svm(vcpu)->vmcb;
|
||||
struct hv_enlightenments *hve = &vmcb->control.hv_enlightenments;
|
||||
struct hv_vmcb_enlightenments *hve = &vmcb->control.hv_enlightenments;
|
||||
|
||||
if (hve->hv_enlightenments_control.msr_bitmap)
|
||||
vmcb_mark_dirty(vmcb, HV_VMCB_NESTED_ENLIGHTENMENTS);
|
||||
@ -70,7 +70,7 @@ static inline void svm_hv_vmcb_dirty_nested_enlightenments(
|
||||
|
||||
static inline void svm_hv_update_vp_id(struct vmcb *vmcb, struct kvm_vcpu *vcpu)
|
||||
{
|
||||
struct hv_enlightenments *hve = &vmcb->control.hv_enlightenments;
|
||||
struct hv_vmcb_enlightenments *hve = &vmcb->control.hv_enlightenments;
|
||||
u32 vp_index = kvm_hv_get_vpindex(vcpu);
|
||||
|
||||
if (hve->hv_vp_id != vp_index) {
|
||||
|
@ -58,7 +58,7 @@ enum {
|
||||
INTERCEPT_RDPRU,
|
||||
};
|
||||
|
||||
struct hv_enlightenments {
|
||||
struct hv_vmcb_enlightenments {
|
||||
struct __packed hv_enlightenments_control {
|
||||
u32 nested_flush_hypercall:1;
|
||||
u32 msr_bitmap:1;
|
||||
@ -124,7 +124,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];
|
||||
};
|
||||
};
|
||||
|
@ -46,7 +46,7 @@ static void __attribute__((__flatten__)) guest_code(struct svm_test_data *svm)
|
||||
{
|
||||
unsigned long l2_guest_stack[L2_GUEST_STACK_SIZE];
|
||||
struct vmcb *vmcb = svm->vmcb;
|
||||
struct hv_enlightenments *hve = &vmcb->control.hv_enlightenments;
|
||||
struct hv_vmcb_enlightenments *hve = &vmcb->control.hv_enlightenments;
|
||||
|
||||
GUEST_SYNC(1);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user