diff options
| author | Markus Armbruster <armbru@redhat.com> | 2019-06-19 22:10:42 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2019-07-02 13:37:00 +0200 |
| commit | ac057879f42549f130c44d5e63ac3743a3540020 (patch) | |
| tree | 3b1cadefbc1dfd3912f4c43ee124fc54c6b525ae | |
| parent | 8ac25c84429031695a8b57727e2b518f5c3d8137 (diff) | |
hw/core: Move numa.c to hw/core/
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190619201050.19040-10-armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | Makefile.target | 2 | ||||
| -rw-r--r-- | hw/core/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/core/numa.c (renamed from numa.c) | 0 |
4 files changed, 4 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f4d8c75d27..96eaa1e124 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1266,8 +1266,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 index 6f85407c46..6f85407c46 100644 --- a/numa.c +++ b/hw/core/numa.c |