From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45271) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2Lc1-0000yv-Oc for qemu-devel@nongnu.org; Mon, 16 May 2016 12:43:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b2Lbq-00068L-QY for qemu-devel@nongnu.org; Mon, 16 May 2016 12:43:20 -0400 Received: from resqmta-po-05v.sys.comcast.net ([2001:558:fe16:19:96:114:154:164]:36913) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2Lbq-00068E-LO for qemu-devel@nongnu.org; Mon, 16 May 2016 12:43:10 -0400 From: Eric Blake Date: Mon, 16 May 2016 10:43:01 -0600 Message-Id: <1463416983-28318-2-git-send-email-eblake@redhat.com> In-Reply-To: <1463416983-28318-1-git-send-email-eblake@redhat.com> References: <1463416983-28318-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v2 1/3] qemu-io: Fix recent UI updates List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, qemu-block@nongnu.org, mreitz@redhat.com Commit 770e0e0e [*] tried to add 'writev -f', but didn't tweak the getopt() call to actually let it work. Likewise, commit c2e001c missed implementing 'aio_write -u -z'. The latter commit also introduced a leak of ctx. [*] does it sound "ech0e" in here? :) Signed-off-by: Eric Blake --- v2: retitle, fix commit id typo, also plug Coverity leak [mreitz] --- qemu-io-cmds.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c index 4a00bc6..1c0b692 100644 --- a/qemu-io-cmds.c +++ b/qemu-io-cmds.c @@ -1150,7 +1150,7 @@ static int writev_f(BlockBackend *blk, int argc, char **argv) int pattern = 0xcd; QEMUIOVector qiov; - while ((c = getopt(argc, argv, "CqP:")) != -1) { + while ((c = getopt(argc, argv, "CfqP:")) != -1) { switch (c) { case 'C': Cflag = true; @@ -1595,7 +1595,7 @@ static int aio_write_f(BlockBackend *blk, int argc, char **argv) int flags = 0; ctx->blk = blk; - while ((c = getopt(argc, argv, "CfqP:z")) != -1) { + while ((c = getopt(argc, argv, "CfqP:uz")) != -1) { switch (c) { case 'C': ctx->Cflag = true; @@ -1638,6 +1638,7 @@ static int aio_write_f(BlockBackend *blk, int argc, char **argv) if ((flags & BDRV_REQ_MAY_UNMAP) && !ctx->zflag) { printf("-u requires -z to be specified\n"); + g_free(ctx); return 0; } -- 2.5.5