[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v6 10/11] x86: move viridian_page_msr to hyperv-tlfs.h
And rename it to hv_vp_assist_page_msr. No functional change. Signed-off-by: Wei Liu <liuwe@xxxxxxxxxxxxx> --- xen/arch/x86/hvm/viridian/viridian.c | 2 +- xen/include/asm-x86/guest/hyperv-tlfs.h | 11 +++++++++++ xen/include/asm-x86/hvm/viridian.h | 15 ++------------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/hvm/viridian/viridian.c b/xen/arch/x86/hvm/viridian/viridian.c index 44c8e6cac6..9a6cafcb62 100644 --- a/xen/arch/x86/hvm/viridian/viridian.c +++ b/xen/arch/x86/hvm/viridian/viridian.c @@ -230,7 +230,7 @@ static void dump_guest_os_id(const struct domain *d) static void dump_hypercall(const struct domain *d) { - const union viridian_page_msr *hg; + const union hv_vp_assist_page_msr *hg; hg = &d->arch.hvm.viridian->hypercall_gpa; diff --git a/xen/include/asm-x86/guest/hyperv-tlfs.h b/xen/include/asm-x86/guest/hyperv-tlfs.h index 07db57b55f..0a0f3398c1 100644 --- a/xen/include/asm-x86/guest/hyperv-tlfs.h +++ b/xen/include/asm-x86/guest/hyperv-tlfs.h @@ -558,6 +558,17 @@ struct hv_nested_enlightenments_control { } hypercallControls; }; +union hv_vp_assist_page_msr +{ + uint64_t raw; + struct + { + uint64_t enabled:1; + uint64_t reserved_preserved:11; + uint64_t pfn:48; + }; +}; + /* Define virtual processor assist page structure. */ struct hv_vp_assist_page { __u32 apic_assist; diff --git a/xen/include/asm-x86/hvm/viridian.h b/xen/include/asm-x86/hvm/viridian.h index d9138562e6..844e56b38f 100644 --- a/xen/include/asm-x86/hvm/viridian.h +++ b/xen/include/asm-x86/hvm/viridian.h @@ -11,20 +11,9 @@ #include <asm/guest/hyperv-tlfs.h> -union viridian_page_msr -{ - uint64_t raw; - struct - { - uint64_t enabled:1; - uint64_t reserved_preserved:11; - uint64_t pfn:48; - }; -}; - struct viridian_page { - union viridian_page_msr msr; + union hv_vp_assist_page_msr msr; void *ptr; }; @@ -70,7 +59,7 @@ struct viridian_time_ref_count struct viridian_domain { union hv_guest_os_id guest_os_id; - union viridian_page_msr hypercall_gpa; + union hv_vp_assist_page_msr hypercall_gpa; struct viridian_time_ref_count time_ref_count; struct viridian_page reference_tsc; }; -- 2.20.1 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxxxxxxxxx https://lists.xenproject.org/mailman/listinfo/xen-devel
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |