From patchwork Wed Feb 8 19:26:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabiano Rosas X-Patchwork-Id: 13133631 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CD78EC636D3 for ; Wed, 8 Feb 2023 19:31:29 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPq8K-0007Bx-75; Wed, 08 Feb 2023 14:29:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPq81-00075j-F3 for qemu-devel@nongnu.org; Wed, 08 Feb 2023 14:29:18 -0500 Received: from smtp-out2.suse.de ([2001:67c:2178:6::1d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pPq7y-0006KW-04 for qemu-devel@nongnu.org; Wed, 08 Feb 2023 14:29:11 -0500 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id DEDAB203D3; Wed, 8 Feb 2023 19:29:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1675884547; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EXpVtblwC6QFK9NTjUkUNmMNYgkJpSVJQTSKo/M8Jos=; b=ONVefuUBz7neUkSxyIX1B8PxzierkhmlKEp9BSZvMCnA5TyjptAoVImQrwULsnqzqkXbdU kcxvSpmGPS7EpzE7Nr6ceARfpSkhtZf617HvEBysqXRfvpvfMq114C1UBtKX/8mqvrlvOU C0P0J3Q1JzhNDkjZnDCowtnFCZy8cP0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1675884547; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EXpVtblwC6QFK9NTjUkUNmMNYgkJpSVJQTSKo/M8Jos=; b=iKIJM/28H2GOkEaaTthnoWFVuFLTx61oSsVZtFqiPdtzjTsfd8XQEp9uohOnWhonLMlVTT XrxEytI34M4VriDA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id E308813425; Wed, 8 Feb 2023 19:29:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id YD5uKgH442NiHQAAMHmgww (envelope-from ); Wed, 08 Feb 2023 19:29:05 +0000 From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum Subject: [PATCH v2 04/10] hw/i386: Select E1000_PCI for i440fx Date: Wed, 8 Feb 2023 16:26:48 -0300 Message-Id: <20230208192654.8854-5-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230208192654.8854-1-farosas@suse.de> References: <20230208192654.8854-1-farosas@suse.de> MIME-Version: 1.0 Received-SPF: pass client-ip=2001:67c:2178:6::1d; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org The i440fx machines uses the e1000 adapter as the default when no other network card is configured. Move the E1000_PCI entry in Kconfig from 'imply' to 'select' to avoid the following situation: ./qemu-system-i386 -machine pc-i440fx-8.0 qemu-system-i386: Unsupported NIC model: e1000 Reviewed-by: Thomas Huth Signed-off-by: Fabiano Rosas --- hw/i386/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index 36590e2691..e98af283b4 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -66,7 +66,6 @@ config PC_ACPI config I440FX bool - imply E1000_PCI imply VMPORT imply VMMOUSE select ACPI_PIIX4 @@ -78,6 +77,7 @@ config I440FX select DIMM select SMBIOS select FW_CFG_DMA + select E1000_PCI config ISAPC bool From patchwork Wed Feb 8 19:26:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabiano Rosas X-Patchwork-Id: 13133632 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 84E3CC636D6 for ; Wed, 8 Feb 2023 19:31:38 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPq8L-0007DT-Bl; Wed, 08 Feb 2023 14:29:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPq81-00075h-Lp; Wed, 08 Feb 2023 14:29:18 -0500 Received: from smtp-out1.suse.de ([2001:67c:2178:6::1c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pPq7z-0006Kf-2J; Wed, 08 Feb 2023 14:29:12 -0500 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id A9C4921CDD; Wed, 8 Feb 2023 19:29:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1675884549; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mAfqu5STQLW35DMfDre2JGCNsJ104sKZIGjzpdV+UzI=; b=G1VwB2cBRSx7Py8YaMpxgcWdmx4eUtdErGuMVQ6MIY9/YkQnCl0YHb7RXVSkTxFEoWujZQ 6/DcuL0HmqyPV8L4qGqNXw+8oqdkkQxsaW/oU4EtTmXRV0G0OXFnhOOEvfMjZgpdtfBINg OYhYiy26uV8/FtgGVJp61gebho9gpBg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1675884549; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mAfqu5STQLW35DMfDre2JGCNsJ104sKZIGjzpdV+UzI=; b=9CZALXvHWh0tFbLRZ90M/lpWmcwrg5SyBem3/h9JQcD2YFXeri6xW0y3Zs5oXKzhHV/6Wp sK+CLi13qmD/XNDw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 5837913425; Wed, 8 Feb 2023 19:29:08 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id CCWTCAT442NiHQAAMHmgww (envelope-from ); Wed, 08 Feb 2023 19:29:08 +0000 From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Thomas Huth , Peter Maydell , qemu-arm@nongnu.org Subject: [PATCH v2 05/10] hw/arm: Select VIRTIO_NET for virt machine Date: Wed, 8 Feb 2023 16:26:49 -0300 Message-Id: <20230208192654.8854-6-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230208192654.8854-1-farosas@suse.de> References: <20230208192654.8854-1-farosas@suse.de> MIME-Version: 1.0 Received-SPF: pass client-ip=2001:67c:2178:6::1c; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org The 'virt' machine uses virtio-net-pci as a fallback when no other network driver has been selected via command line. Select VIRTIO_NET and VIRTIO_PCI from CONFIG_ARM_VIRT to avoid errors when PCI_DEVICES=n (due to e.g. --without-default-devices): $ ./qemu-system-aarch64 -M virt -accel tcg -cpu max qemu-system-aarch64: Unsupported NIC model: virtio-net-pci Reviewed-by: Thomas Huth Signed-off-by: Fabiano Rosas --- hw/arm/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 2d157de9b8..8dcc08b7ec 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -31,6 +31,8 @@ config ARM_VIRT select VIRTIO_MEM_SUPPORTED select ACPI_CXL select ACPI_HMAT + select VIRTIO_PCI + select VIRTIO_NET config CHEETAH bool