From nobody Sun Feb 8 23:41:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1629137088; cv=none; d=zohomail.com; s=zohoarc; b=ZtIcGTBhYRAuZXoJUDmueBmfsMV6Wx2FBbD4prM2bk5ujOT6nP68eJryNXB8ca4dcf3yS1dhV55O8qw3FebEo2fK48+KMU1ylnGfHktb8sq1/M3NYHvCdWmDPEUYCesWMSv0ebLC9MtZ2BlC0NgtGh/L1Q1MGYu8eS5COT7HHaQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629137088; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=yVr0VQQosAtHxyUcL35E8kd9mLrtiVCl383ah7sIDQ0=; b=j+78TCfaSbZYj49VxrcdNAgJsBuTOTqwN79uzwteWeXkIoD5pKOD7s4sDVbGwKwsTzWqb052jshF6SQaqBVoAgZEo1J4GygaBF69U0Dv4yiHIq9+wpCZg8Xx7fMfyq+tlGcpZoNd0KnzdVwPydmqHbRxGgNqW6zZCIC2Q7uV1wM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1629137088095528.0704036658656; Mon, 16 Aug 2021 11:04:48 -0700 (PDT) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-269-ImWEZlQlOcmRAhBcFXKevA-1; Mon, 16 Aug 2021 14:04:45 -0400 Received: by mail-wm1-f70.google.com with SMTP id g70-20020a1c20490000b02902e6753bf473so28464wmg.0 for ; Mon, 16 Aug 2021 11:04:45 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id e10sm12272149wrt.82.2021.08.16.11.04.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Aug 2021 11:04:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629137087; 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; bh=yVr0VQQosAtHxyUcL35E8kd9mLrtiVCl383ah7sIDQ0=; b=Y1xwfSj56qM6gfSDbO/LP1yajghVsnOKDEhLYgFG6ghRn3sAgIGLkBtfT43dNcvPWmqNia OwblSS1xgljyDBBGnjqZyvQIcfaFpqCsVarVjYcveajjBa4T6TiHdzvrdHwrkluMaEfRqN a8XB3A7PSIAbZv6gY2dgMLqdZ1PLUcQ= X-MC-Unique: ImWEZlQlOcmRAhBcFXKevA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=yVr0VQQosAtHxyUcL35E8kd9mLrtiVCl383ah7sIDQ0=; b=F23D8Hbw/imZHrOeNcwTXFf10mEe22d8QAarpvnXL1pJi2vKitgq+0cjpeSgPQkZv2 iNNQghMNklTEKVgVE5MMHVt9XB4+xxPk3auTe34m2yivKSKIezzkc2+BXNerkzcrlSXB TlpppxcPQO7BBhcBHqyyqPlDST+Cq+0l9SpbABvkDEand0YH+i6MDwEr8M9FMxqPUhSw n7TKy2PBKksDPeygEUiw1WIDa3PstMTogBMQE4KUKu7hHGDJFgPzeFmP7FOgpE5gXnic jtzkMbxFy/Xgg8hhVSBj3TMiW1/HQYBhanmMAnzu5Odd7rO5mVPND5nrm+2TIhuUxog5 H8Og== X-Gm-Message-State: AOAM530x7RgjJWdiZ30moMupVXWIcuXKF/cZf3AdLbkGxvmX+tbB9PYu EDMqpbUJ5YA570rRnSZJvDiWWGz7vJfYjaeCmdhc1LqvmcC8jH33idPCuQi6S+efNv47JKt45fk NZaDkINc55n0ByA== X-Received: by 2002:adf:f747:: with SMTP id z7mr14126076wrp.194.1629137084687; Mon, 16 Aug 2021 11:04:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSd8JkYzxFzJfSPwA6IZyD+UO8zixS87khBZLCCSveQxwWLtdCOJfKj2KWjV5XTwRGy//BSg== X-Received: by 2002:adf:f747:: with SMTP id z7mr14126049wrp.194.1629137084491; Mon, 16 Aug 2021 11:04:44 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , qemu-block@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Qing Wang Subject: [PATCH] qemu-storage-daemon: Only display FUSE help when FUSE is built-in Date: Mon, 16 Aug 2021 20:04:42 +0200 Message-Id: <20210816180442.2000642-1-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 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: 1629137090279100001 When configuring QEMU with --disable-fuse, the qemu-storage-daemon still reports FUSE command line options in its help: $ qemu-storage-daemon -h Usage: qemu-storage-daemon [options] QEMU storage daemon --export [type=3D]fuse,id=3D,node-name=3D,mountpoint=3D<= file> [,growable=3Don|off][,writable=3Don|off] export the specified block node over FUSE Remove this help message when FUSE is disabled, to avoid: $ qemu-storage-daemon --export fuse qemu-storage-daemon: --export fuse: Invalid parameter 'fuse' Reported-by: Qing Wang Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Eric Blake Reviewed-by: Hanna Reitz --- storage-daemon/qemu-storage-daemon.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-sto= rage-daemon.c index fc8b1506297..10a1a33761d 100644 --- a/storage-daemon/qemu-storage-daemon.c +++ b/storage-daemon/qemu-storage-daemon.c @@ -98,10 +98,12 @@ static void help(void) " export the specified block node over NBD\n" " (requires --nbd-server)\n" "\n" +#ifdef CONFIG_FUSE " --export [type=3D]fuse,id=3D,node-name=3D,mountpoint=3D<= file>\n" " [,growable=3Don|off][,writable=3Don|off]\n" " export the specified block node over FUSE\n" "\n" +#endif /* CONFIG_FUSE */ " --monitor [chardev=3D]name[,mode=3Dcontrol][,pretty[=3Don|off]]\n" " configure a QMP monitor\n" "\n" --=20 2.31.1