memory-device: improve "range conflicts" error message
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:
parent
ac1b337588
commit
f99d84b1fc
|
@ -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);
|
||||||
|
|
Loading…
Reference in a new issue