mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-26 04:13:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

memory-device: improve "range conflicts" error message

Browse Source 
Handle id==NULL better and indicate that we are dealing with memory
devices.

Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20181005092024.14344-4-david@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
David Hildenbrand 2018-10-05 11:20:11 +02:00 committed by Eduardo Habkost
parent ac1b337588
commit f99d84b1fc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/mem/memory-device.c
View File

@ -175,7 +175,8 @@ uint64_t memory_device_get_free_addr(MachineState *ms, const uint64_t *hint,
if (ranges_overlap(md_addr, md_size, new_addr, size)) { if (ranges_overlap(md_addr, md_size, new_addr, size)) {
if (hint) { if (hint) {
const DeviceState *d = DEVICE(md); const DeviceState *d = DEVICE(md);
error_setg(errp, "address range conflicts with '%s'", d->id); error_setg(errp, "address range conflicts with memory device"
" id='%s'", d->id ? d->id : "(unnamed)");
goto out; goto out;
} }
new_addr = QEMU_ALIGN_UP(md_addr + md_size, align); new_addr = QEMU_ALIGN_UP(md_addr + md_size, align);