diff options
| author | David Hildenbrand <david@redhat.com> | 2018-10-05 11:20:10 +0200 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2018-10-24 06:44:59 -0300 |
| commit | ac1b3375880d8ddc9d8d1b648dd83f80f4338e8e (patch) | |
| tree | 680d2a27f42676db55f77af16527aa9145363df2 /hw/mem | |
| parent | 7c63ba2055a0a27cdd6ae835f5964f7895d18edc (diff) | |
| download | qemu-ac1b3375880d8ddc9d8d1b648dd83f80f4338e8e.zip qemu-ac1b3375880d8ddc9d8d1b648dd83f80f4338e8e.tar.gz qemu-ac1b3375880d8ddc9d8d1b648dd83f80f4338e8e.tar.bz2 | |
memory-device: fix error message when hinted address is too small
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@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20181005092024.14344-3-david@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'hw/mem')
| -rw-r--r-- | hw/mem/memory-device.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c index 0b52fe2..7c706fa 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 |