Re: [Qemu-devel] [PATCH v3 2/2] tests: update expected SSDT for floppy changes

[Michael S. Tsirkin]

On Wed, Dec 23, 2015 at 04:08:19PM +0300, Roman Kagan wrote:
> On Tue, Dec 22, 2015 at 06:41:47PM +0200, Michael S. Tsirkin wrote:
> > On Fri, Dec 18, 2015 at 10:32:30PM +0300, Roman Kagan wrote:
> > > Update the expected SSDTs to reflect the changes introduced in the
> > > previous patch.
> > > 
> > > Signed-off-by: Roman Kagan <address@hidden>
> > > Signed-off-by: Denis V. Lunev <address@hidden>
> > > CC: Michael S. Tsirkin <address@hidden>
> > > CC: Igor Mammedov <address@hidden>
> > > CC: Paolo Bonzini <address@hidden>
> > > CC: Richard Henderson <address@hidden>
> > > CC: Eduardo Habkost <address@hidden>
> > > CC: John Snow <address@hidden>
> > > CC: Kevin Wolf <address@hidden>
> > 
> > Something strange is going on here.
> > If I apply your patch and this one on top, I get
> > a diff in SSDT.
> 
> Aren't you by chance applying it on top of other patches that may affect
> SSDT?  I double-checked the series on top of
> 
> commit 5dc42c186d63b7b338594fc071cf290805dcc5a5
> Merge: c595b21 7236975
> Author: Peter Maydell <address@hidden>
> Date:   Tue Dec 22 14:21:42 2015 +0000
> 
>     Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' 
> into staging
> 
> 
> and it passes OK...
> 
> Roman.

This is the actual vs expected diff with both patches applied.

--- /tmp/asl-MN299X.dsl 2015-12-23 15:41:29.369837861 +0200
+++ /tmp/asl-T0S99X.dsl 2015-12-23 15:41:29.373837813 +0200
@@ -5,20 +5,20 @@
  * 
  * Disassembling to symbolic ASL+ operators
  *
- * Disassembly of /tmp/aml-VVVAAY, Wed Dec 23 15:41:29 2015
+ * Disassembly of tests/acpi-test-data/pc/SSDT, Wed Dec 23 15:41:29 2015
  *
  * Original Table Header:
  *     Signature        "SSDT"
- *     Length           0x000009B6 (2486)
+ *     Length           0x00000A1C (2588)
  *     Revision         0x01
- *     Checksum         0xD7
+ *     Checksum         0x15
  *     OEM ID           "BOCHS "
  *     OEM Table ID     "BXPCSSDT"
  *     OEM Revision     0x00000001 (1)
  *     Compiler ID      "BXPC"
  *     Compiler Version 0x00000001 (1)
  */
-DefinitionBlock ("/tmp/aml-VVVAAY.aml", "SSDT", 1, "BOCHS ", "BXPCSSDT", 
0x00000001)
+DefinitionBlock ("tests/acpi-test-data/pc/SSDT.aml", "SSDT", 1, "BOCHS ", 
"BXPCSSDT", 0x00000001)
 {
 
     External (_SB_.CPEJ, MethodObj)    // 2 Arguments
@@ -26,6 +26,7 @@ DefinitionBlock ("/tmp/aml-VVVAAY.aml",
     External (_SB_.CPST, MethodObj)    // 1 Arguments
     External (_SB_.PCI0, DeviceObj)
     External (_SB_.PCI0.BNUM, FieldUnitObj)
+    External (_SB_.PCI0.ISA_.FDC0, DeviceObj)
     External (_SB_.PCI0.MHPD, DeviceObj)
     External (_SB_.PCI0.PCEJ, MethodObj)    // 2 Arguments
     External (_SB_.PCI0.PCID, FieldUnitObj)
@@ -135,6 +136,40 @@ DefinitionBlock ("/tmp/aml-VVVAAY.aml",
         })
     }
 
