qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Max Reitz <mreitz@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
	"Benoît Canet" <benoit.canet@nodalink.com>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"Max Reitz" <mreitz@redhat.com>
Subject: [Qemu-devel] [PATCH v8 01/17] block: Add qemu_{, try_}blockalign0()
Date: Wed, 22 Oct 2014 14:09:27 +0200	[thread overview]
Message-ID: <1413979783-1549-2-git-send-email-mreitz@redhat.com> (raw)
In-Reply-To: <1413979783-1549-1-git-send-email-mreitz@redhat.com>

These functions call their non-0-counterparts and then fill the
allocated buffer with 0 (if the allocation has been successful).

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block.c               | 16 ++++++++++++++++
 include/block/block.h |  2 ++
 2 files changed, 18 insertions(+)

diff --git a/block.c b/block.c
index 773e87e..bbb04e7 100644
--- a/block.c
+++ b/block.c
@@ -5200,6 +5200,11 @@ void *qemu_blockalign(BlockDriverState *bs, size_t size)
     return qemu_memalign(bdrv_opt_mem_align(bs), size);
 }
 
+void *qemu_blockalign0(BlockDriverState *bs, size_t size)
+{
+    return memset(qemu_blockalign(bs, size), 0, size);
+}
+
 void *qemu_try_blockalign(BlockDriverState *bs, size_t size)
 {
     size_t align = bdrv_opt_mem_align(bs);
@@ -5213,6 +5218,17 @@ void *qemu_try_blockalign(BlockDriverState *bs, size_t size)
     return qemu_try_memalign(align, size);
 }
 
+void *qemu_try_blockalign0(BlockDriverState *bs, size_t size)
+{
+    void *mem = qemu_try_blockalign(bs, size);
+
+    if (mem) {
+        memset(mem, 0, size);
+    }
+
+    return mem;
+}
+
 /*
  * Check if all memory in this vector is sector aligned.
  */
diff --git a/include/block/block.h b/include/block/block.h
index c9ec0ab..341054d 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -412,7 +412,9 @@ void bdrv_img_create(const char *filename, const char *fmt,
 size_t bdrv_opt_mem_align(BlockDriverState *bs);
 void bdrv_set_guest_block_size(BlockDriverState *bs, int align);
 void *qemu_blockalign(BlockDriverState *bs, size_t size);
+void *qemu_blockalign0(BlockDriverState *bs, size_t size);
 void *qemu_try_blockalign(BlockDriverState *bs, size_t size);
+void *qemu_try_blockalign0(BlockDriverState *bs, size_t size);
 bool bdrv_qiov_is_aligned(BlockDriverState *bs, QEMUIOVector *qiov);
 
 struct HBitmapIter;
-- 
1.9.3

  reply	other threads:[~2014-10-22 12:10 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-22 12:09 [Qemu-devel] [PATCH v8 00/17] qcow2: Fix image repairing Max Reitz
2014-10-22 12:09 ` Max Reitz [this message]
2014-10-22 14:02   ` [Qemu-devel] [PATCH v8 01/17] block: Add qemu_{, try_}blockalign0() Eric Blake
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 02/17] qcow2: Calculate refcount block entry count Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 03/17] qcow2: Fix leaks in dirty images Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 04/17] qcow2: Split qcow2_check_refcounts() Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 05/17] qcow2: Use sizeof(**refcount_table) Max Reitz
2014-10-22 14:38   ` Eric Blake
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 06/17] qcow2: Pull check_refblocks() up Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 07/17] qcow2: Use int64_t for in-memory reftable size Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 08/17] qcow2: Split fail code in L1 and L2 checks Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 09/17] qcow2: Let inc_refcounts() return -errno Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 10/17] qcow2: Let inc_refcounts() resize the reftable Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 11/17] qcow2: Reuse refcount table in calculate_refcounts() Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 12/17] qcow2: Fix refcount blocks beyond image end Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 13/17] qcow2: Do not perform potentially damaging repairs Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 14/17] qcow2: Rebuild refcount structure during check Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 15/17] qcow2: Clean up after refcount rebuild Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 16/17] iotests: Fix test outputs Max Reitz
2014-10-22 12:09 ` [Qemu-devel] [PATCH v8 17/17] iotests: Add test for potentially damaging repairs Max Reitz
2014-10-22 13:18 ` [Qemu-devel] [PATCH v8 00/17] qcow2: Fix image repairing Kevin Wolf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1413979783-1549-2-git-send-email-mreitz@redhat.com \
    --to=mreitz@redhat.com \
    --cc=benoit.canet@nodalink.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).