diff options
| author | Peter Maydell | 2015-03-02 13:13:45 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-03-02 13:13:45 +0100 |
| commit | 2dffe5516e74215fadf2e0f5ee401db4d5a86f7a (patch) | |
| tree | 9b7d3cf4b2745e7ad5380cb64d3e90c8d7948bba /hw | |
| parent | Merge remote-tracking branch 'remotes/qmp-unstable/queue/qmp' into staging (diff) | |
| parent | numa: Rename set_numa_modes() to numa_post_machine_init() (diff) | |
| download | qemu-2dffe5516e74215fadf2e0f5ee401db4d5a86f7a.tar.gz qemu-2dffe5516e74215fadf2e0f5ee401db4d5a86f7a.tar.xz qemu-2dffe5516e74215fadf2e0f5ee401db4d5a86f7a.zip | |
Merge remote-tracking branch 'remotes/ehabkost/tags/numa-pull-request' into staging
NUMA fixes queue
# gpg: Signature made Mon Feb 23 19:28:42 2015 GMT using RSA key ID 984DC5A6
# gpg: Can't check signature: public key not found
* remotes/ehabkost/tags/numa-pull-request:
numa: Rename set_numa_modes() to numa_post_machine_init()
numa: Rename option parsing functions
numa: Move QemuOpts parsing to set_numa_nodes()
numa: Make max_numa_nodeid static
numa: Move NUMA globals to numa.c
vl.c: Remove unnecessary zero-initialization of NUMA globals
numa: Move NUMA declarations from sysemu.h to numa.h
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/i386/pc.c | 1 | ||||
| -rw-r--r-- | hw/mem/pc-dimm.c | 1 | ||||
| -rw-r--r-- | hw/ppc/spapr.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 05008cbf6a..74ec2648df 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -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" diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 18cdc54bf9..f27a087061 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -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; diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index a82a0f99b3..23cde20019 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -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" |