diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-05-14 17:43:15 +0800 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-06-19 18:44:19 +0300 |
| commit | dfabb8b91655f680eaa1aa05e9f226fbd596a70f (patch) | |
| tree | 2ca85e70c45c9cb2c410f719ed2fbf21838066e8 /include | |
| parent | d1169464245bcd4c89cbcc64f8937df61ae6bd4b (diff) | |
| download | qemu-dfabb8b91655f680eaa1aa05e9f226fbd596a70f.zip qemu-dfabb8b91655f680eaa1aa05e9f226fbd596a70f.tar.gz qemu-dfabb8b91655f680eaa1aa05e9f226fbd596a70f.tar.bz2 | |
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')
| -rw-r--r-- | include/hw/boards.h | 6 | ||||
| -rw-r--r-- | include/sysemu/sysemu.h | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/hw/boards.h b/include/hw/boards.h index 429ac43..605a970 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -43,9 +43,13 @@ struct QEMUMachine { const char *hw_version; }; -#define TYPE_MACHINE_SUFFIX "-machine" +void memory_region_allocate_system_memory(MemoryRegion *mr, Object *owner, + const char *name, + uint64_t ram_size); + int qemu_register_machine(QEMUMachine *m); +#define TYPE_MACHINE_SUFFIX "-machine" #define TYPE_MACHINE "machine" #undef MACHINE /* BSD defines it and QEMU does not use it */ #define MACHINE(obj) \ diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 423d49e..caf88dd 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 */ |