Skip to content

Commit

Permalink
q35: skip q35-acpi-dsdt.aml load if not needed
Browse files Browse the repository at this point in the history
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 <kraxel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
  • Loading branch information
kraxel authored and mstsirkin committed Dec 22, 2015
1 parent ad2a807 commit aa8abbe
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion hw/i386/pc_q35.c
Expand Up @@ -117,7 +117,10 @@ static void pc_q35_init(MachineState *machine)
}

pc_cpus_init(pcms);
pc_acpi_init("q35-acpi-dsdt.aml");
if (!pcmc->has_acpi_build) {
/* only machine types 1.7 & older need this */
pc_acpi_init("q35-acpi-dsdt.aml");
}

kvmclock_create();

Expand Down

0 comments on commit aa8abbe

Please sign in to comment.