From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, "Eric Blake" <eblake@redhat.com>,
"Kevin Wolf" <kwolf@redhat.com>, "Max Reitz" <mreitz@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [Qemu-devel] [PATCH 1/6 for-3.1] nbd: fix whitespace in server error message
Date: Fri, 16 Nov 2018 15:53:20 +0000 [thread overview]
Message-ID: <20181116155325.22428-2-berrange@redhat.com> (raw)
In-Reply-To: <20181116155325.22428-1-berrange@redhat.com>
A space was missing after the option number was printed:
Option 0x8not permitted before TLS
becomes
Option 0x8 not permitted before TLS
This fixes
commit 3668328303429f3bc93ab3365c66331600b06a2d
Author: Eric Blake <eblake@redhat.com>
Date: Fri Oct 14 13:33:09 2016 -0500
nbd: Send message along with server NBD_REP_ERR errors
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
nbd/server.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nbd/server.c b/nbd/server.c
index 4e8f5ae51b..12e8139f95 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -1135,7 +1135,7 @@ static int nbd_negotiate_options(NBDClient *client, uint16_t myflags,
default:
ret = nbd_opt_drop(client, NBD_REP_ERR_TLS_REQD, errp,
- "Option 0x%" PRIx32
+ "Option 0x%" PRIx32 " "
"not permitted before TLS", option);
/* Let the client keep trying, unless they asked to
* quit. In this mode, we've already sent an error, so
--
2.19.1
next prev parent reply other threads:[~2018-11-16 15:54 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-16 15:53 [Qemu-devel] [PATCH 0/6] Misc fixes to NBD Daniel P. Berrangé
2018-11-16 15:53 ` Daniel P. Berrangé [this message]
2018-11-16 16:01 ` [Qemu-devel] [PATCH 1/6 for-3.1] nbd: fix whitespace in server error message Eric Blake
2018-11-19 16:29 ` Philippe Mathieu-Daudé
2018-11-16 15:53 ` [Qemu-devel] [PATCH 2/6 for-3.1] nbd: stop waiting for a NBD response with NBD_CMD_DISC Daniel P. Berrangé
2018-11-16 16:08 ` Eric Blake
2018-11-18 2:19 ` Eric Blake
2018-11-19 10:23 ` Daniel P. Berrangé
2018-11-19 14:24 ` Eric Blake
2018-11-19 13:47 ` Daniel P. Berrangé
2018-11-16 15:53 ` [Qemu-devel] [PATCH 3/6] tests: pull qemu-nbd iotest helpers into common.nbd file Daniel P. Berrangé
2018-11-16 16:11 ` Eric Blake
2018-11-16 21:41 ` Eric Blake
2018-11-16 21:43 ` Eric Blake
2018-11-19 10:24 ` Daniel P. Berrangé
2018-11-18 3:01 ` Eric Blake
2018-11-19 10:24 ` Daniel P. Berrangé
2018-11-16 15:53 ` [Qemu-devel] [PATCH 4/6] tests: check if qemu-nbd is still alive before waiting Daniel P. Berrangé
2018-11-16 16:24 ` Eric Blake
2018-11-19 10:26 ` Daniel P. Berrangé
2018-11-16 15:53 ` [Qemu-devel] [PATCH 5/6] tests: add iotests helpers for dealing with TLS certificates Daniel P. Berrangé
2018-11-16 16:39 ` Eric Blake
2018-11-19 10:27 ` Daniel P. Berrangé
2018-11-19 11:04 ` Max Reitz
2018-11-19 14:27 ` Eric Blake
2018-11-19 14:32 ` Daniel P. Berrangé
2018-11-16 15:53 ` [Qemu-devel] [PATCH 6/6] tests: exercise NBD server in TLS mode Daniel P. Berrangé
2018-11-16 17:20 ` Eric Blake
2018-11-17 21:31 ` Eric Blake
2018-11-19 10:37 ` Daniel P. Berrangé
2018-11-19 17:00 ` Eric Blake
2018-11-20 9:40 ` Daniel P. Berrangé
2018-11-19 10:36 ` Daniel P. Berrangé
2018-11-17 20:49 ` Eric Blake
2018-11-17 22:31 ` Eric Blake
2018-11-17 22:32 ` [Qemu-devel] [PATCH 1.5/6] nbd/server: Ignore write errors when replying to NBD_OPT_ABORT Eric Blake
2018-11-19 10:39 ` Daniel P. Berrangé
2018-11-19 10:39 ` [Qemu-devel] [PATCH 6/6] tests: exercise NBD server in TLS mode Daniel P. Berrangé
2018-11-18 2:24 ` [Qemu-devel] [PATCH 7/6] iotests: Also test I/O over NBD TLS Eric Blake
2018-11-19 10:40 ` Daniel P. Berrangé
2018-11-19 17:11 ` Eric Blake
2018-11-19 17:04 ` [Qemu-devel] [PATCH 6/6] tests: exercise NBD server in TLS mode Eric Blake
2018-11-20 17:27 ` Kevin Wolf
2018-11-20 17:45 ` Eric Blake
2018-11-20 17:53 ` Daniel P. Berrangé
2018-11-20 18:22 ` Eric Blake
2018-11-20 21:56 ` Kevin Wolf
2018-11-21 9:30 ` Daniel P. Berrangé
2018-11-18 2:39 ` [Qemu-devel] [PATCH 0/6] Misc fixes to NBD Eric Blake
2018-11-27 15:42 ` Eric Blake
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=20181116155325.22428-2-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.