+    Scope (\_SB.PCI0.ISA.FDC0)
+    {
+        Device (FLPA)
+        {
+            Name (_ADR, Zero)  // _ADR: Address
+            Name (_FDI, Package (0x10)  // _FDI: Floppy Drive Information
+            {
+                Zero, 
+                0x04, 
+                0x4F, 
+                0x12, 
+                One, 
+                0xAF, 
+                0x02, 
+                0x25, 
+                0x02, 
+                0x12, 
+                0x1B, 
+                0xFF, 
+                0x6C, 
+                0xF6, 
+                0x0F, 
+                0x08
+            })
+        }
+
+        Name (_FDE, Buffer (0x14)  // _FDE: Floppy Disk Enumerate
+        {
+            /* 0000 */  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 
........ */
+            /* 0008 */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 
........ */
+            /* 0010 */  0x02, 0x00, 0x00, 0x00                           /* 
.... */
+        })
+    }
+
     Scope (\_SB)
     {
         Device (PCI0.PRES)
--- /tmp/asl-NKR59X.dsl 2015-12-23 15:41:30.429825430 +0200
+++ /tmp/asl-3MT59X.dsl 2015-12-23 15:41:30.432825395 +0200
@@ -5,26 +5,27 @@
  * 
  * Disassembling to symbolic ASL+ operators
  *
- * Disassembly of /tmp/aml-H6V69X, Wed Dec 23 15:41:30 2015
+ * Disassembly of tests/acpi-test-data/q35/SSDT, Wed Dec 23 15:41:30 2015
  *
  * Original Table Header:
  *     Signature        "SSDT"
- *     Length           0x000002B3 (691)
+ *     Length           0x00000368 (872)
  *     Revision         0x01
- *     Checksum         0x7D
+ *     Checksum         0xA6
  *     OEM ID           "BOCHS "
  *     OEM Table ID     "BXPCSSDT"
  *     OEM Revision     0x00000001 (1)
  *     Compiler ID      "BXPC"
  *     Compiler Version 0x00000001 (1)
  */
-DefinitionBlock ("/tmp/aml-H6V69X.aml", "SSDT", 1, "BOCHS ", "BXPCSSDT", 
0x00000001)
+DefinitionBlock ("tests/acpi-test-data/q35/SSDT.aml", "SSDT", 1, "BOCHS ", 
"BXPCSSDT", 0x00000001)
 {
 
     External (_SB_.CPEJ, MethodObj)    // 2 Arguments
     External (_SB_.CPMA, MethodObj)    // 1 Arguments
     External (_SB_.CPST, MethodObj)    // 1 Arguments
     External (_SB_.PCI0, DeviceObj)
+    External (_SB_.PCI0.ISA_.FDC0, DeviceObj)
     External (_SB_.PCI0.MHPD, DeviceObj)
 
     Scope (\_SB.PCI0)
@@ -115,6 +116,64 @@ DefinitionBlock ("/tmp/aml-H6V69X.aml",
         })
     }
 
+    Scope (\_SB.PCI0.ISA.FDC0)
+    {
+        Device (FLPA)
+        {
+            Name (_ADR, Zero)  // _ADR: Address
+            Name (_FDI, Package (0x10)  // _FDI: Floppy Drive Information
+            {
+                Zero, 
+                0x04, 
+                0xFFFFFFFFFFFFFFFF, 
+                Zero, 
+                0xFFFFFFFFFFFFFFFF, 
+                0xAF, 
+                0x02, 
+                0x25, 
+                0x02, 
+                0x12, 
+                0x1B, 
+                0xFF, 
+                0x6C, 
+                0xF6, 
+                0x0F, 
+                0x08
+            })
+        }
+
+        Device (FLPB)
+        {
+            Name (_ADR, One)  // _ADR: Address
+            Name (_FDI, Package (0x10)  // _FDI: Floppy Drive Information
+            {
+                One, 
+                0x04, 
+                0xFFFFFFFFFFFFFFFF, 
+                Zero, 
+                0xFFFFFFFFFFFFFFFF, 
+                0xAF, 
+                0x02, 
+                0x25, 
+                0x02, 
+                0x12, 
+                0x1B, 
+                0xFF, 
+                0x6C, 
+                0xF6, 
+                0x0F, 
+                0x08
+            })
+        }
+
+        Name (_FDE, Buffer (0x14)  // _FDE: Floppy Disk Enumerate
+        {
+            /* 0000 */  0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,  /* 
........ */
+            /* 0008 */  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 
........ */
+            /* 0010 */  0x02, 0x00, 0x00, 0x00                           /* 
.... */
+        })
+    }
+
     Scope (\_SB)
     {
         Device (PCI0.PRES)