From nobody Mon Feb 9 01:43:13 2026 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=quarantine dis=none) header.from=crudebyte.com ARC-Seal: i=1; a=rsa-sha256; t=1584727453; cv=none; d=zohomail.com; s=zohoarc; b=Ft1eZ6lQ267cdBlOunTULsmEo3YEldiSKOF1q8INhSa31dGr3mllO/p+ZbqPnuQhb9d82TcB5gnlrPqE3flG55j+cs+T0wjlO8XTEdiLR0m38Gwi53HrlKC7iq+lOskB8ElqlIxDOLyWmsiGO6ZrpS0mAyrmicf7JwRkqmR13SM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584727453; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=KPesT1KlQk2GePUADf96n6O82LMG+9/pKpM7fc0jnRU=; b=DBpG3K0z+UPwTSq1jQfor4Of5+JYNnnkV+GWFRlOFzo6LnBrZLli1Zm9VpUn+Qtdh7GwpvPAQV6dlGMxSY8mpwXIWHWpzAcqlyeNgHsV4gBo7l1wxkgsFf6C0jWuwNBDKc9yoM0GkveYoO2zyk8jZlrOUsUlJ8D7YDrvhipfP2M= 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=quarantine 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 1584727453582837.8093479792936; Fri, 20 Mar 2020 11:04:13 -0700 (PDT) Received: from localhost ([::1]:57322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFM0C-0006Uk-05 for importer@patchew.org; Fri, 20 Mar 2020 14:04:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39709) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jFLyz-0005VG-1i for qemu-devel@nongnu.org; Fri, 20 Mar 2020 14:02:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jFLyx-0002qU-W2 for qemu-devel@nongnu.org; Fri, 20 Mar 2020 14:02:56 -0400 Received: from lizzy.crudebyte.com ([91.194.90.13]:38081) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jFLyx-0001IN-Nr for qemu-devel@nongnu.org; Fri, 20 Mar 2020 14:02:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=crudebyte.com; s=lizzy; h=Cc:To:Subject:Date:From:References:In-Reply-To: Message-Id:Content-Type:Content-Transfer-Encoding:MIME-Version:Content-ID: Content-Description; bh=KPesT1KlQk2GePUADf96n6O82LMG+9/pKpM7fc0jnRU=; b=YDS0A nm83IqfBM4pYlm5HvgC8ljcE5CegmWfqlSPR5sKPCZKUNPgaNX8omsCGbZCrt+okHTQffOSmq6dZj LUZkOi7BKTYCXOyD+wZNlOnujgY+MB0AyKFRPvLnEVxaVMPEwdXD1YAu888TxmccSurxcu6en3h3z MmnY/TIoSFXYqGb0IcKg+33puUi9pp9DDZxSk1uTvNC+mWNvJClQgxAF7W1MHny7/KRLS7GdVXkM5 pGKgBZNTwlTSQDfvO5a3exAqJG+dXbBpdwkXluzNqmN1dPhm9YIL7CgQuXyXYRzzwdwvv1LrBdLtH JhrU8vCplG4jYljU/uGx9JoUNRR+w==; Message-Id: In-Reply-To: References: From: Christian Schoenebeck Date: Fri, 20 Mar 2020 17:54:32 +0100 Subject: [PATCH v2 4/4] qemu: add support for 'multidevs' option To: libvir-list@redhat.com Cc: qemu-devel@nongnu.org, Greg Kurz X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 91.194.90.13 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @crudebyte.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This option prevents misbehaviours on guest if a qemu 9pfs export contains multiple devices, due to the potential file ID collisions this otherwise may cause. Signed-off-by: Christian Schoenebeck --- src/qemu/qemu_command.c | 7 +++++++ src/qemu/qemu_domain.c | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9790c92cf8..7020e5448c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -2632,6 +2632,13 @@ qemuBuildFSStr(virDomainFSDefPtr fs) } else if (fs->accessmode =3D=3D VIR_DOMAIN_FS_ACCESSMODE_SQUASH) { virBufferAddLit(&opt, ",security_model=3Dnone"); } + if (fs->multidevs =3D=3D VIR_DOMAIN_FS_MULTIDEVS_REMAP) { + virBufferAddLit(&opt, ",multidevs=3Dremap"); + } else if (fs->multidevs =3D=3D VIR_DOMAIN_FS_MULTIDEVS_FORBID) { + virBufferAddLit(&opt, ",multidevs=3Dforbid"); + } else if (fs->multidevs =3D=3D VIR_DOMAIN_FS_MULTIDEVS_WARN) { + virBufferAddLit(&opt, ",multidevs=3Dwarn"); + } } else if (fs->fsdriver =3D=3D VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE) { /* removed since qemu 4.0.0 see v3.1.0-29-g93aee84f57 */ virBufferAddLit(&opt, "handle"); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index edc8ba2ddb..c54c64fadb 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8529,6 +8529,13 @@ qemuDomainDeviceDefValidateFS(virDomainFSDefPtr fs, _("only supports mount filesystem type")); return -1; } + if (fs->multidevs !=3D VIR_DOMAIN_FS_MODEL_DEFAULT && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTFS_MULTIDEVS)) + { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("multidevs is not supported with this QEMU binary= ")); + return -1; + } =20 switch ((virDomainFSDriverType) fs->fsdriver) { case VIR_DOMAIN_FS_DRIVER_TYPE_DEFAULT: @@ -8581,6 +8588,11 @@ qemuDomainDeviceDefValidateFS(virDomainFSDefPtr fs, _("virtiofs is not supported with this QEMU bin= ary")); return -1; } + if (fs->multidevs !=3D VIR_DOMAIN_FS_MULTIDEVS_DEFAULT) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("virtiofs does not support multidevs")); + return -1; + } if (qemuDomainDefValidateVirtioFSSharedMemory(def) < 0) return -1; break; --=20 2.20.1