[Qemu-devel] [PATCH v3 40/42] i386/pc: move vmport.c to hw/i386/

Philippe Mathieu-Daudé posted 42 patches 8 years, 3 months ago
There is a newer version of this series
[Qemu-devel] [PATCH v3 40/42] i386/pc: move vmport.c to hw/i386/
Posted by Philippe Mathieu-Daudé 8 years, 3 months ago
It's a x86-only device, so it does not make sense to keep it
in the shared misc folder.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/{misc => i386}/vmport.c | 0
 hw/i386/Makefile.objs      | 1 +
 hw/misc/Makefile.objs      | 2 --
 3 files changed, 1 insertion(+), 2 deletions(-)
 rename hw/{misc => i386}/vmport.c (100%)

diff --git a/hw/misc/vmport.c b/hw/i386/vmport.c
similarity index 100%
rename from hw/misc/vmport.c
rename to hw/i386/vmport.c
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
index 909ead6a77..64a461c929 100644
--- a/hw/i386/Makefile.objs
+++ b/hw/i386/Makefile.objs
@@ -5,6 +5,7 @@ obj-y += pc_sysfw.o
 obj-y += x86-iommu.o intel_iommu.o
 obj-y += amd_iommu.o
 obj-$(CONFIG_XEN) += ../xenpv/ xen/
+obj-$(CONFIG_VMPORT) += vmport.o
 
 obj-y += kvmvapic.o
 obj-y += acpi-build.o
diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs
index 19202d90cf..03bc758592 100644
--- a/hw/misc/Makefile.objs
+++ b/hw/misc/Makefile.objs
@@ -11,8 +11,6 @@ common-obj-$(CONFIG_EDU) += edu.o
 common-obj-y += unimp.o
 common-obj-y += vmcoreinfo.o
 
-obj-$(CONFIG_VMPORT) += vmport.o
-
 # ARM devices
 common-obj-$(CONFIG_PL310) += arm_l2x0.o
 common-obj-$(CONFIG_INTEGRATOR_DEBUG) += arm_integrator_debug.o
-- 
2.15.0.rc0


Re: [Qemu-devel] [PATCH v3 40/42] i386/pc: move vmport.c to hw/i386/
Posted by Thomas Huth 8 years, 3 months ago
On 17.10.2017 18:44, Philippe Mathieu-Daudé wrote:
> It's a x86-only device, so it does not make sense to keep it
> in the shared misc folder.
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  hw/{misc => i386}/vmport.c | 0
>  hw/i386/Makefile.objs      | 1 +
>  hw/misc/Makefile.objs      | 2 --
>  3 files changed, 1 insertion(+), 2 deletions(-)
>  rename hw/{misc => i386}/vmport.c (100%)

Reviewed-by: Thomas Huth <thuth@redhat.com>