[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 40/59] pc: acpi: piix4: acpi move PCI0 device to SSDT
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 40/59] pc: acpi: piix4: acpi move PCI0 device to SSDT |
Date: |
Fri, 8 Jan 2016 16:20:32 +0200 |
From: Igor Mammedov <address@hidden>
leave Scope(\_SB) definition in DSDT so that iasl
would be able to compile DSDT since we are still
need definition block for table.
After Q35 ASL is converted, DSDT templates will
be completly replaced by AML API generated tables.
Signed-off-by: Igor Mammedov <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/i386/acpi-build.c | 8 ++++++++
hw/i386/acpi-dsdt.dsl | 8 --------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index f929bb8..eaabe00 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1701,6 +1701,14 @@ build_ssdt(GArray *table_data, GArray *linker,
build_dbg_aml(ssdt);
if (misc->is_piix4) {
+ sb_scope = aml_scope("_SB");
+ dev = aml_device("PCI0");
+ aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0A03")));
+ aml_append(dev, aml_name_decl("_ADR", aml_int(0)));
+ aml_append(dev, aml_name_decl("_UID", aml_int(1)));
+ aml_append(sb_scope, dev);
+ aml_append(ssdt, sb_scope);
+
build_hpet_aml(ssdt);
build_piix4_pm(ssdt);
build_piix4_isa_bridge(ssdt);
diff --git a/hw/i386/acpi-dsdt.dsl b/hw/i386/acpi-dsdt.dsl
index a7769fc..82e4470 100644
--- a/hw/i386/acpi-dsdt.dsl
+++ b/hw/i386/acpi-dsdt.dsl
@@ -28,14 +28,6 @@ DefinitionBlock (
0x1 // OEM Revision
)
{
-
Scope(\_SB) {
- Device(PCI0) {
- Name(_HID, EisaId("PNP0A03"))
- Name(_ADR, 0x00)
- Name(_UID, 1)
-//#define PX13 S0B_
-// External(PX13, DeviceObj)
- }
}
}
--
MST
- [Qemu-devel] [PULL 30/59] pc: acpi: move FDC0 device from DSDT to SSDT, (continued)
- [Qemu-devel] [PULL 30/59] pc: acpi: move FDC0 device from DSDT to SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 31/59] pc: acpi: move LPT device from DSDT to SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 32/59] pc: acpi: move COM devices from DSDT to SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 33/59] pc: acpi: move PIIX4 isa-bridge and pm devices into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 34/59] pc: acpi: move remaining GPE handlers into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 35/59] pc: acpi: pci: move link devices into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 37/59] pc: acpi: piix4: move IQST() into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 36/59] pc: acpi: piix4: move IQCR() into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 38/59] pc: acpi: piix4: move PCI0._PRT() into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 39/59] pc: acpi: piix4: move remaining PCI hotplug bits into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 40/59] pc: acpi: piix4: acpi move PCI0 device to SSDT,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 41/59] pc: acpi: q35: move GSI links to SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 42/59] pc: acpi: q35: move link devices to SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 43/59] pc: acpi: q35: move IQCR() into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 44/59] pc: acpi: q35: move IQST() into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 45/59] pc: acpi: q35: move ISA bridge into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 47/59] pc: acpi: q35: move PRTA routing table into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 46/59] pc: acpi: q35: move _PRT() into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 49/59] pc: acpi: q35: move _PIC() method into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 48/59] pc: acpi: q35: move PRTP routing table into SSDT, Michael S. Tsirkin, 2016/01/08
- [Qemu-devel] [PULL 50/59] pc: acpi: q35: move PCI0._OSC() method into SSDT, Michael S. Tsirkin, 2016/01/08