On Thu, Sep 20, 2018 at 12:32:22PM +0200, David Hildenbrand wrote: > 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 <dgilb...@redhat.com> > Reviewed-by: Igor Mammedov <imamm...@redhat.com> > Signed-off-by: David Hildenbrand <da...@redhat.com>
Reviewed-by: David Gibson <da...@gibson.dropbear.id.au>
> ---
> 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 6de4f70bb4..efacbc2a7d 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
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
