From 2b2dbe43d7ad911bcf5033f6666e849e7d03bd5a Mon Sep 17 00:00:00 2001 From: Mingqiang Chi Date: Tue, 29 Jan 2019 15:56:48 +0800 Subject: [PATCH] hv:move some files to guest folder move the following files to guest folder: renamed: arch/x86/assign.c -> arch/x86/guest/assign.c renamed: arch/x86/ept.c -> arch/x86/guest/ept.c renamed: arch/x86/io_emul.c -> arch/x86/guest/io_emul.c renamed: arch/x86/trusty.c -> arch/x86/guest/trusty.c renamed: arch/x86/virq.c -> arch/x86/guest/virq.c renamed: arch/x86/virtual_cr.c -> arch/x86/guest/virtual_cr.c renamed: arch/x86/vmcs.c -> arch/x86/guest/vmcs.c renamed: arch/x86/vmexit.c -> arch/x86/guest/vmexit.c renamed: arch/x86/vmx_asm.S -> arch/x86/guest/vmx_asm.S renamed: include/arch/x86/assign.h -> include/arch/x86/guest/assign.h renamed: include/arch/x86/io_emul.h -> include/arch/x86/guest/io_emul.h renamed: include/arch/x86/trusty.h -> include/arch/x86/guest/trusty.h renamed: include/arch/x86/virtual_cr.h -> include/arch/x86/guest/virtual_cr.h renamed: include/arch/x86/vmcs.h -> include/arch/x86/guest/vmcs.h renamed: include/arch/x86/vmexit.h -> include/arch/x86/guest/vmexit.h After these files movement, all the files in arch/x86 are native hardware related, and all the files in arch/x86/guest are virtualiztion related. Tracked-On: #1842 Signed-off-by: Mingqiang Chi Reviewed-by: Jason Chen CJ Reviewed-by: Eddie Dong --- doc/acrn.doxyfile | 8 ++++---- hypervisor/Makefile | 18 +++++++++--------- hypervisor/arch/x86/{ => guest}/assign.c | 0 hypervisor/arch/x86/{ => guest}/ept.c | 0 hypervisor/arch/x86/{ => guest}/io_emul.c | 0 hypervisor/arch/x86/{ => guest}/trusty.c | 0 hypervisor/arch/x86/{ => guest}/virq.c | 0 hypervisor/arch/x86/{ => guest}/virtual_cr.c | 0 hypervisor/arch/x86/{ => guest}/vmcs.c | 0 hypervisor/arch/x86/{ => guest}/vmexit.c | 0 hypervisor/arch/x86/{ => guest}/vmx_asm.S | 0 .../include/arch/x86/{ => guest}/assign.h | 0 .../include/arch/x86/{ => guest}/io_emul.h | 0 .../include/arch/x86/{ => guest}/trusty.h | 0 .../include/arch/x86/{ => guest}/virtual_cr.h | 0 hypervisor/include/arch/x86/{ => guest}/vmcs.h | 0 .../include/arch/x86/{ => guest}/vmexit.h | 0 17 files changed, 13 insertions(+), 13 deletions(-) rename hypervisor/arch/x86/{ => guest}/assign.c (100%) rename hypervisor/arch/x86/{ => guest}/ept.c (100%) rename hypervisor/arch/x86/{ => guest}/io_emul.c (100%) rename hypervisor/arch/x86/{ => guest}/trusty.c (100%) rename hypervisor/arch/x86/{ => guest}/virq.c (100%) rename hypervisor/arch/x86/{ => guest}/virtual_cr.c (100%) rename hypervisor/arch/x86/{ => guest}/vmcs.c (100%) rename hypervisor/arch/x86/{ => guest}/vmexit.c (100%) rename hypervisor/arch/x86/{ => guest}/vmx_asm.S (100%) rename hypervisor/include/arch/x86/{ => guest}/assign.h (100%) rename hypervisor/include/arch/x86/{ => guest}/io_emul.h (100%) rename hypervisor/include/arch/x86/{ => guest}/trusty.h (100%) rename hypervisor/include/arch/x86/{ => guest}/virtual_cr.h (100%) rename hypervisor/include/arch/x86/{ => guest}/vmcs.h (100%) rename hypervisor/include/arch/x86/{ => guest}/vmexit.h (100%) diff --git a/doc/acrn.doxyfile b/doc/acrn.doxyfile index 9989e9785..6b3c3e589 100644 --- a/doc/acrn.doxyfile +++ b/doc/acrn.doxyfile @@ -803,15 +803,15 @@ INPUT = custom-doxygen/mainpage.md \ ../hypervisor/include/dm/vioapic.h \ ../hypervisor/include/dm/vpic.h \ ../hypervisor/include/arch/x86/io_req.h \ - ../hypervisor/include/arch/x86/io_emul.h \ - ../hypervisor/include/arch/x86/assign.h \ + ../hypervisor/include/arch/x86/guest/io_emul.h \ + ../hypervisor/include/arch/x86/guest/assign.h \ ../hypervisor/include/common/hypercall.h \ ../hypervisor/include/public/acrn_common.h \ ../hypervisor/include/public/acrn_hv_defs.h \ ../hypervisor/include/arch/x86/guest/vcpu.h \ - ../hypervisor/include/arch/x86/virtual_cr.h \ + ../hypervisor/include/arch/x86/guest/virtual_cr.h \ ../hypervisor/include/arch/x86/timer.h \ - ../hypervisor/arch/x86/trusty.c \ + ../hypervisor/arch/x86/guest/trusty.c \ ../devicemodel/include/virtio.h \ ../hypervisor/include/arch/x86/ioapic.h \ ../hypervisor/include/arch/x86/irq.h \ diff --git a/hypervisor/Makefile b/hypervisor/Makefile index 8ab786b74..bba4587d9 100644 --- a/hypervisor/Makefile +++ b/hypervisor/Makefile @@ -164,16 +164,7 @@ C_SRCS += arch/x86/vtd.c C_SRCS += arch/x86/gdt.c C_SRCS += arch/x86/irq.c C_SRCS += arch/x86/timer.c -C_SRCS += arch/x86/ept.c -S_SRCS += arch/x86/vmx_asm.S -C_SRCS += arch/x86/io_emul.c -C_SRCS += arch/x86/virq.c -C_SRCS += arch/x86/vmexit.c C_SRCS += arch/x86/vmx.c -C_SRCS += arch/x86/vmcs.c -C_SRCS += arch/x86/virtual_cr.c -C_SRCS += arch/x86/assign.c -C_SRCS += arch/x86/trusty.c C_SRCS += arch/x86/cpu_state_tbl.c C_SRCS += arch/x86/pm.c S_SRCS += arch/x86/wakeup.S @@ -191,6 +182,15 @@ C_SRCS += arch/x86/guest/vmsr.c C_SRCS += arch/x86/guest/instr_emul.c C_SRCS += arch/x86/guest/ucode.c C_SRCS += arch/x86/guest/pm.c +C_SRCS += arch/x86/guest/assign.c +C_SRCS += arch/x86/guest/ept.c +C_SRCS += arch/x86/guest/io_emul.c +C_SRCS += arch/x86/guest/virq.c +C_SRCS += arch/x86/guest/virtual_cr.c +C_SRCS += arch/x86/guest/vmcs.c +C_SRCS += arch/x86/guest/vmexit.c +S_SRCS += arch/x86/guest/vmx_asm.S +C_SRCS += arch/x86/guest/trusty.c C_SRCS += lib/misc.c C_SRCS += lib/string.c C_SRCS += lib/memory.c diff --git a/hypervisor/arch/x86/assign.c b/hypervisor/arch/x86/guest/assign.c similarity index 100% rename from hypervisor/arch/x86/assign.c rename to hypervisor/arch/x86/guest/assign.c diff --git a/hypervisor/arch/x86/ept.c b/hypervisor/arch/x86/guest/ept.c similarity index 100% rename from hypervisor/arch/x86/ept.c rename to hypervisor/arch/x86/guest/ept.c diff --git a/hypervisor/arch/x86/io_emul.c b/hypervisor/arch/x86/guest/io_emul.c similarity index 100% rename from hypervisor/arch/x86/io_emul.c rename to hypervisor/arch/x86/guest/io_emul.c diff --git a/hypervisor/arch/x86/trusty.c b/hypervisor/arch/x86/guest/trusty.c similarity index 100% rename from hypervisor/arch/x86/trusty.c rename to hypervisor/arch/x86/guest/trusty.c diff --git a/hypervisor/arch/x86/virq.c b/hypervisor/arch/x86/guest/virq.c similarity index 100% rename from hypervisor/arch/x86/virq.c rename to hypervisor/arch/x86/guest/virq.c diff --git a/hypervisor/arch/x86/virtual_cr.c b/hypervisor/arch/x86/guest/virtual_cr.c similarity index 100% rename from hypervisor/arch/x86/virtual_cr.c rename to hypervisor/arch/x86/guest/virtual_cr.c diff --git a/hypervisor/arch/x86/vmcs.c b/hypervisor/arch/x86/guest/vmcs.c similarity index 100% rename from hypervisor/arch/x86/vmcs.c rename to hypervisor/arch/x86/guest/vmcs.c diff --git a/hypervisor/arch/x86/vmexit.c b/hypervisor/arch/x86/guest/vmexit.c similarity index 100% rename from hypervisor/arch/x86/vmexit.c rename to hypervisor/arch/x86/guest/vmexit.c diff --git a/hypervisor/arch/x86/vmx_asm.S b/hypervisor/arch/x86/guest/vmx_asm.S similarity index 100% rename from hypervisor/arch/x86/vmx_asm.S rename to hypervisor/arch/x86/guest/vmx_asm.S diff --git a/hypervisor/include/arch/x86/assign.h b/hypervisor/include/arch/x86/guest/assign.h similarity index 100% rename from hypervisor/include/arch/x86/assign.h rename to hypervisor/include/arch/x86/guest/assign.h diff --git a/hypervisor/include/arch/x86/io_emul.h b/hypervisor/include/arch/x86/guest/io_emul.h similarity index 100% rename from hypervisor/include/arch/x86/io_emul.h rename to hypervisor/include/arch/x86/guest/io_emul.h diff --git a/hypervisor/include/arch/x86/trusty.h b/hypervisor/include/arch/x86/guest/trusty.h similarity index 100% rename from hypervisor/include/arch/x86/trusty.h rename to hypervisor/include/arch/x86/guest/trusty.h diff --git a/hypervisor/include/arch/x86/virtual_cr.h b/hypervisor/include/arch/x86/guest/virtual_cr.h similarity index 100% rename from hypervisor/include/arch/x86/virtual_cr.h rename to hypervisor/include/arch/x86/guest/virtual_cr.h diff --git a/hypervisor/include/arch/x86/vmcs.h b/hypervisor/include/arch/x86/guest/vmcs.h similarity index 100% rename from hypervisor/include/arch/x86/vmcs.h rename to hypervisor/include/arch/x86/guest/vmcs.h diff --git a/hypervisor/include/arch/x86/vmexit.h b/hypervisor/include/arch/x86/guest/vmexit.h similarity index 100% rename from hypervisor/include/arch/x86/vmexit.h rename to hypervisor/include/arch/x86/guest/vmexit.h