qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>,
	Kevin Wolf <kwolf@redhat.com>, Eric Blake <eblake@redhat.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Markus Armbruster <armbru@redhat.com>
Subject: [Qemu-devel] [PATCH v5 01/13] block/nbd: Drop trailing "." in error messages
Date: Tue, 25 Oct 2016 15:11:29 +0200	[thread overview]
Message-ID: <20161025131141.24762-2-mreitz@redhat.com> (raw)
In-Reply-To: <20161025131141.24762-1-mreitz@redhat.com>

Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 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.1

  reply	other threads:[~2016-10-25 13:11 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-25 13:11 [Qemu-devel] [PATCH v5 00/13] qapi: Allow blockdev-add for NBD Max Reitz
2016-10-25 13:11 ` Max Reitz [this message]
2016-10-25 13:11 ` [Qemu-devel] [PATCH v5 02/13] block/nbd: Reject port parameter without host Max Reitz
2016-10-25 13:11 ` [Qemu-devel] [PATCH v5 03/13] block/nbd: Default port in nbd_refresh_filename() Max Reitz
2016-10-25 13:11 ` [Qemu-devel] [PATCH v5 04/13] block/nbd: Use qdict_put() Max Reitz
2016-10-25 13:11 ` [Qemu-devel] [PATCH v5 05/13] block/nbd: Add nbd_has_filename_options_conflict() Max Reitz
2016-10-25 13:11 ` [Qemu-devel] [PATCH v5 06/13] block/nbd: Accept SocketAddress Max Reitz
2016-10-25 15:30   ` Kevin Wolf
2016-10-25 13:11 ` [Qemu-devel] [PATCH v5 07/13] block/nbd: Use SocketAddress options Max Reitz
2016-10-26  9:51   ` Kevin Wolf
2016-10-25 13:11 ` [Qemu-devel] [PATCH v5 08/13] qapi: Allow blockdev-add for NBD Max Reitz
2016-10-25 23:57   ` Eric Blake
2016-10-26  8:09     ` Kevin Wolf
2016-10-26 14:17     ` Max Reitz
2016-10-26  9:54   ` Kevin Wolf
2016-10-25 13:11 ` [Qemu-devel] [PATCH v5 09/13] iotests.py: Add qemu_nbd function Max Reitz
2016-10-26 10:04   ` Kevin Wolf
2016-10-25 13:11 ` [Qemu-devel] [PATCH v5 10/13] iotests.py: Allow concurrent qemu instances Max Reitz
2016-10-25 13:11 ` [Qemu-devel] [PATCH v5 11/13] socket_scm_helper: Accept fd directly Max Reitz
2016-10-25 13:11 ` [Qemu-devel] [PATCH v5 12/13] iotests: Add assert_json_filename_equal() method Max Reitz
2016-10-26 10:41   ` Kevin Wolf
2016-10-26 14:24     ` Max Reitz
2016-10-25 13:11 ` [Qemu-devel] [PATCH v5 13/13] iotests: Add test for NBD's blockdev-add interface Max Reitz
2016-10-25 14:41   ` Markus Armbruster
2016-10-26 14:25     ` Max Reitz
2016-10-26 13:08   ` Kevin Wolf
2016-10-25 13:16 ` [Qemu-devel] [PATCH v5 00/13] qapi: Allow blockdev-add for NBD Max Reitz
2016-10-27 17:08 ` Kevin Wolf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161025131141.24762-2-mreitz@redhat.com \
    --to=mreitz@redhat.com \
    --cc=armbru@redhat.com \
    --cc=eblake@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).