From: David Hildenbrand <david(a)redhat.com>
While we rephrased most error messages, we missed these.
Reviewed-by: Dr. David Alan Gilbert <dgilbert(a)redhat.com>
Reviewed-by: Igor Mammedov <imammedo(a)redhat.com>
Reviewed-by: David Gibson <david(a)gibson.dropbear.id.au>
Signed-off-by: David Hildenbrand <david(a)redhat.com>
Message-Id: <20181005092024.14344-6-david(a)redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost(a)redhat.com>
---
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 0624184c40..87369ef2e1 100644
--- a/hw/mem/memory-device.c
+++ b/hw/mem/memory-device.c
@@ -87,7 +87,7 @@ static void memory_device_check_addable(MachineState *ms, uint64_t
size,
memory_device_used_region_size(OBJECT(ms), &used_region_size);
if (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;
}
@@ -145,12 +145,12 @@ 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) > 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;
--
2.18.0.rc1.1.g3f1ff2140