[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 06/14] block/nbd: Add nbd_has_filename_options_co
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v3 06/14] block/nbd: Add nbd_has_filename_options_conflict() |
Date: |
Wed, 6 Apr 2016 20:28:42 +0200 |
Right now, we have four possible options that conflict with specifying
an NBD filename, and a future patch will add another one ("address").
This future option is a nested QDict that is flattened at this point,
requiring as to test each option whether its key has an "address."
prefix. Therefore, we will then need to iterate through all options.
Adding this iteration logic now will simplify adding the new option
later. A nice side effect is that the user will not receive a long list
of five options which are not supposed to be specified with a filename,
but we can actually print the problematic option.
Signed-off-by: Max Reitz <address@hidden>
---
block/nbd.c | 26 ++++++++++++++++++++------
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index d12bcc6..1736f68 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -120,6 +120,25 @@ out:
return ret;
}
+static bool nbd_has_filename_options_conflict(QDict *options, Error **errp)
+{
+ const QDictEntry *e;
+
+ for (e = qdict_first(options); e; e = qdict_next(options, e)) {
+ if (!strcmp(e->key, "host")
+ || !strcmp(e->key, "port")
+ || !strcmp(e->key, "path")
+ || !strcmp(e->key, "export"))
+ {
+ error_setg(errp, "Option '%s' cannot be used with a file name",
+ e->key);
+ return true;
+ }
+ }
+
+ return false;
+}
+
static void nbd_parse_filename(const char *filename, QDict *options,
Error **errp)
{
@@ -128,12 +147,7 @@ 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");
+ if (nbd_has_filename_options_conflict(options, errp)) {
return;
}
--
2.8.0
- [Qemu-block] [PATCH v3 for-2.7 00/14] qapi: Allow blockdev-add for NBD, Max Reitz, 2016/04/06
- [Qemu-block] [PATCH v3 01/14] qdict: Add qdict_change_key(), Max Reitz, 2016/04/06
- [Qemu-block] [PATCH v3 02/14] block/nbd: Drop trailing "." in error messages, Max Reitz, 2016/04/06
- [Qemu-block] [PATCH v3 03/14] block/nbd: Reject port parameter without host, Max Reitz, 2016/04/06
- [Qemu-block] [PATCH v3 05/14] block/nbd: Use qdict_put(), Max Reitz, 2016/04/06
- [Qemu-block] [PATCH v3 04/14] block/nbd: Default port in nbd_refresh_filename(), Max Reitz, 2016/04/06
- [Qemu-block] [PATCH v3 06/14] block/nbd: Add nbd_has_filename_options_conflict(),
Max Reitz <=
- [Qemu-block] [PATCH v3 07/14] block/nbd: "address" in nbd_refresh_filename(), Max Reitz, 2016/04/06
- [Qemu-block] [PATCH v3 08/14] block/nbd: Accept SocketAddress, Max Reitz, 2016/04/06
- [Qemu-block] [PATCH v3 09/14] block/nbd: Use SocketAddress options, Max Reitz, 2016/04/06
- [Qemu-block] [PATCH v3 10/14] qapi: Allow blockdev-add for NBD, Max Reitz, 2016/04/06
- [Qemu-block] [PATCH v3 11/14] iotests.py: Add qemu_nbd function, Max Reitz, 2016/04/06
- [Qemu-block] [PATCH v3 12/14] iotests.py: Allow concurrent qemu instances, Max Reitz, 2016/04/06
- [Qemu-block] [PATCH v3 13/14] socket_scm_helper: Accept fd directly, Max Reitz, 2016/04/06
- [Qemu-block] [PATCH v3 14/14] iotests: Add test for NBD's blockdev-add interface, Max Reitz, 2016/04/06