[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 51/59] pc: acpi: q35: move PCI0 device definition
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 51/59] pc: acpi: q35: move PCI0 device definition into SSDT |
Date: |
Sat, 9 Jan 2016 23:41:53 +0200 |
From: Igor Mammedov <address@hidden>
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 | 14 +++++++++-----
hw/i386/q35-acpi-dsdt.dsl | 13 -------------
2 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 29abb99..609baf4 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1983,11 +1983,15 @@ build_ssdt(GArray *table_data, GArray *linker,
build_piix4_pci0_int(ssdt);
} else {
sb_scope = aml_scope("_SB");
- scope = aml_scope("PCI0");
- aml_append(scope, aml_name_decl("SUPP", aml_int(0)));
- aml_append(scope, aml_name_decl("CTRL", aml_int(0)));
- aml_append(scope, build_q35_osc_method());
- aml_append(sb_scope, scope);
+ dev = aml_device("PCI0");
+ aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0A08")));
+ aml_append(dev, aml_name_decl("_CID", 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(dev, aml_name_decl("SUPP", aml_int(0)));
+ aml_append(dev, aml_name_decl("CTRL", aml_int(0)));
+ aml_append(dev, build_q35_osc_method());
+ aml_append(sb_scope, dev);
aml_append(ssdt, sb_scope);
build_hpet_aml(ssdt);
diff --git a/hw/i386/q35-acpi-dsdt.dsl b/hw/i386/q35-acpi-dsdt.dsl
index b53663c..f234f5c 100644
--- a/hw/i386/q35-acpi-dsdt.dsl
+++ b/hw/i386/q35-acpi-dsdt.dsl
@@ -42,17 +42,4 @@ DefinitionBlock (
PCIB, 8,
}
}
-
-
-/****************************************************************
- * PCI Bus definition
- ****************************************************************/
- Scope(\_SB) {
- Device(PCI0) {
- Name(_HID, EisaId("PNP0A08"))
- Name(_CID, EisaId("PNP0A03"))
- Name(_ADR, 0x00)
- Name(_UID, 1)
- }
- }
}
--
MST
- [Qemu-devel] [PULL v2 41/59] pc: acpi: q35: move GSI links to SSDT, (continued)
- [Qemu-devel] [PULL v2 41/59] pc: acpi: q35: move GSI links to SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 42/59] pc: acpi: q35: move link devices to SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 43/59] pc: acpi: q35: move IQCR() into SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 44/59] pc: acpi: q35: move IQST() into SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 46/59] pc: acpi: q35: move _PRT() into SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 45/59] pc: acpi: q35: move ISA bridge into SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 47/59] pc: acpi: q35: move PRTA routing table into SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 49/59] pc: acpi: q35: move _PIC() method into SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 48/59] pc: acpi: q35: move PRTP routing table into SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 50/59] pc: acpi: q35: move PCI0._OSC() method into SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 51/59] pc: acpi: q35: move PCI0 device definition into SSDT,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 52/59] pc: acpi: q35: PCST, PCSB opregions and PCIB field into SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 53/59] pc: acpi: switch to AML API composed DSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 55/59] i386/pc: expose identifying the floppy controller, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 56/59] Add VMSTATE_STRUCT_VARRAY_KNOWN, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 57/59] migration/virtio: Remove simple .get/.put use, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 58/59] ivshmem: Store file descriptor for vhost-user negotiation, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 59/59] virtio: fix error message for number of queues, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 54/59] pc: acpi: remove unused ASL templates and related blobs/utils, Michael S. Tsirkin, 2016/01/09
- Re: [Qemu-devel] [PULL v2 00/59] acpi dsdt rework, misc fixes, Peter Maydell, 2016/01/11