From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, berto@igalia.com, eblake@redhat.com,
mreitz@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH v2 9/9] quorum: Clean up quorum_aio_get()
Date: Tue, 22 Nov 2016 13:24:04 +0100 [thread overview]
Message-ID: <1479817444-6880-10-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1479817444-6880-1-git-send-email-kwolf@redhat.com>
Make sure that all fields of the new QuorumAIOCB are zeroed when the
function returns even without explicitly setting them. This will protect
us when new fields are added, removes some explicit zero assignment and
makes the code a little nicer to read.
Suggested-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/quorum.c | 23 ++++++++++-------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/block/quorum.c b/block/quorum.c
index 52fa806..38c5e43 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -166,20 +166,17 @@ static QuorumAIOCB *quorum_aio_get(BlockDriverState *bs,
QuorumAIOCB *acb = g_new(QuorumAIOCB, 1);
int i;
- acb->co = qemu_coroutine_self();
- acb->bs = bs;
- acb->offset = offset;
- acb->bytes = bytes;
- acb->qiov = qiov;
- acb->qcrs = g_new0(QuorumChildRequest, s->num_children);
- acb->count = 0;
- acb->success_count = 0;
- acb->rewrite_count = 0;
- acb->votes.compare = quorum_sha256_compare;
- QLIST_INIT(&acb->votes.vote_list);
- acb->is_read = false;
- acb->vote_ret = 0;
+ *acb = (QuorumAIOCB) {
+ .co = qemu_coroutine_self(),
+ .bs = bs,
+ .offset = offset,
+ .bytes = bytes,
+ .qiov = qiov,
+ .votes.compare = quorum_sha256_compare,
+ .votes.vote_list = QLIST_HEAD_INITIALIZER(acb.votes.vote_list),
+ };
+ acb->qcrs = g_new0(QuorumChildRequest, s->num_children);
for (i = 0; i < s->num_children; i++) {
acb->qcrs[i].buf = NULL;
acb->qcrs[i].ret = 0;
--
1.8.3.1
next prev parent reply other threads:[~2016-11-22 12:24 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-22 12:23 [Qemu-devel] [PATCH v2 0/9] quorum: Implement .bdrv_co_preadv/pwritev() Kevin Wolf
2016-11-22 12:23 ` [Qemu-devel] [PATCH v2 1/9] coroutine: Introduce qemu_coroutine_enter_if_inactive() Kevin Wolf
2016-11-22 12:23 ` [Qemu-devel] [PATCH v2 2/9] quorum: Remove s from quorum_aio_get() arguments Kevin Wolf
2016-11-22 12:23 ` [Qemu-devel] [PATCH v2 3/9] quorum: Implement .bdrv_co_readv/writev Kevin Wolf
2016-11-22 12:23 ` [Qemu-devel] [PATCH v2 4/9] quorum: Do cleanup in caller coroutine Kevin Wolf
2016-11-22 12:24 ` [Qemu-devel] [PATCH v2 5/9] quorum: Inline quorum_aio_cb() Kevin Wolf
2016-11-29 9:39 ` Paolo Bonzini
2016-11-29 10:06 ` Alberto Garcia
2016-11-29 13:38 ` Kevin Wolf
2016-11-22 12:24 ` [Qemu-devel] [PATCH v2 6/9] quorum: Avoid bdrv_aio_writev() for rewrites Kevin Wolf
2016-11-22 12:24 ` [Qemu-devel] [PATCH v2 7/9] quorum: Implement .bdrv_co_preadv/pwritev() Kevin Wolf
2016-11-22 12:52 ` Eric Blake
2016-11-22 13:18 ` Alberto Garcia
2016-11-22 12:24 ` [Qemu-devel] [PATCH v2 8/9] quorum: Inline quorum_fifo_aio_cb() Kevin Wolf
2016-11-29 9:41 ` Paolo Bonzini
2016-11-22 12:24 ` Kevin Wolf [this message]
2016-11-22 12:54 ` [Qemu-devel] [PATCH v2 9/9] quorum: Clean up quorum_aio_get() Eric Blake
2016-11-22 13:25 ` Alberto Garcia
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=1479817444-6880-10-git-send-email-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=berto@igalia.com \
--cc=eblake@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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).