From patchwork Fri Jan 7 10:54:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1576528 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=JZS1nCmj; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JVgD76Lhtz9sXM for ; Fri, 7 Jan 2022 21:57:43 +1100 (AEDT) Received: from localhost ([::1]:47020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n5mwH-0006wn-M3 for incoming@patchwork.ozlabs.org; Fri, 07 Jan 2022 05:57:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42310) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n5mtC-00034Y-5A; Fri, 07 Jan 2022 05:54:30 -0500 Received: from [2a00:1450:4864:20::42b] (port=46975 helo=mail-wr1-x42b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n5mtA-0008LR-L7; Fri, 07 Jan 2022 05:54:29 -0500 Received: by mail-wr1-x42b.google.com with SMTP id i22so10260714wrb.13; Fri, 07 Jan 2022 02:54:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MeEm7h+236b3jz3HgakFoX/GMcHt60JKsq8f9Y3JC/Q=; b=JZS1nCmjzBJ3Fo64wGbMf2AyJEz9gH1dvbGJuYkgHsygOi1TZWnmAcj4hfO/rlOVS/ fjaDjlGzC3k4kYIqKnOQWSq90liAKQrRQ3zJT7HiDbg9gvt71TllKgH63qaZn7/WrOY9 zIoXS5dN/TMXgKu0GJL0KMNVkLNq4uArWHljgEJFAEJoDOuyzH7UnEXsYRRR5YhbDcrh RfgMWkR5n08i90URpBjgm9I7fQbC9UpabWOslOdsEiceZoZHLkIxXTxcHr9wlHZGGCHz 1Zqi2Ar/hDYYHVNRp+1q9pNrFutmoLofzrZaU/vr+1Ac+IjlC3kWZ4hIivmRhFtYK5QA 3Qqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=MeEm7h+236b3jz3HgakFoX/GMcHt60JKsq8f9Y3JC/Q=; b=6DroZSW0kEaulqVXsuyKcxnZxNA7dHObPQApff5LNln4PeKChYO+LkwDsq7Jc8xyQU uRTtJ9Z8KzBPW3MUONZRkV5PzFEjctByqVCQCEiwY4G/XKOYObZAHvlY4qWrsFz74vR4 VItV89/HkJfQZlCSXuq11fqpEEb7NGQhQhO/p7xehMdCPPL60lbAVETAJHpx22g+RhvP x+lC7HsLcbeB8s2wCKpTOK0FoXj26eanhZXgGN2FtYqqmSYv6AEjHuZU9r18jgxCJhbZ QKFfXf5cGju7D8vE90p6qYJLPRagyLhJonmfm1SrKml3M6u1fozKGgtxQ3yh7yypffyZ lxlg== X-Gm-Message-State: AOAM533wjhENu7N7bBp1rutSSAjPvFvGLMZx0LVzYa89F77w4g1wEZYD Hp7xFkZIL1PNSNxqSa/53GpKYio7brk1fA== X-Google-Smtp-Source: ABdhPJzZRnWDGjPQnWJbEi3ltwEjYEA91hsss2H6Ml09R3fuClqArdn22OAKTd6fmxBazffVap0eAw== X-Received: by 2002:a05:6000:144d:: with SMTP id v13mr55408646wrx.411.1641552866892; Fri, 07 Jan 2022 02:54:26 -0800 (PST) Received: from nuc.. (83.red-83-50-87.dynamicip.rima-tde.net. [83.50.87.83]) by smtp.gmail.com with ESMTPSA id az1sm1488090wrb.104.2022.01.07.02.54.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jan 2022 02:54:26 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 1/3] docs: Correct 'vhost-user-blk' spelling Date: Fri, 7 Jan 2022 11:54:18 +0100 Message-Id: <20220107105420.395011-2-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220107105420.395011-1-f4bug@amsat.org> References: <20220107105420.395011-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42b (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Eric Blake , Markus Armbruster , qemu-block@nongnu.org, =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Reported-by: Eric Blake Signed-off-by: Philippe Mathieu-Daudé --- docs/tools/qemu-storage-daemon.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tools/qemu-storage-daemon.rst b/docs/tools/qemu-storage-daemon.rst index 3e5a9dc0320..9b0eaba6e5c 100644 --- a/docs/tools/qemu-storage-daemon.rst +++ b/docs/tools/qemu-storage-daemon.rst @@ -201,7 +201,7 @@ Export raw image file ``disk.img`` over NBD UNIX domain socket ``nbd.sock``:: --nbd-server addr.type=unix,addr.path=nbd.sock \ --export type=nbd,id=export,node-name=disk,writable=on -Export a qcow2 image file ``disk.qcow2`` as a vhosts-user-blk device over UNIX +Export a qcow2 image file ``disk.qcow2`` as a vhost-user-blk device over UNIX domain socket ``vhost-user-blk.sock``:: $ qemu-storage-daemon \ From patchwork Fri Jan 7 10:54:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1576531 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=YV6B7z3Y; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JVgGN3NFLz9tk3 for ; Fri, 7 Jan 2022 21:59:38 +1100 (AEDT) Received: from localhost ([::1]:50614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n5my7-0000z7-9u for incoming@patchwork.ozlabs.org; Fri, 07 Jan 2022 05:59:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42376) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n5mtJ-0003WR-9F; Fri, 07 Jan 2022 05:54:37 -0500 Received: from [2a00:1450:4864:20::32a] (port=56185 helo=mail-wm1-x32a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n5mtF-0008M7-I5; Fri, 07 Jan 2022 05:54:36 -0500 Received: by mail-wm1-x32a.google.com with SMTP id c66so3617600wma.5; Fri, 07 Jan 2022 02:54:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/ow3SZqynToXpYuYefz018ZnoAMd3khg8ReRtVnTvO0=; b=YV6B7z3YnN+CO8N6OI8j4BFDuIr4brqE9b5Q62CdiDuPYcjqZEpmOEjqs7gr4vJRt4 0GbeF1Ypjuh3SRb78APDSGtNKvAukxH0mCSKAD7uCX+SwbDAYhcwGwPU/8Gor1R5XGwu WUn9SD2zyj32qi9RITMpCQL27XReHNSE3DGeHOEPtuwCDPR6DQzhYyP6PTGXyJ3Qt/7+ sHlCHIbTrHuHHKtlAsWeETT/Eepudnk3u2bDmMMWvXdD06x7qxygEp5poG02CEZrOmh/ Llvof+5afhk17j0X1A2b36wzSzNYztbwMTxxETU7ntInte7TIAS+QzY4Ua5rX2vbV3n2 a3oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/ow3SZqynToXpYuYefz018ZnoAMd3khg8ReRtVnTvO0=; b=vPGq158Hp1xyPsspveDSYLpz2OK1pPlH7epgy1KohQxMcxxB49N24cN5yiPvfvAtmj Nm1lJLS9j8fUnMtGRK0jhoX3XnY+bUNpvfmeoy2twQ6Gj7frc/pwTK1+/y5mN9JrTgLd 4XSgEJneMhZmmuCUUdYVVDzh8TNEP7gnpkW8xwXYC3KPQWTfALCJne+4A9TZxHKozuY4 l7ifZAcD3ZSZr4+pFl5+BsGezFDqFjtGBjW1pPVV4YTKn9qR67K4YSR/vaT4tj4ks2v7 2sVoDfM8BOVFXJQ23ZGLPHw7s+AmLHXzKlY2D0V3oxCFnRM69PZMmOuHPGGgqlSxchLd INxQ== X-Gm-Message-State: AOAM531cZp1tpFepv8HnT1gvhWOzHUjwGZS723opG6vCx0vQ+nj+exQW im2/1XgKokf9M6RRHrgawavqkabHUVTzwA== X-Google-Smtp-Source: ABdhPJzFSoJE908mysCrf4VxJuy1jBtMBu13vgSvlrt8sEqy1ApX/Le/tB2bZqT+ZNJUBaMdj8USWg== X-Received: by 2002:a7b:cf33:: with SMTP id m19mr4836106wmg.30.1641552871663; Fri, 07 Jan 2022 02:54:31 -0800 (PST) Received: from nuc.. (83.red-83-50-87.dynamicip.rima-tde.net. [83.50.87.83]) by smtp.gmail.com with ESMTPSA id a3sm4302398wrm.52.2022.01.07.02.54.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jan 2022 02:54:31 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 2/3] qemu-storage-daemon: Add vhost-user-blk help Date: Fri, 7 Jan 2022 11:54:19 +0100 Message-Id: <20220107105420.395011-3-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220107105420.395011-1-f4bug@amsat.org> References: <20220107105420.395011-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32a (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32a.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Qing Wang , qemu-block@nongnu.org, Eric Blake , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Add missing vhost-user-blk help: $ qemu-storage-daemon -h ... --export [type=]vhost-user-blk,id=,node-name=, addr.type=unix,addr.path=[,writable=on|off] [,logical-block-size=][,num-queues=] export the specified block node as a vhosts-user-blk device over UNIX domain socket --export [type=]vhost-user-blk,id=,node-name=, fd,addr.str=[,writable=on|off] [,logical-block-size=][,num-queues=] export the specified block node as a vhosts-user-blk device over file descriptor ... Fixes: 90fc91d50b7 ("convert vhost-user-blk server to block export API") Reported-by: Qing Wang Reviewed-by: Eric Blake Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé --- v3: Fix 'vhost-user-blk' spelling (eblake) --- storage-daemon/qemu-storage-daemon.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c index 52cf17e8ace..9d76d1114d4 100644 --- a/storage-daemon/qemu-storage-daemon.c +++ b/storage-daemon/qemu-storage-daemon.c @@ -104,6 +104,19 @@ static void help(void) " export the specified block node over FUSE\n" "\n" #endif /* CONFIG_FUSE */ +#ifdef CONFIG_VHOST_USER_BLK_SERVER +" --export [type=]vhost-user-blk,id=,node-name=,\n" +" addr.type=unix,addr.path=[,writable=on|off]\n" +" [,logical-block-size=][,num-queues=]\n" +" export the specified block node as a\n" +" vhost-user-blk device over UNIX domain socket\n" +" --export [type=]vhost-user-blk,id=,node-name=,\n" +" fd,addr.str=[,writable=on|off]\n" +" [,logical-block-size=][,num-queues=]\n" +" export the specified block node as a\n" +" vhost-user-blk device over file descriptor\n" +"\n" +#endif /* CONFIG_VHOST_USER_BLK_SERVER */ " --monitor [chardev=]name[,mode=control][,pretty[=on|off]]\n" " configure a QMP monitor\n" "\n" From patchwork Fri Jan 7 10:54:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1576541 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=breiJyJC; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JVgJY1J36z9sXM for ; Fri, 7 Jan 2022 22:01:33 +1100 (AEDT) Received: from localhost ([::1]:53924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n5mzx-0003Ms-Gp for incoming@patchwork.ozlabs.org; Fri, 07 Jan 2022 06:01:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n5mtQ-0003hU-9x; Fri, 07 Jan 2022 05:54:44 -0500 Received: from [2a00:1450:4864:20::32c] (port=54087 helo=mail-wm1-x32c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n5mtK-0008Mg-7m; Fri, 07 Jan 2022 05:54:43 -0500 Received: by mail-wm1-x32c.google.com with SMTP id l4so3636032wmq.3; Fri, 07 Jan 2022 02:54:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pRt1ZQeTh5X10hpoQU2/jHbFxikau/BmnLWyXQMXPG8=; b=breiJyJCjJdM8/ZoQxm/OE+LnLAIyCDERWzPDsbVHSjr5glfhB5jYXVy0k4q1BgYvZ qthNPf3Iiv7+J1ww8PxmZCTr/I1UhMqgE919Uqwr4mSPiWDuTBgB5Rla73NmXvE7tw7G Yb8fnBd3zO1ttumHDvRkvCc4tHdbc5Kv4HWA4PaHu+wLAK003NxQav7B4CcaFR9FImR3 Dgcgbjep9gcbjc8vMiMWVGNA7ArlNVDpTiqA/LRTCDvAEk9hBSlez2baZETEujHFgi0X fa7ueM3BahFRTH5K/T03Bs/69vhbVq1riLwaw1C+ZseQiF3DqUWvKcmnI9c+hCtXHEVT jdGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=pRt1ZQeTh5X10hpoQU2/jHbFxikau/BmnLWyXQMXPG8=; b=GYX9XxDTpPxdtBZcAf9l4jleoxCSm4shmdHcb0g0SyWQHAhsrtuaPNS7SPZbblAHeB ic9Lv3nnDHG84IX9262Rd0/Jz6UAs1Qn0wMSGXmHkze77DAD5ZQxcYyrGt1+XW0IjdCr y3jS5Q2Z6tX2wi72Iws0C3IwFDjoXDwmnH5rSNYalRrKR+Y9BqKCcjvHzQ9KzudHy84F L9ew8L0dAlHmqLuxlcJWjtZlZB3J8jIaXKf9FAnHr/yb1L29l5pwb2RCOO/FMEsNlcGQ In56nJm9CkR3/lD11VcaP1AZQTS0zNXCBtSommUizdFua+HTfBIrBBPZktneP4iS6cje ED4g== X-Gm-Message-State: AOAM5303spsyMDpSn0fK/8xRMiUGUPXFt134pvJNcpgGaZNpLm0J9vmm rSH/1bEYlodqLMhPhlCS7S0xFYJ4D8hRwQ== X-Google-Smtp-Source: ABdhPJwTMasOAzaXAAtmqkCaQl73LrHm3bplXAks+gJJk8WCU54X+Gu5yiCfkR6yWkaHqoEKstZ8bA== X-Received: by 2002:a7b:c397:: with SMTP id s23mr10763937wmj.162.1641552876396; Fri, 07 Jan 2022 02:54:36 -0800 (PST) Received: from nuc.. (83.red-83-50-87.dynamicip.rima-tde.net. [83.50.87.83]) by smtp.gmail.com with ESMTPSA id 1sm5056239wry.33.2022.01.07.02.54.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jan 2022 02:54:36 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v3 3/3] qapi/block: Restrict vhost-user-blk to CONFIG_VHOST_USER_BLK_SERVER Date: Fri, 7 Jan 2022 11:54:20 +0100 Message-Id: <20220107105420.395011-4-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220107105420.395011-1-f4bug@amsat.org> References: <20220107105420.395011-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32c (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32c.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-block@nongnu.org, Eric Blake , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Philip?= =?utf-8?q?pe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé When building QEMU with --disable-vhost-user and using introspection, query-qmp-schema lists vhost-user-blk even though it's not actually available: { "execute": "query-qmp-schema" } { "return": [ ... { "name": "312", "members": [ { "name": "nbd" }, { "name": "vhost-user-blk" } ], "meta-type": "enum", "values": [ "nbd", "vhost-user-blk" ] }, Restrict vhost-user-blk in BlockExportType when CONFIG_VHOST_USER_BLK_SERVER is disabled, so it doesn't end listed by query-qmp-schema. Fixes: 90fc91d50b7 ("convert vhost-user-blk server to block export API") Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé --- v2: Reword + restrict BlockExportOptions union (armbru) --- qapi/block-export.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qapi/block-export.json b/qapi/block-export.json index c1b92ce1c1c..f9ce79a974b 100644 --- a/qapi/block-export.json +++ b/qapi/block-export.json @@ -277,7 +277,8 @@ # Since: 4.2 ## { 'enum': 'BlockExportType', - 'data': [ 'nbd', 'vhost-user-blk', + 'data': [ 'nbd', + { 'name': 'vhost-user-blk', 'if': 'CONFIG_VHOST_USER_BLK_SERVER' }, { 'name': 'fuse', 'if': 'CONFIG_FUSE' } ] } ## @@ -319,7 +320,8 @@ 'discriminator': 'type', 'data': { 'nbd': 'BlockExportOptionsNbd', - 'vhost-user-blk': 'BlockExportOptionsVhostUserBlk', + 'vhost-user-blk': { 'type': 'BlockExportOptionsVhostUserBlk', + 'if': 'CONFIG_VHOST_USER_BLK_SERVER' }, 'fuse': { 'type': 'BlockExportOptionsFuse', 'if': 'CONFIG_FUSE' } } }