mirror of https://github.com/proxmox/mirror_qemu
qemu_ram_ptr_length: take ram_addr_t as arguments
qemu_ram_ptr_length should take ram_addr_t as argument rather than target_phys_addr_t because is doing comparisons with RAMBlock addresses. cpu_physical_memory_map should create a ram_addr_t address to pass to qemu_ram_ptr_length from PhysPageDesc phys_offset. Remove code after abort() in qemu_ram_ptr_length. Changes in v2: - handle 0 size in qemu_ram_ptr_length; - rename addr1 to raddr; - initialize raddr to ULONG_MAX. Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Alexander Graf <agraf@suse.de>master
parent
5ea3c2b405
commit
8ab934f93b
|
@ -65,7 +65,7 @@ void qemu_ram_free_from_ptr(ram_addr_t addr);
|
||||||
void qemu_ram_remap(ram_addr_t addr, ram_addr_t length);
|
void qemu_ram_remap(ram_addr_t addr, ram_addr_t length);
|
||||||
/* This should only be used for ram local to a device. */
|
/* This should only be used for ram local to a device. */
|
||||||
void *qemu_get_ram_ptr(ram_addr_t addr);
|
void *qemu_get_ram_ptr(ram_addr_t addr);
|
||||||
void *qemu_ram_ptr_length(target_phys_addr_t addr, target_phys_addr_t *size);
|
void *qemu_ram_ptr_length(ram_addr_t addr, ram_addr_t *size);
|
||||||
/* Same but slower, to use for migration, where the order of
|
/* Same but slower, to use for migration, where the order of
|
||||||
* RAMBlocks must not change. */
|
* RAMBlocks must not change. */
|
||||||
void *qemu_safe_ram_ptr(ram_addr_t addr);
|
void *qemu_safe_ram_ptr(ram_addr_t addr);
|
||||||
|
|
21
exec.c
21
exec.c
|
@ -3167,8 +3167,11 @@ void *qemu_safe_ram_ptr(ram_addr_t addr)
|
||||||
|
|
||||||
/* Return a host pointer to guest's ram. Similar to qemu_get_ram_ptr
|
/* Return a host pointer to guest's ram. Similar to qemu_get_ram_ptr
|
||||||
* but takes a size argument */
|
* but takes a size argument */
|
||||||
void *qemu_ram_ptr_length(target_phys_addr_t addr, target_phys_addr_t *size)
|
void *qemu_ram_ptr_length(ram_addr_t addr, ram_addr_t *size)
|
||||||
{
|
{
|
||||||
|
if (*size == 0) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
if (xen_enabled()) {
|
if (xen_enabled()) {
|
||||||
return xen_map_cache(addr, *size, 1);
|
return xen_map_cache(addr, *size, 1);
|
||||||
} else {
|
} else {
|
||||||
|
@ -3184,9 +3187,6 @@ void *qemu_ram_ptr_length(target_phys_addr_t addr, target_phys_addr_t *size)
|
||||||
|
|
||||||
fprintf(stderr, "Bad ram offset %" PRIx64 "\n", (uint64_t)addr);
|
fprintf(stderr, "Bad ram offset %" PRIx64 "\n", (uint64_t)addr);
|
||||||
abort();
|
abort();
|
||||||
|
|
||||||
*size = 0;
|
|
||||||
return NULL;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4052,7 +4052,9 @@ void *cpu_physical_memory_map(target_phys_addr_t addr,
|
||||||
target_phys_addr_t page;
|
target_phys_addr_t page;
|
||||||
unsigned long pd;
|
unsigned long pd;
|
||||||
PhysPageDesc *p;
|
PhysPageDesc *p;
|
||||||
target_phys_addr_t addr1 = addr;
|
ram_addr_t raddr = ULONG_MAX;
|
||||||
|
ram_addr_t rlen;
|
||||||
|
void *ret;
|
||||||
|
|
||||||
while (len > 0) {
|
while (len > 0) {
|
||||||
page = addr & TARGET_PAGE_MASK;
|
page = addr & TARGET_PAGE_MASK;
|
||||||
|
@ -4080,13 +4082,18 @@ void *cpu_physical_memory_map(target_phys_addr_t addr,
|
||||||
*plen = l;
|
*plen = l;
|
||||||
return bounce.buffer;
|
return bounce.buffer;
|
||||||
}
|
}
|
||||||
|
if (!todo) {
|
||||||
|
raddr = (pd & TARGET_PAGE_MASK) + (addr & ~TARGET_PAGE_MASK);
|
||||||
|
}
|
||||||
|
|
||||||
len -= l;
|
len -= l;
|
||||||
addr += l;
|
addr += l;
|
||||||
todo += l;
|
todo += l;
|
||||||
}
|
}
|
||||||
*plen = todo;
|
rlen = todo;
|
||||||
return qemu_ram_ptr_length(addr1, plen);
|
ret = qemu_ram_ptr_length(raddr, &rlen);
|
||||||
|
*plen = rlen;
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Unmaps a memory region previously mapped by cpu_physical_memory_map().
|
/* Unmaps a memory region previously mapped by cpu_physical_memory_map().
|
||||||
|
|
Loading…
Reference in New Issue