Re: [Qemu-block] [PATCH 1/6 for-3.1] nbd: fix whitespace in server error message

2018-11-16 Thread Eric Blake 

On 11/16/18 9:53 AM, Daniel P. Berrangé wrote:

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 
   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é 
---
  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);


Visually, I'd include the space in the next line instead of on its own 
(but that's aesthetics, not semantic). Agree that this is 3.1 material; 
I'll queue it up and send a PR on Monday.


Reviewed-by: Eric Blake 

--
Eric Blake, Principal Software Engineer
Red Hat, Inc.   +1-919-301-3266
Virtualization:  qemu.org | libvirt.org

[Qemu-block] [PATCH 1/6 for-3.1] nbd: fix whitespace in server error message

2018-11-16 Thread Daniel P . Berrangé 
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 
  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é 
---
 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