[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH v3 03/22] memory-device: use memory device terminology
From: |
David Hildenbrand |
Subject: |
[Qemu-ppc] [PATCH v3 03/22] memory-device: use memory device terminology in error messages |
Date: |
Thu, 20 Sep 2018 12:32:24 +0200 |
While we rephrased most error messages, we missed these.
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
---
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;
--
2.17.1
- [Qemu-ppc] [PATCH v3 00/22] memory-device: complete refactoring + virtio-pmem, David Hildenbrand, 2018/09/20
- [Qemu-ppc] [PATCH v3 01/22] memory-device: fix error message when hinted address is too small, David Hildenbrand, 2018/09/20
- [Qemu-ppc] [PATCH v3 02/22] memory-device: handle integer overflows properly, David Hildenbrand, 2018/09/20
- [Qemu-ppc] [PATCH v3 04/22] memory-device: introduce separate config option, David Hildenbrand, 2018/09/20
- [Qemu-ppc] [PATCH v3 03/22] memory-device: use memory device terminology in error messages,
David Hildenbrand <=
- [Qemu-ppc] [PATCH v3 05/22] memory-device: forward errors in get_region_size()/get_plugged_size(), David Hildenbrand, 2018/09/20
- [Qemu-ppc] [PATCH v3 06/22] memory-device: document MemoryDeviceClass, David Hildenbrand, 2018/09/20