Commit dbb651c4 authored by Markus Armbruster's avatar Markus Armbruster Committed by Kevin Wolf
Browse files

qemu-io: Clean up openfile() after commit 2e40134b 



Commit 6db95603 split off the growable case so it can use
bdrv_file_open() instead of bdrv_open() then.  Growable BDSes become
anonymous.  Weird.

Commit 2e40134b folded bdrv_file_open() back into bdrv_open() with new
flag BDRV_O_PROTOCOL.  We still have two bdrv_open() calls, and
growable BDSes remain anonymous.

Circle back to before commit 6db95603: just one call, not anonymous.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 0d4cc3e7

qemu-io.c

+13 −23
Original line number Diff line number Diff line
@@ -58,22 +58,13 @@ static int openfile(char *name, int flags, int growable, QDict *opts) 
        return 1;

    }



    qemuio_bs = bdrv_new("hda", &error_abort);



    if (growable) {

        if (bdrv_open(&qemuio_bs, name, NULL, opts, flags | BDRV_O_PROTOCOL,

                      NULL, &local_err))

        {

            fprintf(stderr, "%s: can't open%s%s: %s\n", progname,

                    name ? " device " : "", name ?: "",

                    error_get_pretty(local_err));

            error_free(local_err);

            return 1;

        flags |= BDRV_O_PROTOCOL;

    }

    } else {

        qemuio_bs = bdrv_new("hda", &error_abort);



        if (bdrv_open(&qemuio_bs, name, NULL, opts, flags, NULL, &local_err)

            < 0)

        {

    if (bdrv_open(&qemuio_bs, name, NULL, opts, flags, NULL, &local_err) < 0) {

        fprintf(stderr, "%s: can't open%s%s: %s\n", progname,

                name ? " device " : "", name ?: "",

                error_get_pretty(local_err));
@@ -82,7 +73,6 @@ static int openfile(char *name, int flags, int growable, QDict *opts) 
        qemuio_bs = NULL;

        return 1;

    }

    }



    return 0;

}