From nobody Sun May 19 09:42:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1640254484; cv=none; d=zohomail.com; s=zohoarc; b=EzjHlTU7hpffTo0GqKWNzwgWDqoaps3M5YP6lNPLu+nuBVuMgRYZLzbYYiVilP414eRdzjH+I7Cb+hWbLXShNq92570a9ej5fJ61tmFEUXjzeNZW4eALdUqKrHa6RQetOzx/YZBZ4eXfWltN70MShXjurRyXnVkfoJB21w86KWM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1640254484; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=ayL3Y6gZm6XhBH2r4HXO5sw4wKPzmz4WxHL5sCFdC0w=; b=nyGqeqDPnk1FaFNYNkHBB44xgw5dxElHmVFmljI8gKuI531HCAQZfzRZG5PeusC5ZdM6TbGqcc6K0JyNZvhUsutpBPIWhhFlw+WYaWnhRM+fEqBg5B4Dm0nMHJSHFY/feRr77Sykj8OE7xWGfLhElp85mNBfl+e01pvxz1nc6Rs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1640254484958349.72844472971735; Thu, 23 Dec 2021 02:14:44 -0800 (PST) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-103-3s9TR14YP6ukeUYsnVw5hw-1; Thu, 23 Dec 2021 05:14:41 -0500 Received: by mail-wm1-f69.google.com with SMTP id v23-20020a05600c215700b0034566adb612so1844224wml.0 for ; Thu, 23 Dec 2021 02:14:40 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (33.red-193-152-124.dynamicip.rima-tde.net. [193.152.124.33]) by smtp.gmail.com with ESMTPSA id s1sm7400975wmh.35.2021.12.23.02.14.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Dec 2021 02:14:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640254484; 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=ayL3Y6gZm6XhBH2r4HXO5sw4wKPzmz4WxHL5sCFdC0w=; b=F05StKhlw0Db4iujQJzzYbM5LaTnZhrsZ57bsOvs74LF3+7KeKjZwHtnWDjZCqQlYhx3tx fpBtlZCPR/aZeA7pC380WJV32stcTwX0UVqAF/pQxUQew7WVH72A2FhT/BKxiU84kUUZ2Z 2S8ujuIraiIVCPdwvyIG4tcPxQyPu+4= X-MC-Unique: 3s9TR14YP6ukeUYsnVw5hw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ayL3Y6gZm6XhBH2r4HXO5sw4wKPzmz4WxHL5sCFdC0w=; b=vB1sJdh5XdyKUsnV5kWfLKbR8kqjyG9sNQitFKnLMNdVlZp4haAin2SpLGRIugVaAX I8Q0TNtZAgKlkMFSDZucXLzstVpQM34H9YcdZM5y43KeWZ7n/Gyf1pCyY1ri3rMUXGIq E/VlbXe19bEdNo/Dxw0UDceySZh3h8nCkC5gXt6Pp96XNXOQ3uPRqzxAFb72nM8yPedA YjWxqpmRdifZWGMXldInHO7NyoBkn4P004kjMaZ6mGCDl2cWHN7/yWIrzFAt+ue0r9nd fTHIppqVpIb+jmKI5f2NT1XZsn752pz9XFLfGtK0vGayhuifpMIae8QHIYJDa/6ysoBU TOeg== X-Gm-Message-State: AOAM53332YVYf1uuJobhrO6rV1UjvsscLRynkCFpo9fNxop2nvp1q+se gDxCpYBkWBPDwf4TcCjPui/4gxb/hCUfLelrZg7dmjCst3WGNAI+EY6sx7A84xYgh3obOs5qVrH L4k4h7N6Rnjsq8g== X-Received: by 2002:adf:e844:: with SMTP id d4mr1212951wrn.151.1640254479837; Thu, 23 Dec 2021 02:14:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJxzZ0UO5oY2YIF+4pXbv/1JYA2isTkwfvU1LoGnVF5/B17dvuFf7LivJ76OgR17ZBEyijJdhg== X-Received: by 2002:adf:e844:: with SMTP id d4mr1212940wrn.151.1640254479696; Thu, 23 Dec 2021 02:14:39 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eric Blake , Markus Armbruster , Stefan Hajnoczi , Kevin Wolf , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Qing Wang Subject: [PATCH v2 1/2] qemu-storage-daemon: Add vhost-user-blk help Date: Thu, 23 Dec 2021 11:14:25 +0100 Message-Id: <20211223101426.3143647-2-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211223101426.3143647-1-philmd@redhat.com> References: <20211223101426.3143647-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1640254485955100001 Add missing vhost-user-blk help: $ qemu-storage-daemon -h ... --export [type=3D]vhost-user-blk,id=3D,node-name=3D, addr.type=3Dunix,addr.path=3D[,writable=3Don|off] [,logical-block-size=3D][,num-queues=3D] export the specified block node as a vhosts-user-blk device over UNIX domain socket --export [type=3D]vhost-user-blk,id=3D,node-name=3D, fd,addr.str=3D[,writable=3Don|off] [,logical-block-size=3D][,num-queues=3D] 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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Eric Blake --- 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-sto= rage-daemon.c index 52cf17e8ace..0c19e128e3f 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=3D]vhost-user-blk,id=3D,node-name=3D,\n" +" addr.type=3Dunix,addr.path=3D[,writable=3Don|off]= \n" +" [,logical-block-size=3D][,num-queues=3D]\n" +" export the specified block node as a\n" +" vhosts-user-blk device over UNIX domain socket\n" +" --export [type=3D]vhost-user-blk,id=3D,node-name=3D,\n" +" fd,addr.str=3D[,writable=3Don|off]\n" +" [,logical-block-size=3D][,num-queues=3D]\n" +" export the specified block node as a\n" +" vhosts-user-blk device over file descriptor\n" +"\n" +#endif /* CONFIG_VHOST_USER_BLK_SERVER */ " --monitor [chardev=3D]name[,mode=3Dcontrol][,pretty[=3Don|off]]\n" " configure a QMP monitor\n" "\n" --=20 2.33.1 From nobody Sun May 19 09:42:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1640254492; cv=none; d=zohomail.com; s=zohoarc; b=SoMIV6/vCq7vPtjaORfHBtRxrjQxQZlixpaSEFr6rqwjEB40qqq0FSgA+9rzrlgA0bjd+6j5NCQljX1lzcemwwTEN1EdhheOp6NsGo1w3VznaUBCkEkCZaKHFGxnpIT1srdgnR7F3zSs317AkRuz6ucoHRRsXL6keFtRoZlCzW0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1640254492; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=N8Lqsw6/q5K/GsbrbDDFAAcbrQAsX6YJVuBetTcmBeI=; b=a5ZWlameCaLuNlYjdqBrZeL52qiDPIjq3erHpms1uWKvew8mTDNi1x7NXx+xK9GaGK2c8J7XVEmeXFfinqT4ZAwLHVJepU3te961tp9ovZN/ZNOgMy/bE8wl7yBRtAFQjnhhnLZ58HGAhfNa0rQaGmucX6gLOQY6XYam0x29E8U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1640254492695969.5255286513448; Thu, 23 Dec 2021 02:14:52 -0800 (PST) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-522-RkPtvgMBOzelURSd1up0hA-1; Thu, 23 Dec 2021 05:14:48 -0500 Received: by mail-wm1-f72.google.com with SMTP id bg20-20020a05600c3c9400b0033a9300b44bso1765828wmb.2 for ; Thu, 23 Dec 2021 02:14:48 -0800 (PST) Return-Path: Return-Path: Received: from x1w.. (33.red-193-152-124.dynamicip.rima-tde.net. [193.152.124.33]) by smtp.gmail.com with ESMTPSA id r1sm5505403wrz.30.2021.12.23.02.14.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Dec 2021 02:14:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640254491; 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=N8Lqsw6/q5K/GsbrbDDFAAcbrQAsX6YJVuBetTcmBeI=; b=D2FHkUgwijKyh3YO3L4rMMY1G1nehfYwDSefmEGPXoXAmIPp501GVvzvbfvn4+s77wtu/R +QUJ1shy7OBHtzn/pboHE4Owfv9qR6n+D9n0kzMjJAPQpCBrmmWA6MsjGUVWzl2BlHtfqI NtHjj9ToCV9yCUpoiXKtTtpY4OIwm/s= X-MC-Unique: RkPtvgMBOzelURSd1up0hA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=N8Lqsw6/q5K/GsbrbDDFAAcbrQAsX6YJVuBetTcmBeI=; b=idTuw6wMdvGuRMYOxoiaSyCUtaFl5OtIy8/Hrw8ixlon1kr8kxu2K16qxJSVKf4U5p tvCSLzWN8mVfHZ4DosUHZbnK0pNROXz27vYfakdjzoUGfdGKDVPc9oE74aYjFXFQo0lO 6GX7VrplPARVvkRk0WiTu2fHExsBQKxKrpKInW59vvYvE3v/Edje77mT0x8kbNEGgTDX b1+t9tEDvc90tfowuLzqowqEq5ntQOolI/XDWXWxfqXvnNPYtm2RSrkVx9QhOvjTFa+T IKhyn5NAGqDyk/0E1Akp9wS/OGCswaKsOvLnv430tFOuY0gVBlHwhE6CaBcz3r9v7ERb khbg== X-Gm-Message-State: AOAM5335gfdAzoSXlDH3V+fabwp+EvOp4oOA95MbMpyHvDLeAabA8M4n WCG9KCethELT14nPqiBm8hTgNKlphUOh5/urShUu7abBVEHzrZBRcEQdO0ULTvQTkKD5bt20X+w L29o+Fi8ns2Le6A== X-Received: by 2002:adf:f085:: with SMTP id n5mr1260850wro.418.1640254487328; Thu, 23 Dec 2021 02:14:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJyuPiMDSO+/2Ya793k51CAu30dNj1ZMZB6VUUTNVzkq45z9Jqso+3uTbR2AvsA4pP73JnPSCg== X-Received: by 2002:adf:f085:: with SMTP id n5mr1260840wro.418.1640254487186; Thu, 23 Dec 2021 02:14:47 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eric Blake , Markus Armbruster , Stefan Hajnoczi , Kevin Wolf , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/2] qapi/block: Restrict vhost-user-blk to CONFIG_VHOST_USER_BLK_SERVER Date: Thu, 23 Dec 2021 11:14:26 +0100 Message-Id: <20211223101426.3143647-3-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211223101426.3143647-1-philmd@redhat.com> References: <20211223101426.3143647-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1640254492945100001 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=C3=A9 Acked-by: Markus Armbruster --- 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_SERVE= R' }, { 'name': 'fuse', 'if': 'CONFIG_FUSE' } ] } =20 ## @@ -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' } } } --=20 2.33.1