[libvirt] [PULL v2 18/43] memory-device: fix error message when hinted address is too small

Eduardo Habkost ehabkost at redhat.com
Thu Oct 25 13:32:36 UTC 2018


From: David Hildenbrand <david at redhat.com>

The "at" should actually be a "before".
    if (new_addr < address_space_start)
     -> "can't add memory ... before... $address_space_start"

So it looks similar to the other check
    } else if ((new_addr + size) > address_space_end)
     -> "can't add memory ... beyond..."

Reviewed-by: Dr. David Alan Gilbert <dgilbert at redhat.com>
Reviewed-by: Igor Mammedov <imammedo at redhat.com>
Reviewed-by: David Gibson <david at gibson.dropbear.id.au>
Signed-off-by: David Hildenbrand <david at redhat.com>
Message-Id: <20181005092024.14344-3-david at redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost at 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 0b52fe2c5e..7c706fadfc 100644
--- a/hw/mem/memory-device.c
+++ b/hw/mem/memory-device.c
@@ -146,7 +146,8 @@ uint64_t memory_device_get_free_addr(MachineState *ms, const uint64_t *hint,
         new_addr = *hint;
         if (new_addr < address_space_start) {
             error_setg(errp, "can't add memory [0x%" PRIx64 ":0x%" PRIx64
-                       "] at 0x%" PRIx64, new_addr, size, address_space_start);
+                       "] 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
-- 
2.18.0.rc1.1.g3f1ff2140




More information about the libvir-list mailing list