[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/18] hw/core: Move numa.c to hw/core/
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 10/18] hw/core: Move numa.c to hw/core/ |
Date: |
Tue, 2 Jul 2019 12:47:08 +0200 |
Cc: Eduardo Habkost <address@hidden>
Cc: Marcel Apfelbaum <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
---
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%)
diff --git a/MAINTAINERS b/MAINTAINERS
index f4d8c75d27..96eaa1e124 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1266,8 +1266,8 @@ M: Marcel Apfelbaum <address@hidden>
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
--
2.21.0
- [Qemu-devel] [PULL 00/18] Monitor patches for 2019-07-02, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 02/18] MAINTAINERS: Make section "QOM" cover qdev as well, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 04/18] hmp: Move hmp.h to include/monitor/, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 01/18] MAINTAINERS: new maintainers for QOM, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 06/18] qom: Move QMP command handlers to qom/, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 17/18] MAINTAINERS: Add Windows dump to section "Dump", Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 14/18] qapi: Rename target.json to misc-target.json, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 13/18] qapi: Split machine-target.json off target.json and misc.json, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 10/18] hw/core: Move numa.c to hw/core/,
Markus Armbruster <=
- [Qemu-devel] [PULL 16/18] dump: Move the code to dump/, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 03/18] Makefile: Don't add monitor/ twice to common-obj-y, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 07/18] qom: Move HMP command handlers to qom/, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 12/18] hw/core: Collect HMP command handlers in hw/core/, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 08/18] MAINTAINERS: Merge sections CPU, NUMA into Machine core, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 15/18] qapi: Split dump.json off misc.json, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 11/18] hw/core: Collect QMP command handlers in hw/core/, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 05/18] qapi: Split qom.json and qdev.json off misc.json, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 09/18] qapi: Split machine.json off misc.json, Markus Armbruster, 2019/07/02
- [Qemu-devel] [PULL 18/18] dump: Move HMP command handlers to dump/, Markus Armbruster, 2019/07/02