From: Peter Lieven <pl@kamp.de>
Date: Tue, 30 Sep 2014 07:09:11 +0000 (+0200)
Subject: util: introduce bitmap_try_new
X-Git-Tag: qemu-xen-4.6.0-rc1~144^2~1
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=be4d57c1ea7f17b9cadb0150b330efd9b6026972;p=qemu-upstream-4.6-testing.git

util: introduce bitmap_try_new

regular bitmap_new simply aborts if the memory allocation fails.
bitmap_try_new returns NULL on failure and allows for proper
error handling.

Signed-off-by: Peter Lieven <pl@kamp.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/include/qemu/bitmap.h b/include/qemu/bitmap.h
index 1babd5d81..edf4f17d9 100644
--- a/include/qemu/bitmap.h
+++ b/include/qemu/bitmap.h
@@ -88,10 +88,19 @@ int slow_bitmap_andnot(unsigned long *dst, const unsigned long *bitmap1,
 int slow_bitmap_intersects(const unsigned long *bitmap1,
                            const unsigned long *bitmap2, long bits);
 
-static inline unsigned long *bitmap_new(long nbits)
+static inline unsigned long *bitmap_try_new(long nbits)
 {
     long len = BITS_TO_LONGS(nbits) * sizeof(unsigned long);
-    return g_malloc0(len);
+    return g_try_malloc0(len);
+}
+
+static inline unsigned long *bitmap_new(long nbits)
+{
+    unsigned long *ptr = bitmap_try_new(nbits);
+    if (ptr == NULL) {
+        abort();
+    }
+    return ptr;
 }
 
 static inline void bitmap_zero(unsigned long *dst, long nbits)