From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38500) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3wWT-000581-6t for qemu-devel@nongnu.org; Tue, 01 Dec 2015 20:47:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a3wWS-000250-Cz for qemu-devel@nongnu.org; Tue, 01 Dec 2015 20:47:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52748) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3wWS-00024w-80 for qemu-devel@nongnu.org; Tue, 01 Dec 2015 20:47:56 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id E5ED5C0CC623 for ; Wed, 2 Dec 2015 01:47:55 +0000 (UTC) From: Eduardo Habkost Date: Tue, 1 Dec 2015 23:47:10 -0200 Message-Id: <1449020831-8414-16-git-send-email-ehabkost@redhat.com> In-Reply-To: <1449020831-8414-1-git-send-email-ehabkost@redhat.com> References: <1449020831-8414-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 15/16] pc: Move PcGuestInfo.apic_xrupt_override field to PCMachineState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , Marcel Apfelbaum , "Michael S. Tsirkin" Signed-off-by: Eduardo Habkost --- hw/i386/acpi-build.c | 7 ++++--- hw/i386/pc.c | 2 +- include/hw/i386/pc.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 7771be7..cdbe5b9 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -366,8 +366,9 @@ build_fadt(GArray *table_data, GArray *linker, AcpiPmInfo *pm, static void build_madt(GArray *table_data, GArray *linker, AcpiCpuInfo *cpu, - PcGuestInfo *guest_info) + PCMachineState *pcms) { + PcGuestInfo *guest_info = &pcms->acpi_guest_info; int madt_start = table_data->len; AcpiMultipleApicTable *madt; @@ -400,7 +401,7 @@ build_madt(GArray *table_data, GArray *linker, AcpiCpuInfo *cpu, io_apic->address = cpu_to_le32(IO_APIC_DEFAULT_ADDRESS); io_apic->interrupt = cpu_to_le32(0); - if (guest_info->apic_xrupt_override) { + if (pcms->apic_xrupt_override) { intsrcovr = acpi_data_push(table_data, sizeof *intsrcovr); intsrcovr->type = ACPI_APIC_XRUPT_OVERRIDE; intsrcovr->length = sizeof(*intsrcovr); @@ -1740,7 +1741,7 @@ void acpi_build(PCMachineState *pcms, AcpiBuildTables *tables) aml_len += tables_blob->len - ssdt; acpi_add_table(table_offsets, tables_blob); - build_madt(tables_blob, tables->linker, &cpu, guest_info); + build_madt(tables_blob, tables->linker, &cpu, pcms); if (misc.has_hpet) { acpi_add_table(table_offsets, tables_blob); diff --git a/hw/i386/pc.c b/hw/i386/pc.c index cdfdd52..f399d14 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1188,7 +1188,7 @@ PcGuestInfo *pc_guest_info_init(PCMachineState *pcms) int i, j; guest_info->apic_id_limit = pc_apic_id_limit(max_cpus); - guest_info->apic_xrupt_override = kvm_allows_irq0_override(); + pcms->apic_xrupt_override = kvm_allows_irq0_override(); guest_info->numa_nodes = nb_numa_nodes; guest_info->node_mem = g_malloc0(guest_info->numa_nodes * sizeof *guest_info->node_mem); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index a175131..5ded182 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -23,7 +23,6 @@ /* Machine info for ACPI build: */ struct PcGuestInfo { unsigned apic_id_limit; - bool apic_xrupt_override; uint64_t numa_nodes; uint64_t *node_mem; uint64_t *node_cpu; @@ -51,6 +50,7 @@ struct PCMachineState { PcGuestInfo acpi_guest_info; Notifier machine_done; FWCfgState *fw_cfg; + bool apic_xrupt_override; }; #define PC_MACHINE_ACPI_DEVICE_PROP "acpi-device" -- 2.1.0