diff options
| author | Markus Armbruster <armbru@redhat.com> | 2019-08-12 07:23:55 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2019-08-16 13:31:53 +0200 |
| commit | b58c5c2dd29db0eae0bed800ac1a311e14007cec (patch) | |
| tree | 0ab50dca3d25e92fe33439b82f40c0ff49383fc1 /include | |
| parent | 7969dd9169f64493fa70b542d8ab65b275571ea6 (diff) | |
| download | qemu-b58c5c2dd29db0eae0bed800ac1a311e14007cec.zip qemu-b58c5c2dd29db0eae0bed800ac1a311e14007cec.tar.gz qemu-b58c5c2dd29db0eae0bed800ac1a311e14007cec.tar.bz2 | |
numa: Move remaining NUMA declarations from sysemu.h to numa.h
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sysemu/hostmem.h | 2 | ||||
| -rw-r--r-- | include/sysemu/numa.h | 9 | ||||
| -rw-r--r-- | include/sysemu/sysemu.h | 7 |
3 files changed, 8 insertions, 10 deletions
diff --git a/include/sysemu/hostmem.h b/include/sysemu/hostmem.h index afeb5db..4dbdadd 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 4c4c1de..7a4ce89 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 ac18a11..2272029 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; |