[Qemu-devel] [PATCH v2 34/51] pc: acpi: piix4: move IQST() into SSDT

[Igor Mammedov <imammedo@redhat.com>]

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 hw/i386/acpi-build.c  | 10 ++++++++++
 hw/i386/acpi-dsdt.dsl |  9 ---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 45bc6b1..8b23363 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1480,6 +1480,16 @@ static void build_piix4_pci0_int(Aml *table)
     aml_append(field, aml_named_field("PRQ3", 8));
     aml_append(sb_scope, field);
 
+    /* _STA method - get status */
+    method = aml_method("IQST", 1, AML_NOTSERIALIZED);
+    {
+        if_ctx = aml_if(aml_and(aml_int(0x80), aml_arg(0), NULL));
+        aml_append(if_ctx, aml_return(aml_int(0x09)));
+        aml_append(method, if_ctx);
+        aml_append(method, aml_return(aml_int(0x0B)));
+    }
+    aml_append(sb_scope, method);
+
     /* _CRS method - get current settings */
     method = aml_method("IQCR", 1, AML_SERIALIZED);
     {
diff --git a/hw/i386/acpi-dsdt.dsl b/hw/i386/acpi-dsdt.dsl
index 1f58ec4..bc6bd45 100644
--- a/hw/i386/acpi-dsdt.dsl
+++ b/hw/i386/acpi-dsdt.dsl
@@ -132,15 +132,6 @@ DefinitionBlock (
         External(PRQ1, FieldUnitObj)
         External(PRQ2, FieldUnitObj)
         External(PRQ3, FieldUnitObj)
-
-        Method(IQST, 1, NotSerialized) {
-            // _STA method - get status
-            If (And(0x80, Arg0)) {
-                Return (0x09)
-            }
-            Return (0x0B)
-        }
-
         External(LNKA, DeviceObj)
         External(LNKB, DeviceObj)
         External(LNKC, DeviceObj)
-- 
1.8.3.1