Commit a44432b4 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

numa: Don't include hw/boards.h into sysemu/numa.h 



sysemu/numa.h includes hw/boards.h just for the CPUArchId typedef, at
the cost of pulling in more than two dozen extra headers indirectly.

I could move the typedef from hw/boards.h to qemu/typedefs.h.  But
it's used in just two headers: boards.h and numa.h.

I could move it to another header both its users include.
exec/cpu-common.h seems to be the least bad fit.

But I'm keeping this simple & stupid: declare the struct tag in
numa.h.

Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Message-Id: <20190812052359.30071-24-armbru@redhat.com>
parent 12e9493d

hw/mem/pc-dimm.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
 */



#include "qemu/osdep.h"

#include "hw/boards.h"

#include "hw/mem/pc-dimm.h"

#include "hw/qdev-properties.h"

#include "migration/vmstate.h"

include/hw/boards.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ void machine_class_allow_dynamic_sysbus_dev(MachineClass *mc, const char *type); 
 * @props - CPU object properties, initialized by board

 * #vcpus_count - number of threads provided by @cpu object

 */

typedef struct {

typedef struct CPUArchId {

    uint64_t arch_id;

    int64_t vcpus_count;

    CpuInstanceProperties props;

include/sysemu/numa.h

+7 −2
Original line number Diff line number Diff line
@@ -4,7 +4,10 @@ 
#include "qemu/bitmap.h"

#include "sysemu/sysemu.h"

#include "sysemu/hostmem.h"

#include "hw/boards.h"

#include "qapi/qapi-types-machine.h"

#include "exec/cpu-common.h"



struct CPUArchId;



extern int nb_numa_nodes;   /* Number of NUMA nodes */

extern bool have_numa_distance;
@@ -32,5 +35,7 @@ void numa_legacy_auto_assign_ram(MachineClass *mc, NodeInfo *nodes, 
                                 int nb_nodes, ram_addr_t size);

void numa_default_auto_assign_ram(MachineClass *mc, NodeInfo *nodes,

                                  int nb_nodes, ram_addr_t size);

void numa_cpu_pre_plug(const CPUArchId *slot, DeviceState *dev, Error **errp);

void numa_cpu_pre_plug(const struct CPUArchId *slot, DeviceState *dev,

                       Error **errp);



#endif