summary refs log tree commit diff stats
path: root/include/sysemu/sysemu.h
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-05-14 17:43:15 +0800
committerMichael S. Tsirkin <mst@redhat.com>2014-06-19 18:44:19 +0300
commitdfabb8b91655f680eaa1aa05e9f226fbd596a70f (patch)
tree2ca85e70c45c9cb2c410f719ed2fbf21838066e8 /include/sysemu/sysemu.h
parentd1169464245bcd4c89cbcc64f8937df61ae6bd4b (diff)
downloadfocaccia-qemu-dfabb8b91655f680eaa1aa05e9f226fbd596a70f.tar.gz
focaccia-qemu-dfabb8b91655f680eaa1aa05e9f226fbd596a70f.zip
numa: introduce memory_region_allocate_system_memory
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

MST: resolve conflicts
Diffstat (limited to 'include/sysemu/sysemu.h')
-rw-r--r--include/sysemu/sysemu.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 423d49efc6..caf88dd870 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -10,6 +10,7 @@
 #include "qemu/notify.h"
 #include "qemu/main-loop.h"
 #include "qemu/bitmap.h"
+#include "qom/object.h"
 
 /* vl.c */