Re: [Qemu-block] [PATCH v4 02/12] block/nbd: Reject port parameter without host

[Kevin Wolf]

Am 28.09.2016 um 22:55 hat Max Reitz geschrieben:
> Currently, a port that is passed along with a UNIX socket path is
> silently ignored. That is not exactly ideal, it should be an error
> instead.
> 
> Signed-off-by: Max Reitz 

Reviewed-by: Kevin Wolf 

Re: [Qemu-block] [PATCH v4 02/12] block/nbd: Reject port parameter without host

[Eric Blake]

On 09/28/2016 03:55 PM, Max Reitz wrote:
> Currently, a port that is passed along with a UNIX socket path is
> silently ignored. That is not exactly ideal, it should be an error
> instead.
> 
> Signed-off-by: Max Reitz 
> ---
>  block/nbd.c | 7 +--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 

Reviewed-by: Eric Blake 


-- 
Eric Blake   eblake redhat com+1-919-301-3266
Libvirt virtualization library http://libvirt.org



signature.asc
Description: OpenPGP digital signature

[Qemu-block] [PATCH v4 02/12] block/nbd: Reject port parameter without host

[Max Reitz]

Currently, a port that is passed along with a UNIX socket path is
silently ignored. That is not exactly ideal, it should be an error
instead.

Signed-off-by: Max Reitz 
---
 block/nbd.c | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/block/nbd.c b/block/nbd.c
index ce7c14f..eaca33c 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -197,6 +197,7 @@ static SocketAddress *nbd_config(BDRVNBDState *s, QemuOpts 
*opts, Error **errp)
 
 s->path = g_strdup(qemu_opt_get(opts, "path"));
 s->host = g_strdup(qemu_opt_get(opts, "host"));
+s->port = g_strdup(qemu_opt_get(opts, "port"));
 
 if (!s->path == !s->host) {
 if (s->path) {
@@ -206,6 +207,10 @@ static SocketAddress *nbd_config(BDRVNBDState *s, QemuOpts 
*opts, Error **errp)
 }
 return NULL;
 }
+if (s->port && !s->host) {
+error_setg(errp, "port may not be used without host");
+return NULL;
+}
 
 saddr = g_new0(SocketAddress, 1);
 
@@ -217,8 +222,6 @@ static SocketAddress *nbd_config(BDRVNBDState *s, QemuOpts 
*opts, Error **errp)
 } else {
 InetSocketAddress *inet;
 
-s->port = g_strdup(qemu_opt_get(opts, "port"));
-
 saddr->type = SOCKET_ADDRESS_KIND_INET;
 inet = saddr->u.inet.data = g_new0(InetSocketAddress, 1);
 inet->host = g_strdup(s->host);
-- 
2.10.0