On 04/06/2016 12:28 PM, Max Reitz wrote:
> 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 <mre...@redhat.com>
> ---
> block/nbd.c | 18 +++++++-----------
> 1 file changed, 7 insertions(+), 11 deletions(-)
>
> diff --git a/block/nbd.c b/block/nbd.c
> index 2112ec0..efa5d3d 100644
> --- a/block/nbd.c
> +++ b/block/nbd.c
> @@ -433,6 +433,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);
> + }It would be nice to store the port as a number rather than a string - but that's not your task (I've long thought that port should be a QAPI alternate type, with both string and number branches, but it's a big audit and code change to actually make it happen). Reviewed-by: Eric Blake <ebl...@redhat.com> -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
