[libvirt] [PULL v2 19/43] memory-device: improve "range conflicts" error message

From: David Hildenbrand <david(a)redhat.com&gt; Handle id==NULL better and indicate that we are dealing with memory devices. Signed-off-by: David Hildenbrand <david(a)redhat.com&gt; Message-Id: <20181005092024.14344-4-david(a)redhat.com&gt; Reviewed-by: David Gibson <david(a)gibson.dropbear.id.au&gt; Reviewed-by: Philippe Mathieu-Daudé <philmd(a)redhat.com&gt; Signed-off-by: Eduardo Habkost <ehabkost(a)redhat.com&gt; --- hw/mem/memory-device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c index 7c706fadfc..0624184c40 100644 --- a/hw/mem/memory-device.c +++ b/hw/mem/memory-device.c @@ -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 (hint) { 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; } new_addr = QEMU_ALIGN_UP(md_addr + md_size, align); -- 2.18.0.rc1.1.g3f1ff2140