cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
05bba0
From ad8bc0d8901415eeea7bb27ef26f197918be0752 Mon Sep 17 00:00:00 2001
05bba0
From: Max Reitz <mreitz@redhat.com>
05bba0
Date: Sat, 13 Jun 2015 16:22:09 +0200
05bba0
Subject: [PATCH 15/42] block: Add qemu_{,try_}blockalign0()
05bba0
05bba0
Message-id: <1434212556-3927-16-git-send-email-mreitz@redhat.com>
05bba0
Patchwork-id: 66034
05bba0
O-Subject: [RHEL-7.2 qemu-kvm PATCH 15/42] block: Add qemu_{,try_}blockalign0()
05bba0
Bugzilla: 1129893
05bba0
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
05bba0
RH-Acked-by: Fam Zheng <famz@redhat.com>
05bba0
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
05bba0
05bba0
BZ: 1129893
05bba0
05bba0
These functions call their non-0-counterparts and then fill the
05bba0
allocated buffer with 0 (if the allocation has been successful).
05bba0
05bba0
Signed-off-by: Max Reitz <mreitz@redhat.com>
05bba0
Reviewed-by: Eric Blake <eblake@redhat.com>
05bba0
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
05bba0
(cherry picked from commit 9ebd84480583bb6d9a7666c079d99ff3266c423d)
05bba0
05bba0
Signed-off-by: Max Reitz <mreitz@redhat.com>
05bba0
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
05bba0
---
05bba0
 block.c               | 16 ++++++++++++++++
05bba0
 include/block/block.h |  2 ++
05bba0
 2 files changed, 18 insertions(+)
05bba0
05bba0
diff --git a/block.c b/block.c
05bba0
index 1afa544..22ab762 100644
05bba0
--- a/block.c
05bba0
+++ b/block.c
05bba0
@@ -5178,6 +5178,11 @@ void *qemu_blockalign(BlockDriverState *bs, size_t size)
05bba0
     return qemu_memalign(bdrv_opt_mem_align(bs), size);
05bba0
 }
05bba0
 
05bba0
+void *qemu_blockalign0(BlockDriverState *bs, size_t size)
05bba0
+{
05bba0
+    return memset(qemu_blockalign(bs, size), 0, size);
05bba0
+}
05bba0
+
05bba0
 void *qemu_try_blockalign(BlockDriverState *bs, size_t size)
05bba0
 {
05bba0
     size_t align = bdrv_opt_mem_align(bs);
05bba0
@@ -5191,6 +5196,17 @@ void *qemu_try_blockalign(BlockDriverState *bs, size_t size)
05bba0
     return qemu_try_memalign(align, size);
05bba0
 }
05bba0
 
05bba0
+void *qemu_try_blockalign0(BlockDriverState *bs, size_t size)
05bba0
+{
05bba0
+    void *mem = qemu_try_blockalign(bs, size);
05bba0
+
05bba0
+    if (mem) {
05bba0
+        memset(mem, 0, size);
05bba0
+    }
05bba0
+
05bba0
+    return mem;
05bba0
+}
05bba0
+
05bba0
 /*
05bba0
  * Check if all memory in this vector is sector aligned.
05bba0
  */
05bba0
diff --git a/include/block/block.h b/include/block/block.h
05bba0
index 7b538b7..8339cac 100644
05bba0
--- a/include/block/block.h
05bba0
+++ b/include/block/block.h
05bba0
@@ -417,7 +417,9 @@ void bdrv_img_create(const char *filename, const char *fmt,
05bba0
 size_t bdrv_opt_mem_align(BlockDriverState *bs);
05bba0
 void bdrv_set_guest_block_size(BlockDriverState *bs, int align);
05bba0
 void *qemu_blockalign(BlockDriverState *bs, size_t size);
05bba0
+void *qemu_blockalign0(BlockDriverState *bs, size_t size);
05bba0
 void *qemu_try_blockalign(BlockDriverState *bs, size_t size);
05bba0
+void *qemu_try_blockalign0(BlockDriverState *bs, size_t size);
05bba0
 bool bdrv_qiov_is_aligned(BlockDriverState *bs, QEMUIOVector *qiov);
05bba0
 
05bba0
 struct HBitmapIter;
05bba0
-- 
05bba0
1.8.3.1
05bba0