Re: [Qemu-devel] [PATCH v4 17/23] hw: i386: Export the MADT build method

["Philippe Mathieu-Daudé" <philmd@redhat.com>]

On 1/11/18 16:12, Philippe Mathieu-Daudé wrote:
> Hi Samuel,
> 
> On 1/11/18 11:22, Samuel Ortiz wrote:
>> It is going to be used by the PC machine type as the MADT table builder
>> method and thus needs to be exported outside of acpi-build.c
>>
>> Also, now that the generic build_madt() API is exported, we have to
>> rename the ARM static one in order to avoid build time conflicts.
>>
>> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
>> ---
>>   hw/arm/virt-acpi-build.c |  4 ++--
>>   hw/i386/acpi-build.c     |  3 ++-
>>   include/hw/i386/acpi.h   | 27 +++++++++++++++++++++++++++
>>   3 files changed, 31 insertions(+), 3 deletions(-)
>>   create mode 100644 include/hw/i386/acpi.h
>>
>> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
>> index f9a60907f1..4a37c5997c 100644
>> --- a/hw/arm/virt-acpi-build.c
>> +++ b/hw/arm/virt-acpi-build.c
>> @@ -565,7 +565,7 @@ build_gtdt(GArray *table_data, BIOSLinker *linker, 
>> VirtMachineState *vms)
>>   /* MADT */
>>   static void
>> -build_madt(GArray *table_data, BIOSLinker *linker, VirtMachineState 
>> *vms)
>> +virt_build_madt(GArray *table_data, BIOSLinker *linker, 
>> VirtMachineState *vms)
>>   {
>>       VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);
>>       int madt_start = table_data->len;
>> @@ -746,7 +746,7 @@ void virt_acpi_build(VirtMachineState *vms, 
>> AcpiBuildTables *tables)
>>       build_fadt_rev5(tables_blob, tables->linker, vms, dsdt);
>>       acpi_add_table(table_offsets, tables_blob);
>> -    build_madt(tables_blob, tables->linker, vms);
>> +    virt_build_madt(tables_blob, tables->linker, vms);
>>       acpi_add_table(table_offsets, tables_blob);
>>       build_gtdt(tables_blob, tables->linker, vms);
>> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
>> index 6c9b61cea2..f4afdbcd1a 100644
>> --- a/hw/i386/acpi-build.c
>> +++ b/hw/i386/acpi-build.c
>> @@ -60,6 +60,7 @@
>>   #include "qom/qom-qobject.h"
>>   #include "hw/i386/amd_iommu.h"
>>   #include "hw/i386/intel_iommu.h"
>> +#include "hw/i386/acpi.h"
>>   #include "hw/acpi/ipmi.h"
>> @@ -279,7 +280,7 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid,
>>       }
>>   }
>> -static void
>> +void
>>   build_madt(GArray *table_data, BIOSLinker *linker,
>>              MachineState *ms, AcpiConfiguration *acpi_conf)
>>   {
>> diff --git a/include/hw/i386/acpi.h b/include/hw/i386/acpi.h
>> new file mode 100644
>> index 0000000000..ee1203914a
>> --- /dev/null
>> +++ b/include/hw/i386/acpi.h
>> @@ -0,0 +1,27 @@
>> +/*
>> + *
>> + * Copyright (c) 2018 Intel Corportation
>> + *
>> + * This program is free software; you can redistribute it and/or 
>> modify it
>> + * under the terms and conditions of the GNU General Public License,
>> + * version 2 or later, as published by the Free Software Foundation.
>> + *
>> + * This program is distributed in the hope it will be useful, but 
>> WITHOUT
>> + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
>> + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public 
>> License for
>> + * more details.
>> + *
>> + * You should have received a copy of the GNU General Public License 
>> along with
>> + * this program.  If not, see <http://www.gnu.org/licenses/>.
>> + */
>> +
>> +#ifndef HW_I386_ACPI_H
>> +#define HW_I386_ACPI_H
>> +
>> +#include "hw/acpi/acpi.h"
> 
> You forgot the following header:
> 
> #include "hw/acpi/bios-linker-loader.h"

You can also remove it from hw/i386/acpi-build.c.

> 
> The BIOSLinker is not provided by "acpi/acpi.h", which results in a 
> failure when trying to precompile this header.
> 
>> +
>> +/* ACPI MADT (Multiple APIC Description Table) build method */
>> +void build_madt(GArray *table_data, BIOSLinker *linker,
>> +                MachineState *ms, AcpiConfiguration *conf);
>> +
>> +#endif
>>