From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Gerd Hoffmann <kraxel@redhat.com>, qemu-devel@nongnu.org
Cc: Eduardo Habkost <ehabkost@redhat.com>,
Sergio Lopez <slp@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Igor Mammedov <imammedo@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Richard Henderson <rth@twiddle.net>
Subject: Re: [PATCH 01/13] acpi: make build_madt() more generic.
Date: Thu, 19 Mar 2020 10:34:51 +0100 [thread overview]
Message-ID: <b810545d-c5e4-d5b3-8bb9-d5e21c640623@redhat.com> (raw)
In-Reply-To: <20200319080117.7725-2-kraxel@redhat.com>
On 3/19/20 9:01 AM, Gerd Hoffmann wrote:
> Remove PCMachineState dependency from build_madt().
> Pass AcpiDeviceIf as separate argument instead of
> depending on PCMachineState->acpi_dev.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> hw/i386/acpi-build.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 9a19c14e661b..1b0684c433e3 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -360,14 +360,13 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
> }
>
> static void
> -build_madt(GArray *table_data, BIOSLinker *linker, PCMachineState *pcms)
> +build_madt(GArray *table_data, BIOSLinker *linker,
> + X86MachineState *x86ms, AcpiDeviceIf *adev)
> {
> - MachineClass *mc = MACHINE_GET_CLASS(pcms);
> - X86MachineState *x86ms = X86_MACHINE(pcms);
> - const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(MACHINE(pcms));
> + MachineClass *mc = MACHINE_GET_CLASS(x86ms);
> + const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(MACHINE(x86ms));
> int madt_start = table_data->len;
> - AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_GET_CLASS(pcms->acpi_dev);
> - AcpiDeviceIf *adev = ACPI_DEVICE_IF(pcms->acpi_dev);
> + AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_GET_CLASS(adev);
> bool x2apic_mode = false;
>
> AcpiMultipleApicTable *madt;
> @@ -2807,7 +2806,8 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
> aml_len += tables_blob->len - fadt;
>
> acpi_add_table(table_offsets, tables_blob);
> - build_madt(tables_blob, tables->linker, pcms);
> + build_madt(tables_blob, tables->linker, x86ms,
> + ACPI_DEVICE_IF(pcms->acpi_dev));
>
> vmgenid_dev = find_vmgenid_dev();
> if (vmgenid_dev) {
>
next prev parent reply other threads:[~2020-03-19 9:36 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-19 8:01 [PATCH 00/13] microvm: add acpi support Gerd Hoffmann
2020-03-19 8:01 ` [PATCH 01/13] acpi: make build_madt() more generic Gerd Hoffmann
2020-03-19 9:34 ` Philippe Mathieu-Daudé [this message]
2020-03-19 8:01 ` [PATCH 02/13] acpi: factor out acpi_dsdt_add_fw_cfg() Gerd Hoffmann
2020-03-19 9:36 ` Philippe Mathieu-Daudé
2020-03-19 12:16 ` Igor Mammedov
2020-03-19 8:01 ` [PATCH 03/13] microvm: add isa-acpi device Gerd Hoffmann
2020-03-19 13:42 ` Igor Mammedov
2020-03-20 8:22 ` Gerd Hoffmann
2020-03-20 14:54 ` Igor Mammedov
2020-03-19 8:01 ` [PATCH 04/13] microvm: add minimal acpi support Gerd Hoffmann
2020-03-19 14:00 ` Igor Mammedov
2020-03-25 9:04 ` Gerd Hoffmann
2020-03-25 18:59 ` Igor Mammedov
2020-03-19 8:01 ` [PATCH 05/13] microvm: add acpi_dsdt_add_virtio() for x86 Gerd Hoffmann
2020-03-19 14:30 ` Igor Mammedov
2020-03-20 8:19 ` Gerd Hoffmann
2020-03-19 8:01 ` [PATCH 06/13] microvm: disable virtio-mmio cmdline hack Gerd Hoffmann
2020-03-19 8:01 ` [PATCH 07/13] [testing] seabios: update submodule to experimental microvm branch Gerd Hoffmann
2020-03-19 8:01 ` [PATCH 08/13] [testing] seabios: update config & build rules Gerd Hoffmann
2020-03-19 8:01 ` [PATCH 09/13] [testing] seabios: update binaries to experimental microvm branch Gerd Hoffmann
2020-03-19 8:01 ` [PATCH 10/13] microvm/acpi: add rtc Gerd Hoffmann
2020-03-19 8:01 ` [PATCH 11/13] microvm/acpi: add serial Gerd Hoffmann
2020-03-19 8:01 ` [PATCH 12/13] microvm: make virtio irq base runtime configurable Gerd Hoffmann
2020-03-19 8:01 ` [PATCH 13/13] microvm/acpi: use GSI 16-23 for virtio Gerd Hoffmann
2020-03-20 15:30 ` Konrad Rzeszutek Wilk
2020-03-23 10:23 ` Gerd Hoffmann
2020-03-19 8:19 ` [PATCH 00/13] microvm: add acpi support no-reply
2020-03-19 8:23 ` no-reply
2020-03-19 8:24 ` no-reply
2020-03-19 8:49 ` Paolo Bonzini
2020-03-19 9:33 ` Gerd Hoffmann
2020-03-19 9:59 ` Paolo Bonzini
2020-03-19 11:28 ` Gerd Hoffmann
2020-03-19 13:40 ` Gerd Hoffmann
2020-03-19 17:34 ` Paolo Bonzini
2020-03-20 8:32 ` Gerd Hoffmann
2020-03-20 10:41 ` Paolo Bonzini
2020-03-23 10:51 ` Michael S. Tsirkin
2020-03-23 12:09 ` Gerd Hoffmann
2020-03-23 12:16 ` Igor Mammedov
2020-03-25 9:16 ` Gerd Hoffmann
2020-03-25 9:53 ` Igor Mammedov
2020-03-25 18:56 ` Igor Mammedov
2020-03-25 12:32 ` Igor Mammedov
2020-03-25 15:03 ` Gerd Hoffmann
2020-03-25 18:44 ` Igor Mammedov
2020-03-26 7:33 ` Michael S. Tsirkin
2020-03-26 10:59 ` Igor Mammedov
2020-03-27 12:06 ` Gerd Hoffmann
2020-03-27 14:05 ` Igor Mammedov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b810545d-c5e4-d5b3-8bb9-d5e21c640623@redhat.com \
--to=philmd@redhat.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=kraxel@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
--cc=slp@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).