From nobody Thu Dec 18 17:53:52 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1583515397; cv=none; d=zohomail.com; s=zohoarc; b=YbCdFMT3g/onzM/nNKMwzKAC76WLPcNsrQKVw6+uWeVIAqsscLFLI+zd++GBtk/BhbFrtlZVQh73289K2PXpnkebxyLf0sj8Uc0WA6AJqEt4IyZOXx6ilaC8p8vAkHz6WGmvcUAuHPLe4h7yO+wi8x6jqVuI5RrEDCl7VBe2IR0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583515397; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KrGbiQzS51UahfnmWeKqS0q0ozeE43ff9NeocMrkrpM=; b=DzfZhRe9ooTvSWPVUAc6Ie4FzvHTbK9cRweLzrPjTmjurhzf0ppYt6FNeq7Mfc1SMlaVDShSw9VOhMET/XpG3dQe9muA/x1amJkQESy6gQadBdONc1Xr0O1Ee1wE7oUram57hYqgNgE2nXEMveZqAY/PEngOfKddrVE30mW8zoU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583515397957530.2885663705953; Fri, 6 Mar 2020 09:23:17 -0800 (PST) Received: from localhost ([::1]:39894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAGgu-0007qt-IK for importer@patchew.org; Fri, 06 Mar 2020 12:23:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48451) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAGZR-0004sd-PO for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:15:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAGZP-0007oS-86 for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:15:33 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:20481 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jAGZN-0007bZ-Ao for qemu-devel@nongnu.org; Fri, 06 Mar 2020 12:15:29 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-9-ytIUMpC2PQakGXy24jpGtA-1; Fri, 06 Mar 2020 12:15:26 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 58E901005509; Fri, 6 Mar 2020 17:15:25 +0000 (UTC) Received: from linux.fritz.box.com (unknown [10.36.118.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A81C73873; Fri, 6 Mar 2020 17:15:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583514928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KrGbiQzS51UahfnmWeKqS0q0ozeE43ff9NeocMrkrpM=; b=TO671U49ZIaNdQPq0ypNsv4KnkXnoxMYT11WGWpysTNt3SxBVtbXMIEtclAwwxTj4JLNu1 9LcyE5ZwhfJxNItN7dWiVl08S6Y/N2g5YUG4UVPIKIH0pFL87CP6uVlr9t6Q1ucWQQkDyb Thc3nhJpSJfh4YeoskSTtcWfpfdibGY= X-MC-Unique: ytIUMpC2PQakGXy24jpGtA-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 15/29] qemu-storage-daemon: Add --nbd-server option Date: Fri, 6 Mar 2020 18:14:44 +0100 Message-Id: <20200306171458.1848-16-kwolf@redhat.com> In-Reply-To: <20200306171458.1848-1-kwolf@redhat.com> References: <20200306171458.1848-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Add a --nbd-server option to qemu-storage-daemon to start the built-in NBD server right away. It maps the arguments for nbd-server-start to the command line, with the exception that it uses SocketAddress instead of SocketAddressLegacy: New interfaces shouldn't use legacy types, and the additional nesting would be nasty on the command line. Example (only with required options): --nbd-server addr.type=3Dinet,addr.host=3Dlocalhost,addr.port=3D10809 Signed-off-by: Kevin Wolf Message-Id: <20200224143008.13362-10-kwolf@redhat.com> Acked-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- qapi/block-core.json | 24 ++++++++++++++++++++++++ include/block/nbd.h | 1 + blockdev-nbd.c | 5 +++++ qemu-storage-daemon.c | 26 +++++++++++++++++++++++++- Makefile.objs | 2 +- 5 files changed, 56 insertions(+), 2 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index b65b6a9f49..f8888f06c8 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -5062,6 +5062,27 @@ 'iothread': 'StrOrNull', '*force': 'bool' } } =20 +## +# @NbdServerOptions: +# +# @addr: Address on which to listen. +# @tls-creds: ID of the TLS credentials object (since 2.6). +# @tls-authz: ID of the QAuthZ authorization object used to validate +# the client's x509 distinguished name. This object is +# is only resolved at time of use, so can be deleted and +# recreated on the fly while the NBD server is active. +# If missing, it will default to denying access (since 4.0). +# +# Keep this type consistent with the nbd-server-start arguments. The only +# intended difference is using SocketAddress instead of SocketAddressLegac= y. +# +# Since: 4.2 +## +{ 'struct': 'NbdServerOptions', + 'data': { 'addr': 'SocketAddress', + '*tls-creds': 'str', + '*tls-authz': 'str'} } + ## # @nbd-server-start: # @@ -5080,6 +5101,9 @@ # # Returns: error if the server is already running. # +# Keep this type consistent with the NbdServerOptions type. The only inten= ded +# difference is using SocketAddressLegacy instead of SocketAddress. +# # Since: 1.3.0 ## { 'command': 'nbd-server-start', diff --git a/include/block/nbd.h b/include/block/nbd.h index 7f46932d80..20363280ae 100644 --- a/include/block/nbd.h +++ b/include/block/nbd.h @@ -353,6 +353,7 @@ void nbd_client_put(NBDClient *client); =20 void nbd_server_start(SocketAddress *addr, const char *tls_creds, const char *tls_authz, Error **errp); +void nbd_server_start_options(NbdServerOptions *arg, Error **errp); =20 /* nbd_read * Reads @size bytes from @ioc. Returns 0 on success. diff --git a/blockdev-nbd.c b/blockdev-nbd.c index de2f2ff713..d8c892f7da 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -132,6 +132,11 @@ void nbd_server_start(SocketAddress *addr, const char = *tls_creds, nbd_server =3D NULL; } =20 +void nbd_server_start_options(NbdServerOptions *arg, Error **errp) +{ + nbd_server_start(arg->addr, arg->tls_creds, arg->tls_authz, errp); +} + void qmp_nbd_server_start(SocketAddressLegacy *addr, bool has_tls_creds, const char *tls_creds, bool has_tls_authz, const char *tls_authz, diff --git a/qemu-storage-daemon.c b/qemu-storage-daemon.c index 0cd8144c81..276a412915 100644 --- a/qemu-storage-daemon.c +++ b/qemu-storage-daemon.c @@ -28,11 +28,14 @@ #include =20 #include "block/block.h" +#include "block/nbd.h" #include "crypto/init.h" =20 #include "qapi/error.h" -#include "qapi/qapi-visit-block-core.h" +#include "qapi/qapi-commands-block.h" #include "qapi/qapi-commands-block-core.h" +#include "qapi/qapi-visit-block.h" +#include "qapi/qapi-visit-block-core.h" #include "qapi/qmp/qdict.h" #include "qapi/qobject-input-visitor.h" =20 @@ -67,6 +70,12 @@ static void help(void) " [,driver specific parameters...]\n" " configure a block backend\n" "\n" +" --nbd-server addr.type=3Dinet,addr.host=3D,addr.port=3D\n" +" [,tls-creds=3D][,tls-authz=3D]\n" +" --nbd-server addr.type=3Dunix,addr.path=3D\n" +" [,tls-creds=3D][,tls-authz=3D]\n" +" start an NBD server for exporting block nodes\n" +"\n" " --object help list object types that can be added\n" " --object ,help list properties for the given object type\n" " --object [,=3D...]\n" @@ -82,6 +91,7 @@ QEMU_HELP_BOTTOM "\n", =20 enum { OPTION_BLOCKDEV =3D 256, + OPTION_NBD_SERVER, OPTION_OBJECT, }; =20 @@ -101,6 +111,7 @@ static void process_options(int argc, char *argv[]) static const struct option long_options[] =3D { {"blockdev", required_argument, NULL, OPTION_BLOCKDEV}, {"help", no_argument, NULL, 'h'}, + {"nbd-server", required_argument, NULL, OPTION_NBD_SERVER}, {"object", required_argument, NULL, OPTION_OBJECT}, {"trace", required_argument, NULL, 'T'}, {"version", no_argument, NULL, 'V'}, @@ -145,6 +156,19 @@ static void process_options(int argc, char *argv[]) qapi_free_BlockdevOptions(options); break; } + case OPTION_NBD_SERVER: + { + Visitor *v; + NbdServerOptions *options; + + v =3D qobject_input_visitor_new_str(optarg, NULL, &error_f= atal); + visit_type_NbdServerOptions(v, NULL, &options, &error_fata= l); + visit_free(v); + + nbd_server_start_options(options, &error_fatal); + qapi_free_NbdServerOptions(options); + break; + } case OPTION_OBJECT: { QemuOpts *opts; diff --git a/Makefile.objs b/Makefile.objs index b5d9e1e134..bacbdb55bc 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -32,7 +32,7 @@ endif # CONFIG_SOFTMMU or CONFIG_TOOLS # used for system emulation, too, but specified separately there) =20 storage-daemon-obj-y =3D block/ qom/ -storage-daemon-obj-y +=3D blockdev.o iothread.o +storage-daemon-obj-y +=3D blockdev.o blockdev-nbd.o iothread.o =20 ###################################################################### # Target independent part of system emulation. The long term path is to --=20 2.20.1