| Message ID | 20171017001209.32276-36-f4bug@amsat.org |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | remove i386/pc dependency from non-PC world (part 1) | expand |
May I suggest to add at least a small patch description a la "It's a x86-only device, so it does not make sense to keep it in the shared misc folder" here? On 17.10.2017 02:12, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > default-configs/i386-softmmu.mak | 1 - > default-configs/x86_64-softmmu.mak | 1 - > hw/{misc => i386}/vmport.c | 0 > hw/i386/Makefile.objs | 1 + > hw/misc/Makefile.objs | 2 -- > 5 files changed, 1 insertion(+), 4 deletions(-) > rename hw/{misc => i386}/vmport.c (100%) > > diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak > index d2ab2f6655..dbc4e65652 100644 > --- a/default-configs/i386-softmmu.mak > +++ b/default-configs/i386-softmmu.mak > @@ -41,7 +41,6 @@ CONFIG_PCI_PIIX=y > CONFIG_WDT_IB700=y > CONFIG_ISA_DEBUG=y > CONFIG_ISA_TESTDEV=y > -CONFIG_VMPORT=y > CONFIG_SGA=y > CONFIG_LPC_ICH9=y > CONFIG_PCI_Q35=y > diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak > index 9bde2f1c4b..f1fe508ff4 100644 > --- a/default-configs/x86_64-softmmu.mak > +++ b/default-configs/x86_64-softmmu.mak > @@ -41,7 +41,6 @@ CONFIG_PCI_PIIX=y > CONFIG_WDT_IB700=y > CONFIG_ISA_DEBUG=y > CONFIG_ISA_TESTDEV=y > -CONFIG_VMPORT=y > CONFIG_SGA=y > CONFIG_LPC_ICH9=y > CONFIG_PCI_Q35=y > 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..feff56a9b7 100644 > --- a/hw/i386/Makefile.objs > +++ b/hw/i386/Makefile.objs > @@ -9,3 +9,4 @@ obj-$(CONFIG_XEN) += ../xenpv/ xen/ > obj-y += kvmvapic.o > obj-y += acpi-build.o > obj-y += pci-assign-load-rom.o > +obj-y += vmport.o It seems to be possible to disable this device in the configuration (when also disabling VMMOUSE), so I'd maybe be nicer to rather keep the config switch, I think (in case people want to build a minimalistic QEMU) Thomas
On 17/10/2017 02:12, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Keeping the configurability is desirable here too, but moving to hw/i386 makes a lot of sense in this case. Paolo > --- > default-configs/i386-softmmu.mak | 1 - > default-configs/x86_64-softmmu.mak | 1 - > hw/{misc => i386}/vmport.c | 0 > hw/i386/Makefile.objs | 1 + > hw/misc/Makefile.objs | 2 -- > 5 files changed, 1 insertion(+), 4 deletions(-) > rename hw/{misc => i386}/vmport.c (100%) > > diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak > index d2ab2f6655..dbc4e65652 100644 > --- a/default-configs/i386-softmmu.mak > +++ b/default-configs/i386-softmmu.mak > @@ -41,7 +41,6 @@ CONFIG_PCI_PIIX=y > CONFIG_WDT_IB700=y > CONFIG_ISA_DEBUG=y > CONFIG_ISA_TESTDEV=y > -CONFIG_VMPORT=y > CONFIG_SGA=y > CONFIG_LPC_ICH9=y > CONFIG_PCI_Q35=y > diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak > index 9bde2f1c4b..f1fe508ff4 100644 > --- a/default-configs/x86_64-softmmu.mak > +++ b/default-configs/x86_64-softmmu.mak > @@ -41,7 +41,6 @@ CONFIG_PCI_PIIX=y > CONFIG_WDT_IB700=y > CONFIG_ISA_DEBUG=y > CONFIG_ISA_TESTDEV=y > -CONFIG_VMPORT=y > CONFIG_SGA=y > CONFIG_LPC_ICH9=y > CONFIG_PCI_Q35=y > 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..feff56a9b7 100644 > --- a/hw/i386/Makefile.objs > +++ b/hw/i386/Makefile.objs > @@ -9,3 +9,4 @@ obj-$(CONFIG_XEN) += ../xenpv/ xen/ > obj-y += kvmvapic.o > obj-y += acpi-build.o > obj-y += pci-assign-load-rom.o > +obj-y += vmport.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 >
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index d2ab2f6655..dbc4e65652 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -41,7 +41,6 @@ CONFIG_PCI_PIIX=y CONFIG_WDT_IB700=y CONFIG_ISA_DEBUG=y CONFIG_ISA_TESTDEV=y -CONFIG_VMPORT=y CONFIG_SGA=y CONFIG_LPC_ICH9=y CONFIG_PCI_Q35=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 9bde2f1c4b..f1fe508ff4 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -41,7 +41,6 @@ CONFIG_PCI_PIIX=y CONFIG_WDT_IB700=y CONFIG_ISA_DEBUG=y CONFIG_ISA_TESTDEV=y -CONFIG_VMPORT=y CONFIG_SGA=y CONFIG_LPC_ICH9=y CONFIG_PCI_Q35=y 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..feff56a9b7 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -9,3 +9,4 @@ obj-$(CONFIG_XEN) += ../xenpv/ xen/ obj-y += kvmvapic.o obj-y += acpi-build.o obj-y += pci-assign-load-rom.o +obj-y += vmport.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
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- default-configs/i386-softmmu.mak | 1 - default-configs/x86_64-softmmu.mak | 1 - hw/{misc => i386}/vmport.c | 0 hw/i386/Makefile.objs | 1 + hw/misc/Makefile.objs | 2 -- 5 files changed, 1 insertion(+), 4 deletions(-) rename hw/{misc => i386}/vmport.c (100%)