On 7/26/19 2:05 PM, Markus Armbruster wrote: > 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 <ehabk...@redhat.com> > Cc: Marcel Apfelbaum <marcel.apfelb...@gmail.com> > Signed-off-by: Markus Armbruster <arm...@redhat.com>
:) Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com> > --- > exec.c | 2 +- > hw/core/numa.c | 1 + > hw/mem/pc-dimm.c | 1 + > hw/pci/pci.c | 2 +- > hw/ppc/spapr.c | 1 + > include/sysemu/hostmem.h | 2 +- > include/sysemu/numa.h | 9 +++++++-- > include/sysemu/sysemu.h | 7 ------- > 8 files changed, 13 insertions(+), 12 deletions(-) > > diff --git a/exec.c b/exec.c > index 4d9e146c79..f0ac29aa26 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 fa90d4fc6c..938706d5a7 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" > 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; >