Patchwork [v2,12/12] nbd: Check against invalid option combinations

login
register
mail settings
Submitter Kevin Wolf
Date March 20, 2013, 6:39 p.m.
Message ID <1363804788-18535-13-git-send-email-kwolf@redhat.com>
Download mbox | patch
Permalink /patch/229460/
State New
Headers show

Comments

Kevin Wolf - March 20, 2013, 6:39 p.m.
A file name may only specified if no host or socket path is specified.
The latter two may not appear at the same time either.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block/nbd.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
Eric Blake - March 20, 2013, 9:34 p.m.
On 03/20/2013 12:39 PM, Kevin Wolf wrote:
> A file name may only specified if no host or socket path is specified.
> The latter two may not appear at the same time either.
> 
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  block/nbd.c | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)

Reviewed-by: Eric Blake <eblake@redhat.com>

I'm assuming that the rest of the series is unchanged, on the commits
where you carried forward my v1 review.
Kevin Wolf - March 21, 2013, 10:29 a.m.
Am 20.03.2013 um 22:34 hat Eric Blake geschrieben:
> On 03/20/2013 12:39 PM, Kevin Wolf wrote:
> > A file name may only specified if no host or socket path is specified.
> > The latter two may not appear at the same time either.
> > 
> > Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> > ---
> >  block/nbd.c | 14 ++++++++++++++
> >  1 file changed, 14 insertions(+)
> 
> Reviewed-by: Eric Blake <eblake@redhat.com>
> 
> I'm assuming that the rest of the series is unchanged, on the commits
> where you carried forward my v1 review.

I think I've added a spelling fix or two for things you pointed out, but
other than that they are unchanged, yes.

Thanks for your review, Eric!

Kevin

Patch

diff --git a/block/nbd.c b/block/nbd.c
index 67f1df2..3d711b2 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -148,6 +148,15 @@  static void nbd_parse_filename(const char *filename, QDict *options,
     const char *host_spec;
     const char *unixpath;
 
+    if (qdict_haskey(options, "host")
+        || qdict_haskey(options, "port")
+        || qdict_haskey(options, "path"))
+    {
+        error_setg(errp, "host/port/path and a file name may not be specified "
+                         "at the same time");
+        return;
+    }
+
     if (strstr(filename, "://")) {
         int ret = nbd_parse_uri(filename, options);
         if (ret < 0) {
@@ -204,6 +213,11 @@  static int nbd_config(BDRVNBDState *s, QDict *options)
     Error *local_err = NULL;
 
     if (qdict_haskey(options, "path")) {
+        if (qdict_haskey(options, "host")) {
+            qerror_report(ERROR_CLASS_GENERIC_ERROR, "path and host may not "
+                          "be used at the same time.");
+            return -EINVAL;
+        }
         s->is_unix = true;
     } else if (qdict_haskey(options, "host")) {
         s->is_unix = false;