From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFfnh-00032N-Ri for qemu-devel@nongnu.org; Thu, 25 Oct 2018 09:35:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gFfnf-00008d-P7 for qemu-devel@nongnu.org; Thu, 25 Oct 2018 09:35:49 -0400 From: Eduardo Habkost Date: Thu, 25 Oct 2018 10:32:37 -0300 Message-Id: <20181025133301.16578-20-ehabkost@redhat.com> In-Reply-To: <20181025133301.16578-1-ehabkost@redhat.com> References: <20181025133301.16578-1-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v2 19/43] memory-device: improve "range conflicts" error message List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell , qemu-devel@nongnu.org Cc: Paolo Bonzini , Alexander Graf , Rob Herring , libvir-list@redhat.com, Richard Henderson , David Gibson , Eric Blake , Igor Mammedov , qemu-arm@nongnu.org, "Edgar E. Iglesias" , Peter Crosthwaite , Markus Armbruster , Artyom Tarasenko , Mark Cave-Ayland , Eduardo Habkost , Michael Walle , Thomas Huth , Marcel Apfelbaum , Aleksandar Markovic , Aurelien Jarno , Alistair Francis , "Michael S. Tsirkin" , Jason Wang , Laurent Vivier , qemu-ppc@nongnu.org, Xiao Guangrong , Max Filippov , David Hildenbrand From: David Hildenbrand Handle id=3D=3DNULL better and indicate that we are dealing with memory devices. Signed-off-by: David Hildenbrand Message-Id: <20181005092024.14344-4-david@redhat.com> Reviewed-by: David Gibson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Eduardo Habkost --- 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 =3D DEVICE(md); - error_setg(errp, "address range conflicts with '%s'", d-= >id); + error_setg(errp, "address range conflicts with memory de= vice" + " id=3D'%s'", d->id ? d->id : "(unnamed)"); goto out; } new_addr =3D QEMU_ALIGN_UP(md_addr + md_size, align); --=20 2.18.0.rc1.1.g3f1ff2140