| Message ID | 1454517196-4560-2-git-send-email-mreitz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 02/03/2016 09:33 AM, Max Reitz wrote: > This is better than the generic block layer finding out later that the > port parameter has not been used. > > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > block/nbd.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/block/nbd.c b/block/nbd.c > index 1a90bc7..063c403 100644 > --- a/block/nbd.c > +++ b/block/nbd.c > @@ -201,6 +201,10 @@ static SocketAddress *nbd_config(BDRVNBDState *s, QDict *options, char **export, > } > return NULL; > } > + if (qdict_haskey(options, "port") && !qdict_haskey(options, "host")) { > + error_setg(errp, "port may not be used without host."); No trailing '.' With that fixed, Reviewed-by: Eric Blake <eblake@redhat.com>
On 03.02.2016 17:38, Eric Blake wrote: > On 02/03/2016 09:33 AM, Max Reitz wrote: >> This is better than the generic block layer finding out later that the >> port parameter has not been used. >> >> Signed-off-by: Max Reitz <mreitz@redhat.com> >> --- >> block/nbd.c | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/block/nbd.c b/block/nbd.c >> index 1a90bc7..063c403 100644 >> --- a/block/nbd.c >> +++ b/block/nbd.c >> @@ -201,6 +201,10 @@ static SocketAddress *nbd_config(BDRVNBDState *s, QDict *options, char **export, >> } >> return NULL; >> } >> + if (qdict_haskey(options, "port") && !qdict_haskey(options, "host")) { >> + error_setg(errp, "port may not be used without host."); > > No trailing '.' I plead guilty. I was tempted by the error_setg() calls above this one, I'll add a patch to fix them in v2. > With that fixed, > Reviewed-by: Eric Blake <eblake@redhat.com> Thanks, Max
diff --git a/block/nbd.c b/block/nbd.c index 1a90bc7..063c403 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -201,6 +201,10 @@ static SocketAddress *nbd_config(BDRVNBDState *s, QDict *options, char **export, } return NULL; } + if (qdict_haskey(options, "port") && !qdict_haskey(options, "host")) { + error_setg(errp, "port may not be used without host."); + return NULL; + } saddr = g_new0(SocketAddress, 1);
This is better than the generic block layer finding out later that the port parameter has not been used. Signed-off-by: Max Reitz <mreitz@redhat.com> --- block/nbd.c | 4 ++++ 1 file changed, 4 insertions(+)