Commit 4ca1d340 authored by Eric Blake's avatar Eric Blake Committed by Max Reitz
Browse files

qemu-io: Fix recent UI updates 



Commit 770e0e0e [*] tried to add 'writev -f', but didn't tweak
the getopt() call to actually let it work.  Likewise, commit
c2e001cc missed implementing 'aio_write -u -z'.  The latter commit
also introduced a leak of ctx.

[*] does it sound "ech0e" in here? :)

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Message-id: 1463416983-28318-2-git-send-email-eblake@redhat.com
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 3a3086b7

qemu-io-cmds.c

+3 −2
Original line number Diff line number Diff line
@@ -1107,7 +1107,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;
@@ -1393,7 +1393,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;
@@ -1436,6 +1436,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;

    }