From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9CF35364 for ; Fri, 8 Mar 2024 00:04:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709856243; cv=none; b=DpUhI35dhRRzYsgW04Tf+QwzB2EagIIEDiWbIOYUQEfgmmT2NOZco9oPz3ERyx6XgTKeNcF5JtsoHG+qwcnjn1Iv2VzH/FXTb9cyW5+waVOOWan0PGAQgxkoFUBMS8DFDiTAK8WkWSH0rIzYlooGqI7rauiLwHejYz6GI+bi/Oo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709856243; c=relaxed/simple; bh=EINo7mVvlW5S1UIXrna60KAGIKK9dwRztz52vnVPV6w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W0rs7e59LhaxHrrDwcSWUW3X0qMTCOgUFzvtWw45LeoWFHdeXDWwWFWhgVv3AqIDMfz2f7la2vGVUvffC+u6txsmPP54Vjce8LarVGmK2sRJjjVkAR2aJhj6hHBbP/vS0cu82Tmp80jHK6yOAD1W0ULaT7bfjs3KQHlMmWDJPWQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=ANjoAnKC; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="ANjoAnKC" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=2Ng/v/A9H4qj3UnxWskjB//7y/2+ThBF1hejoueB0Xw=; b=ANjoAnKCamkN+PnOZVesNTsanb 9Zmql55VPkO3inO/hbGl/056DLoD98EWBgzXu49y7Z8h+k9M+FpTvwL0/NbHHP7JXOqqwDv9dlM3d 90DEKuCP4hCJMF4ZzAgbzaN7SMHFFnr0Toyg1wCb2NRQLHZ6qHe/GkoRkV5w7ksPhg9fQKvHAGr6n SgR82GZukHv1DfcD5sAmMVnhqB4wkbBMiknuvb4qq77wp5DBSH4N5nWs46cxpIpWLY0JZP/DT13eV E7aI4ciejCUDwijxarfYUoBtF1tAK8ExJ4kfVGDNACig0f5FEfhp0dxMwu/6XKkGqvlfnh47Wk3bt DQ6U1JWQ==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1riNiT-00000006uQL-0WbX; Fri, 08 Mar 2024 00:04:01 +0000 From: Luis Chamberlain To: kdevops@lists.linux.dev Cc: Luis Chamberlain Subject: [PATCH 2/8] bringup: disable ZNS and CXL for guestfs Date: Thu, 7 Mar 2024 16:03:53 -0800 Message-ID: <20240308000400.1646823-3-mcgrof@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240308000400.1646823-1-mcgrof@kernel.org> References: <20240308000400.1646823-1-mcgrof@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Luis Chamberlain Support for things like ZNS and CXL require libvirt XML macros to be developed for guestfs and this is not ready yet, so hide support for it under options which make it clear these features are still missing for guestfs. Signed-off-by: Luis Chamberlain --- kconfigs/Kconfig.bringup | 7 +++++++ kconfigs/Kconfig.extra_storage | 6 ++++++ kconfigs/Kconfig.libvirt | 9 +++++++++ 3 files changed, 22 insertions(+) diff --git a/kconfigs/Kconfig.bringup b/kconfigs/Kconfig.bringup index ba7b5430..de4128ae 100644 --- a/kconfigs/Kconfig.bringup +++ b/kconfigs/Kconfig.bringup @@ -1,3 +1,6 @@ +config BRINGUP_SUPPORTS_CXL + bool + choice prompt "Node bring up method" default VAGRANT @@ -5,6 +8,9 @@ choice config VAGRANT bool "Vagrant for local virtualization (KVM / VirtualBox)" select KDEVOPS_SSH_CONFIG_UPDATE_STRICT + select EXTRA_STORAGE_SUPPORTS_ZNS + select EXTRA_STORAGE_SUPPORTS_LARGEIO + select BRINGUP_SUPPORTS_CXL depends on TARGET_ARCH_X86_64 help This option will enable use of Vagrant. Enable this if you want to @@ -17,6 +23,7 @@ config VAGRANT config GUESTFS bool "Use guestfs-tools for local virtualization via KVM and libvirt (EXPERIMENTAL)" + select EXTRA_STORAGE_SUPPORTS_LARGEIO help This option will use libguestfs utilities instead of Vagrant to build guest images and spin them up using libvirt with KVM. diff --git a/kconfigs/Kconfig.extra_storage b/kconfigs/Kconfig.extra_storage index 12bb4206..7b0df9a1 100644 --- a/kconfigs/Kconfig.extra_storage +++ b/kconfigs/Kconfig.extra_storage @@ -13,3 +13,9 @@ config EXTRA_STORAGE_SUPPORTS_2K config EXTRA_STORAGE_SUPPORTS_4K bool default n +config EXTRA_STORAGE_SUPPORTS_ZNS + bool + default n +config EXTRA_STORAGE_SUPPORTS_LARGEIO + bool + default n diff --git a/kconfigs/Kconfig.libvirt b/kconfigs/Kconfig.libvirt index d8b972c1..7486be49 100644 --- a/kconfigs/Kconfig.libvirt +++ b/kconfigs/Kconfig.libvirt @@ -1091,6 +1091,8 @@ config LIBVIRT_STORAGE_POOL_NAME For instance you may want to use a volume name of "data2" for a path on a partition on /data2/ or something like that. +if EXTRA_STORAGE_SUPPORTS_ZNS + config QEMU_ENABLE_NVME_ZNS bool "Enable QEMU NVMe ZNS drives" depends on LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME @@ -1238,6 +1240,10 @@ config QEMU_NVME_ZONE_LOGICAL_BLOCK_SIZE default 4096 if !QEMU_CUSTOM_NVME_ZNS default QEMU_CUSTOM_NVME_ZONE_LOGICAL_BLOCK_SIZE if QEMU_CUSTOM_NVME_ZNS +endif # EXTRA_STORAGE_SUPPORTS_ZNS + +if EXTRA_STORAGE_SUPPORTS_LARGEIO + config QEMU_ENABLE_EXTRA_DRIVE_LARGEIO bool "Enable QEMU drives for large IO experimentation" depends on LIBVIRT @@ -1369,10 +1375,13 @@ config QEMU_LARGEIO_MAX_POW_LIMIT default 12 if !QEMU_ENABLE_EXTRA_DRIVE_LARGEIO default QEMU_EXTRA_DRIVE_LARGEIO_MAX_POW_LIMIT if QEMU_ENABLE_EXTRA_DRIVE_LARGEIO +endif # EXTRA_STORAGE_SUPPORTS_LARGEIO + config QEMU_ENABLE_CXL bool "Enable QEMU CXL devices" depends on LIBVIRT depends on LIBVIRT_MACHINE_TYPE_Q35 + depends on BRINGUP_SUPPORTS_CXL depends on QEMU_USE_DEVELOPMENT_VERSION default n help -- 2.43.0