[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 06/16] block/nbd: Default port in nbd_refresh_fil
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH v2 06/16] block/nbd: Default port in nbd_refresh_filename() |
Date: |
Tue, 1 Mar 2016 00:19:23 +0100 |
Instead of not emitting the port in nbd_refresh_filename(), just set it
to the default if the user did not specify it. This makes the logic a
bit simpler.
Signed-off-by: Max Reitz <address@hidden>
---
block/nbd.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index 6a2fc27..8d9a217 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -411,6 +411,10 @@ static void nbd_refresh_filename(BlockDriverState *bs,
QDict *options)
const char *export = qdict_get_try_str(options, "export");
const char *tlscreds = qdict_get_try_str(options, "tls-creds");
+ if (host && !port) {
+ port = stringify(NBD_DEFAULT_PORT);
+ }
+
qdict_put_obj(opts, "driver", QOBJECT(qstring_from_str("nbd")));
if (path && export) {
@@ -419,27 +423,19 @@ static void nbd_refresh_filename(BlockDriverState *bs,
QDict *options)
} else if (path && !export) {
snprintf(bs->exact_filename, sizeof(bs->exact_filename),
"nbd+unix://?socket=%s", path);
- } else if (!path && export && port) {
+ } else if (!path && export) {
snprintf(bs->exact_filename, sizeof(bs->exact_filename),
"nbd://%s:%s/%s", host, port, export);
- } else if (!path && export && !port) {
- snprintf(bs->exact_filename, sizeof(bs->exact_filename),
- "nbd://%s/%s", host, export);
- } else if (!path && !export && port) {
+ } else if (!path && !export) {
snprintf(bs->exact_filename, sizeof(bs->exact_filename),
"nbd://%s:%s", host, port);
- } else if (!path && !export && !port) {
- snprintf(bs->exact_filename, sizeof(bs->exact_filename),
- "nbd://%s", host);
}
if (path) {
qdict_put_obj(opts, "path", QOBJECT(qstring_from_str(path)));
- } else if (port) {
- qdict_put_obj(opts, "host", QOBJECT(qstring_from_str(host)));
- qdict_put_obj(opts, "port", QOBJECT(qstring_from_str(port)));
} else {
qdict_put_obj(opts, "host", QOBJECT(qstring_from_str(host)));
+ qdict_put_obj(opts, "port", QOBJECT(qstring_from_str(port)));
}
if (export) {
qdict_put_obj(opts, "export", QOBJECT(qstring_from_str(export)));
--
2.7.1
- [Qemu-block] [PATCH v2 00/16] qapi: Allow blockdev-add for NBD, Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 01/16] qdict: Add qdict_change_key(), Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 02/16] qdict: Add qdict_unflatten(), Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 03/16] check-qdict: Add a test for qdict_unflatten(), Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 04/16] block/nbd: Drop trailing "." in error messages, Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 05/16] block/nbd: Reject port parameter without host, Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 06/16] block/nbd: Default port in nbd_refresh_filename(),
Max Reitz <=
- [Qemu-block] [PATCH v2 07/16] block/nbd: Use qdict_put(), Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 08/16] block/nbd: Add nbd_has_filename_options_conflict(), Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 09/16] block/nbd: "address" in nbd_refresh_filename(), Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 11/16] block/nbd: Use SocketAddress options, Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 10/16] block/nbd: Accept SocketAddress, Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 12/16] qapi: Allow blockdev-add for NBD, Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 15/16] socket_scm_helper: Accept fd directly, Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 14/16] iotests.py: Allow concurrent qemu instances, Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 16/16] iotests: Add test for NBD's blockdev-add interface, Max Reitz, 2016/02/29
- [Qemu-block] [PATCH v2 13/16] iotests.py: Add qemu_nbd function, Max Reitz, 2016/02/29