| Message ID | 20180920103243.28474-4-david@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | memory-device: complete refactoring + virtio-pmem | expand |
On Thu, Sep 20, 2018 at 12:32:24PM +0200, David Hildenbrand wrote: > While we rephrased most error messages, we missed these. > > Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > Reviewed-by: Igor Mammedov <imammedo@redhat.com> > Signed-off-by: David Hildenbrand <david@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/mem/memory-device.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c > index 020aad102a..909566756a 100644 > --- a/hw/mem/memory-device.c > +++ b/hw/mem/memory-device.c > @@ -88,7 +88,7 @@ static void memory_device_check_addable(MachineState *ms, uint64_t size, > if (used_region_size + size < used_region_size || > used_region_size + size > ms->maxram_size - ms->ram_size) { > error_setg(errp, "not enough space, currently 0x%" PRIx64 > - " in use of total hot pluggable 0x" RAM_ADDR_FMT, > + " in use of total space for memory devices 0x" RAM_ADDR_FMT, > used_region_size, ms->maxram_size - ms->ram_size); > return; > } > @@ -146,13 +146,13 @@ uint64_t memory_device_get_free_addr(MachineState *ms, const uint64_t *hint, > if (hint) { > new_addr = *hint; > if (new_addr < address_space_start) { > - error_setg(errp, "can't add memory [0x%" PRIx64 ":0x%" PRIx64 > + error_setg(errp, "can't add memory device [0x%" PRIx64 ":0x%" PRIx64 > "] before 0x%" PRIx64, new_addr, size, > address_space_start); > return 0; > } else if (new_addr + size - 1 < new_addr || > new_addr + size - 1 > address_space_end) { > - error_setg(errp, "can't add memory [0x%" PRIx64 ":0x%" PRIx64 > + error_setg(errp, "can't add memory device [0x%" PRIx64 ":0x%" PRIx64 > "] beyond 0x%" PRIx64, new_addr, size, > address_space_end); > return 0;
diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c index 020aad102a..909566756a 100644 --- a/hw/mem/memory-device.c +++ b/hw/mem/memory-device.c @@ -88,7 +88,7 @@ static void memory_device_check_addable(MachineState *ms, uint64_t size, if (used_region_size + size < used_region_size || used_region_size + size > ms->maxram_size - ms->ram_size) { error_setg(errp, "not enough space, currently 0x%" PRIx64 - " in use of total hot pluggable 0x" RAM_ADDR_FMT, + " in use of total space for memory devices 0x" RAM_ADDR_FMT, used_region_size, ms->maxram_size - ms->ram_size); return; } @@ -146,13 +146,13 @@ uint64_t memory_device_get_free_addr(MachineState *ms, const uint64_t *hint, if (hint) { new_addr = *hint; if (new_addr < address_space_start) { - error_setg(errp, "can't add memory [0x%" PRIx64 ":0x%" PRIx64 + error_setg(errp, "can't add memory device [0x%" PRIx64 ":0x%" PRIx64 "] before 0x%" PRIx64, new_addr, size, address_space_start); return 0; } else if (new_addr + size - 1 < new_addr || new_addr + size - 1 > address_space_end) { - error_setg(errp, "can't add memory [0x%" PRIx64 ":0x%" PRIx64 + error_setg(errp, "can't add memory device [0x%" PRIx64 ":0x%" PRIx64 "] beyond 0x%" PRIx64, new_addr, size, address_space_end); return 0;