[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 13/23] block/nbd: Default port in nbd_refresh_filenam
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 13/23] block/nbd: Default port in nbd_refresh_filename() |
Date: |
Thu, 27 Oct 2016 20:08:57 +0200 |
From: Max Reitz <address@hidden>
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.
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/nbd.c | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index eaca33c..c77a969 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -444,6 +444,7 @@ static void nbd_refresh_filename(BlockDriverState *bs,
QDict *options)
{
BDRVNBDState *s = bs->opaque;
QDict *opts = qdict_new();
+ const char *port = s->port ?: stringify(NBD_DEFAULT_PORT);
qdict_put_obj(opts, "driver", QOBJECT(qstring_from_str("nbd")));
@@ -453,27 +454,19 @@ static void nbd_refresh_filename(BlockDriverState *bs,
QDict *options)
} else if (s->path && !s->export) {
snprintf(bs->exact_filename, sizeof(bs->exact_filename),
"nbd+unix://?socket=%s", s->path);
- } else if (!s->path && s->export && s->port) {
+ } else if (!s->path && s->export) {
snprintf(bs->exact_filename, sizeof(bs->exact_filename),
- "nbd://%s:%s/%s", s->host, s->port, s->export);
- } else if (!s->path && s->export && !s->port) {
+ "nbd://%s:%s/%s", s->host, port, s->export);
+ } else if (!s->path && !s->export) {
snprintf(bs->exact_filename, sizeof(bs->exact_filename),
- "nbd://%s/%s", s->host, s->export);
- } else if (!s->path && !s->export && s->port) {
- snprintf(bs->exact_filename, sizeof(bs->exact_filename),
- "nbd://%s:%s", s->host, s->port);
- } else if (!s->path && !s->export && !s->port) {
- snprintf(bs->exact_filename, sizeof(bs->exact_filename),
- "nbd://%s", s->host);
+ "nbd://%s:%s", s->host, port);
}
if (s->path) {
qdict_put_obj(opts, "path", QOBJECT(qstring_from_str(s->path)));
- } else if (s->port) {
- qdict_put_obj(opts, "host", QOBJECT(qstring_from_str(s->host)));
- qdict_put_obj(opts, "port", QOBJECT(qstring_from_str(s->port)));
} else {
qdict_put_obj(opts, "host", QOBJECT(qstring_from_str(s->host)));
+ qdict_put_obj(opts, "port", QOBJECT(qstring_from_str(port)));
}
if (s->export) {
qdict_put_obj(opts, "export", QOBJECT(qstring_from_str(s->export)));
--
1.8.3.1
- [Qemu-block] [PULL 01/23] block: Use blk_co_flush() for all BB level flushes, (continued)
- [Qemu-block] [PULL 01/23] block: Use blk_co_flush() for all BB level flushes, Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 04/23] block: Use blk_co_ioctl() for all BB level ioctls, Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 05/23] raw-posix: Don't use bdrv_ioctl(), Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 06/23] block: Remove bdrv_ioctl(), Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 08/23] raw: Implement .bdrv_co_ioctl instead of .bdrv_aio_ioctl, Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 07/23] block: Introduce .bdrv_co_ioctl() driver callback, Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 09/23] block: Remove bdrv_aio_ioctl(), Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 10/23] qemu-iotests: Fix typo for NFS with IMGOPTSSYNTAX, Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 11/23] block/nbd: Drop trailing "." in error messages, Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 12/23] block/nbd: Reject port parameter without host, Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 13/23] block/nbd: Default port in nbd_refresh_filename(),
Kevin Wolf <=
- [Qemu-block] [PULL 14/23] block/nbd: Use qdict_put(), Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 16/23] block/nbd: Accept SocketAddress, Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 15/23] block/nbd: Add nbd_has_filename_options_conflict(), Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 17/23] block/nbd: Use SocketAddress options, Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 18/23] qapi: Allow blockdev-add for NBD, Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 20/23] iotests.py: Allow concurrent qemu instances, Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 19/23] iotests.py: Add qemu_nbd function, Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 21/23] socket_scm_helper: Accept fd directly, Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 23/23] iotests: Add test for NBD's blockdev-add interface, Kevin Wolf, 2016/10/27
- [Qemu-block] [PULL 22/23] iotests: Add assert_json_filename_equal() method, Kevin Wolf, 2016/10/27