OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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

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

Commit 2e40134 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 6db9560: just one call, not anonymous.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Markus Armbruster 2014-09-08 18:50:58 +02:00 committed by Kevin Wolf
parent 0d4cc3e715
commit dbb651c46c
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
qemu-io.c
View File

@ -58,30 +58,20 @@ static int openfile(char *name, int flags, int growable, QDict *opts)
return 1; return 1;
} }
if (growable) { qemuio_bs = bdrv_new("hda", &error_abort);
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;
}
} else {
qemuio_bs = bdrv_new("hda", &error_abort);
if (bdrv_open(&qemuio_bs, name, NULL, opts, flags, NULL, &local_err) if (growable) {
< 0) flags |= BDRV_O_PROTOCOL;
{ }
fprintf(stderr, "%s: can't open%s%s: %s\n", progname,
name ? " device " : "", name ?: "", if (bdrv_open(&qemuio_bs, name, NULL, opts, flags, NULL, &local_err) < 0) {
error_get_pretty(local_err)); fprintf(stderr, "%s: can't open%s%s: %s\n", progname,
error_free(local_err); name ? " device " : "", name ?: "",
bdrv_unref(qemuio_bs); error_get_pretty(local_err));
qemuio_bs = NULL; error_free(local_err);
return 1; bdrv_unref(qemuio_bs);
} qemuio_bs = NULL;
return 1;
} }
return 0; return 0;