[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/13] qemu-img: fix formatting of error message
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 02/13] qemu-img: fix formatting of error message |
Date: |
Tue, 12 Apr 2016 18:18:57 +0200 |
From: "Daniel P. Berrange" <address@hidden>
The error_reportf_err() will not automatically append a
': ' before adding its suffix, so we must include that
in the message we pass it, otherwise we get a badly
formatted message lacking whitespace:
qemu-img: Could not open
'driver=nbd,host=127.0.0.1,port=6666,tls-creds=tls0'Failed to connect socket:
Connection refused
Signed-off-by: Daniel P. Berrange <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
qemu-img.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qemu-img.c b/qemu-img.c
index 06264d9..17c5cfd 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -256,7 +256,7 @@ static BlockBackend *img_open_opts(const char *optstr,
options = qemu_opts_to_qdict(opts, NULL);
blk = blk_new_open(NULL, NULL, options, flags, &local_err);
if (!blk) {
- error_reportf_err(local_err, "Could not open '%s'", optstr);
+ error_reportf_err(local_err, "Could not open '%s': ", optstr);
return NULL;
}
blk_set_enable_write_cache(blk, !writethrough);
--
1.8.3.1
- [Qemu-devel] [PULL 00/13] Block patches for 2.6, Kevin Wolf, 2016/04/12
- [Qemu-devel] [PULL 02/13] qemu-img: fix formatting of error message,
Kevin Wolf <=
- [Qemu-devel] [PULL 03/13] block: initialize qcrypto API at startup, Kevin Wolf, 2016/04/12
- [Qemu-devel] [PULL 05/13] vpc: fix return value check for blk_pwrite, Kevin Wolf, 2016/04/12
- [Qemu-devel] [PULL 04/13] iotests: Make 150 use qemu-img map instead of du, Kevin Wolf, 2016/04/12
- [Qemu-devel] [PULL 07/13] MAINTAINERS: Block layer core, qcow2 and blkdebug, Kevin Wolf, 2016/04/12
- [Qemu-devel] [PULL 08/13] qemu-iotests: check: don't place files with predictable names in /tmp, Kevin Wolf, 2016/04/12
- [Qemu-devel] [PULL 06/13] qcow2: Prevent backing file names longer than 1023, Kevin Wolf, 2016/04/12
- [Qemu-devel] [PULL 01/13] iotests: fix the broken 026.nocache output, Kevin Wolf, 2016/04/12
- [Qemu-devel] [PULL 10/13] qemu-iotests: iotests.VM: remove qtest socket on error, Kevin Wolf, 2016/04/12
- [Qemu-devel] [PULL 13/13] qemu-iotests: iotests.py: get rid of __all__, Kevin Wolf, 2016/04/12
- [Qemu-devel] [PULL 12/13] qemu-iotests: 068: don't require KVM, Kevin Wolf, 2016/04/12