Message ID | 20181005092024.14344-4-david@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | memory-device: complete refactoring | expand |
On Fri, Oct 05, 2018 at 11:20:11AM +0200, David Hildenbrand wrote: > Handle id==NULL better and indicate that we are dealing with memory > devices. > > Signed-off-by: David Hildenbrand <david@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > 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);
On 05/10/2018 11:20, David Hildenbrand wrote: > Handle id==NULL better and indicate that we are dealing with memory > devices. > > Signed-off-by: David Hildenbrand <david@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > 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); >
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);
Handle id==NULL better and indicate that we are dealing with memory devices. Signed-off-by: David Hildenbrand <david@redhat.com> --- hw/mem/memory-device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)