From nobody Tue Nov 26 15:35:12 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=1706537304; cv=none; d=zohomail.com; s=zohoarc; b=G7Xi9BL9Ne0gbzNqLKKJf3rKj0sIySiIdyGhocD3qVgzRtjfL4MpoeLZYWBZ5Ou0DO973gAPKMCYrw4006NxHxcPRcwPUqKa1s9sNcvquBdp4YeV1wduDcMncQdcjgVF+wBpSsUNpsMOR4hJC5lziJWios+3kso7fuaVVaJmqWU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1706537304; 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=nLOABirsn5jmWA1R6juqxKb1mavf0htw/yc/6sFKvLU=; b=lB00cXQShfiJ3RHibQ7uCxZvRICzq5TPK2tzQKwzE71wKP7EwMNr62XWcvABLqvDh5kGXdGQ2Wk1+v045emrXV3WxkfOogoI4kHaAsX/MW7Gctc6uldHJJ2i388S+cShdiSH1Q4cWTzyqAk4OnsYfqbLFEXsOuiDHbnIiD5tCyc= 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 170653730411688.76062433225957; Mon, 29 Jan 2024 06:08:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rURpu-0002ES-27; Mon, 29 Jan 2024 08:38:06 -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 1rURpr-0002Cp-Kn for qemu-devel@nongnu.org; Mon, 29 Jan 2024 08:38:03 -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 1rURpp-0000lD-3q for qemu-devel@nongnu.org; Mon, 29 Jan 2024 08:38:02 -0500 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-81-OEdI8YtNOi-o_vUT77YDkg-1; Mon, 29 Jan 2024 08:37:57 -0500 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a35bcf841a0so46549966b.0 for ; Mon, 29 Jan 2024 05:37:57 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id pk27-20020a170906d7bb00b00a35242f5976sm3157264ejb.164.2024.01.29.05.37.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 05:37:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706535478; 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=nLOABirsn5jmWA1R6juqxKb1mavf0htw/yc/6sFKvLU=; b=Ix5GgWGSeKTObuONPXVZ5mguVwZBnbq6QWX4imbj5ANcjZfYxbbcFG9mXBm/33ubbKwVW/ TxI0N1d4caU5A5MQxC0RXyXCm21smgpb3WyvRkMdpkXEWf3AS79cznFfzCR0NH2CPRx/kc UGx54kpRO0g0JoTRY8Z2Ka4kPFvXQ8g= X-MC-Unique: OEdI8YtNOi-o_vUT77YDkg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706535475; x=1707140275; 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=nLOABirsn5jmWA1R6juqxKb1mavf0htw/yc/6sFKvLU=; b=M55szV7SLIqos2FL/h+fB5Jbczm/tgJQYlnfC+1/mDjHOVwtigCX56SKNxWTpf+jzP cprbAEfByUzGnm//FQhG4SIWIgKBsqjNTHP1fqHneOUj+PNv0HdLO9F/k9GzGmrl2YWi YkNIftWPij85AKtg2Afccbmjm2+iEyMvelZdloN2TvDZwR306xeH3bEILgT/J8X5ezPl oGcg0qpqN4YNjT1nCsTVFAb7jQhYKQWHcvJGWfA0fTTj17uEvz+aERLIJRKSCFTtkQwR hcfwC1WJQdlk+sJXZVEpw9FyaVJq+MYSmwtEy1EtdCa1zDVMH+CRNlkHyISRB2aJjXJQ AJJQ== X-Gm-Message-State: AOJu0YxH2HOsBvceRK1oZogIlC/ZABr6KWV+iaxDl6HISUznfQgyBEo4 NphpSpqLHQoo8U+lxLxdCfOJ15AHoLInYPIj/GZVA8SSXcIiuMR+Mxe7DpCITdlT5GkLEOZkgtD DuWhCAlXrmpmRCeNPNYf7f/HUhRoeaoSknmIJquj+XBOb+XNLmDKDWG0KeAx8yZlhxWX1kHAm18 PX/vfNVHKKj2SD0uYEDICl0oMtd7bO4NgrE8TW X-Received: by 2002:a17:906:fa9a:b0:a35:e22a:9d15 with SMTP id lt26-20020a170906fa9a00b00a35e22a9d15mr1031744ejb.8.1706535475746; Mon, 29 Jan 2024 05:37:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IGjDbEfbkd+1PzY3NFE1S2ScMacqj2Jbt3ZcUx6WRDSTpTvT2uGtq1CygzeQxaGDEFpFuoD8Q== X-Received: by 2002:a17:906:fa9a:b0:a35:e22a:9d15 with SMTP id lt26-20020a170906fa9a00b00a35e22a9d15mr1031729ejb.8.1706535475391; Mon, 29 Jan 2024 05:37:55 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH 1/4] isa: clean up Kconfig selections for ISA_SUPERIO Date: Mon, 29 Jan 2024 14:37:45 +0100 Message-ID: <20240129133751.1106716-2-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.129.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_H4=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: 1706537304387100001 Content-Type: text/plain; charset="utf-8" All users of ISA_SUPERIO include a floppy disk controller, serial port and parallel port via the automatic creation mechanism of isa-superio.c. Select the symbol and remove it from the dependents. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- hw/isa/Kconfig | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index 040a18c0709..7884179d08b 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -17,7 +17,11 @@ config ISA_SUPERIO bool select ISA_BUS select PCKBD + select PARALLEL + select SERIAL_ISA select FDC_ISA + # Some users of ISA_SUPERIO do not use it + #select IDE_ISA =20 config PC87312 bool @@ -26,9 +30,6 @@ config PC87312 select I8254 select I8257 select MC146818RTC - select SERIAL_ISA - select PARALLEL - select FDC_ISA select IDE_ISA =20 config PIIX @@ -49,8 +50,6 @@ config VT82C686 select ISA_SUPERIO select ACPI select ACPI_SMBUS - select SERIAL_ISA - select FDC_ISA select USB_UHCI select APM select I8254 @@ -58,14 +57,10 @@ config VT82C686 select I8259 select IDE_VIA select MC146818RTC - select PARALLEL =20 config SMC37C669 bool select ISA_SUPERIO - select SERIAL_ISA - select PARALLEL - select FDC_ISA =20 config LPC_ICH9 bool --=20 2.43.0 From nobody Tue Nov 26 15:35:12 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=1706537676; cv=none; d=zohomail.com; s=zohoarc; b=EqEdcR8XJADqXmzvLZJ3AD+lFHv68Vd26GF3UzKG/SrS9HR3ij3kOaGgRtMRLA+zZSE4+MAlaPRphBsw3wR3EooBiU2fOA+wFUGaEfWp0yHGzxQJ2zgF+3fd2WdkuObrYZJ7t7WK6nPk08MQfJztrVWZU8qiByNs8cuz7pLpL5o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1706537676; 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=/wLNrSOPwnwYcl0GYuXoPrwMHs3/ciQ0o966uZkfutc=; b=jigPX/sHXthuuGuoqP+otE6wki0IQTTI8XPone0U7xTkF2ib8L3woUsGYd65KSPNyPsWzpPA8rXtjKVWncNDEnkkMfjUWheg9VWFgFzeXWO7DPmxu0RpbIjqX8BBZRdMOYrk3E/tafW6d20ltV4+kh96EUuSw03vcPdjYQeOKJk= 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 1706537676941509.15953882463555; Mon, 29 Jan 2024 06:14:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rURq5-0002UJ-AD; Mon, 29 Jan 2024 08:38:17 -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 1rURpu-0002GS-9w for qemu-devel@nongnu.org; Mon, 29 Jan 2024 08:38:06 -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 1rURpq-0000lX-1W for qemu-devel@nongnu.org; Mon, 29 Jan 2024 08:38:04 -0500 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-54-_Xv7N__lMXq_0bLdFZMCnA-1; Mon, 29 Jan 2024 08:37:59 -0500 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-a2bc65005feso210045666b.0 for ; Mon, 29 Jan 2024 05:37:59 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id l5-20020a1709062a8500b00a35922ecbccsm1691638eje.203.2024.01.29.05.37.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 05:37:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706535481; 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=/wLNrSOPwnwYcl0GYuXoPrwMHs3/ciQ0o966uZkfutc=; b=TWY9lamWDgQMYaMCtb6Kd7iIHTmmYNrtHF7SWDIx1ww93ja03DG4JaqZCCcsH093+cE7FA MnUdmOgIBMQ2Ub1OKUlwTCtxpSfpdDt3oG2tJtqKLsy5mvhndEGGd+qJgpuYC20vObSqBI iVX3N75UvMVKvoGaN1asnslZ+67TZKI= X-MC-Unique: _Xv7N__lMXq_0bLdFZMCnA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706535477; x=1707140277; 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=/wLNrSOPwnwYcl0GYuXoPrwMHs3/ciQ0o966uZkfutc=; b=YJux8OayHzt0IbRBmDe0ydOGOiJwAaD4VSgCSCdcAbKxtGBvvO3q7OSb/QVsQTdE1d zlfgY9tGI7F+po48iLiXPlG4CcJauxm1WxhdKTqtUbFrw7qvPEHJyHC00wwJaho7fB3x NxFh7ziKa3rCAGwaTTRQQpAwDo/KX9UwBcMj0fjMBxFeOSPxYKwph+iq/EGNg6PSTE16 df5w3J+y6FRgs858Y/DyW9Qn9ZhwWwEZVILj4KAdrJ/Mx36/kthu7OFUSrv6xd7Hpuxm ExE1gPeJ9rOne98SUdj2NztVbh0QwLKpS18v7TDUJIzYr7fPNw0HdvDo8XBEvHz0FGA8 smLQ== X-Gm-Message-State: AOJu0YzFHh/AC6CFFIK+oWxQwk36BkLzvKUZqUS7zOU5orKd44CHZRUD Lsfp7yvyLnh+usd+m/nsPaDMS7cQjOD/+wqGHpR1EBzaVvExFJffdXgjfuqkpW/DIuYSp8CPJWH j5SRsEr+XfYBVm8nX7gY185+38HB3LRaDSswjZgAa3HB7ty2omYdvvfg4Qmml6Dltqx+iW/TPMJ Dz3rao5k+Hu8tN5VIGQYNnloGWVbgGsNumhLLH X-Received: by 2002:a17:906:f9c3:b0:a31:f7e:8a53 with SMTP id lj3-20020a170906f9c300b00a310f7e8a53mr4631399ejb.26.1706535477451; Mon, 29 Jan 2024 05:37:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IEdtblCbKuN4Wbe3IFW8vItLmP8PZX7ql7ctXhXJNyF9OCgjxRcfC7yvRbkKdjzGayyF/QEiQ== X-Received: by 2002:a17:906:f9c3:b0:a31:f7e:8a53 with SMTP id lj3-20020a170906f9c300b00a310f7e8a53mr4631385ejb.26.1706535477038; Mon, 29 Jan 2024 05:37:57 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH 2/4] isa: extract FDC37M81X to a separate file Date: Mon, 29 Jan 2024 14:37:46 +0100 Message-ID: <20240129133751.1106716-3-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-Type: text/plain; charset="utf-8" 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: 1706537677565100001 isa-superio.c currently defines a SuperIO chip that depends on CONFIG_IDE_ISA, but not all users of isa-superio.c depend on that symbol. Extract the chip to a separate file so that there is an obvious place to select IDE_ISA. Signed-off-by: Paolo Bonzini --- hw/isa/fdc37m81x-superio.c | 37 +++++++++++++++++++++++++++++++++++++ hw/isa/isa-superio.c | 19 ------------------- hw/isa/Kconfig | 5 +++++ hw/isa/meson.build | 1 + hw/mips/Kconfig | 2 +- 5 files changed, 44 insertions(+), 20 deletions(-) create mode 100644 hw/isa/fdc37m81x-superio.c diff --git a/hw/isa/fdc37m81x-superio.c b/hw/isa/fdc37m81x-superio.c new file mode 100644 index 00000000000..5ad769b69e8 --- /dev/null +++ b/hw/isa/fdc37m81x-superio.c @@ -0,0 +1,37 @@ +/* + * Generic ISA Super I/O + * + * Copyright (c) 2018 Philippe Mathieu-Daud=C3=A9 + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "hw/isa/superio.h" + +/* SMS FDC37M817 Super I/O */ +static void fdc37m81x_class_init(ObjectClass *klass, void *data) +{ + ISASuperIOClass *sc =3D ISA_SUPERIO_CLASS(klass); + + sc->serial.count =3D 2; /* NS16C550A */ + sc->parallel.count =3D 1; + sc->floppy.count =3D 1; /* SMSC 82077AA Compatible */ + sc->ide.count =3D 0; +} + +static const TypeInfo fdc37m81x_type_info =3D { + .name =3D TYPE_FDC37M81X_SUPERIO, + .parent =3D TYPE_ISA_SUPERIO, + .instance_size =3D sizeof(ISASuperIODevice), + .class_init =3D fdc37m81x_class_init, +}; + +static void fdc37m81x_register_types(void) +{ + type_register_static(&fdc37m81x_type_info); +} + +type_init(fdc37m81x_register_types) diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c index 7dbfc374da3..80e0c34652e 100644 --- a/hw/isa/isa-superio.c +++ b/hw/isa/isa-superio.c @@ -187,28 +187,9 @@ static const TypeInfo isa_superio_type_info =3D { .class_init =3D isa_superio_class_init, }; =20 -/* SMS FDC37M817 Super I/O */ -static void fdc37m81x_class_init(ObjectClass *klass, void *data) -{ - ISASuperIOClass *sc =3D ISA_SUPERIO_CLASS(klass); - - sc->serial.count =3D 2; /* NS16C550A */ - sc->parallel.count =3D 1; - sc->floppy.count =3D 1; /* SMSC 82077AA Compatible */ - sc->ide.count =3D 0; -} - -static const TypeInfo fdc37m81x_type_info =3D { - .name =3D TYPE_FDC37M81X_SUPERIO, - .parent =3D TYPE_ISA_SUPERIO, - .instance_size =3D sizeof(ISASuperIODevice), - .class_init =3D fdc37m81x_class_init, -}; - static void isa_superio_register_types(void) { type_register_static(&isa_superio_type_info); - type_register_static(&fdc37m81x_type_info); } =20 type_init(isa_superio_register_types) diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig index 7884179d08b..af856af052d 100644 --- a/hw/isa/Kconfig +++ b/hw/isa/Kconfig @@ -23,6 +23,11 @@ config ISA_SUPERIO # Some users of ISA_SUPERIO do not use it #select IDE_ISA =20 +config FDC37M81X + bool + select ISA_BUS + select IDE_ISA + config PC87312 bool select ISA_SUPERIO diff --git a/hw/isa/meson.build b/hw/isa/meson.build index 2ab99ce0c6b..f650b395071 100644 --- a/hw/isa/meson.build +++ b/hw/isa/meson.build @@ -4,6 +4,7 @@ system_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('isa-b= us.c')) system_ss.add(when: 'CONFIG_ISA_SUPERIO', if_true: files('isa-superio.c')) system_ss.add(when: 'CONFIG_PC87312', if_true: files('pc87312.c')) system_ss.add(when: 'CONFIG_PIIX', if_true: files('piix.c')) +system_ss.add(when: 'CONFIG_FDC37M81X', if_true: files('fdc37m81x-superio.= c')) system_ss.add(when: 'CONFIG_SMC37C669', if_true: files('smc37c669-superio.= c')) system_ss.add(when: 'CONFIG_VT82C686', if_true: files('vt82c686.c')) =20 diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index ab61af209a0..94b969c21db 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -1,7 +1,7 @@ config MALTA bool + select FDC37M81X select GT64120 - select ISA_SUPERIO select PIIX =20 config MIPSSIM --=20 2.43.0 From nobody Tue Nov 26 15:35:12 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=1706537413; cv=none; d=zohomail.com; s=zohoarc; b=OBysd0UZEHMPmLqz1ejX8y845VPzgssNNmUxpwrkOR1Tn5qAJV/6xt21swKyy4RDydOU3Z6I2/WQ6zqrpZY3z8vSdN6EV3B5c9JltfPy9oaWDfaZQidQlUwPnFQtTu3tX+K8wImc4cjmFtMwo7HF6CZUJSnHPnsmP/G6caxlCa0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1706537413; 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=1Nw+XG2iLy3sRXrIY0iWr13edbR83tRmpX3QxJPQulo=; b=TsIYG/CF6qdldaQFHk31lW5bgnhRaALY5IzazbjNDo6VjngNxeKXrBpdv51mtbwBA5DB11ieJWf1k98nNls25UC3gfSSWWVfnZIxYPlVAuFFj/nYDoqqpUCo7dzYA8NWkGeCjkHPcZ4GAZC3X8EfvpdQxE39hElfofAmriB5kes= 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 170653741306931.08526254372771; Mon, 29 Jan 2024 06:10:13 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rURqb-0002pV-5R; Mon, 29 Jan 2024 08:38:50 -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 1rURpy-0002SE-KJ for qemu-devel@nongnu.org; Mon, 29 Jan 2024 08:38:12 -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 1rURpt-0000lz-In for qemu-devel@nongnu.org; Mon, 29 Jan 2024 08:38:08 -0500 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-487-5JePgY_KPnaQL9WlSFhDUA-1; Mon, 29 Jan 2024 08:38:01 -0500 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a2f1d0c3389so134430466b.0 for ; Mon, 29 Jan 2024 05:38:01 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id hu22-20020a170907a09600b00a31641972c4sm3924139ejc.21.2024.01.29.05.37.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jan 2024 05:37:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706535482; 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=1Nw+XG2iLy3sRXrIY0iWr13edbR83tRmpX3QxJPQulo=; b=IBfu5hVeSHgLypz+z+NxFo2lqhUs3+Hag4mziL+yKM2AlYH+TRIfXaU9bCqjswZgzcfEhJ bXqWma75r4KtsM1BAB1KADHyx8iLnTXfyX2GefvnLzmxTw95bfsa3AQHri+fdUKyULgnM5 ihiMR9R5d054Vh0Fu5u2JtRSUqBhM/U= X-MC-Unique: 5JePgY_KPnaQL9WlSFhDUA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706535480; x=1707140280; 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=1Nw+XG2iLy3sRXrIY0iWr13edbR83tRmpX3QxJPQulo=; b=Db+0/S5BhnAYCp8xZ/AgWrNV0izk41qpgfPcN7AJpngcMixVjNuXNGe/0PziiBUxII loY++hMnbMlI+sq+5UH78VwHim6f+U13wbOgp9VXrh4BRnSO1Qt7buyqDYSqmwRK9CUH y0TmOOOpAEWL7YwS8fAQkLoS26Qkz2dXxp7HNak2A3rktponjSsWKDmPEV4bHdZGYjHQ HJWJ4HkaOT/2RhTxQFvk7yBi+lyBYTxLk32PHgRHzxZuVj9DDH8tC+uxTnF2FiRvnEXD w8TT23vPDYiZycmwi4QR0GJj9tioQnMZojZxO7Zgpssda1V/cZdQfF2nWumfzdlyaitx brOA== X-Gm-Message-State: AOJu0YwD+lrkQjLwU2y+EYY7faa3RctN7M1C2ljm0b8GpVtW8Rs9apHH V0GrrGOEpjY1bLbWtsGG99bfzhbKWBwXkVneoIoYB81j6e4GAq2lOUjljvTDMh9WgUKf2hUJmo7 P+TOOkYd64xGKyTii9NlshIPzKLfl4xzCXXQTR+rwV/wZ419csecO8vz9qJP1V8HxAgWxNVsSnw +Bah4JmVhvTUCiKNypjcXmKEDzULRtxtby/dyQ X-Received: by 2002:a17:906:c446:b0:a35:e5f4:fef7 with SMTP id ck6-20020a170906c44600b00a35e5f4fef7mr986641ejb.68.1706535479859; Mon, 29 Jan 2024 05:37:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IF7/Mn6u7wsNFynCBR3kv5IpeR1pKoAmfnpphDkV1IKm0RL0FswrO1ct5jpEilXPSj8FAn0Ww== X-Received: by 2002:a17:906:c446:b0:a35:e5f4:fef7 with SMTP id ck6-20020a170906c44600b00a35e5f4fef7mr986632ejb.68.1706535479596; Mon, 29 Jan 2024 05:37:59 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH 3/4] usb: inline device creation functions Date: Mon, 29 Jan 2024 14:37:47 +0100 Message-ID: <20240129133751.1106716-4-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.129.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_H4=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: 1706537414734100003 Content-Type: text/plain; charset="utf-8" Allow boards to use the device creation functions even if USB itself is not available; of course the functions will fail inexorably, but this can be okay if the calls are conditional on the existence of some USB host controller device. This is for example the case for hw/mips/loongson3_virt.c. Signed-off-by: Paolo Bonzini Acked-by: Richard Henderson --- include/hw/usb.h | 26 +++++++++++++++++++++++--- hw/usb/bus.c | 23 ----------------------- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/include/hw/usb.h b/include/hw/usb.h index 32c23a5ca2a..bd76c514d17 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -500,9 +500,6 @@ void usb_bus_release(USBBus *bus); USBBus *usb_bus_find(int busnr); void usb_legacy_register(const char *typename, const char *usbdevice_name, USBDevice *(*usbdevice_init)(void)); -USBDevice *usb_new(const char *name); -bool usb_realize_and_unref(USBDevice *dev, USBBus *bus, Error **errp); -USBDevice *usb_create_simple(USBBus *bus, const char *name); USBDevice *usbdevice_create(const char *cmdline); void usb_register_port(USBBus *bus, USBPort *port, void *opaque, int index, USBPortOps *ops, int speedmask); @@ -582,4 +579,27 @@ void usb_pcap_init(FILE *fp); void usb_pcap_ctrl(USBPacket *p, bool setup); void usb_pcap_data(USBPacket *p, bool setup); =20 +static inline USBDevice *usb_new(const char *name) +{ + return USB_DEVICE(qdev_new(name)); +} + +static inline USBDevice *usb_try_new(const char *name) +{ + return USB_DEVICE(qdev_try_new(name)); +} + +static inline bool usb_realize_and_unref(USBDevice *dev, USBBus *bus, Erro= r **errp) +{ + return qdev_realize_and_unref(&dev->qdev, &bus->qbus, errp); +} + +static inline USBDevice *usb_create_simple(USBBus *bus, const char *name) +{ + USBDevice *dev =3D usb_new(name); + + usb_realize_and_unref(dev, bus, &error_abort); + return dev; +} + #endif diff --git a/hw/usb/bus.c b/hw/usb/bus.c index 59c39945ddd..76fda41b7ec 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -329,29 +329,6 @@ void usb_legacy_register(const char *typename, const c= har *usbdevice_name, } } =20 -USBDevice *usb_new(const char *name) -{ - return USB_DEVICE(qdev_new(name)); -} - -static USBDevice *usb_try_new(const char *name) -{ - return USB_DEVICE(qdev_try_new(name)); -} - -bool usb_realize_and_unref(USBDevice *dev, USBBus *bus, Error **errp) -{ - return qdev_realize_and_unref(&dev->qdev, &bus->qbus, errp); -} - -USBDevice *usb_create_simple(USBBus *bus, const char *name) -{ - USBDevice *dev =3D usb_new(name); - - usb_realize_and_unref(dev, bus, &error_abort); - return dev; -} - static void usb_fill_port(USBPort *port, void *opaque, int index, USBPortOps *ops, int speedmask) { --=20 2.43.0 From nobody Tue Nov 26 15:35:12 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