From d5d30b394975f460a99a6313645a737acf16d4c7 Mon Sep 17 00:00:00 2001 From: Paul Durrant Date: Wed, 31 Oct 2018 13:44:00 +0100 Subject: [PATCH] viridian: move the code into its own sub-directory Subsequent patches will introduce support for more viridian enlightenments which will make a single source module quite lengthy. This patch therefore creates a new arch/x86/hvm/viridian sub-directory and moves viridian.c into that. The patch also fixes some bad whitespace whilst moving the code and adjusts the MAINTAINERS file. Signed-off-by: Paul Durrant Acked-by: Jan Beulich --- MAINTAINERS | 2 +- xen/arch/x86/hvm/Makefile | 2 +- xen/arch/x86/hvm/viridian/Makefile | 1 + xen/arch/x86/hvm/{ => viridian}/viridian.c | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 xen/arch/x86/hvm/viridian/Makefile rename xen/arch/x86/hvm/{ => viridian}/viridian.c (99%) diff --git a/MAINTAINERS b/MAINTAINERS index 1970100b37..c2ba74d0c9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -487,7 +487,7 @@ F: xen/arch/x86/mm/shadow/ X86 VIRIDIAN ENLIGHTENMENTS M: Paul Durrant S: Supported -F: xen/arch/x86/hvm/viridian.c +F: xen/arch/x86/hvm/viridian/ F: xen/include/asm-x86/hvm/viridian.h XENTRACE diff --git a/xen/arch/x86/hvm/Makefile b/xen/arch/x86/hvm/Makefile index 5e04bc1429..86b106f8e7 100644 --- a/xen/arch/x86/hvm/Makefile +++ b/xen/arch/x86/hvm/Makefile @@ -1,5 +1,6 @@ subdir-y += svm subdir-y += vmx +subdir-y += viridian obj-y += asid.o obj-y += dm.o @@ -23,7 +24,6 @@ obj-y += rtc.o obj-y += save.o obj-y += stdvga.o obj-y += vioapic.o -obj-y += viridian.o obj-y += vlapic.o obj-y += vm_event.o obj-y += vmsi.o diff --git a/xen/arch/x86/hvm/viridian/Makefile b/xen/arch/x86/hvm/viridian/Makefile new file mode 100644 index 0000000000..09fd0a5f3c --- /dev/null +++ b/xen/arch/x86/hvm/viridian/Makefile @@ -0,0 +1 @@ +obj-y += viridian.o diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian/viridian.c similarity index 99% rename from xen/arch/x86/hvm/viridian.c rename to xen/arch/x86/hvm/viridian/viridian.c index f42b1f063e..3e9beda831 100644 --- a/xen/arch/x86/hvm/viridian.c +++ b/xen/arch/x86/hvm/viridian/viridian.c @@ -4,7 +4,7 @@ * An implementation of some Viridian enlightenments. See Microsoft's * Hypervisor Top Level Functional Specification (v5.0a) at: * - * https://github.com/Microsoft/Virtualization-Documentation/raw/master/tlfs/Hypervisor%20Top%20Level%20Functional%20Specification%20v5.0.pdf + * https://github.com/Microsoft/Virtualization-Documentation/raw/master/tlfs/Hypervisor%20Top%20Level%20Functional%20Specification%20v5.0.pdf * * for more information. */ @@ -334,7 +334,7 @@ static void dump_reference_tsc(const struct domain *d) const union viridian_reference_tsc *rt; rt = &d->arch.hvm.viridian.reference_tsc; - + printk(XENLOG_G_INFO "d%d: VIRIDIAN REFERENCE_TSC: enabled: %x pfn: %lx\n", d->domain_id, rt->fields.enabled, (unsigned long)rt->fields.pfn); -- 2.39.5