| Message ID | 20181130220344.3350618-2-eblake@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | nbd: add qemu-nbd --list | expand |
On Fri, Nov 30, 2018 at 04:03:30PM -0600, Eric Blake wrote: > 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 <eblake@redhat.com> > --- > 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 == Same as done in qemu (vl.c) and qemu-img.c, so: Reviewed-by: Richard W.M. Jones <rjones@redhat.com> Rich.
01.12.2018 1:03, Eric Blake wrote: > 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 <eblake@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
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 ==
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 <eblake@redhat.com> --- qemu-nbd.c | 1 + tests/qemu-iotests/233.out | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)