[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/17] qemu-io: Don't print NULL when open without no
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 07/17] qemu-io: Don't print NULL when open without non-option arg fails |
Date: |
Mon, 2 Jun 2014 15:56:38 +0200 |
From: Markus Armbruster <address@hidden>
Reproducer: "open -o a=b". Broken in commit fd0fee3.
Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
qemu-io.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/qemu-io.c b/qemu-io.c
index f63e771..795cf46 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -62,7 +62,8 @@ static int openfile(char *name, int flags, int growable,
QDict *opts)
if (bdrv_open(&qemuio_bs, name, NULL, opts, flags | BDRV_O_PROTOCOL,
NULL, &local_err))
{
- fprintf(stderr, "%s: can't open device %s: %s\n", progname, name,
+ 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;
@@ -73,7 +74,8 @@ static int openfile(char *name, int flags, int growable,
QDict *opts)
if (bdrv_open(&qemuio_bs, name, NULL, opts, flags, NULL, &local_err)
< 0)
{
- fprintf(stderr, "%s: can't open device %s: %s\n", progname, name,
+ fprintf(stderr, "%s: can't open%s%s: %s\n", progname,
+ name ? " device " : "", name ?: "",
error_get_pretty(local_err));
error_free(local_err);
bdrv_unref(qemuio_bs);
--
1.8.3.1
- [Qemu-devel] [PULL 00/17] Block patches, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 01/17] qemu-img: Plug memory leak on block option help error path, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 02/17] block/vvfat: Plug memory leak in enable_write_target(), Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 03/17] qcow2: Plug memory leak on qcow2_invalidate_cache() error paths, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 04/17] block: Plug memory leak on brv_open_image() error path, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 05/17] qemu-io: Support multiple -o in open command, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 06/17] qemu-io: Plug memory leak in open command, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 08/17] blockdev: Plug memory leak in blockdev_init(), Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 07/17] qemu-io: Don't print NULL when open without non-option arg fails,
Kevin Wolf <=
- [Qemu-devel] [PULL 10/17] block/qapi: Plug memory leak in dump_qobject() case QTYPE_QERROR, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 11/17] block/vvfat: Plug memory leak in check_directory_consistency(), Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 09/17] blockdev: Plug memory leak in drive_init(), Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 12/17] block/vvfat: Plug memory leak in read_directory(), Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 13/17] block/sheepdog: Plug memory leak in sd_snapshot_create(), Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 14/17] qemu-img: Plug memory leak in convert command, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 15/17] block/raw-posix.c: Avoid nonstandard LONG_LONG_MAX, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 16/17] vmdk: Fix local_err in vmdk_create, Kevin Wolf, 2014/06/02
- [Qemu-devel] [PULL 17/17] qemu-img: Report error even with --oformat=json, Kevin Wolf, 2014/06/02
- Re: [Qemu-devel] [PULL 00/17] Block patches, Peter Maydell, 2014/06/02