diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-03-02 12:13:45 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-03-02 12:13:45 +0000 |
| commit | 2dffe5516e74215fadf2e0f5ee401db4d5a86f7a (patch) | |
| tree | 9b7d3cf4b2745e7ad5380cb64d3e90c8d7948bba /hw/i386 | |
| parent | 041ccc922ee474693a2869d4e3b59e920c739bc0 (diff) | |
| parent | dde11116782c1891a057165539efc014cf365026 (diff) | |
| download | qemu-2dffe5516e74215fadf2e0f5ee401db4d5a86f7a.zip qemu-2dffe5516e74215fadf2e0f5ee401db4d5a86f7a.tar.gz qemu-2dffe5516e74215fadf2e0f5ee401db4d5a86f7a.tar.bz2 | |
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/i386')
| -rw-r--r-- | hw/i386/pc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 05008cb..74ec264 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" |