[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL v2 21/43] memory-device: use memory device terminology
From: |
Eduardo Habkost |
Subject: |
[Qemu-ppc] [PULL v2 21/43] memory-device: use memory device terminology in error messages |
Date: |
Thu, 25 Oct 2018 10:32:39 -0300 |
From: David Hildenbrand <address@hidden>
While we rephrased most error messages, we missed these.
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Reviewed-by: David Gibson <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <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 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
- [Qemu-ppc] [PULL v2 20/43] pc-dimm: pass PCDIMMDevice to pc_dimm_.*plug, (continued)
- [Qemu-ppc] [PULL v2 20/43] pc-dimm: pass PCDIMMDevice to pc_dimm_.*plug, Eduardo Habkost, 2018/10/25
- [Qemu-ppc] [PULL v2 17/43] memory-device: fix alignment error message, Eduardo Habkost, 2018/10/25
- [Qemu-ppc] [PULL v2 13/43] hw/alpha/typhoon: Remove unuseful code, Eduardo Habkost, 2018/10/25
- [Qemu-ppc] [PULL v2 10/43] hw/mips/gt64xxx_pci: Convert gt64120_reset() function into Device reset method, Eduardo Habkost, 2018/10/25
- [Qemu-ppc] [PULL v2 19/43] memory-device: improve "range conflicts" error message, Eduardo Habkost, 2018/10/25
- [Qemu-ppc] [PULL v2 14/43] hw/hppa/dino: Remove unuseful code, Eduardo Habkost, 2018/10/25
- [Qemu-ppc] [PULL v2 15/43] hw/mips/malta: Remove unuseful code, Eduardo Habkost, 2018/10/25
- [Qemu-ppc] [PULL v2 12/43] hw/sparc64/niagara: Model the I/O Bridge with the 'unimplemented_device', Eduardo Habkost, 2018/10/25
- [Qemu-ppc] [PULL v2 18/43] memory-device: fix error message when hinted address is too small, Eduardo Habkost, 2018/10/25
- [Qemu-ppc] [PULL v2 22/43] memory-device: introduce separate config option, Eduardo Habkost, 2018/10/25
- [Qemu-ppc] [PULL v2 21/43] memory-device: use memory device terminology in error messages,
Eduardo Habkost <=
- [Qemu-ppc] [PULL v2 23/43] memory-device: forward errors in get_region_size()/get_plugged_size(), Eduardo Habkost, 2018/10/25
- [Qemu-ppc] [PULL v2 16/43] machine: fix a typo, Eduardo Habkost, 2018/10/25
- [Qemu-ppc] [PULL v2 24/43] memory-device: document MemoryDeviceClass, Eduardo Habkost, 2018/10/25
- [Qemu-ppc] [PULL v2 25/43] memory-device: add and use memory_device_get_region_size(), Eduardo Habkost, 2018/10/25
- [Qemu-ppc] [PULL v2 26/43] memory-device: factor out get_memory_region() from pc-dimm, Eduardo Habkost, 2018/10/25
- [Qemu-ppc] [PULL v2 27/43] memory-device: drop get_region_size(), Eduardo Habkost, 2018/10/25
- [Qemu-ppc] [PULL v2 28/43] memory-device: add device class function set_addr(), Eduardo Habkost, 2018/10/25
- [Qemu-ppc] [PULL v2 29/43] memory-device: complete factoring out pre_plug handling, Eduardo Habkost, 2018/10/25
- [Qemu-ppc] [PULL v2 11/43] hw/mips/gt64xxx_pci: Mark as bridge device, Eduardo Habkost, 2018/10/25
- Re: [Qemu-ppc] [PULL v2 00/43] Machine queue, 2018-10-25, Peter Maydell, 2018/10/26