[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/8] qemu-nbd: Use program name in error messages
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PULL 4/8] qemu-nbd: Use program name in error messages |
Date: |
Sat, 5 Jan 2019 08:00:56 -0600 |
This changes output from:
$ qemu-nbd nosuch
Failed to blk_new_open 'nosuch': Could not open 'nosuch': No such file or
directory
to something more consistent with qemu-img and qemu:
$ qemu-nbd nosuch
qemu-nbd: Failed to blk_new_open 'nosuch': Could not open 'nosuch': No such
file or directory
Update the lone affected test to match. (Hmm - is it sad that we don't
do much testing of expected failures?)
Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Richard W.M. Jones <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-Id: <address@hidden>
---
qemu-nbd.c | 1 +
tests/qemu-iotests/233.out | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/qemu-nbd.c b/qemu-nbd.c
index ca7109652e5..e169b839ece 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -571,6 +571,7 @@ int main(int argc, char **argv)
#endif
module_call_init(MODULE_INIT_TRACE);
+ error_set_progname(argv[0]);
qcrypto_init(&error_fatal);
module_call_init(MODULE_INIT_QOM);
diff --git a/tests/qemu-iotests/233.out b/tests/qemu-iotests/233.out
index 94acd9b9479..5f416721b03 100644
--- a/tests/qemu-iotests/233.out
+++ b/tests/qemu-iotests/233.out
@@ -27,7 +27,7 @@ virtual size: 64M (67108864 bytes)
disk size: unavailable
== check TLS with different CA fails ==
-option negotiation failed: Verify failed: No certificate was found.
+qemu-nbd: option negotiation failed: Verify failed: No certificate was found.
qemu-img: Could not open 'driver=nbd,host=127.0.0.1,port=PORT,tls-creds=tls0':
The certificate hasn't got a known issuer
== perform I/O over TLS ==
--
2.20.1
- [Qemu-devel] [PULL 0/8] NBD patches through 2019-01-05, Eric Blake, 2019/01/05
- [Qemu-devel] [PULL 1/8] nbd: publish _lookup functions, Eric Blake, 2019/01/05
- [Qemu-devel] [PULL 2/8] nbd/client: Trace all server option error messages, Eric Blake, 2019/01/05
- [Qemu-devel] [PULL 4/8] qemu-nbd: Use program name in error messages,
Eric Blake <=
- [Qemu-devel] [PULL 5/8] nbd: Document timeline of various features, Eric Blake, 2019/01/05
- [Qemu-devel] [PULL 3/8] block/nbd-client: use traces instead of noisy error_report_err, Eric Blake, 2019/01/05
- [Qemu-devel] [PULL 8/8] nbd/client: Drop pointless buf variable, Eric Blake, 2019/01/05
- [Qemu-devel] [PULL 6/8] nbd/client: More consistent error messages, Eric Blake, 2019/01/05
- [Qemu-devel] [PULL 7/8] qemu-nbd: Fail earlier for -c/-d on non-linux, Eric Blake, 2019/01/05
- Re: [Qemu-devel] [PULL 0/8] NBD patches through 2019-01-05, Peter Maydell, 2019/01/07