Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20191022-2' into...

[qemu.git] / hw / mem / memory-device.c

diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
index 53953fdc3aa89bcb56e273ef93daab5371b24b2c..aef148c1d7d01b1ea4a8059520eb1ee9a099da03 100644 (file)
--- a/hw/mem/memory-device.c
+++ b/hw/mem/memory-device.c
@@ -179,13 +179,14 @@ static uint64_t memory_device_get_free_addr(MachineState *ms,
                 range_make_empty(&new);
                 break;
             }
+        } else if (range_lob(&tmp) > range_upb(&new)) {
+            break;
         }
     }
 
     if (!range_contains_range(&as, &new)) {
         error_setg(errp, "could not find position in guest address space for "
                    "memory device - memory fragmented due to alignments");
-        goto out;
     }
 out:
     g_slist_free(list);