From nobody Mon Feb 9 23:59:46 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1709921628; cv=none; d=zohomail.com; s=zohoarc; b=O/IYPh+eXiqerdOZAOESqZ5Euq9T+hGlvndGB9vVnIseKbtV/51UaWATsNDaEz+QsSTKzmFRecTqM+wwnnRNKe2/a4XC8VrlcKeimBSV6p9ZSsvv5oMne/5GjaeyM0LkXrWOEL+bNigKvLF0us9z0cNzvK62BpadCjXVi6r4fU4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1709921628; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=3KoCC3GLxKllev6oWHU5ANiWBK8CXBJdkMjLAQdqd4w=; b=g1eTfvsyt2rHVaBCNRAwp5txeuYoWI14nubp+7orr8OGDvNKxP3nI90FH+B6r8fKgZAx3stEIyl5NJS8GrKcpSt4JpuK58hkE6eO6MYeTS+v/an5zXgamv6bFEh73gD+5Kk5VsNqSS1yv1k3x7gxygrpZWLnklPkAj5x/tE0tmc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1709921628712177.66701920657704; Fri, 8 Mar 2024 10:13:48 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1riehr-0007Ch-Py; Fri, 08 Mar 2024 13:12:31 -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 1riehq-0007Bn-P7 for qemu-devel@nongnu.org; Fri, 08 Mar 2024 13:12:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1riehp-0005q1-6B for qemu-devel@nongnu.org; Fri, 08 Mar 2024 13:12:30 -0500 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-325-49ZmrepCO1SFTZ2YveS47g-1; Fri, 08 Mar 2024 13:12:26 -0500 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-a45b4f09107so91456166b.1 for ; Fri, 08 Mar 2024 10:12:26 -0800 (PST) Received: from [192.168.10.118] ([151.49.77.21]) by smtp.gmail.com with ESMTPSA id w15-20020a170906480f00b00a45beabb104sm34549ejq.159.2024.03.08.10.12.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Mar 2024 10:12:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709921548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3KoCC3GLxKllev6oWHU5ANiWBK8CXBJdkMjLAQdqd4w=; b=H3IueYVFSpvtptGf0rZsoqeAHHzwKjawRp7hRiBv3ELCIO7vce3v3/OHxZbaySPFtpSW80 SMVs6m2bOkDF2k5blX5uX6Npui6QOJRdYjwd5zNuj8NbCM9fYlaq0Ehn6BketSgoMU75k8 rP6Kb6mBv5IRF9jUeDW9FrKkNxHpH2s= X-MC-Unique: 49ZmrepCO1SFTZ2YveS47g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709921544; x=1710526344; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3KoCC3GLxKllev6oWHU5ANiWBK8CXBJdkMjLAQdqd4w=; b=VF3R61X/RlhJcxXUUhlemlpjbl9giDAac/fUjDXtotsavRFhWb1Oc3fxWc9SiZ/Cf5 8EpEXIcr6VtIu4cpRDWEpg0CXvms1NE2Yek2NvCSVvQYa3gRl97qLBxStNewfnySY3ie bYEVc1SITPVN97yn30N7vCGA48h8YXPSaV9w92ac+tSNweuIHHq57Qo6JwIdQBP5Z7oX zO02Y9Mk7Etk18uzEntcF4fAqUIp7cbJ31Y5G0dKLLGtxGjgzBrto8tpIHsRvEOqa+lk n3LXEuMLqTGGfGdF9pIOGwOrmHpmS0NVt9vOboo/AkKkkFISraHiqHQxR/AFKOjALhH4 Aj9w== X-Gm-Message-State: AOJu0YxSmJzf2MQiIsPFdUEVn9pZYTtvXU4AoNNtw3ruhL1L27td56FN eLVogI1rnC9/i1Gw9NF4dhAj452jbUmmhSZHoabqeDTZHkSGdNgISeToHPB+mY2y5C6vrpnM9UL lmOD6YpDtRk+I67y7jHjy+ljvz6YeORpKBgW14pkfPuEzDImbqEP9212N8o0lMQQsiW1mL2axIV OlVzToWwkuBidwtrUEy2pySDyvVbmmaVVflucf X-Received: by 2002:a17:906:6bda:b0:a45:b1d8:200c with SMTP id t26-20020a1709066bda00b00a45b1d8200cmr7007311ejs.14.1709921544530; Fri, 08 Mar 2024 10:12:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IF+viANonRhxNsuIVU7/lpqV7pJpp/09BgxJ6igXRlFIJ3RmNo5X9MhbnggJh5FvBlNXWln2A== X-Received: by 2002:a17:906:6bda:b0:a45:b1d8:200c with SMTP id t26-20020a1709066bda00b00a45b1d8200cmr7007292ejs.14.1709921544025; Fri, 08 Mar 2024 10:12:24 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 7/9] mips: do not list individual devices from configs/ Date: Fri, 8 Mar 2024 19:11:59 +0100 Message-ID: <20240308181202.617329-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240308181202.617329-1-pbonzini@redhat.com> References: <20240308181202.617329-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.572, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1709921629556100001 Content-Type: text/plain; charset="utf-8" Add new "select" and "imply" directives if needed. The resulting config-devices.mak files are the same as before. Builds without default devices will become much smaller than before, and qtests fail (as expected, though suboptimal) for mips64-softmmu because most tests do not use -nodefaults, so remove it from build-without-defaults Signed-off-by: Paolo Bonzini --- configs/devices/mips-softmmu/common.mak | 28 +++----------------- configs/devices/mips64el-softmmu/default.mak | 3 --- .gitlab-ci.d/buildtest.yml | 2 +- hw/display/Kconfig | 2 +- hw/mips/Kconfig | 20 +++++++++++++- 5 files changed, 25 insertions(+), 30 deletions(-) diff --git a/configs/devices/mips-softmmu/common.mak b/configs/devices/mips= -softmmu/common.mak index 1a853841b27..416a5d353e8 100644 --- a/configs/devices/mips-softmmu/common.mak +++ b/configs/devices/mips-softmmu/common.mak @@ -1,28 +1,8 @@ # Common mips*-softmmu CONFIG defines =20 -CONFIG_ISA_BUS=3Dy -CONFIG_PCI=3Dy -CONFIG_PCI_DEVICES=3Dy -CONFIG_VGA_ISA=3Dy -CONFIG_VGA_MMIO=3Dy -CONFIG_VGA_CIRRUS=3Dy -CONFIG_VMWARE_VGA=3Dy -CONFIG_SERIAL=3Dy -CONFIG_SERIAL_ISA=3Dy -CONFIG_PARALLEL=3Dy -CONFIG_I8254=3Dy -CONFIG_PCSPK=3Dy -CONFIG_PCKBD=3Dy -CONFIG_FDC=3Dy -CONFIG_I8257=3Dy -CONFIG_IDE_ISA=3Dy -CONFIG_PFLASH_CFI01=3Dy -CONFIG_I8259=3Dy -CONFIG_MC146818RTC=3Dy -CONFIG_MIPS_CPS=3Dy -CONFIG_MIPS_ITU=3Dy +# Uncomment the following lines to disable these optional devices: +# CONFIG_PCI_DEVICES=3Dn +# CONFIG_TEST_DEVICES=3Dn + CONFIG_MALTA=3Dy -CONFIG_PCNET_PCI=3Dy CONFIG_MIPSSIM=3Dy -CONFIG_SMBUS_EEPROM=3Dy -CONFIG_TEST_DEVICES=3Dy diff --git a/configs/devices/mips64el-softmmu/default.mak b/configs/devices= /mips64el-softmmu/default.mak index d5188f7ea58..88a37cf27f1 100644 --- a/configs/devices/mips64el-softmmu/default.mak +++ b/configs/devices/mips64el-softmmu/default.mak @@ -3,8 +3,5 @@ include ../mips-softmmu/common.mak CONFIG_FULOONG=3Dy CONFIG_LOONGSON3V=3Dy -CONFIG_ATI_VGA=3Dy -CONFIG_RTL8139_PCI=3Dy CONFIG_JAZZ=3Dy -CONFIG_VT82C686=3Dy CONFIG_MIPS_BOSTON=3Dy diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index a1c030337b1..901265af95d 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -659,7 +659,7 @@ build-without-defaults: --disable-pie --disable-qom-cast-debug --disable-strip - TARGETS: avr-softmmu mips64-softmmu s390x-softmmu sh4-softmmu + TARGETS: avr-softmmu s390x-softmmu sh4-softmmu sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user MAKE_CHECK_ARGS: check =20 diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 07acb37dc66..234c7de027c 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -55,7 +55,7 @@ config VGA_MMIO =20 config VMWARE_VGA bool - default y if PCI_DEVICES && PC_PCI + default y if PCI_DEVICES && (PC_PCI || MIPS) depends on PCI select VGA =20 diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index e57db4f6412..5c83ef49cf6 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -1,8 +1,15 @@ config MALTA bool + imply PCNET_PCI + imply PCI_DEVICES + imply TEST_DEVICES select FDC37M81X select GT64120 + select MIPS_CPS select PIIX + select PFLASH_CFI01 + select SERIAL + select SMBUS_EEPROM =20 config MIPSSIM bool @@ -31,17 +38,26 @@ config JAZZ =20 config FULOONG bool + imply PCI_DEVICES + imply TEST_DEVICES + imply ATI_VGA + imply RTL8139_PCI select PCI_BONITO + select SMBUS_EEPROM select VT82C686 =20 config LOONGSON3V bool + imply PCI_DEVICES + imply TEST_DEVICES + imply VIRTIO_PCI + imply VIRTIO_NET imply VIRTIO_VGA imply QXL if SPICE + imply USB_OHCI_PCI select SERIAL select GOLDFISH_RTC select LOONGSON_LIOINTC - select PCI_DEVICES select PCI_EXPRESS_GENERIC_BRIDGE select MSI_NONBROKEN select FW_CFG_MIPS @@ -53,6 +69,8 @@ config MIPS_CPS =20 config MIPS_BOSTON bool + imply PCI_DEVICES + imply TEST_DEVICES select FITLOADER select MIPS_CPS select PCI_EXPRESS_XILINX --=20 2.43.2