qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 13/23] block/nbd: Default port in nbd_refresh_filename()
Date: Thu, 27 Oct 2016 20:08:57 +0200	[thread overview]
Message-ID: <1477591747-21962-14-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1477591747-21962-1-git-send-email-kwolf@redhat.com>

From: Max Reitz <mreitz@redhat.com>

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 <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 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

  parent reply	other threads:[~2016-10-27 18:09 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-27 18:08 [Qemu-devel] [PULL 00/23] Block layer patches Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 01/23] block: Use blk_co_flush() for all BB level flushes Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 02/23] block: Use blk_co_pdiscard() for all BB level discard Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 03/23] block: Remove bdrv_aio_pdiscard() Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 04/23] block: Use blk_co_ioctl() for all BB level ioctls Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 05/23] raw-posix: Don't use bdrv_ioctl() Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 06/23] block: Remove bdrv_ioctl() Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 07/23] block: Introduce .bdrv_co_ioctl() driver callback Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 08/23] raw: Implement .bdrv_co_ioctl instead of .bdrv_aio_ioctl Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 09/23] block: Remove bdrv_aio_ioctl() Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 10/23] qemu-iotests: Fix typo for NFS with IMGOPTSSYNTAX Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 11/23] block/nbd: Drop trailing "." in error messages Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 12/23] block/nbd: Reject port parameter without host Kevin Wolf
2016-10-27 18:08 ` Kevin Wolf [this message]
2016-10-27 18:08 ` [Qemu-devel] [PULL 14/23] block/nbd: Use qdict_put() Kevin Wolf
2016-10-27 18:08 ` [Qemu-devel] [PULL 15/23] block/nbd: Add nbd_has_filename_options_conflict() Kevin Wolf
2016-10-27 18:09 ` [Qemu-devel] [PULL 16/23] block/nbd: Accept SocketAddress Kevin Wolf
2016-10-27 18:09 ` [Qemu-devel] [PULL 17/23] block/nbd: Use SocketAddress options Kevin Wolf
2016-10-27 18:09 ` [Qemu-devel] [PULL 18/23] qapi: Allow blockdev-add for NBD Kevin Wolf
2016-10-27 18:09 ` [Qemu-devel] [PULL 19/23] iotests.py: Add qemu_nbd function Kevin Wolf
2016-10-27 18:09 ` [Qemu-devel] [PULL 20/23] iotests.py: Allow concurrent qemu instances Kevin Wolf
2016-10-27 18:09 ` [Qemu-devel] [PULL 21/23] socket_scm_helper: Accept fd directly Kevin Wolf
2016-10-27 18:09 ` [Qemu-devel] [PULL 22/23] iotests: Add assert_json_filename_equal() method Kevin Wolf
2016-10-27 18:09 ` [Qemu-devel] [PULL 23/23] iotests: Add test for NBD's blockdev-add interface Kevin Wolf
2016-10-28 13:29 ` [Qemu-devel] [PULL 00/23] Block layer patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1477591747-21962-14-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).