[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v4 01/12] block/nbd: Drop trailing "." in error mess
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v4 01/12] block/nbd: Drop trailing "." in error messages |
Date: |
Wed, 28 Sep 2016 22:55:51 +0200 |
Signed-off-by: Max Reitz <address@hidden>
---
block/nbd.c | 4 ++--
tests/qemu-iotests/051.out | 4 ++--
tests/qemu-iotests/051.pc.out | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index 6bc06d6..ce7c14f 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -200,9 +200,9 @@ static SocketAddress *nbd_config(BDRVNBDState *s, QemuOpts
*opts, Error **errp)
if (!s->path == !s->host) {
if (s->path) {
- error_setg(errp, "path and host may not be used at the same
time.");
+ error_setg(errp, "path and host may not be used at the same time");
} else {
- error_setg(errp, "one of path and host must be specified.");
+ error_setg(errp, "one of path and host must be specified");
}
return NULL;
}
diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out
index 408d613..9e584fe 100644
--- a/tests/qemu-iotests/051.out
+++ b/tests/qemu-iotests/051.out
@@ -222,7 +222,7 @@ Testing: -drive driver=file
QEMU_PROG: -drive driver=file: The 'file' block driver requires a file name
Testing: -drive driver=nbd
-QEMU_PROG: -drive driver=nbd: one of path and host must be specified.
+QEMU_PROG: -drive driver=nbd: one of path and host must be specified
Testing: -drive driver=raw
QEMU_PROG: -drive driver=raw: Can't use 'raw' as a block driver for the
protocol level
@@ -231,7 +231,7 @@ Testing: -drive file.driver=file
QEMU_PROG: -drive file.driver=file: The 'file' block driver requires a file
name
Testing: -drive file.driver=nbd
-QEMU_PROG: -drive file.driver=nbd: one of path and host must be specified.
+QEMU_PROG: -drive file.driver=nbd: one of path and host must be specified
Testing: -drive file.driver=raw
QEMU_PROG: -drive file.driver=raw: Can't use 'raw' as a block driver for the
protocol level
diff --git a/tests/qemu-iotests/051.pc.out b/tests/qemu-iotests/051.pc.out
index ec6d222..6395a30 100644
--- a/tests/qemu-iotests/051.pc.out
+++ b/tests/qemu-iotests/051.pc.out
@@ -316,7 +316,7 @@ Testing: -drive driver=file
QEMU_PROG: -drive driver=file: The 'file' block driver requires a file name
Testing: -drive driver=nbd
-QEMU_PROG: -drive driver=nbd: one of path and host must be specified.
+QEMU_PROG: -drive driver=nbd: one of path and host must be specified
Testing: -drive driver=raw
QEMU_PROG: -drive driver=raw: Can't use 'raw' as a block driver for the
protocol level
@@ -325,7 +325,7 @@ Testing: -drive file.driver=file
QEMU_PROG: -drive file.driver=file: The 'file' block driver requires a file
name
Testing: -drive file.driver=nbd
-QEMU_PROG: -drive file.driver=nbd: one of path and host must be specified.
+QEMU_PROG: -drive file.driver=nbd: one of path and host must be specified
Testing: -drive file.driver=raw
QEMU_PROG: -drive file.driver=raw: Can't use 'raw' as a block driver for the
protocol level
--
2.10.0
- [Qemu-block] [PATCH v4 00/12] qapi: Allow blockdev-add for NBD, Max Reitz, 2016/09/28
- [Qemu-block] [PATCH v4 01/12] block/nbd: Drop trailing "." in error messages,
Max Reitz <=
- [Qemu-block] [PATCH v4 02/12] block/nbd: Reject port parameter without host, Max Reitz, 2016/09/28
- [Qemu-block] [PATCH v4 03/12] block/nbd: Default port in nbd_refresh_filename(), Max Reitz, 2016/09/28
- [Qemu-block] [PATCH v4 05/12] block/nbd: Add nbd_has_filename_options_conflict(), Max Reitz, 2016/09/28
- [Qemu-block] [PATCH v4 04/12] block/nbd: Use qdict_put(), Max Reitz, 2016/09/28
- [Qemu-block] [PATCH v4 06/12] block/nbd: Accept SocketAddress, Max Reitz, 2016/09/28
- [Qemu-block] [PATCH v4 07/12] block/nbd: Use SocketAddress options, Max Reitz, 2016/09/28
- [Qemu-block] [PATCH v4 08/12] qapi: Allow blockdev-add for NBD, Max Reitz, 2016/09/28