[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v5 02/13] block/nbd: Reject port parameter without h
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v5 02/13] block/nbd: Reject port parameter without host |
Date: |
Tue, 25 Oct 2016 15:11:30 +0200 |
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.
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
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.1
- [Qemu-block] [PATCH v5 00/13] qapi: Allow blockdev-add for NBD, Max Reitz, 2016/10/25
- [Qemu-block] [PATCH v5 01/13] block/nbd: Drop trailing "." in error messages, Max Reitz, 2016/10/25
- [Qemu-block] [PATCH v5 02/13] block/nbd: Reject port parameter without host,
Max Reitz <=
- [Qemu-block] [PATCH v5 03/13] block/nbd: Default port in nbd_refresh_filename(), Max Reitz, 2016/10/25
- [Qemu-block] [PATCH v5 04/13] block/nbd: Use qdict_put(), Max Reitz, 2016/10/25
- [Qemu-block] [PATCH v5 05/13] block/nbd: Add nbd_has_filename_options_conflict(), Max Reitz, 2016/10/25
- [Qemu-block] [PATCH v5 07/13] block/nbd: Use SocketAddress options, Max Reitz, 2016/10/25
- [Qemu-block] [PATCH v5 06/13] block/nbd: Accept SocketAddress, Max Reitz, 2016/10/25
- [Qemu-block] [PATCH v5 08/13] qapi: Allow blockdev-add for NBD, Max Reitz, 2016/10/25