From patchwork Mon Mar 10 14:18:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 14010080 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 4D6D91A314B for ; Mon, 10 Mar 2025 14:18:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741616300; cv=none; b=UPzFpwn1lPyvpuFjsOCP4ZoUztNGf+BUuXLehHKkDP65DFcykv9O1R3B489Qm1zs81GlfelBWkIPHjDI6BqqeCNlYJvNNNbXxISffnOxCxsDBM7zpCabbqrK5d1PGE4Tq/fGzL+44pS5FGI7kEpGnusp8Zo+Qg7ZF1lRUPn7Pb4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741616300; c=relaxed/simple; bh=0ctYUGUokQq1DnJbsA0kGdnb4tBRbTRoLsD2tgcW0D8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bn52t/VQRmz4aY6aLXwU12a0ALb63gXWmoqELIkIVPIogEa0yLfld526qrfK0qXg/WfmCVm/1rs+3xqclIn1beztKPzziqRxG9m4bPwoCKZRs45HfxqzOk+ssg1P5S7tFOwBfDcduq00SKFhRuC9o9TPrACgr9bSZpQgD2Er2xs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=H+3cAF5s; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="H+3cAF5s" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 96B3DC4CEEF; Mon, 10 Mar 2025 14:18:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741616300; bh=0ctYUGUokQq1DnJbsA0kGdnb4tBRbTRoLsD2tgcW0D8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H+3cAF5s2dargi76ypD1jJUePoVtVvvUs8wQQXKBO3U0MxMjHB78IokPa0s/f7E91 VpM34UgOYlClxcIjSNQpNEvorfJmGMwFBmeHrHvnk3y0dSxbnMjyP/Swc9e2XxTy9r nUDfzYSIvjvFOyQIq9KHbXy/eBEzKAkkmogJRmo9Ek4M4Qeo/8lSJYKGWuDrHpBNiH RaXQD/U+I8L/f+0f0roke7/zA8F0b/dtMeBobBbhCqYsdUVwAcWOfnvyrMExGtpbfk dRsLYai4to+HUKer4SW2s8k5YzLvoiWnj+CF8mw8+CbRfOV1U0BtFOz5mA8en9OLQM MtiFVuw8f6+Qw== From: cel@kernel.org To: Luis Chamberlain , Chandan Babu R , Jeff Layton Cc: , Chuck Lever Subject: [PATCH v1 05/13] guestfs: Set storage options consistently Date: Mon, 10 Mar 2025 10:18:05 -0400 Message-ID: <20250310141813.969325-6-cel@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310141813.969325-1-cel@kernel.org> References: <20250310141813.969325-1-cel@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Chuck Lever Clean up: The set-up for guestfs extra storage options is done differently for each of the three libvirt storage choices. Ensure that all three set the global variables consistently. Signed-off-by: Chuck Lever --- kconfigs/Kconfig.libvirt | 3 +++ playbooks/roles/gen_nodes/defaults/main.yml | 2 +- scripts/gen-nodes.Makefile | 10 ---------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/kconfigs/Kconfig.libvirt b/kconfigs/Kconfig.libvirt index e64db2b64c89..1ed967423096 100644 --- a/kconfigs/Kconfig.libvirt +++ b/kconfigs/Kconfig.libvirt @@ -528,6 +528,7 @@ choice config LIBVIRT_EXTRA_STORAGE_DRIVE_NVME bool "NVMe" + output yaml help Use the QEMU NVMe driver for extra storage drives. We always expect to use this as we expect *could* be outperforming the virtio driver. @@ -537,6 +538,7 @@ config LIBVIRT_EXTRA_STORAGE_DRIVE_NVME config LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO bool "virtio" + output yaml help Use the QEMU virtio driver for extra storage drives. Use this if you are having issues with "NVMe timeouts" issues when testing in a loop @@ -545,6 +547,7 @@ config LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO config LIBVIRT_EXTRA_STORAGE_DRIVE_IDE bool "ide" + output yaml help Use the QEMU ide driver for extra storage drives. This is useful for really old Linux distributions that lack the virtio backend driver. diff --git a/playbooks/roles/gen_nodes/defaults/main.yml b/playbooks/roles/gen_nodes/defaults/main.yml index 00971e293d12..8ff9b87993a7 100644 --- a/playbooks/roles/gen_nodes/defaults/main.yml +++ b/playbooks/roles/gen_nodes/defaults/main.yml @@ -64,7 +64,7 @@ libvirt_enable_cxl_demo_topo2: False libvirt_enable_cxl_switch_topo1: False libvirt_enable_cxl_dcd_topo1: False libvirt_extra_drive_id_prefix: 'drv' -libvirt_extra_storage_drive_nvme: True +libvirt_extra_storage_drive_nvme: False libvirt_extra_storage_drive_virtio: False libvirt_extra_storage_drive_ide: False libvirt_extra_storage_aio_mode: "native" diff --git a/scripts/gen-nodes.Makefile b/scripts/gen-nodes.Makefile index ce6b794f1fb1..8bee2db57591 100644 --- a/scripts/gen-nodes.Makefile +++ b/scripts/gen-nodes.Makefile @@ -48,16 +48,6 @@ GEN_NODES_EXTRA_ARGS += libvirt_storage_pool_name='$(subst ",,$(CONFIG_LIBVIRT_S GEN_NODES_EXTRA_ARGS += libvirt_storage_pool_path='$(subst ",,$(CONFIG_KDEVOPS_STORAGE_POOL_PATH))' endif -ifeq (y,$(CONFIG_LIBVIRT_EXTRA_STORAGE_DRIVE_IDE)) -GEN_NODES_EXTRA_ARGS += libvirt_extra_storage_drive_nvme='False' -GEN_NODES_EXTRA_ARGS += libvirt_extra_storage_drive_ide='True' -endif - -ifeq (y,$(CONFIG_LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO)) -GEN_NODES_EXTRA_ARGS += libvirt_extra_storage_drive_nvme='False' -GEN_NODES_EXTRA_ARGS += libvirt_extra_storage_drive_virtio='True' -endif - GEN_NODES_EXTRA_ARGS += libvirt_extra_storage_aio_mode='$(subst ",,$(CONFIG_LIBVIRT_AIO_MODE))' GEN_NODES_EXTRA_ARGS += libvirt_extra_storage_aio_cache_mode='$(subst ",,$(CONFIG_LIBVIRT_AIO_CACHE_MODE))'