diff mbox series

[v2,2/3] hw/i386: Move SGX files within the kvm/ directory

Message ID 20240215142035.73331-3-philmd@linaro.org
State New
Headers show
Series hw/i386: Move SGX under KVM and use QDev API | expand

Commit Message

Philippe Mathieu-Daudé Feb. 15, 2024, 2:20 p.m. UTC 
Per hw/i386/Kconfig:

  config SGX
      bool
      depends on KVM

So move SGX related files under kvm/ for clarity.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/i386/{ => kvm}/sgx-epc.c  | 0
 hw/i386/{ => kvm}/sgx-stub.c | 0
 hw/i386/{ => kvm}/sgx.c      | 0
 hw/i386/kvm/meson.build      | 3 +++
 hw/i386/meson.build          | 2 --
 5 files changed, 3 insertions(+), 2 deletions(-)
 rename hw/i386/{ => kvm}/sgx-epc.c (100%)
 rename hw/i386/{ => kvm}/sgx-stub.c (100%)
 rename hw/i386/{ => kvm}/sgx.c (100%)
diff mbox series

Patch

diff --git a/hw/i386/sgx-epc.c b/hw/i386/kvm/sgx-epc.c
similarity index 100%
rename from hw/i386/sgx-epc.c
rename to hw/i386/kvm/sgx-epc.c
diff --git a/hw/i386/sgx-stub.c b/hw/i386/kvm/sgx-stub.c
similarity index 100%
rename from hw/i386/sgx-stub.c
rename to hw/i386/kvm/sgx-stub.c
diff --git a/hw/i386/sgx.c b/hw/i386/kvm/sgx.c
similarity index 100%
rename from hw/i386/sgx.c
rename to hw/i386/kvm/sgx.c
diff --git a/hw/i386/kvm/meson.build b/hw/i386/kvm/meson.build
index a4a2e23c06..c9c7adea77 100644
--- a/hw/i386/kvm/meson.build
+++ b/hw/i386/kvm/meson.build
@@ -13,6 +13,9 @@  i386_kvm_ss.add(when: 'CONFIG_XEN_EMU', if_true: files(
   'xenstore_impl.c',
   ))
 
+i386_ss.add(when: 'CONFIG_SGX', if_true: files('sgx-epc.c','sgx.c'),
+                                if_false: files('sgx-stub.c'))
+
 i386_ss.add_all(when: 'CONFIG_KVM', if_true: i386_kvm_ss)
 
 xen_stubs_ss = ss.source_set()
diff --git a/hw/i386/meson.build b/hw/i386/meson.build
index b9c1ca39cb..d7318b83e4 100644
--- a/hw/i386/meson.build
+++ b/hw/i386/meson.build
@@ -17,8 +17,6 @@  i386_ss.add(when: 'CONFIG_Q35', if_true: files('pc_q35.c'))
 i386_ss.add(when: 'CONFIG_VMMOUSE', if_true: files('vmmouse.c'))
 i386_ss.add(when: 'CONFIG_VMPORT', if_true: files('vmport.c'))
 i386_ss.add(when: 'CONFIG_VTD', if_true: files('intel_iommu.c'))
-i386_ss.add(when: 'CONFIG_SGX', if_true: files('sgx-epc.c','sgx.c'),
-                                if_false: files('sgx-stub.c'))
 
 i386_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-common.c'))
 i386_ss.add(when: 'CONFIG_PC', if_true: files(