diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2015-12-17 11:40:49 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2015-12-22 18:39:19 +0200 |
| commit | aa8abbed0028fc4a5a2a346eedaa7ab4f52c750a (patch) | |
| tree | ea627339981c54683a479f5dea4d505428c49aad | |
| parent | ad2a8077188f05155b07489747ea682070eb135f (diff) | |
| download | qemu-aa8abbed0028fc4a5a2a346eedaa7ab4f52c750a.zip qemu-aa8abbed0028fc4a5a2a346eedaa7ab4f52c750a.tar.gz qemu-aa8abbed0028fc4a5a2a346eedaa7ab4f52c750a.tar.bz2 | |
q35: skip q35-acpi-dsdt.aml load if not needed
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>
| -rw-r--r-- | hw/i386/pc_q35.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 342e9cf..942ef7e 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -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(); |