[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 05/16] block/nbd: Reject port parameter without h
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v2 05/16] block/nbd: Reject port parameter without host |
Date: |
Tue, 1 Mar 2016 00:19:22 +0100 |
This is better than the generic block layer finding out later that the
port parameter has not been used.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
block/nbd.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/block/nbd.c b/block/nbd.c
index ce31119..6a2fc27 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -200,6 +200,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);
--
2.7.1
- [Qemu-devel] [PATCH v2 00/16] qapi: Allow blockdev-add for NBD, Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 01/16] qdict: Add qdict_change_key(), Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 02/16] qdict: Add qdict_unflatten(), Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 03/16] check-qdict: Add a test for qdict_unflatten(), Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 04/16] block/nbd: Drop trailing "." in error messages, Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 06/16] block/nbd: Default port in nbd_refresh_filename(), Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 05/16] block/nbd: Reject port parameter without host,
Max Reitz <=
- [Qemu-devel] [PATCH v2 07/16] block/nbd: Use qdict_put(), Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 08/16] block/nbd: Add nbd_has_filename_options_conflict(), Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 10/16] block/nbd: Accept SocketAddress, Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 09/16] block/nbd: "address" in nbd_refresh_filename(), Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 11/16] block/nbd: Use SocketAddress options, Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 15/16] socket_scm_helper: Accept fd directly, Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 12/16] qapi: Allow blockdev-add for NBD, Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 16/16] iotests: Add test for NBD's blockdev-add interface, Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 13/16] iotests.py: Add qemu_nbd function, Max Reitz, 2016/02/29
- [Qemu-devel] [PATCH v2 14/16] iotests.py: Allow concurrent qemu instances, Max Reitz, 2016/02/29