On Thu, Dec 17, 2015 at 11:40:49AM +0100, 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 kraxel@redhat.com
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 */pc_acpi_init("q35-acpi-dsdt.aml");- }
This conflicts with:
Subject: [Qemu-devel] [PATCH v3 0/6] pc: Initialization and compat function cleanup Date: Tue, 1 Dec 2015 20:58:02 -0200 Message-Id: 1449010688-19205-1-git-send-email-ehabkost@redhat.com
But rebasing it is very simple (just replace has_acpi_build with pcmc->has_acpi_build).
But I would prefer to finally apply the series that deletes pc-q35-2.3 and older (submitted in August), so we just can delete this code.