From patchwork Mon Jan 16 12:58:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13103008 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 E0F0FC63797 for ; Mon, 16 Jan 2023 12:59:58 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHP5B-0005BR-Jo; Mon, 16 Jan 2023 07:59:25 -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 1pHP59-0005AQ-LF; Mon, 16 Jan 2023 07:59:24 -0500 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHP58-00014g-1H; Mon, 16 Jan 2023 07:59:23 -0500 Received: by mail-ej1-x629.google.com with SMTP id ss4so60629732ejb.11; Mon, 16 Jan 2023 04:59:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vDvnNleTofFVRIOnoN95BqkY3xCpBxqsWSXhf9xPH6I=; b=KypHgCttC3+NnaBH2BHOhCvu1zT163HS3dpbxammkVo7smBENGYyWpHV9vPNthU/KP I6lzPx5LXQF96aplCSN1rEeDB4WdTQKUzdXdfecjpLanwgUAVLK8Kvz8PLfNmyeu0jKi BJ2knOTGvAc76iwIiCRig7QTrHvKFD3WgA5Jhtu9W+Zn5PmuzpPabjoj7xc12csXNt5w CsrZ8jRtVKUSHfErs+fYkKQZUDYPZyoqBqOGhN2Hg6GxHnYYS0iQAhJKnyLdv4LD+Ebl kOlRFuTdBq2diSHRtWKsE/ySILyElCOmvncw9CbkE40sJyjlLpfqJNufdpOqXpUoukPY mb9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=vDvnNleTofFVRIOnoN95BqkY3xCpBxqsWSXhf9xPH6I=; b=rQb4rSdXPEEi5zfLcQk3cO4C0ta4npYVRhjYC2Rhse7n+r6YdewDQgTCXM/pnUkkTU Hxhw1m1k4rDKxHdkHHE+7YEe5WWLo1IeJz1QEvDTifVbUHglxzNcR7xVXpN7P+lACrsw v2IaRqdRauh47WH4dtE4cuVy/YRmapkMJbEyYbrtES9VRIDXeVVx70hWD3cdndnx7aym Qg9CpQd01bdd8sOsMmj6wWlpHmY3S4SoVSKANSIO/JnhPbFkxhYpQNJgd+28489VIstN RvC4g/Qp+JcwNmoJuFnwBPmLxYkihgzneVS2fIRuQwRnUi/7YWAp249PGuyF/MUrEQU/ ZZJQ== X-Gm-Message-State: AFqh2kou7tvmw4Pv45LHYgccQNr7tDspk/z89yaxZAf1vZQEv1oi/GkM eURpPCsjoNOaLc+glRf2vgkJqeAZo/o= X-Google-Smtp-Source: AMrXdXs1nxyj7kPJheEBYqppFAFIhZVokOn8AkflWgose07Z0HP0zB0i24eSwjpZNzwj+9EQ82o3nQ== X-Received: by 2002:a17:906:a82:b0:81b:f931:cb08 with SMTP id y2-20020a1709060a8200b0081bf931cb08mr12251222ejf.47.1673873959996; Mon, 16 Jan 2023 04:59:19 -0800 (PST) Received: from localhost.localdomain (dynamic-077-191-143-217.77.191.pool.telefonica.de. [77.191.143.217]) by smtp.gmail.com with ESMTPSA id um41-20020a170907cb2900b0086c4fbb8507sm3201517ejc.225.2023.01.16.04.59.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 04:59:19 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Markus Armbruster , Aurelien Jarno , Ani Sinha , Richard Henderson , Paolo Bonzini , qemu-trivial@nongnu.org, =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum , Igor Mammedov , Bernhard Beschow Subject: [PATCH v2 1/8] hw/acpi: Add missing includes Date: Mon, 16 Jan 2023 13:58:35 +0100 Message-Id: <20230116125842.66817-2-shentey@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116125842.66817-1-shentey@gmail.com> References: <20230116125842.66817-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=shentey@gmail.com; helo=mail-ej1-x629.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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 When removing the "hw/boards.h" include in hw/acpi/acpi_dev_interface.h, these include directives must be added to make the code compile again. Signed-off-by: Bernhard Beschow --- hw/acpi/hmat.h | 3 ++- hw/acpi/cpu.c | 2 ++ hw/acpi/hmat.c | 1 + hw/acpi/memory_hotplug.c | 1 + monitor/qmp-cmds.c | 1 + 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hw/acpi/hmat.h b/hw/acpi/hmat.h index b57f0e7e80..fd989cb661 100644 --- a/hw/acpi/hmat.h +++ b/hw/acpi/hmat.h @@ -27,7 +27,8 @@ #ifndef HMAT_H #define HMAT_H -#include "hw/acpi/aml-build.h" +#include "hw/acpi/bios-linker-loader.h" +#include "sysemu/numa.h" /* * ACPI 6.3: 5.2.27.3 Memory Proximity Domain Attributes Structure, diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c index 4e580959a2..9148b3a49e 100644 --- a/hw/acpi/cpu.c +++ b/hw/acpi/cpu.c @@ -1,6 +1,8 @@ #include "qemu/osdep.h" #include "migration/vmstate.h" #include "hw/acpi/cpu.h" +#include "hw/core/cpu.h" +#include "hw/boards.h" #include "qapi/error.h" #include "qapi/qapi-events-acpi.h" #include "trace.h" diff --git a/hw/acpi/hmat.c b/hw/acpi/hmat.c index 3a6d51282a..d9de0daf89 100644 --- a/hw/acpi/hmat.c +++ b/hw/acpi/hmat.c @@ -27,6 +27,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" #include "sysemu/numa.h" +#include "hw/acpi/aml-build.h" #include "hw/acpi/hmat.h" /* diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c index d926f4f77d..0b883df813 100644 --- a/hw/acpi/memory_hotplug.c +++ b/hw/acpi/memory_hotplug.c @@ -1,6 +1,7 @@ #include "qemu/osdep.h" #include "hw/acpi/memory_hotplug.h" #include "hw/mem/pc-dimm.h" +#include "hw/boards.h" #include "hw/qdev-core.h" #include "migration/vmstate.h" #include "trace.h" diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index 2932b3f3a5..45b0f2905d 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -44,6 +44,7 @@ #include "hw/acpi/acpi_dev_interface.h" #include "hw/intc/intc.h" #include "hw/rdma/rdma.h" +#include "hw/boards.h" #include "monitor/stats.h" NameInfo *qmp_query_name(Error **errp) From patchwork Mon Jan 16 12:58:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13103011 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 22CB7C54EBE for ; Mon, 16 Jan 2023 13:02:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHP5C-0005Dn-Tu; Mon, 16 Jan 2023 07:59:26 -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 1pHP5B-0005Bb-Qv; Mon, 16 Jan 2023 07:59:25 -0500 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHP59-00015l-Tf; Mon, 16 Jan 2023 07:59:25 -0500 Received: by mail-ej1-x62a.google.com with SMTP id kt14so9011665ejc.3; Mon, 16 Jan 2023 04:59:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=whT6D5WKLjFRXoHNNRzzdcMxrjsv8D/ocKlR+tR8VYk=; b=XkX+OIrpPq+GklrUO7/3QbL3KGbz7G2imlMNYZ1HCvonpFGllklNMMXKbQO/XjuBmw MFQ1R2uTl/zbI9ZWVlzJjWkSpzeYPor+fxOHuLZ05FRiWiSAZ8YX/5VHde4qa9xQ46cU TSj+8S0DrmgpctkdyfcGhkECfr5yD49VMqFxqLUEh6E4WON/+2YPtQF0CObBd4LCdWyk AIvFSA8HDeZW26SSgdxuYUSvE8VobpsRYxjjakpXwJmV6vScQ8+S90xMBhIdh5uJlnpw QpN1pvXsR2e7637/zA40bXejan1dheRxK9HUG//+8kCPuIFI1kC4csCIgq2YySkwTP5J 35JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=whT6D5WKLjFRXoHNNRzzdcMxrjsv8D/ocKlR+tR8VYk=; b=CgoYH5ftBfrwg8aCJUoBQABIlknN6j6LhNcFtjxja2o7Is9jr1q04LoKA3uJIxgHuw 8r5yVj+2x+5J/RqQyK+H9BzNThbbuLU5se5IOtWsVy8fksCY4e3YPn5tApSh6QJZe4an o2MMvXh+185SYETNw4KWxWEmtMktm2oJP691AOspKQ169FDYpTEQ+v9MO4h7miskmroT 2Dif/QPteD8mz7WRBe8BCiaPCKe49NofKLSiHVvdpTYndymvuav6Beebp5wUldz2Jx4N e2gZilKAWsIc8cyfB981ZqUX8uz/3SmMTOdbfx/HZplDs4ybkqAnsqRKB4pmvnuDj6Oy dKCA== X-Gm-Message-State: AFqh2kprNcgxNySQo66K5Vf2belF12Y34ayokM0lhsVGGG3Ah1Bdh9G8 mZWA7l26G/VrMqxA1FPQFNFZcs6L8wY= X-Google-Smtp-Source: AMrXdXudXtTgDheebzsc2BLHWq2PEForiTV53281wtgsd6PSxNIuiU2YEPtuV7uZdrtoOYAaTkGZMg== X-Received: by 2002:a17:906:39ca:b0:871:e336:cd2a with SMTP id i10-20020a17090639ca00b00871e336cd2amr658385eje.47.1673873961574; Mon, 16 Jan 2023 04:59:21 -0800 (PST) Received: from localhost.localdomain (dynamic-077-191-143-217.77.191.pool.telefonica.de. [77.191.143.217]) by smtp.gmail.com with ESMTPSA id um41-20020a170907cb2900b0086c4fbb8507sm3201517ejc.225.2023.01.16.04.59.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 04:59:21 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Markus Armbruster , Aurelien Jarno , Ani Sinha , Richard Henderson , Paolo Bonzini , qemu-trivial@nongnu.org, =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum , Igor Mammedov , Bernhard Beschow Subject: [PATCH v2 2/8] hw/acpi/acpi_dev_interface: Remove unused parameter from AcpiDeviceIfClass::madt_cpu Date: Mon, 16 Jan 2023 13:58:36 +0100 Message-Id: <20230116125842.66817-3-shentey@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116125842.66817-1-shentey@gmail.com> References: <20230116125842.66817-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62a; envelope-from=shentey@gmail.com; helo=mail-ej1-x62a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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 only function ever assigned to AcpiDeviceIfClass::madt_cpu is pc_madt_cpu_entry() which doesn't use the AcpiDeviceIf parameter. Signed-off-by: Bernhard Beschow --- include/hw/acpi/acpi_dev_interface.h | 3 +-- include/hw/i386/pc.h | 6 ++---- hw/acpi/acpi-x86-stub.c | 5 ++--- hw/acpi/cpu.c | 3 +-- hw/i386/acpi-common.c | 7 +++---- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/include/hw/acpi/acpi_dev_interface.h b/include/hw/acpi/acpi_dev_interface.h index ea6056ab92..a1648220ff 100644 --- a/include/hw/acpi/acpi_dev_interface.h +++ b/include/hw/acpi/acpi_dev_interface.h @@ -52,8 +52,7 @@ struct AcpiDeviceIfClass { /* */ void (*ospm_status)(AcpiDeviceIf *adev, ACPIOSTInfoList ***list); void (*send_event)(AcpiDeviceIf *adev, AcpiEventStatusBits ev); - void (*madt_cpu)(AcpiDeviceIf *adev, int uid, - const CPUArchIdList *apic_ids, GArray *entry, + void (*madt_cpu)(int uid, const CPUArchIdList *apic_ids, GArray *entry, bool force_enabled); }; #endif diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 991f905f5d..a0647165d1 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -9,7 +9,6 @@ #include "hw/block/flash.h" #include "hw/i386/x86.h" -#include "hw/acpi/acpi_dev_interface.h" #include "hw/hotplug.h" #include "qom/object.h" #include "hw/i386/sgx-epc.h" @@ -193,9 +192,8 @@ bool pc_system_ovmf_table_find(const char *entry, uint8_t **data, void pc_system_parse_ovmf_flash(uint8_t *flash_ptr, size_t flash_size); /* hw/i386/acpi-common.c */ -void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, - const CPUArchIdList *apic_ids, GArray *entry, - bool force_enabled); +void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids, + GArray *entry, bool force_enabled); /* sgx.c */ void pc_machine_init_sgx_epc(PCMachineState *pcms); diff --git a/hw/acpi/acpi-x86-stub.c b/hw/acpi/acpi-x86-stub.c index 3df1e090f4..d0d399d26b 100644 --- a/hw/acpi/acpi-x86-stub.c +++ b/hw/acpi/acpi-x86-stub.c @@ -2,9 +2,8 @@ #include "hw/i386/pc.h" #include "hw/i386/acpi-build.h" -void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, - const CPUArchIdList *apic_ids, GArray *entry, - bool force_enabled) +void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids, + GArray *entry, bool force_enabled) { } diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c index 9148b3a49e..c59a0acbf1 100644 --- a/hw/acpi/cpu.c +++ b/hw/acpi/cpu.c @@ -357,7 +357,6 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts, char *cphp_res_path = g_strdup_printf("%s." CPUHP_RES_DEVICE, res_root); Object *obj = object_resolve_path_type("", TYPE_ACPI_DEVICE_IF, NULL); AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_GET_CLASS(obj); - AcpiDeviceIf *adev = ACPI_DEVICE_IF(obj); cpu_ctrl_dev = aml_device("%s", cphp_res_path); { @@ -668,7 +667,7 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts, /* build _MAT object */ assert(adevc && adevc->madt_cpu); - adevc->madt_cpu(adev, i, arch_ids, madt_buf, + adevc->madt_cpu(i, arch_ids, madt_buf, true); /* set enabled flag */ aml_append(dev, aml_name_decl("_MAT", aml_buffer(madt_buf->len, (uint8_t *)madt_buf->data))); diff --git a/hw/i386/acpi-common.c b/hw/i386/acpi-common.c index 4aaafbdd7b..52e5c1439a 100644 --- a/hw/i386/acpi-common.c +++ b/hw/i386/acpi-common.c @@ -33,9 +33,8 @@ #include "acpi-build.h" #include "acpi-common.h" -void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, - const CPUArchIdList *apic_ids, GArray *entry, - bool force_enabled) +void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids, + GArray *entry, bool force_enabled) { uint32_t apic_id = apic_ids->cpus[uid].arch_id; /* Flags – Local APIC Flags */ @@ -112,7 +111,7 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker, build_append_int_noprefix(table_data, 1 /* PCAT_COMPAT */, 4); /* Flags */ for (i = 0; i < apic_ids->len; i++) { - adevc->madt_cpu(adev, i, apic_ids, table_data, false); + adevc->madt_cpu(i, apic_ids, table_data, false); if (apic_ids->cpus[i].arch_id > 254) { x2apic_mode = true; } From patchwork Mon Jan 16 12:58:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13103007 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 3A4DCC54EBE for ; Mon, 16 Jan 2023 12:59:58 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHP5F-0005FB-3R; Mon, 16 Jan 2023 07:59:29 -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 1pHP5D-0005Dx-HG; Mon, 16 Jan 2023 07:59:27 -0500 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHP5B-00016C-A8; Mon, 16 Jan 2023 07:59:27 -0500 Received: by mail-ej1-x62d.google.com with SMTP id cf18so61521174ejb.5; Mon, 16 Jan 2023 04:59:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UgcCIq04sStSaxyfa0AQh8ota7xey1Q2r5NQSKgYtsY=; b=P106dJ+S7nHbxn7aovW36gJZi1f2gDhrAXNcAdULaeNWj/VYRUi0LWYYjj2eO4WfLn xH8q0iaaEeGWQBnokiVunhFJkC6hz5kcStFyJuhO1BUq/1n+zRAGxaEwxAZ7dzmTXT4E Dn1E5PRwWKkBXfAkkKu4uUrRhjOeoSq9ikBATU6JOLtdhO//byeWtYW3OhHI+YJMmZxp aBcfTRytNfJQTUWL4Tnwy58iZbukMgO5Ziu3dXv8laKGXlaQipFyX4FHlZZ8fvIxsUQ4 ZkBZysYihXaziS6d9yC+Gm2xc3fx4/2ILMZHAF+SAixBEx5wmvCITeg6iVxntj35gzG+ wYVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=UgcCIq04sStSaxyfa0AQh8ota7xey1Q2r5NQSKgYtsY=; b=X4Qt6InyI7d5IhH9cd3ZVABbK/2QtKvG3oEAeSIxCEVNyQFtmvzIE2q+U15MyG1fH5 oSK05ggACJOK1Dk1Dwbaz+ZpRzv5Lw3xO8jfTc4PB4eh8i2jITuEG1LEUg3iPUPzouxg i+NY6aYU3F8rrxKAvr5wOjo3sxKGav6aBFjIQuoq8NKaUqiBB4TAFeqISIhfSaVSTd5T JcG5fn6NmxGmlju+tXPiRmANA/VYlvQsshhDohTtYdyaEj8Frs9i3Z01JsIvWsoOWiJq BkwjojSkV6xvsC1XpPQsOjJh43jgpZ5aGE8p5KC7BbQ2veN6MftqMttLH82KwdM8CVht aZIA== X-Gm-Message-State: AFqh2koNo2VwN6KLgajr1uiPlV6Nhr0CPPdcdU70FGz5zHqcRFz0xQ2i pJQBIJ8eieG30cmV0bTBuIJx/Y5HB1c= X-Google-Smtp-Source: AMrXdXuWvt8JA9f1qT4P/WOuqI/Z/+Fi3z1l52pYGjCMqrMbGPg/GtMqoqcNGTAjQCaTNmrR+qGfSw== X-Received: by 2002:a17:907:d48e:b0:862:fc76:6f8e with SMTP id vj14-20020a170907d48e00b00862fc766f8emr19052980ejc.36.1673873963009; Mon, 16 Jan 2023 04:59:23 -0800 (PST) Received: from localhost.localdomain (dynamic-077-191-143-217.77.191.pool.telefonica.de. [77.191.143.217]) by smtp.gmail.com with ESMTPSA id um41-20020a170907cb2900b0086c4fbb8507sm3201517ejc.225.2023.01.16.04.59.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 04:59:22 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Markus Armbruster , Aurelien Jarno , Ani Sinha , Richard Henderson , Paolo Bonzini , qemu-trivial@nongnu.org, =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum , Igor Mammedov , Bernhard Beschow Subject: [PATCH v2 3/8] hw/acpi/acpi_dev_interface: Resolve AcpiDeviceIfClass::madt_cpu Date: Mon, 16 Jan 2023 13:58:37 +0100 Message-Id: <20230116125842.66817-4-shentey@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116125842.66817-1-shentey@gmail.com> References: <20230116125842.66817-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=shentey@gmail.com; helo=mail-ej1-x62d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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 This class attribute was always set to pc_madt_cpu_entry(). pc_madt_cpu_entry() is architecture dependent and was assigned to the attribute even in architecture agnostic code such as in hw/acpi/piix4.c and hw/isa/lpc_ich9. Not having to set madt_cpu there resolves the assumption that these device models are only ever used with ACPI on x86 targets. The only target independent location where madt_cpu was called was hw/ acpi/cpu.c. Here a function pointer can be passed via an argument instead. The other locations where it was called was in x86 specific code where pc_madt_cpu_entry() can be used directly. Signed-off-by: Bernhard Beschow --- hw/i386/acpi-common.h | 7 +++++-- include/hw/acpi/acpi_dev_interface.h | 3 --- include/hw/acpi/cpu.h | 6 +++++- include/hw/i386/pc.h | 4 ---- hw/acpi/acpi-x86-stub.c | 6 ------ hw/acpi/cpu.c | 11 ++++------- hw/acpi/piix4.c | 2 -- hw/i386/acpi-build.c | 5 ++--- hw/i386/acpi-common.c | 5 ++--- hw/i386/acpi-microvm.c | 3 +-- hw/i386/generic_event_device_x86.c | 9 --------- hw/isa/lpc_ich9.c | 1 - 12 files changed, 19 insertions(+), 43 deletions(-) diff --git a/hw/i386/acpi-common.h b/hw/i386/acpi-common.h index a68825acf5..968d625d88 100644 --- a/hw/i386/acpi-common.h +++ b/hw/i386/acpi-common.h @@ -1,15 +1,18 @@ #ifndef HW_I386_ACPI_COMMON_H #define HW_I386_ACPI_COMMON_H -#include "hw/acpi/acpi_dev_interface.h" #include "hw/acpi/bios-linker-loader.h" #include "hw/i386/x86.h" +#include "hw/boards.h" /* Default IOAPIC ID */ #define ACPI_BUILD_IOAPIC_ID 0x0 +void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids, GArray *entry, + bool force_enabled); + void acpi_build_madt(GArray *table_data, BIOSLinker *linker, - X86MachineState *x86ms, AcpiDeviceIf *adev, + X86MachineState *x86ms, const char *oem_id, const char *oem_table_id); #endif diff --git a/include/hw/acpi/acpi_dev_interface.h b/include/hw/acpi/acpi_dev_interface.h index a1648220ff..68d9d15f50 100644 --- a/include/hw/acpi/acpi_dev_interface.h +++ b/include/hw/acpi/acpi_dev_interface.h @@ -3,7 +3,6 @@ #include "qapi/qapi-types-acpi.h" #include "qom/object.h" -#include "hw/boards.h" #include "hw/qdev-core.h" /* These values are part of guest ABI, and can not be changed */ @@ -52,7 +51,5 @@ struct AcpiDeviceIfClass { /* */ void (*ospm_status)(AcpiDeviceIf *adev, ACPIOSTInfoList ***list); void (*send_event)(AcpiDeviceIf *adev, AcpiEventStatusBits ev); - void (*madt_cpu)(int uid, const CPUArchIdList *apic_ids, GArray *entry, - bool force_enabled); }; #endif diff --git a/include/hw/acpi/cpu.h b/include/hw/acpi/cpu.h index 999caaf510..25b25bb594 100644 --- a/include/hw/acpi/cpu.h +++ b/include/hw/acpi/cpu.h @@ -15,6 +15,7 @@ #include "hw/qdev-core.h" #include "hw/acpi/acpi.h" #include "hw/acpi/aml-build.h" +#include "hw/boards.h" #include "hw/hotplug.h" typedef struct AcpiCpuStatus { @@ -55,8 +56,11 @@ typedef struct CPUHotplugFeatures { const char *smi_path; } CPUHotplugFeatures; +typedef void (*madt_cpu_fn)(int uid, const CPUArchIdList *apic_ids, + GArray *entry, bool force_enabled); + void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts, - hwaddr io_base, + hwaddr io_base, madt_cpu_fn madt_cpu, const char *res_root, const char *event_handler_method); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index a0647165d1..a5cce88653 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -191,10 +191,6 @@ bool pc_system_ovmf_table_find(const char *entry, uint8_t **data, int *data_len); void pc_system_parse_ovmf_flash(uint8_t *flash_ptr, size_t flash_size); -/* hw/i386/acpi-common.c */ -void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids, - GArray *entry, bool force_enabled); - /* sgx.c */ void pc_machine_init_sgx_epc(PCMachineState *pcms); diff --git a/hw/acpi/acpi-x86-stub.c b/hw/acpi/acpi-x86-stub.c index d0d399d26b..9662a594ad 100644 --- a/hw/acpi/acpi-x86-stub.c +++ b/hw/acpi/acpi-x86-stub.c @@ -1,12 +1,6 @@ #include "qemu/osdep.h" -#include "hw/i386/pc.h" #include "hw/i386/acpi-build.h" -void pc_madt_cpu_entry(int uid, const CPUArchIdList *apic_ids, - GArray *entry, bool force_enabled) -{ -} - Object *acpi_get_i386_pci_host(void) { return NULL; diff --git a/hw/acpi/cpu.c b/hw/acpi/cpu.c index c59a0acbf1..bc77c00d66 100644 --- a/hw/acpi/cpu.c +++ b/hw/acpi/cpu.c @@ -2,7 +2,6 @@ #include "migration/vmstate.h" #include "hw/acpi/cpu.h" #include "hw/core/cpu.h" -#include "hw/boards.h" #include "qapi/error.h" #include "qapi/qapi-events-acpi.h" #include "trace.h" @@ -340,7 +339,7 @@ const VMStateDescription vmstate_cpu_hotplug = { #define CPU_FW_EJECT_EVENT "CEJF" void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts, - hwaddr io_base, + hwaddr io_base, madt_cpu_fn madt_cpu, const char *res_root, const char *event_handler_method) { @@ -355,8 +354,8 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts, MachineClass *mc = MACHINE_GET_CLASS(machine); const CPUArchIdList *arch_ids = mc->possible_cpu_arch_ids(machine); char *cphp_res_path = g_strdup_printf("%s." CPUHP_RES_DEVICE, res_root); - Object *obj = object_resolve_path_type("", TYPE_ACPI_DEVICE_IF, NULL); - AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_GET_CLASS(obj); + + assert(madt_cpu); cpu_ctrl_dev = aml_device("%s", cphp_res_path); { @@ -666,9 +665,7 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts, aml_append(dev, method); /* build _MAT object */ - assert(adevc && adevc->madt_cpu); - adevc->madt_cpu(i, arch_ids, madt_buf, - true); /* set enabled flag */ + madt_cpu(i, arch_ids, madt_buf, true /* set enabled flag */); aml_append(dev, aml_name_decl("_MAT", aml_buffer(madt_buf->len, (uint8_t *)madt_buf->data))); g_array_free(madt_buf, true); diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 0a81f1ad93..4d0d4fdeeb 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -20,7 +20,6 @@ */ #include "qemu/osdep.h" -#include "hw/i386/pc.h" #include "hw/southbridge/piix.h" #include "hw/irq.h" #include "hw/isa/apm.h" @@ -643,7 +642,6 @@ static void piix4_pm_class_init(ObjectClass *klass, void *data) hc->unplug = piix4_device_unplug_cb; adevc->ospm_status = piix4_ospm_status; adevc->send_event = piix4_send_gpe; - adevc->madt_cpu = pc_madt_cpu_entry; } static const TypeInfo piix4_pm_info = { diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 127c4e2d50..0be3960a37 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1440,7 +1440,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, .fw_unplugs_cpu = pm->smi_on_cpu_unplug, }; build_cpus_aml(dsdt, machine, opts, pm->cpu_hp_io_base, - "\\_SB.PCI0", "\\_GPE._E02"); + pc_madt_cpu_entry, "\\_SB.PCI0", "\\_GPE._E02"); } if (pcms->memhp_io_base && nr_mem) { @@ -2424,8 +2424,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) acpi_add_table(table_offsets, tables_blob); acpi_build_madt(tables_blob, tables->linker, x86ms, - ACPI_DEVICE_IF(x86ms->acpi_dev), x86ms->oem_id, - x86ms->oem_table_id); + x86ms->oem_id, x86ms->oem_table_id); #ifdef CONFIG_ACPI_ERST { diff --git a/hw/i386/acpi-common.c b/hw/i386/acpi-common.c index 52e5c1439a..aabf78092e 100644 --- a/hw/i386/acpi-common.c +++ b/hw/i386/acpi-common.c @@ -94,14 +94,13 @@ build_xrupt_override(GArray *entry, uint8_t src, uint32_t gsi, uint16_t flags) * 5.2.8 Multiple APIC Description Table */ void acpi_build_madt(GArray *table_data, BIOSLinker *linker, - X86MachineState *x86ms, AcpiDeviceIf *adev, + X86MachineState *x86ms, const char *oem_id, const char *oem_table_id) { int i; bool x2apic_mode = false; MachineClass *mc = MACHINE_GET_CLASS(x86ms); const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(MACHINE(x86ms)); - AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_GET_CLASS(adev); AcpiTable table = { .sig = "APIC", .rev = 1, .oem_id = oem_id, .oem_table_id = oem_table_id }; @@ -111,7 +110,7 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *linker, build_append_int_noprefix(table_data, 1 /* PCAT_COMPAT */, 4); /* Flags */ for (i = 0; i < apic_ids->len; i++) { - adevc->madt_cpu(i, apic_ids, table_data, false); + pc_madt_cpu_entry(i, apic_ids, table_data, false); if (apic_ids->cpus[i].arch_id > 254) { x2apic_mode = true; } diff --git a/hw/i386/acpi-microvm.c b/hw/i386/acpi-microvm.c index fb09185cbd..d8a444d06c 100644 --- a/hw/i386/acpi-microvm.c +++ b/hw/i386/acpi-microvm.c @@ -213,8 +213,7 @@ static void acpi_build_microvm(AcpiBuildTables *tables, acpi_add_table(table_offsets, tables_blob); acpi_build_madt(tables_blob, tables->linker, X86_MACHINE(machine), - ACPI_DEVICE_IF(x86ms->acpi_dev), x86ms->oem_id, - x86ms->oem_table_id); + x86ms->oem_id, x86ms->oem_table_id); #ifdef CONFIG_ACPI_ERST { diff --git a/hw/i386/generic_event_device_x86.c b/hw/i386/generic_event_device_x86.c index e26fb02a2e..8fc233e1f1 100644 --- a/hw/i386/generic_event_device_x86.c +++ b/hw/i386/generic_event_device_x86.c @@ -8,19 +8,10 @@ #include "qemu/osdep.h" #include "hw/acpi/generic_event_device.h" -#include "hw/i386/pc.h" - -static void acpi_ged_x86_class_init(ObjectClass *class, void *data) -{ - AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_CLASS(class); - - adevc->madt_cpu = pc_madt_cpu_entry; -} static const TypeInfo acpi_ged_x86_info = { .name = TYPE_ACPI_GED_X86, .parent = TYPE_ACPI_GED, - .class_init = acpi_ged_x86_class_init, .interfaces = (InterfaceInfo[]) { { TYPE_HOTPLUG_HANDLER }, { TYPE_ACPI_DEVICE_IF }, diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 8d541e2b54..0ab0a341be 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -870,7 +870,6 @@ static void ich9_lpc_class_init(ObjectClass *klass, void *data) hc->unplug = ich9_pm_device_unplug_cb; adevc->ospm_status = ich9_pm_ospm_status; adevc->send_event = ich9_send_gpe; - adevc->madt_cpu = pc_madt_cpu_entry; amldevc->build_dev_aml = build_ich9_isa_aml; } From patchwork Mon Jan 16 12:58:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13103013 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 6E4D2C63797 for ; Mon, 16 Jan 2023 13:03:10 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHP5H-0005JP-BE; Mon, 16 Jan 2023 07:59: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 1pHP5F-0005FC-3V; Mon, 16 Jan 2023 07:59:29 -0500 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHP5D-00016o-J2; Mon, 16 Jan 2023 07:59:28 -0500 Received: by mail-ej1-x633.google.com with SMTP id vm8so67883277ejc.2; Mon, 16 Jan 2023 04:59:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HGFA1IAZGe7qEvZ3mo0CJqcNUUJ0fER/+h+Iq3ohYkY=; b=YoHcmawVVJYoZ/xrwe1bot5g9gk5c/5y5oOXkBWCZzNGaU0/vVwBgERLjsqfRc+M4J Df5vudY9rRAzeDq8JuRTT7aL4bmSuK6s21q7xVq7kNHlzvUcmVlXwRaytwq1F0AviwxZ HLkJf+L3+6JbdQ8K75sBeVA3AK/UhQMH2dhYjOxOwb+7nOSHd5HxuM4KnOLBD2A412qd GMHh8LtE6ZxUX9DB6AT1E8RLEwU4Ryv3Z8iGjzkYReqh/E8/9OtU3sHqYn7VJP45onBG jZmoX7SDU4xGVyP7wr9V+skqaH0sgatq+do0moM2zpR2AHcOeuRh0x6ILhlnu2+wxWhK mUWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=HGFA1IAZGe7qEvZ3mo0CJqcNUUJ0fER/+h+Iq3ohYkY=; b=Bp6dgBa6fC7X+ZdU5F8Cb1E2UxBujZgtoJGhi7ME/macnNlo7NKNdaC5TgSLdsJplo 10YWwKxYTR8vWt2zRyW7R2mxE37cRoKorOXVhOn94gk/CmTcv9Js68jZvvCNaJShVZAT I2BzqGxj+kTa401XzYu7Qntps+G9dpVJ4ZlaTgCMbYgO4VqTGj+D7Dmff+cF6MSI9M0p Bff9mZxPrp3ebrwf3WCn4uIvJNM8smNJhIaiU+2/vHpPn87aLy1Iq8uT4DLMEGrKvYTt xSGvzAYaQSUu0gabi2kc1qGntMTNn4fIGzjfpsgmUZunFzdJLzPA2UNV/lS6gKnA6e/k T/bw== X-Gm-Message-State: AFqh2kq4CFw5pwF0ehWPQI49QF03g97vCz/j7bepzvlWwF2PH4RI1SVA OB0Hp4g9FKZvofEZbtR7l3+UnTQ82NE= X-Google-Smtp-Source: AMrXdXvKNr/TKo+mPQjGCVIho/bgmIyTLlM8UZgKNjMfqHzIfpMGM1T/fBIG6cxFLHubUVcDpJM0eg== X-Received: by 2002:a17:906:fcc8:b0:863:e38b:5b0a with SMTP id qx8-20020a170906fcc800b00863e38b5b0amr16698142ejb.65.1673873965691; Mon, 16 Jan 2023 04:59:25 -0800 (PST) Received: from localhost.localdomain (dynamic-077-191-143-217.77.191.pool.telefonica.de. [77.191.143.217]) by smtp.gmail.com with ESMTPSA id um41-20020a170907cb2900b0086c4fbb8507sm3201517ejc.225.2023.01.16.04.59.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 04:59:25 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Markus Armbruster , Aurelien Jarno , Ani Sinha , Richard Henderson , Paolo Bonzini , qemu-trivial@nongnu.org, =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum , Igor Mammedov , Bernhard Beschow Subject: [PATCH v2 4/8] hw/acpi/piix4: No need to #include "hw/southbridge/piix.h" Date: Mon, 16 Jan 2023 13:58:38 +0100 Message-Id: <20230116125842.66817-5-shentey@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116125842.66817-1-shentey@gmail.com> References: <20230116125842.66817-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::633; envelope-from=shentey@gmail.com; helo=mail-ej1-x633.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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 hw/acpi/piix4 has its own header with its structure definition etc. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daudé --- hw/acpi/piix4.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 4d0d4fdeeb..2e19a55526 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -20,7 +20,6 @@ */ #include "qemu/osdep.h" -#include "hw/southbridge/piix.h" #include "hw/irq.h" #include "hw/isa/apm.h" #include "hw/i2c/pm_smbus.h" From patchwork Mon Jan 16 12:58:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13103009 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 865CCC46467 for ; Mon, 16 Jan 2023 13:02:14 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHP5K-0005Ns-KB; Mon, 16 Jan 2023 07:59:36 -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 1pHP5H-0005Ji-El; Mon, 16 Jan 2023 07:59:31 -0500 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHP5F-000177-QE; Mon, 16 Jan 2023 07:59:31 -0500 Received: by mail-ed1-x536.google.com with SMTP id v30so40612050edb.9; Mon, 16 Jan 2023 04:59:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FIPjagYbHti5a3V5WvuYNbsfsB1fpcKo6VchvNPRZ9g=; b=F7ZPnD4XT5mWnoeM2E3NdFooCIT+5e+U5H2dyjTW7th/CyZsTccUkJs7c3u/mn7FmZ WFic/GIT8wPVvLnI//8oGq4swpALSAjxtz/lOESnp/KsZK4dAHMpG3I/oAjeXM71nJNk xMWvE+T8lB2RtUFauLwJYoGEsmo2RfeiOOhP4B3N8W1yS6xikK7rIJAYAPysQYTZ1eqh OLOuHoX7K9blmvh3c59VTHDao37GVubNRFyQE/sQ/vgFBuJnzuCc3Meotza2EJjbb/wV vloJ+7TEmR6HAddO1Ze56ybwldcLs40IUx4jyAQnp13Ue+uQbi+A12GgpIZTP6YY0276 26Kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=FIPjagYbHti5a3V5WvuYNbsfsB1fpcKo6VchvNPRZ9g=; b=jtuaFyop040JrypSpyc+SY1iLrgKWBCy1nmmvEYzCpEAuFE0Yso2Nv4s1+szbaluuC jx/49OV/za0mmcIt9k7An2IJ4/zPEnyycvDuSboYR8eSBKugvkvZPq/iE7egVoRhYWSu aTKuWz/Hy1Lto3WOig/PPEZL+jGq90JpZ1O4Vm7DE1+8xjlcA2cYFXXJdbNp7RU72duV o0MutRNeJpZS/saqcFexUW2HnDBQgekHGvXrI/mHA15E8JGbjjC4X5j3H1Mr86y0co8f pVrGvdKfAirWN/GpDwYNfrh6QiTezbX9gkLKWNOugFoJXmXpM4RthlIYKtM3nrzD/kbh 0TuQ== X-Gm-Message-State: AFqh2krJdXkL0kS48SOIG4mIXPv3JVZHjqnpFpw2lJgBaCiI6aX7ZPW+ w5WzC/NO6cUxG4wTyPL0AWDE3OfjTt0= X-Google-Smtp-Source: AMrXdXv/OpveEDg7glaD//1HABJ+nKEsos6Xd5m2FP1qD2MkND7/EVZSTh6BzCsXGnThAgu6EAt57w== X-Received: by 2002:a05:6402:381b:b0:497:233d:3ef4 with SMTP id es27-20020a056402381b00b00497233d3ef4mr42279349edb.22.1673873967653; Mon, 16 Jan 2023 04:59:27 -0800 (PST) Received: from localhost.localdomain (dynamic-077-191-143-217.77.191.pool.telefonica.de. [77.191.143.217]) by smtp.gmail.com with ESMTPSA id um41-20020a170907cb2900b0086c4fbb8507sm3201517ejc.225.2023.01.16.04.59.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 04:59:27 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Markus Armbruster , Aurelien Jarno , Ani Sinha , Richard Henderson , Paolo Bonzini , qemu-trivial@nongnu.org, =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum , Igor Mammedov , Bernhard Beschow Subject: [PATCH v2 5/8] hw/i386/acpi-build: Remove unused attributes Date: Mon, 16 Jan 2023 13:58:39 +0100 Message-Id: <20230116125842.66817-6-shentey@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116125842.66817-1-shentey@gmail.com> References: <20230116125842.66817-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::536; envelope-from=shentey@gmail.com; helo=mail-ed1-x536.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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 Ammends commit 3db119da7915 'pc: acpi: switch to AML API composed DSDT'. Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daudé --- hw/i386/acpi-build.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 0be3960a37..428328dc2d 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -117,8 +117,6 @@ typedef struct AcpiMiscInfo { #ifdef CONFIG_TPM TPMVersion tpm_version; #endif - const unsigned char *dsdt_code; - unsigned dsdt_size; } AcpiMiscInfo; typedef struct FwCfgTPMConfig { From patchwork Mon Jan 16 12:58:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13103006 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 BF2FEC46467 for ; Mon, 16 Jan 2023 12:59:58 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHP5R-0005RS-DW; Mon, 16 Jan 2023 07:59:45 -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 1pHP5J-0005Nd-IJ; Mon, 16 Jan 2023 07:59:33 -0500 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHP5H-00017c-Oy; Mon, 16 Jan 2023 07:59:33 -0500 Received: by mail-ej1-x636.google.com with SMTP id v6so24894785ejg.6; Mon, 16 Jan 2023 04:59:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/GmSyQtA9EZqK3gmKwXH6/dze8F/QLFLhSnRdmS42qw=; b=a0EzVJVjBHm/IwUy/rPSwVl3/wJuG9rN6Rn8qibz2yqOvMOrJyOuqgkaLOQxK3NtfP 5jRjnVeuZr1+gkF7jFfdy0ZfTTE48AM26G3DcIcyw+YVuGmkV0cp7HpVYuJ3Q8rdkSah AOjQOOs9MwNYKYdoWuH/Pq/GzbNkqsrjld4wmm97B8oQTDsQlEuD8Eyb6f38yDRRofdb e017G0XXPX7laWFNAdvjAPqFHfS/5Lw4ICkUqdoKiL+SeTqOlILXDwOVFPiJS9SjLJed uR02+wWAkkXM6jRhia5uHtc+WpwMEPY0ziaNClu3yOSobyTsQNiyoolIXbT/D+Zz2udg T+xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=/GmSyQtA9EZqK3gmKwXH6/dze8F/QLFLhSnRdmS42qw=; b=mW95g2Hp0JsrdZ9PGwQ1MDIxwhbiEMuSHartFuPu7rzkopxhdD4hjoFi07xYeGcmd1 y0sduxLgtUSqbPaYtWkJ+/osJIXSmfMbto+HMWkpPsUfgWWaiOjOx+dCIdw2KM9kmhJh b6lDr9M5kmQCO4e7vDU/ri1XAkNa93rPMdvKdmF6zjbEYFeH6DPBwnCBjPZ0FUWh2EuY AuZU5xIwct/pI6DcpiUaWT6rcrp0Kt2SPJ82ml2pEaqKB5q56Na7CoemKPuVrvEx8ACX pohoNGpZe36myS/lsIfygycfjU8po6EWgRFiGNp0kQker/obc3DRkygueFK7yG2mhFgq BgBw== X-Gm-Message-State: AFqh2krORWhTmmyBoJG7zFy+66AMaoH3Sov3AIlCtM/n4eHyIYdvUAP5 IVxOeLKjvwncUViDKrE2SjMKRgtD09Y= X-Google-Smtp-Source: AMrXdXuO/95i0AUc7D4L/3+Orw2P/6c4nYTqkiJcRNEuVcYchQnTiC3sfUWzAIoeIisaMKJsADkajg== X-Received: by 2002:a17:906:6881:b0:84d:4d6c:a462 with SMTP id n1-20020a170906688100b0084d4d6ca462mr23840629ejr.25.1673873969655; Mon, 16 Jan 2023 04:59:29 -0800 (PST) Received: from localhost.localdomain (dynamic-077-191-143-217.77.191.pool.telefonica.de. [77.191.143.217]) by smtp.gmail.com with ESMTPSA id um41-20020a170907cb2900b0086c4fbb8507sm3201517ejc.225.2023.01.16.04.59.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 04:59:29 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Markus Armbruster , Aurelien Jarno , Ani Sinha , Richard Henderson , Paolo Bonzini , qemu-trivial@nongnu.org, =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum , Igor Mammedov , Bernhard Beschow Subject: [PATCH v2 6/8] hw/acpi/acpi_aml_interface: Extract qbus_build_aml() Date: Mon, 16 Jan 2023 13:58:40 +0100 Message-Id: <20230116125842.66817-7-shentey@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116125842.66817-1-shentey@gmail.com> References: <20230116125842.66817-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::636; envelope-from=shentey@gmail.com; helo=mail-ej1-x636.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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 Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daudé --- include/hw/acpi/acpi_aml_interface.h | 3 +++ hw/acpi/acpi_interface.c | 10 ++++++++++ hw/i2c/smbus_ich9.c | 5 +---- hw/isa/lpc_ich9.c | 5 +---- hw/isa/piix3.c | 5 +---- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/include/hw/acpi/acpi_aml_interface.h b/include/hw/acpi/acpi_aml_interface.h index 436da069d6..11748a8866 100644 --- a/include/hw/acpi/acpi_aml_interface.h +++ b/include/hw/acpi/acpi_aml_interface.h @@ -3,6 +3,7 @@ #include "qom/object.h" #include "hw/acpi/aml-build.h" +#include "hw/qdev-core.h" #define TYPE_ACPI_DEV_AML_IF "acpi-dev-aml-interface" typedef struct AcpiDevAmlIfClass AcpiDevAmlIfClass; @@ -46,4 +47,6 @@ static inline void call_dev_aml_func(DeviceState *dev, Aml *scope) } } +void qbus_build_aml(BusState *bus, Aml *scope); + #endif diff --git a/hw/acpi/acpi_interface.c b/hw/acpi/acpi_interface.c index c668d361f6..8637ff18fc 100644 --- a/hw/acpi/acpi_interface.c +++ b/hw/acpi/acpi_interface.c @@ -2,6 +2,7 @@ #include "hw/acpi/acpi_dev_interface.h" #include "hw/acpi/acpi_aml_interface.h" #include "qemu/module.h" +#include "qemu/queue.h" void acpi_send_event(DeviceState *dev, AcpiEventStatusBits event) { @@ -12,6 +13,15 @@ void acpi_send_event(DeviceState *dev, AcpiEventStatusBits event) } } +void qbus_build_aml(BusState *bus, Aml *scope) +{ + BusChild *kid; + + QTAILQ_FOREACH(kid, &bus->children, sibling) { + call_dev_aml_func(DEVICE(kid->child), scope); + } +} + static void register_types(void) { static const TypeInfo acpi_dev_if_info = { diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c index ee50ba1f2c..52ba77f3fc 100644 --- a/hw/i2c/smbus_ich9.c +++ b/hw/i2c/smbus_ich9.c @@ -97,13 +97,10 @@ static void ich9_smbus_realize(PCIDevice *d, Error **errp) static void build_ich9_smb_aml(AcpiDevAmlIf *adev, Aml *scope) { - BusChild *kid; ICH9SMBState *s = ICH9_SMB_DEVICE(adev); BusState *bus = BUS(s->smb.smbus); - QTAILQ_FOREACH(kid, &bus->children, sibling) { - call_dev_aml_func(DEVICE(kid->child), scope); - } + qbus_build_aml(bus, scope); } static void ich9_smb_class_init(ObjectClass *klass, void *data) diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 0ab0a341be..d5d4b0f177 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -813,7 +813,6 @@ static void ich9_send_gpe(AcpiDeviceIf *adev, AcpiEventStatusBits ev) static void build_ich9_isa_aml(AcpiDevAmlIf *adev, Aml *scope) { Aml *field; - BusChild *kid; ICH9LPCState *s = ICH9_LPC_DEVICE(adev); BusState *bus = BUS(s->isa_bus); Aml *sb_scope = aml_scope("\\_SB"); @@ -835,9 +834,7 @@ static void build_ich9_isa_aml(AcpiDevAmlIf *adev, Aml *scope) aml_append(sb_scope, field); aml_append(scope, sb_scope); - QTAILQ_FOREACH(kid, &bus->children, sibling) { - call_dev_aml_func(DEVICE(kid->child), scope); - } + qbus_build_aml(bus, scope); } static void ich9_lpc_class_init(ObjectClass *klass, void *data) diff --git a/hw/isa/piix3.c b/hw/isa/piix3.c index eabad7ba58..93077bb3b9 100644 --- a/hw/isa/piix3.c +++ b/hw/isa/piix3.c @@ -317,7 +317,6 @@ static void pci_piix3_realize(PCIDevice *dev, Error **errp) static void build_pci_isa_aml(AcpiDevAmlIf *adev, Aml *scope) { Aml *field; - BusChild *kid; Aml *sb_scope = aml_scope("\\_SB"); BusState *bus = qdev_get_child_bus(DEVICE(adev), "isa.0"); @@ -333,9 +332,7 @@ static void build_pci_isa_aml(AcpiDevAmlIf *adev, Aml *scope) aml_append(sb_scope, field); aml_append(scope, sb_scope); - QTAILQ_FOREACH(kid, &bus->children, sibling) { - call_dev_aml_func(DEVICE(kid->child), scope); - } + qbus_build_aml(bus, scope); } static void pci_piix3_class_init(ObjectClass *klass, void *data) From patchwork Mon Jan 16 12:58:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13103012 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 0DF64C63797 for ; Mon, 16 Jan 2023 13:02:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHP5f-0005Z3-Ft; Mon, 16 Jan 2023 07:59:55 -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 1pHP5K-0005Qp-Sy; Mon, 16 Jan 2023 07:59:36 -0500 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHP5J-00017s-7h; Mon, 16 Jan 2023 07:59:34 -0500 Received: by mail-ej1-x631.google.com with SMTP id qx13so9535785ejb.13; Mon, 16 Jan 2023 04:59:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=C3aXSHolNmoD+uAWx1iQQB3uBgq7VIljmtpVGikvpuU=; b=bIH+NF7fMl7RaZ9RSv9OeaGSoipCcZ8xc4kjCW4qxRl0tkUL/KCNkvbXqCyH7HtJZB U4pbFpk3Z80EpkD4iJBDOyWxwxJyucba71CPGW48sQql6P4Y9iWhb0IjfmHNoNA5N1kl 1/LGAHkj+1HmIBgdCEbws6bTCJYtKUfpx+YKBfHB2lUYvOdGpu58XsbHPOv4k/J7brh0 GyLOc/G0594L1qisuWmffpRm42mGQepqgjOH6W7jPspAj+I3+3EWCu01HqE44VafukH3 jn5nuKCe8MKMdpwn+L7JPTww2lQO9JbpC95+21ItdXHbS6mh2PIDrRJV6pjaGwo/99cg TZXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=C3aXSHolNmoD+uAWx1iQQB3uBgq7VIljmtpVGikvpuU=; b=cxlZYQ8f5KKvaS/KaNTPQxAGsxQgvA0ZGmPHq4EZtejhF9d/YUAORIDJEJ2FVy1bNb DfuIfQ0xO0lUk6DzL+K5fQv2K6RJ5pdrLCG2DEUFSPNC/QUzJN2DlN0syIsi9byWkIVx MXCMDXm8SWDVFWaLq4nCm3FfKHMDkzB7wnJ4PDMs2DK/thrw+jlFcbvh7QKYavz/b5eH 8NJaP41XGz3Rjxur1ZQm4mTCXRUcI8SRMI5tu4Dha9zaNpWODjLbdHTAe7Ulcgqjfcva TWF8Hliirhq5puDst+O5GFNlQvhXjLTMd7p/QoGU9hnlXqQr7XzGVH7Mb28tyF9Kk1Pz nyqQ== X-Gm-Message-State: AFqh2kpifLNrECA1Yax2X2lUDQJivSLq3AGemwXUTjM9oiBOefboGSKq FD1/MZaWpKsKoF4SCmITAKU9kOcPpBk= X-Google-Smtp-Source: AMrXdXsO0yVTnqImrZa8Qj61A2Nx9YUnQh5HqVliDFtjCob1aMzqZ6irD2jGdCikxGdKTEFEGFhdMg== X-Received: by 2002:a17:906:c795:b0:84d:45ff:d283 with SMTP id cw21-20020a170906c79500b0084d45ffd283mr26006880ejb.72.1673873970985; Mon, 16 Jan 2023 04:59:30 -0800 (PST) Received: from localhost.localdomain (dynamic-077-191-143-217.77.191.pool.telefonica.de. [77.191.143.217]) by smtp.gmail.com with ESMTPSA id um41-20020a170907cb2900b0086c4fbb8507sm3201517ejc.225.2023.01.16.04.59.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 04:59:30 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Markus Armbruster , Aurelien Jarno , Ani Sinha , Richard Henderson , Paolo Bonzini , qemu-trivial@nongnu.org, =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum , Igor Mammedov , Bernhard Beschow Subject: [PATCH v2 7/8] hw/i386/acpi-microvm: Reuse qbus_build_aml() Date: Mon, 16 Jan 2023 13:58:41 +0100 Message-Id: <20230116125842.66817-8-shentey@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116125842.66817-1-shentey@gmail.com> References: <20230116125842.66817-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=shentey@gmail.com; helo=mail-ej1-x631.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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 Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daudé --- hw/i386/acpi-microvm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/i386/acpi-microvm.c b/hw/i386/acpi-microvm.c index d8a444d06c..fec22d85c1 100644 --- a/hw/i386/acpi-microvm.c +++ b/hw/i386/acpi-microvm.c @@ -26,6 +26,7 @@ #include "exec/memory.h" #include "hw/acpi/acpi.h" +#include "hw/acpi/acpi_aml_interface.h" #include "hw/acpi/aml-build.h" #include "hw/acpi/bios-linker-loader.h" #include "hw/acpi/generic_event_device.h" @@ -129,7 +130,7 @@ build_dsdt_microvm(GArray *table_data, BIOSLinker *linker, sb_scope = aml_scope("_SB"); fw_cfg_add_acpi_dsdt(sb_scope, x86ms->fw_cfg); - isa_build_aml(ISA_BUS(isabus), sb_scope); + qbus_build_aml(BUS(isabus), sb_scope); build_ged_aml(sb_scope, GED_DEVICE, x86ms->acpi_dev, GED_MMIO_IRQ, AML_SYSTEM_MEMORY, GED_MMIO_BASE); acpi_dsdt_add_power_button(sb_scope); From patchwork Mon Jan 16 12:58:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 13103010 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 3BF70C46467 for ; Mon, 16 Jan 2023 13:02:25 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pHP5f-0005Yo-DR; Mon, 16 Jan 2023 07:59:55 -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 1pHP5N-0005RN-JY; Mon, 16 Jan 2023 07:59:39 -0500 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pHP5K-00018H-MJ; Mon, 16 Jan 2023 07:59:35 -0500 Received: by mail-ej1-x62d.google.com with SMTP id qx13so9535980ejb.13; Mon, 16 Jan 2023 04:59:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=G7JWsWCZehcpT6ngJWodvXzLoKg3Bv3U8R2NWRwkFTA=; b=WtVOsYi6Rnmw9gvbL7hWvpH4A+S6OieZnyPQpLqbEQFiTMLtrYPmWbuHlhBJIfdzsd zXpJMBKUyctYLJZ9/DBIatH58snubx+CI+WLolb5ucs6TtGHpcBIKoK/sTmO3NNaCTVg g6EVHDLODEbf3qkhazImmQxjSQjkSmaHN46fbw87aacDl/tRE3a58wRW624a7Y7Ed6m9 aYhrmUSya8lFfjdO1UPLRZjFXNcVmk3MlztP1MnwUfpunJ8cdvfMk1saqbEWiKy9ZKwG y7K4GSuWkmmS0lFFpN2QZqL7qRiBcLnZp7im9B76Yf2xBirc7fZm27PzRl/ATlVQziUT W35w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=G7JWsWCZehcpT6ngJWodvXzLoKg3Bv3U8R2NWRwkFTA=; b=F2nMXoW8bQ7SNJ8chzxR1ZdUR9fr7+aJg9W61pcR9EDCIYAfHYnpNx3+p0JWKpX/mb OQGV3DNx+6okA8aV/+tGkSdR5p1h8Jtl5KsBsy1mI/U/tvMRtC6JNfpCrr43/87ITPKy ctCCLZbX0cDdrsDhPi4uEBY+Ry1KCGz7aNWeJsw+PB4CKjGrGgpOwZykvw496VFHzDv4 W6tkiG1pdW3Ahd2hlfK+210IYhnMleiv/I+0Vs0MoHWET5WSHsAexIUtjioiLMe2cT+d hZREi5WmVVz2PEgAwys5cnJqmnXfTnQaaBUwWNFzngCYPneiVC+jVfAdLbw+UpJ2JIbp sWmw== X-Gm-Message-State: AFqh2kql3ac8mbwNBs67fkLqPAbsh9MJBmaPaN0y2DcjDQR+lHunleCK xVgP1JRMplD8jhYZIPWuKAH9QJFpzBI= X-Google-Smtp-Source: AMrXdXtCg0dDOuIXx53w62VjBrYCFvAdgGPvlzLUmDWFEpD6O5VOVHclpkCj2AGqumfOnUo96CiuUg== X-Received: by 2002:a17:907:9c04:b0:86a:d385:81df with SMTP id ld4-20020a1709079c0400b0086ad38581dfmr14405769ejc.3.1673873972938; Mon, 16 Jan 2023 04:59:32 -0800 (PST) Received: from localhost.localdomain (dynamic-077-191-143-217.77.191.pool.telefonica.de. [77.191.143.217]) by smtp.gmail.com with ESMTPSA id um41-20020a170907cb2900b0086c4fbb8507sm3201517ejc.225.2023.01.16.04.59.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Jan 2023 04:59:32 -0800 (PST) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: Markus Armbruster , Aurelien Jarno , Ani Sinha , Richard Henderson , Paolo Bonzini , qemu-trivial@nongnu.org, =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum , Igor Mammedov , Bernhard Beschow Subject: [PATCH v2 8/8] hw/isa/isa-bus: Remove now unused isa_build_aml() Date: Mon, 16 Jan 2023 13:58:42 +0100 Message-Id: <20230116125842.66817-9-shentey@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116125842.66817-1-shentey@gmail.com> References: <20230116125842.66817-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=shentey@gmail.com; helo=mail-ej1-x62d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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 Signed-off-by: Bernhard Beschow Reviewed-by: Philippe Mathieu-Daudé --- include/hw/isa/isa.h | 1 - hw/isa/isa-bus.c | 10 ---------- 2 files changed, 11 deletions(-) diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index 6c8a8a92cb..25acd5c34c 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -86,7 +86,6 @@ bool isa_realize_and_unref(ISADevice *dev, ISABus *bus, Error **errp); ISADevice *isa_create_simple(ISABus *bus, const char *name); ISADevice *isa_vga_init(ISABus *bus); -void isa_build_aml(ISABus *bus, Aml *scope); /** * isa_register_ioport: Install an I/O port region on the ISA bus. diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c index 1bee1a47f1..f155b80010 100644 --- a/hw/isa/isa-bus.c +++ b/hw/isa/isa-bus.c @@ -24,7 +24,6 @@ #include "hw/sysbus.h" #include "sysemu/sysemu.h" #include "hw/isa/isa.h" -#include "hw/acpi/acpi_aml_interface.h" static ISABus *isabus; @@ -188,15 +187,6 @@ ISADevice *isa_vga_init(ISABus *bus) } } -void isa_build_aml(ISABus *bus, Aml *scope) -{ - BusChild *kid; - - QTAILQ_FOREACH(kid, &bus->parent_obj.children, sibling) { - call_dev_aml_func(DEVICE(kid->child), scope); - } -} - static void isabus_bridge_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass);