diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-19 09:45:12 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-12-19 09:45:12 -0600 |
| commit | 4a1cc6800a54b154a214e7ecf36c63c8c81f2074 (patch) | |
| tree | fabd1db70f86cce4b49f3a32e880f9e22b56ab0a /cpu-common.h | |
| parent | cde7fc31dee7a7bac96779f77a21825b187871d3 (diff) | |
| parent | ce76b8a8ab61255f9029b5244b885cb8bef60e97 (diff) | |
| download | focaccia-qemu-4a1cc6800a54b154a214e7ecf36c63c8c81f2074.tar.gz focaccia-qemu-4a1cc6800a54b154a214e7ecf36c63c8c81f2074.zip | |
Merge remote-tracking branch 'qemu-kvm/memory/xen' into staging
Diffstat (limited to 'cpu-common.h')
| -rw-r--r-- | cpu-common.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cpu-common.h b/cpu-common.h index 48f4c01a3f..72eb731c3e 100644 --- a/cpu-common.h +++ b/cpu-common.h @@ -61,9 +61,12 @@ static inline void cpu_register_physical_memory(target_phys_addr_t start_addr, } ram_addr_t cpu_get_physical_page_desc(target_phys_addr_t addr); +struct MemoryRegion; ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name, - ram_addr_t size, void *host); -ram_addr_t qemu_ram_alloc(DeviceState *dev, const char *name, ram_addr_t size); + ram_addr_t size, void *host, + struct MemoryRegion *mr); +ram_addr_t qemu_ram_alloc(DeviceState *dev, const char *name, ram_addr_t size, + struct MemoryRegion *mr); void qemu_ram_free(ram_addr_t addr); void qemu_ram_free_from_ptr(ram_addr_t addr); void qemu_ram_remap(ram_addr_t addr, ram_addr_t length); |