From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>
Subject: [Qemu-devel] [PULL 25/29] numa: Move remaining NUMA declarations from sysemu.h to numa.h
Date: Tue, 13 Aug 2019 17:46:49 +0200 [thread overview]
Message-ID: <20190813154653.20568-26-armbru@redhat.com> (raw)
In-Reply-To: <20190813154653.20568-1-armbru@redhat.com>
Commit e35704ba9c "numa: Move NUMA declarations from sysemu.h to
numa.h" left a few NUMA-related macros behind. Move them now.
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20190812052359.30071-26-armbru@redhat.com>
---
include/sysemu/hostmem.h | 2 +-
include/sysemu/numa.h | 9 +++++++--
include/sysemu/sysemu.h | 7 -------
exec.c | 2 +-
hw/core/numa.c | 1 +
hw/mem/pc-dimm.c | 1 +
hw/pci/pci.c | 2 +-
hw/ppc/spapr.c | 1 +
8 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/include/sysemu/hostmem.h b/include/sysemu/hostmem.h
index afeb5db1b1..4dbdadd39e 100644
--- a/include/sysemu/hostmem.h
+++ b/include/sysemu/hostmem.h
@@ -13,7 +13,7 @@
#ifndef SYSEMU_HOSTMEM_H
#define SYSEMU_HOSTMEM_H
-#include "sysemu/sysemu.h" /* for MAX_NODES */
+#include "sysemu/numa.h"
#include "qapi/qapi-types-machine.h"
#include "qom/object.h"
#include "exec/memory.h"
diff --git a/include/sysemu/numa.h b/include/sysemu/numa.h
index 4c4c1dee9b..7a4ce89765 100644
--- a/include/sysemu/numa.h
+++ b/include/sysemu/numa.h
@@ -2,13 +2,18 @@
#define SYSEMU_NUMA_H
#include "qemu/bitmap.h"
-#include "sysemu/sysemu.h"
-#include "sysemu/hostmem.h"
#include "qapi/qapi-types-machine.h"
#include "exec/cpu-common.h"
struct CPUArchId;
+#define MAX_NODES 128
+#define NUMA_NODE_UNASSIGNED MAX_NODES
+#define NUMA_DISTANCE_MIN 10
+#define NUMA_DISTANCE_DEFAULT 20
+#define NUMA_DISTANCE_MAX 254
+#define NUMA_DISTANCE_UNREACHABLE 255
+
extern int nb_numa_nodes; /* Number of NUMA nodes */
extern bool have_numa_distance;
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index ac18a1184a..227202999d 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -117,13 +117,6 @@ extern QEMUClockType rtc_clock;
extern const char *mem_path;
extern int mem_prealloc;
-#define MAX_NODES 128
-#define NUMA_NODE_UNASSIGNED MAX_NODES
-#define NUMA_DISTANCE_MIN 10
-#define NUMA_DISTANCE_DEFAULT 20
-#define NUMA_DISTANCE_MAX 254
-#define NUMA_DISTANCE_UNREACHABLE 255
-
#define MAX_OPTION_ROMS 16
typedef struct QEMUOptionRom {
const char *name;
diff --git a/exec.c b/exec.c
index 78f849de99..4aaa14b075 100644
--- a/exec.c
+++ b/exec.c
@@ -45,7 +45,7 @@
#include "exec/memory.h"
#include "exec/ioport.h"
#include "sysemu/dma.h"
-#include "sysemu/numa.h"
+#include "sysemu/hostmem.h"
#include "sysemu/hw_accel.h"
#include "exec/address-spaces.h"
#include "sysemu/xen-mapcache.h"
diff --git a/hw/core/numa.c b/hw/core/numa.c
index d817f06ead..450c522dd8 100644
--- a/hw/core/numa.c
+++ b/hw/core/numa.c
@@ -23,6 +23,7 @@
*/
#include "qemu/osdep.h"
+#include "sysemu/hostmem.h"
#include "sysemu/numa.h"
#include "exec/cpu-common.h"
#include "exec/ramlist.h"
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index dea48f9163..7c324a1329 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -28,6 +28,7 @@
#include "qapi/error.h"
#include "qapi/visitor.h"
#include "qemu/module.h"
+#include "sysemu/hostmem.h"
#include "sysemu/numa.h"
#include "trace.h"
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 9001b81daa..4b6ffab13d 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -34,7 +34,7 @@
#include "migration/vmstate.h"
#include "monitor/monitor.h"
#include "net/net.h"
-#include "sysemu/sysemu.h"
+#include "sysemu/numa.h"
#include "hw/loader.h"
#include "qemu/error-report.h"
#include "qemu/range.h"
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 06d23a5004..4044e61a0c 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -29,6 +29,7 @@
#include "qapi/error.h"
#include "qapi/visitor.h"
#include "sysemu/sysemu.h"
+#include "sysemu/hostmem.h"
#include "sysemu/numa.h"
#include "sysemu/qtest.h"
#include "sysemu/reset.h"
--
2.21.0
next prev parent reply other threads:[~2019-08-13 15:56 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-13 15:46 [Qemu-devel] [PULL 00/29] Header cleanup patches for 2019-08-13 Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 01/29] include: Make headers more self-contained Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 02/29] Include generated QAPI headers less Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 03/29] qapi: Split error.json off common.json Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 04/29] memory: Fix type of IOMMUMemoryRegionClass member @parent_class Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 05/29] queue: Drop superfluous #include qemu/atomic.h Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 06/29] trace: Eliminate use of TARGET_FMT_plx Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 07/29] trace: Do not include qom/cpu.h into generated trace.h Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 08/29] Include sysemu/reset.h a lot less Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 09/29] Include migration/qemu-file-types.h " Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 10/29] ide: Include hw/ide/internal a bit less outside hw/ide/ Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 11/29] typedefs: Separate incomplete types and function types Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 12/29] Include hw/irq.h a lot less Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 13/29] Clean up inclusion of exec/cpu-common.h Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 14/29] migration: Move the VMStateDescription typedef to typedefs.h Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 15/29] Include migration/vmstate.h less Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 16/29] Include exec/memory.h slightly less Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 17/29] Include qom/object.h " Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 18/29] Include hw/hw.h exactly where needed Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 19/29] Include qemu/queue.h slightly less Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 20/29] Include qemu/main-loop.h less Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 21/29] Include hw/qdev-properties.h less Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 22/29] Include hw/boards.h a bit less Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 23/29] numa: Don't include hw/boards.h into sysemu/numa.h Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 24/29] Include sysemu/hostmem.h less Markus Armbruster
2019-08-13 15:46 ` Markus Armbruster [this message]
2019-08-13 15:46 ` [Qemu-devel] [PULL 26/29] Clean up inclusion of sysemu/sysemu.h Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 27/29] Include sysemu/sysemu.h a lot less Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 28/29] sysemu: Move the VMChangeStateEntry typedef to qemu/typedefs.h Markus Armbruster
2019-08-13 15:46 ` [Qemu-devel] [PULL 29/29] sysemu: Split sysemu/runstate.h off sysemu/sysemu.h Markus Armbruster
2019-08-16 10:59 ` [Qemu-devel] [PULL 00/29] Header cleanup patches for 2019-08-13 Peter Maydell
2019-08-16 11:23 ` Philippe Mathieu-Daudé
2019-08-16 12:39 ` Philippe Mathieu-Daudé
2019-08-16 13:24 ` Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190813154653.20568-26-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=ehabkost@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).