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 199F84A01 for ; Mon, 28 Jul 2025 01:14:35 +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=1753665277; cv=none; b=TO3TtJ9Z8FQV75TwkqQYohibYsmsFJQ1aBx7nRGpiss1eTZtj0p2WAqfVQ20POsYqGueRwrNdnGS747PWLlSXxnEweaB2aJGpBcdMQifhRdmmCi+GujIfGhXVGGW/ImMX+P9mmqEsHkJp0ojR9WUCyXsUIwuCmxzDSoUj4laCI8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753665277; c=relaxed/simple; bh=ZM6wNadNVSA8uE9yMjSHhxOdBYT1+xUJ4r6e0ylDHqM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=phUpBp99/+0JyCbEuSju2K4e0PE6bUk6hxTl2PS8YctGmLWvjG16OeAi+wrYbhc+klEH4k5vcYfFm9/UKHN0KbET4H0tGDGoptt0Saqwiv8pDmO+GzAK1lpUBe+ZW0vvOBFYwRXrnNN0NKCoUZCGSUHVwThOgWvz9oVR0iCA1Kk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine 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=UWPiq7Kf; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine 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="UWPiq7Kf" 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=MVyyndkI7vP/GRlYNkUGwVBbobiYjL1XvskPpBiioRY=; b=UWPiq7KfDOg6f60200K5h3bWLb MCnIzTPfyW9ANhtZsoB0N3mde8zIXtSgzWao6aeEUJqUZugqACb/5cGufmleCXtFxaMX16kMMpuKA KbTTDZtAF3b5gxjjlEujuPDOLLCJO4O84Eaoo5Ti6ilPV6kK+hnQSxNO6aSuHpunnlTLYn659x4Bx lak3Drzjd4d2rvvCDDgYV+gqZXdwMa9KKLn9/jZPmpf0MHbBynqHvdU1Uo7544Uo6xYTncanj+Qsu JW6cUmjlIURQGOSq44RmvIPPgp1KuOST5yYiwbfuHCsdijIO84Hq+28cFSIFAQ5J0xLnKCGty48zy gCPypTTA==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.98.2 #2 (Red Hat Linux)) id 1ugCRn-0000000DPie-2JHm; Mon, 28 Jul 2025 01:14:35 +0000 From: Luis Chamberlain To: Chuck Lever , Daniel Gomez , kdevops@lists.linux.dev Cc: Luis Chamberlain Subject: [PATCH v2 02/33] kconfigs: fix Kconfig references after vagrant removal Date: Sun, 27 Jul 2025 18:14:02 -0700 Message-ID: <20250728011434.3197091-3-mcgrof@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250728011434.3197091-1-mcgrof@kernel.org> References: <20250728011434.3197091-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 Remove Vagrant references from Kconfig files that were causing build failures after the vagrant directory was removed: - Remove vagrant/Kconfig source line from Kconfig.bringup - Remove VAGRANT_LIBVIRT_SELECT dependency from LIBVIRT config - Remove PCIe passthrough Vagrant references from Kconfig.libvirt - Remove VAGRANT-dependent machine type options - Update help text to remove Vagrant mentions Generated-by: Claude AI Suggested-by: Chuck Lever Signed-off-by: Luis Chamberlain --- kconfigs/Kconfig.bringup | 11 +++++------ kconfigs/Kconfig.libvirt | 20 -------------------- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/kconfigs/Kconfig.bringup b/kconfigs/Kconfig.bringup index a9aefc56..887d3851 100644 --- a/kconfigs/Kconfig.bringup +++ b/kconfigs/Kconfig.bringup @@ -14,8 +14,8 @@ config GUESTFS select KDEVOPS_ENABLE_GUESTFS 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. + This option will use libguestfs utilities to build guest images and + spin them up using libvirt with KVM. config TERRAFORM bool "Terraform for cloud environments" @@ -24,8 +24,8 @@ config TERRAFORM select EXTRA_STORAGE_SUPPORTS_2K select EXTRA_STORAGE_SUPPORTS_4K help - This option will enable use of Vagrant. Enable this if you want to - use terraform to create nodes on a cloud environment such as: + Enable this if you want to use terraform to create nodes on a cloud + environment such as: * Azure * AWS @@ -55,11 +55,10 @@ endchoice config LIBVIRT bool - depends on VAGRANT_LIBVIRT_SELECT || GUESTFS + depends on GUESTFS default y source "kconfigs/Kconfig.guestfs" -source "vagrant/Kconfig" source "terraform/Kconfig" if LIBVIRT source "kconfigs/Kconfig.libvirt" diff --git a/kconfigs/Kconfig.libvirt b/kconfigs/Kconfig.libvirt index 1b8f4b95..743a76c6 100644 --- a/kconfigs/Kconfig.libvirt +++ b/kconfigs/Kconfig.libvirt @@ -463,32 +463,12 @@ config HAVE_LIBVIRT_PCIE_PASSTHROUGH bool default $(shell, scripts/check_pciepassthrough_kconfig.sh passthrough_libvirt.generated) -if HAVE_LIBVIRT_PCIE_PASSTHROUGH -source "vagrant/Kconfig.pcie_passthrough_libvirt" -endif # HAVE_LIBVIRT_PCIE_PASSTHROUGH choice prompt "Machine type to use" default LIBVIRT_MACHINE_TYPE_Q35 if TARGET_ARCH_X86_64 default LIBVIRT_MACHINE_TYPE_VIRT if TARGET_ARCH_ARM64 -config LIBVIRT_MACHINE_TYPE_DEFAULT - bool "Use the default machine type" - depends on VAGRANT - help - Use whatever default the guest was intended to use. This will either - be the machine type used at virt-install time or some other default - by QEMU / libvirt. This is important for backward compatibility with - older kernels. For example if you enable q35 on an old kernel the old - kernel may not boot. For details refer to kdevops commit 83952e2e532e - ("vagrant/kdevops_nodes.yaml.in: remove machine_type)". - - It would seem today's default for libvirt is to still use "pc" which - is the old i440x, so you will not get PCIe support. - - We only want to support PCI-E capable guests with libguest so the - default is not allowed on libguest. - config LIBVIRT_MACHINE_TYPE_Q35 bool "q35" depends on TARGET_ARCH_X86_64 -- 2.47.2