Merge commit '5b500f974ba1701436ec0e4743c802c0651a3f4f' into upstream-merge
* commit '5b500f974ba1701436ec0e4743c802c0651a3f4f':
Add qemu_ram_alloc_from_ptr function
Conflicts:
cpu-common.h
exec.c
Signed-off-by: Avi Kivity <avi@redhat.com>
diff --git a/cpu-common.h b/cpu-common.h
index f430f2d..81e824c 100644
--- a/cpu-common.h
+++ b/cpu-common.h
@@ -40,7 +40,7 @@
}
ram_addr_t cpu_get_physical_page_desc(target_phys_addr_t addr);
-ram_addr_t qemu_ram_map(DeviceState *dev, const char *name,
+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);
void qemu_ram_unmap(ram_addr_t addr);
diff --git a/exec.c b/exec.c
index b14bad9..dbeab5a 100644
--- a/exec.c
+++ b/exec.c
@@ -2824,7 +2824,7 @@
return last;
}
-ram_addr_t qemu_ram_map(DeviceState *dev, const char *name,
+ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name,
ram_addr_t size, void *host)
{
RAMBlock *new_block, *block;
diff --git a/hw/device-assignment.c b/hw/device-assignment.c
index c56870e..d00a20e 100644
--- a/hw/device-assignment.c
+++ b/hw/device-assignment.c
@@ -582,7 +582,7 @@
snprintf(name, sizeof(name), "%s.bar%d",
pci_dev->dev.qdev.info->name, i);
pci_dev->v_addrs[i].memory_index =
- qemu_ram_map(&pci_dev->dev.qdev,
+ qemu_ram_alloc_from_ptr(&pci_dev->dev.qdev,
name, cur_region->size,
virtbase);
} else
