Re: [Qemu-devel] [PATCH 6/6] q35: skip q35-acpi-dsdt.aml load if not needed

[Marcel Apfelbaum]

M
On 12/17/2015 12:40 PM, Gerd Hoffmann wrote:
> Only old machine types which don't use the acpi builder (qemu 1.7 + older)
> have to load that file for proper acpi support.
>
> Signed-off-by: Gerd Hoffmann <address@hidden>
> ---
>   hw/i386/pc_q35.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
> index 133bc68..727269e 100644
> --- a/hw/i386/pc_q35.c
> +++ b/hw/i386/pc_q35.c
> @@ -129,7 +129,10 @@ static void pc_q35_init(MachineState *machine)
>       }
>
>       pc_cpus_init(pcms);
> -    pc_acpi_init("q35-acpi-dsdt.aml");
> +    if (!has_acpi_build) {
> +        /* only machine types 1.7 & older need this */

Actually 1.6 and older, right? (I might be wrong)

> +        pc_acpi_init("q35-acpi-dsdt.aml");
> +    }
>
>       kvmclock_create();

It looks OK to me.

Reviewed-by: Marcel Apfelbaum <address@hidden>

Thanks,
Marcel