From nobody Tue Nov 26 17:26:35 2024 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=1706537331; cv=none; d=zohomail.com; s=zohoarc; b=UjiveKffwJ8LgYs2uHpQAEkMGcDLOqZdi3ikMYJ+uwBFwYdIiNqfYxagQSzr9GrTWrr5TymwKYrif/EGs6xq8xhrLeSt1MxiKoaUOK44ERjEnMnhltEm12kqGs64lnDfjmyMv3ulI77gnEo8hc4OT+xjhYv4b5qlOh9hTIO2nOM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1706537331; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=uqlR587g0s9aEVoVSgcKUMNuiFvDn1e+qLmdN6NXKGQ=; b=cmNA5M5PkxKnzRCa3PSIZyHsC0YJKOCbytjJ20akKz91pnV9md9Hk6XLohtlHJmh/zvrFiw451C3LOypB4ARM8Wr6PhPSdv7WSbT7cXVCMYOqGPhPrWg3/0jGcmnpygKmkhG/JVp6Q2PYuRB8Oytlh13xB95gvbsckJCX+t6bvU= 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 17065373311741022.2072512972783; Mon, 29 Jan 2024 06:08:51 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rURqG-0002WQ-Eo; Mon, 29 Jan 2024 08:38: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 1rURpz-0002SX-Ch for qemu-devel@nongnu.org; Mon, 29 Jan 2024 08:38:12 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rURpu-0000mV-3J for qemu-devel@nongnu.org; Mon, 29 Jan 2024 08:38:08 -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-404-SABbkz-OMKykkZ7qbVwJsQ-1; Mon, 29 Jan 2024 08:38:04 -0500 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-a3158fbb375so137482666b.3 for ; Mon, 29 Jan 2024 05:38:03 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id q15-20020a17090622cf00b00a359afad88dsm1608952eja.10.2024.01.29.05.38.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 05:38:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706535485; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uqlR587g0s9aEVoVSgcKUMNuiFvDn1e+qLmdN6NXKGQ=; b=a03yM8tCAvOCgm6YPpinjX2XkJ+UHUXyqRv1KwpMIeA9NnEIZc4ujcvze+dBucEpno33Az EHC2BNGKfCVMSXRUh2vER4vBrVNlcx7U7EFaggSNDqTWYBFdQhJ8tzfmvzsypk6T4267so qv85uzMoF2sXNeiSHvSldAYVKQOwrO8= X-MC-Unique: SABbkz-OMKykkZ7qbVwJsQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706535482; x=1707140282; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uqlR587g0s9aEVoVSgcKUMNuiFvDn1e+qLmdN6NXKGQ=; b=K5llnqmIVInwoeWTnjyky77S4n8FgvzQetLb3UW6emdhhKuYoQv+IAOQK7kSeoR11p Ezr+zF7A1799J+zZ5rxXouQWh0+/nxVjuoBLOVNup5gHv22T0ftUC5gVxQj5H3FcalFF WQLap5oJfgRFdm8iqCiUK5n88fqOb6VmCVCGcxvVutVcc6xnnDUKBuuO8cJstFW7MfN6 tKB7XNdcZzRk4AxRsp35/XwjwdFOagLLK4Baa5PwBtjIfOD+iEeboFIkN2xwinBZM9DJ nbE+7/dp7Z1VG0UH5IsFcdbGdFUiBvR0e7rUeWLzn/9T4fHk0kqmzWLaeXorXgoK7EGu l0cQ== X-Gm-Message-State: AOJu0YwE+v7c7/3aJY935UQOvOkDGJrR4pPSGmYm0efWsrrNwvzY64pC J5P3Z7Kkqw+EFaX5YCJ5WL5mroZhE/DQS4ORuzI/utBj98ITQHKjES5r0bui4JS0+uBbsJ/I5bv 9IP0G/vZ55vQ7tQkAsGDPMwV7IbvRR59lOwYQf58vXuuSg+P0G9i+BP+jhPRR02uItAUlvFFmFW O5cWvgBKXJiGGZjE9qMou/ATLLBkd9xlJDPvZY X-Received: by 2002:a17:906:c282:b0:a35:71c3:b687 with SMTP id r2-20020a170906c28200b00a3571c3b687mr3464751ejz.55.1706535482247; Mon, 29 Jan 2024 05:38:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IFU8S5u6MfGncLkYk5HdCGvDfxdJxaV3l6aKeSXvG0BfLqlo1+W6RxLH9TXl7XTPHsLTtNF0Q== X-Received: by 2002:a17:906:c282:b0:a35:71c3:b687 with SMTP id r2-20020a170906c28200b00a3571c3b687mr3464731ejz.55.1706535481933; Mon, 29 Jan 2024 05:38:01 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH 4/4] mips: do not list individual devices from configs/ Date: Mon, 29 Jan 2024 14:37:48 +0100 Message-ID: <20240129133751.1106716-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240129133751.1106716-1-pbonzini@redhat.com> References: <20240129133751.1106716-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.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.29, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: 1706537332496100002 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. Signed-off-by: Paolo Bonzini --- configs/devices/mips-softmmu/common.mak | 28 +++----------------- configs/devices/mips64el-softmmu/default.mak | 3 --- hw/mips/loongson3_virt.c | 5 ++-- hw/display/Kconfig | 2 +- hw/mips/Kconfig | 23 +++++++++++++--- 5 files changed, 28 insertions(+), 33 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/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c index 33eae01eca2..da47af2fa71 100644 --- a/hw/mips/loongson3_virt.c +++ b/hw/mips/loongson3_virt.c @@ -447,8 +447,9 @@ static inline void loongson3_virt_devices_init(MachineS= tate *machine, =20 if (defaults_enabled() && object_class_by_name("pci-ohci")) { pci_create_simple(pci_bus, -1, "pci-ohci"); - usb_create_simple(usb_bus_find(-1), "usb-kbd"); - usb_create_simple(usb_bus_find(-1), "usb-tablet"); + Object *usb_bus =3D object_resolve_path_type("", TYPE_USB_BUS, NUL= L); + usb_create_simple(USB_BUS(usb_bus), "usb-kbd"); + usb_create_simple(USB_BUS(usb_bus), "usb-tablet"); } =20 for (i =3D 0; i < nb_nics; i++) { diff --git a/hw/display/Kconfig b/hw/display/Kconfig index 1aafe1923d2..5b2b3840f7a 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 94b969c21db..5c83ef49cf6 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -1,13 +1,19 @@ 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 - select ISA_BUS - select SERIAL_ISA + select SERIAL select MIPSNET =20 config JAZZ @@ -32,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 @@ -54,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.0