diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2015-12-28 18:02:53 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2016-01-09 23:20:19 +0200 |
| commit | e9fce798615b37c661df9bff405d74c69874ceb4 (patch) | |
| tree | 47ce5eda54a4dd7b2e5fd223c479895abddd3070 /hw | |
| parent | 65aef4de5e9db1ce5b05b99cdabd304b00a31d4e (diff) | |
| download | qemu-e9fce798615b37c661df9bff405d74c69874ceb4.tar.gz qemu-e9fce798615b37c661df9bff405d74c69874ceb4.tar.bz2 qemu-e9fce798615b37c661df9bff405d74c69874ceb4.zip | |
pc: acpi: q35: move _PIC() method into SSDT
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/i386/acpi-build.c | 8 | ||||
| -rw-r--r-- | hw/i386/q35-acpi-dsdt.dsl | 10 |
2 files changed, 8 insertions, 10 deletions
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 6095e5932e..55ea84d43b 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1696,6 +1696,14 @@ static void build_q35_pci0_int(Aml *table) Aml *sb_scope = aml_scope("_SB"); Aml *pci0_scope = aml_scope("PCI0"); + /* Zero => PIC mode, One => APIC Mode */ + aml_append(table, aml_name_decl("PICF", aml_int(0))); + method = aml_method("_PIC", 1, AML_NOTSERIALIZED); + { + aml_append(method, aml_store(aml_arg(0), aml_name("PICF"))); + } + aml_append(table, method); + aml_append(pci0_scope, aml_name_decl("PRTP", build_q35_routing_table("LNK"))); aml_append(pci0_scope, diff --git a/hw/i386/q35-acpi-dsdt.dsl b/hw/i386/q35-acpi-dsdt.dsl index 34485e79fc..7c7aef7e5d 100644 --- a/hw/i386/q35-acpi-dsdt.dsl +++ b/hw/i386/q35-acpi-dsdt.dsl @@ -112,14 +112,4 @@ DefinitionBlock ( } } } - -/**************************************************************** - * PCI IRQs - ****************************************************************/ - - /* Zero => PIC mode, One => APIC Mode */ - Name(\PICF, Zero) - Method(\_PIC, 1, NotSerialized) { - Store(Arg0, \PICF) - } } |