[PULL,13/18] memory-device: break the loop if tmp exceed the hinted range

Commit Message

Eduardo Habkost Oct. 15, 2019, 9:37 p.m. UTC

From: Wei Yang <[e-mail]>

The memory-device list built by memory_device_build_list is ordered by
its address, this means if the tmp range exceed the hinted range, all
the following range will not overlap with it.

And this won't change default pc-dimm mapping and address assignment stay
the same as before this change.

Signed-off-by: Wei Yang <[e-mail]>
Message-Id: <[e-mail]>
Reviewed-by: David Hildenbrand <[e-mail]>
Reviewed-by: Igor Mammedov <[e-mail]>
Signed-off-by: Eduardo Habkost <[e-mail]>
---
 hw/mem/memory-device.c | 2 ++
 1 file changed, 2 insertions(+)

Patch

diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
index 5029890e06..aef148c1d7 100644
--- a/hw/mem/memory-device.c
+++ b/hw/mem/memory-device.c
@@ -179,6 +179,8 @@  static uint64_t memory_device_get_free_addr(MachineState *ms,
                 range_make_empty(&new);
                 break;
             }
+        } else if (range_lob(&tmp) > range_upb(&new)) {
+            break;
         }
     }