From nobody Mon Feb 9 20:32:13 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548412865942437.51528322503486; Fri, 25 Jan 2019 02:41:05 -0800 (PST) Received: from localhost ([127.0.0.1]:41730 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyun-0000CP-S1 for importer@patchew.org; Fri, 25 Jan 2019 05:40:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58695) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmyPL-0008Cv-9O for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmyP9-0002Jr-SS for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:17 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:33548) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gmyP9-0002IN-LB for qemu-devel@nongnu.org; Fri, 25 Jan 2019 05:08:07 -0500 Received: by mail-wr1-x442.google.com with SMTP id p7so9673314wru.0 for ; Fri, 25 Jan 2019 02:08:06 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p4sm88048455wrs.74.2019.01.25.02.08.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 02:08:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=k0MhAqIQD4IKNwcjVBjHqp1gv0srcUlPRTKaAo4UN0s=; b=nOlUNqKH2he63SJTQZCqAR/IUAn0VPlA4QxGbdOBlz9hGf07M8+xibX74VXjwgApnj iGIkb7rq3NYYV1HroEXGja3WOfzYoQOElsSx5OXEXJcedaEsvLyIe+Tw8zqhIVy1y/Rc OXQqn9/LH1/UhILvr03DxF5xn1+2HvPHCzFH7aBg8RxbdDCTpHSbh35pCp+jO3x/jL/h l/E8Eosf5do0O9v9rnpeO8ae/VAftjorQbJPPcj8ryAAyTSi8AEUr5BqHLG24h9T0qmF VMraTUzVEOqPGHzT4Wo/MLL+zNF/6UqOTDUSdQfDjpF2ZAmHPVlmNUewK0hXxZJnMQA2 jjwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=k0MhAqIQD4IKNwcjVBjHqp1gv0srcUlPRTKaAo4UN0s=; b=DAbp8bx3t8cDSDnGV0IyvvIbiwzQWkhp0tQPxzTNxghIg5Yzw+cYFqUmjRg8ZCUkLA X3DvxBbOmw+QR1aX/xI0zTnyCEO7A0J0V+s01hv02E5NAnhgy3inTuFfrYp3bfQx4ly/ IkuqkPzoE5g99tknKUGd3CfY1g7wPvMx0z++JofSr2sINpm5cm/7arqe2DwRvE2WJEb+ 93oIk4RloUjr13pB9nKKqMot1XKLaFLe0/YHrrTy9QpwIEXT2bWAJGQsrHcSgcVUol1U nct9L8G2HKfpToI8d03WYaFl7aLomrGIZT0flPBGPvknqsBUjUR6cBBx4iOHJViAeKKP t85Q== X-Gm-Message-State: AJcUukeGcSupQ5OmnPH7V/a6//FwzD/SY/ZlJDPpStB+etzYT/vAPC3u RKo/11SZDh878n72ysE5MzKnq8io X-Google-Smtp-Source: ALg8bN4Ox5zYT2t0dp9pkzI4LHdmRPwhffzTTSLRt/ssDBmyxmhAscn1jZxBdmR5pupwtt6Y+XjfcQ== X-Received: by 2002:adf:81c4:: with SMTP id 62mr10158505wra.266.1548410885189; Fri, 25 Jan 2019 02:08:05 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 11:07:11 +0100 Message-Id: <1548410831-19553-53-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> References: <1548410831-19553-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH 52/52] kconfig: introduce CONFIG_TEST_DEVICES X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: yang.zhong@intel.com, thuth@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This moves some devices that are mostly used for testing purposes (for example in endianness-test) under a new symbol CONFIG_TEST_DEVICES that has to be enabled explicitly in the default-configs file. This makes it easier to drop this code from QEMU if desirable. Signed-off-by: Paolo Bonzini --- default-configs/alpha-softmmu.mak | 2 +- default-configs/i386-softmmu.mak | 1 + default-configs/mips-softmmu-common.mak | 2 +- default-configs/ppc-softmmu.mak | 2 +- default-configs/sh4-softmmu.mak | 3 +-- default-configs/sh4eb-softmmu.mak | 2 +- default-configs/sparc64-softmmu.mak | 2 +- hw/Kconfig | 3 +++ hw/hyperv/Kconfig | 2 +- hw/misc/Kconfig | 7 ++++--- 10 files changed, 15 insertions(+), 11 deletions(-) diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-soft= mmu.mak index 2ad4d40..762e3a2 100644 --- a/default-configs/alpha-softmmu.mak +++ b/default-configs/alpha-softmmu.mak @@ -10,6 +10,6 @@ CONFIG_VMWARE_VGA=3Dy CONFIG_IDE_CMD646=3Dy CONFIG_I8259=3Dy CONFIG_MC146818RTC=3Dy -CONFIG_ISA_TESTDEV=3Dy +CONFIG_TEST_DEVICES=3Dy CONFIG_SMC37C669=3Dy CONFIG_DP264=3Dy diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmm= u.mak index 07b1e82..0f30bd6 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -3,6 +3,7 @@ # Optional devices: # CONFIG_PCI_DEVICES=3Dy +CONFIG_TEST_DEVICES=3Dy =20 # Boards: # diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips= -softmmu-common.mak index e5f0841..ac70f00 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -31,7 +31,6 @@ CONFIG_MIPSNET=3Dy CONFIG_PFLASH_CFI01=3Dy CONFIG_I8259=3Dy CONFIG_MC146818RTC=3Dy -CONFIG_ISA_TESTDEV=3Dy CONFIG_EMPTY_SLOT=3Dy CONFIG_MIPS_CPS=3Dy CONFIG_MIPS_ITU=3Dy @@ -41,3 +40,4 @@ CONFIG_MALTA=3Dy CONFIG_MIPSSIM=3Dy CONFIG_ACPI_SMBUS=3Dy CONFIG_SMBUS_EEPROM=3Dy +CONFIG_TEST_DEVICES=3Dy diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.= mak index 87c2d6d..05ba726 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -3,6 +3,7 @@ CONFIG_PCI=3Dy CONFIG_PCI_DEVICES=3Dy CONFIG_ISA_BUS=3Dy +CONFIG_TEST_DEVICES=3Dy =20 # For embedded PPCs: CONFIG_PPC4XX=3Dy @@ -57,7 +58,6 @@ CONFIG_MAC_NEWWORLD=3Dy # For PReP CONFIG_PREP=3Dy CONFIG_PREP_PCI=3Dy -CONFIG_ISA_TESTDEV=3Dy CONFIG_RS6000_MC=3Dy CONFIG_I82374=3Dy CONFIG_I82378=3Dy diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.= mak index 1b4582a..4ebcaaa 100644 --- a/default-configs/sh4-softmmu.mak +++ b/default-configs/sh4-softmmu.mak @@ -9,9 +9,8 @@ CONFIG_IDE_MMIO=3Dy CONFIG_SM501=3Dy CONFIG_I2C=3Dy CONFIG_DDC=3Dy -CONFIG_ISA_TESTDEV=3Dy +CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy CONFIG_I82374=3Dy CONFIG_R2D=3Dy CONFIG_SHIX=3Dy -CONFIG_TEST_DEVICES=3Dy diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-soft= mmu.mak index baed9a4..4ebcaaa 100644 --- a/default-configs/sh4eb-softmmu.mak +++ b/default-configs/sh4eb-softmmu.mak @@ -9,7 +9,7 @@ CONFIG_IDE_MMIO=3Dy CONFIG_SM501=3Dy CONFIG_I2C=3Dy CONFIG_DDC=3Dy -CONFIG_ISA_TESTDEV=3Dy +CONFIG_TEST_DEVICES=3Dy CONFIG_I82378=3Dy CONFIG_I82374=3Dy CONFIG_R2D=3Dy diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index aef26a2..7fe1005 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -14,7 +14,7 @@ CONFIG_PCI_SABRE=3Dy CONFIG_SIMBA=3Dy CONFIG_SUNHME=3Dy CONFIG_MC146818RTC=3Dy -CONFIG_ISA_TESTDEV=3Dy +CONFIG_TEST_DEVICES=3Dy CONFIG_SUN4V_RTC=3Dy CONFIG_SUN4U=3Dy CONFIG_NIAGARA=3Dy diff --git a/hw/Kconfig b/hw/Kconfig index e3c380f..d5ecd02 100644 --- a/hw/Kconfig +++ b/hw/Kconfig @@ -61,6 +61,9 @@ source unicore32/Kconfig source xtensa/Kconfig =20 # Symbols used by multiple targets +config TEST_DEVICES + bool + config XILINX bool select PTIMER # for hw/timer/xilinx_timer.c diff --git a/hw/hyperv/Kconfig b/hw/hyperv/Kconfig index a178bac..892a472 100644 --- a/hw/hyperv/Kconfig +++ b/hw/hyperv/Kconfig @@ -5,5 +5,5 @@ config HYPERV =20 config HYPERV_TESTDEV bool - default y if PC + default y if TEST_DEVICES depends on HYPERV diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 823135c..3ebe30f 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -25,16 +25,17 @@ config SGA =20 config ISA_TESTDEV bool - default y if PC + default y if TEST_DEVICES + depends on ISA_BUS =20 config PCI_TESTDEV bool - default y if PCI_DEVICES + default y if TEST_DEVICES depends on PCI =20 config EDU bool - default y if PCI_DEVICES + default y if TEST_DEVICES depends on PCI =20 config PCA9552 --=20 1.8.3.1