Commit e35704ba authored by Eduardo Habkost's avatar Eduardo Habkost
Browse files

numa: Move NUMA declarations from sysemu.h to numa.h 



Not all sysemu.h users need the NUMA declarations, and keeping them in a
separate file makes it easier to see what are the interfaces provided by
numa.c.

Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent cd2d5541

hw/i386/pc.c

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include "hw/pci/msi.h"

#include "hw/sysbus.h"

#include "sysemu/sysemu.h"

#include "sysemu/numa.h"

#include "sysemu/kvm.h"

#include "kvm_i386.h"

#include "hw/xen/xen.h"

hw/mem/pc-dimm.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "qemu/config-file.h"

#include "qapi/visitor.h"

#include "qemu/range.h"

#include "sysemu/numa.h"



typedef struct pc_dimms_capacity {

     uint64_t size;

hw/ppc/spapr.c

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

 */

#include "sysemu/sysemu.h"

#include "sysemu/numa.h"

#include "hw/hw.h"

#include "hw/fw-path-provider.h"

#include "elf.h"

include/sysemu/numa.h

0 → 100644
+28 −0
Original line number Diff line number Diff line 
#ifndef SYSEMU_NUMA_H

#define SYSEMU_NUMA_H



#include <stdint.h>

#include "qemu/bitmap.h"

#include "qemu/option.h"

#include "sysemu/sysemu.h"

#include "sysemu/hostmem.h"



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

extern int max_numa_nodeid; /* Highest specified NUMA node ID, plus one.

                             * For all nodes, nodeid < max_numa_nodeid

                             */



typedef struct node_info {

    uint64_t node_mem;

    DECLARE_BITMAP(node_cpu, MAX_CPUMASK_BITS);

    struct HostMemoryBackend *node_memdev;

    bool present;

} NodeInfo;

extern NodeInfo numa_info[MAX_NODES];

void set_numa_nodes(void);

void set_numa_modes(void);

void query_numa_node_mem(uint64_t node_mem[]);

extern QemuOptsList qemu_numa_opts;

int numa_init_func(QemuOpts *opts, void *opaque);



#endif

include/sysemu/sysemu.h

+0 −18
Original line number Diff line number Diff line
@@ -147,24 +147,6 @@ extern int mem_prealloc; 
 */

#define MAX_CPUMASK_BITS 255



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

extern int max_numa_nodeid; /* Highest specified NUMA node ID, plus one.

                             * For all nodes, nodeid < max_numa_nodeid

                             */



typedef struct node_info {

    uint64_t node_mem;

    DECLARE_BITMAP(node_cpu, MAX_CPUMASK_BITS);

    struct HostMemoryBackend *node_memdev;

    bool present;

} NodeInfo;

extern NodeInfo numa_info[MAX_NODES];

void set_numa_nodes(void);

void set_numa_modes(void);

void query_numa_node_mem(uint64_t node_mem[]);

extern QemuOptsList qemu_numa_opts;

int numa_init_func(QemuOpts *opts, void *opaque);



#define MAX_OPTION_ROMS 16

typedef struct QEMUOptionRom {

    const char *name;