qemu-s390x
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[qemu-s390x] [PATCH v1] pc-dimm: fix error messages if no slots were def


From: David Hildenbrand
Subject: [qemu-s390x] [PATCH v1] pc-dimm: fix error messages if no slots were defined
Date: Thu, 26 Apr 2018 12:34:30 +0200

If not slots were defined we try to allocate an empty bitmap, which
fails.

Signed-off-by: David Hildenbrand <address@hidden>
---

This fixes the queued patch "exec: Allow memory regions with size 0"

 hw/mem/pc-dimm.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index 0119c68e01..f2c140947d 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -118,9 +118,15 @@ static int pc_dimm_slot2bitmap(Object *obj, void *opaque)
 
 int pc_dimm_get_free_slot(const int *hint, int max_slots, Error **errp)
 {
-    unsigned long *bitmap = bitmap_new(max_slots);
+    unsigned long *bitmap;
     int slot = 0;
 
+    if (max_slots <= 0) {
+        error_setg(errp, "no free slots available");
+        return slot;
+    }
+
+    bitmap = bitmap_new(max_slots);
     object_child_foreach(qdev_get_machine(), pc_dimm_slot2bitmap, bitmap);
 
     /* check if requested slot is not occupied */
-- 
2.14.3




reply via email to

[Prev in Thread] Current Thread [Next in Thread]