| Message ID | 20190619201050.19040-10-armbru@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Move QOM, qdev, machine core and dump code | expand |
On Wed, Jun 19, 2019 at 10:10:42PM +0200, Markus Armbruster wrote: > Cc: Eduardo Habkost <ehabkost@redhat.com> > Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > MAINTAINERS | 2 +- > Makefile.target | 2 +- > hw/core/Makefile.objs | 2 ++ > numa.c => hw/core/numa.c | 0 > 4 files changed, 4 insertions(+), 2 deletions(-) > rename numa.c => hw/core/numa.c (100%) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel
diff --git a/MAINTAINERS b/MAINTAINERS index 9b488c5151..96a72a999a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1267,8 +1267,8 @@ M: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> S: Supported F: hw/core/machine.c F: hw/core/null-machine.c +F: hw/core/numa.c F: hw/cpu/cluster.c -F: numa.c F: qapi/machine.json F: qom/cpu.c F: include/hw/boards.h diff --git a/Makefile.target b/Makefile.target index 72c267f7dc..167ae2174e 100644 --- a/Makefile.target +++ b/Makefile.target @@ -148,7 +148,7 @@ endif #CONFIG_BSD_USER ######################################################### # System emulator target ifdef CONFIG_SOFTMMU -obj-y += arch_init.o cpus.o gdbstub.o balloon.o ioport.o numa.o +obj-y += arch_init.o cpus.o gdbstub.o balloon.o ioport.o obj-y += qtest.o obj-y += hw/ obj-y += monitor/ diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs index a799c83815..e3a8307be6 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -22,3 +22,5 @@ common-obj-$(CONFIG_SOFTMMU) += split-irq.o common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o common-obj-$(CONFIG_SOFTMMU) += generic-loader.o common-obj-$(CONFIG_SOFTMMU) += null-machine.o + +obj-$(CONFIG_SOFTMMU) += numa.o diff --git a/numa.c b/hw/core/numa.c similarity index 100% rename from numa.c rename to hw/core/numa.c
Cc: Eduardo Habkost <ehabkost@redhat.com> Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> --- MAINTAINERS | 2 +- Makefile.target | 2 +- hw/core/Makefile.objs | 2 ++ numa.c => hw/core/numa.c | 0 4 files changed, 4 insertions(+), 2 deletions(-) rename numa.c => hw/core/numa.c (100%)