mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qemu-io: Fix recent UI updates

Browse Source 
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 <eblake@redhat.com>
Message-id: 1463416983-28318-2-git-send-email-eblake@redhat.com
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Eric Blake 2016-05-16 10:43:01 -06:00 committed by Max Reitz
parent 3a3086b72a
commit 4ca1d3401b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qemu-io-cmds.c
View File

@ -1107,7 +1107,7 @@ static int writev_f(BlockBackend *blk, int argc, char **argv)
int pattern = 0xcd; int pattern = 0xcd;
QEMUIOVector qiov; QEMUIOVector qiov;
while ((c = getopt(argc, argv, "CqP:")) != -1) { while ((c = getopt(argc, argv, "CfqP:")) != -1) {
switch (c) { switch (c) {
case 'C': case 'C':
Cflag = true; Cflag = true;
@ -1393,7 +1393,7 @@ static int aio_write_f(BlockBackend *blk, int argc, char **argv)
int flags = 0; int flags = 0;
ctx->blk = blk; ctx->blk = blk;
while ((c = getopt(argc, argv, "CfqP:z")) != -1) { while ((c = getopt(argc, argv, "CfqP:uz")) != -1) {
switch (c) { switch (c) {
case 'C': case 'C':
ctx->Cflag = true; ctx->Cflag = true;
@ -1436,6 +1436,7 @@ static int aio_write_f(BlockBackend *blk, int argc, char **argv)
if ((flags & BDRV_REQ_MAY_UNMAP) && !ctx->zflag) { if ((flags & BDRV_REQ_MAY_UNMAP) && !ctx->zflag) {
printf("-u requires -z to be specified\n"); printf("-u requires -z to be specified\n");
g_free(ctx);
return 0; return 0;
} }