Re: [PULL 00/73] virtio,pc,pci: features, fixes

["Philippe Mathieu-Daudé" <philmd@linaro.org>]

Hi,

On 10/3/23 18:32, Peter Maydell wrote:
> On Thu, 9 Mar 2023 at 14:47, Michael S. Tsirkin <mst@redhat.com> wrote:

>> I moved it one commit back, now at (96cb085897)
>> Cornelia posted some concerns about the last commit.
>>
>>> ----------------------------------------------------------------
>>> virtio,pc,pci: features, fixes
>>>
>>> Several features that landed at the last possible moment:
>>>
>>> Passthrough HDM decoder emulation
>>> Refactor cryptodev
>>> RAS error emulation and injection
>>> acpi-index support on non-hotpluggable slots
>>> Dynamically switch to vhost shadow virtqueues at vdpa net migration
>>>
>>> Plus a couple of bugfixes that look important to have in the release.
>>>
>>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>>>
> 
> 
> Applied, thanks.

I'm getting this failure on Darwin (m1):

C compiler for the host machine: clang (clang 14.0.0 "Apple clang 
version 14.0.0 (clang-1400.0.29.202)")
Program iasl found: YES (/opt/homebrew/bin/iasl)

$ make check-qtest-i386 V=1
  ...
  3/61 qemu:qtest+qtest-i386 / qtest-i386/bios-tables-test 
ERROR          17.52s   killed by signal 6 SIGABRT
――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― 
✀ 
――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――
stderr:
acpi-test: Warning! DSDT binary file mismatch. Actual 
[aml:/var/folders/yj/r7khncsj4d77k04ybz9lw4tm0000gn/T/aml-HANQ11], 
Expected [aml:tests/data/acpi/pc/DSDT.nosmm].
See source file tests/qtest/bios-tables-test.c for instructions on how 
to update expected files.
acpi-test: Warning! DSDT mismatch. Actual 
[asl:/var/folders/yj/r7khncsj4d77k04ybz9lw4tm0000gn/T/asl-1CNQ11.dsl, 
aml:/var/folders/yj/r7khncsj4d77k04ybz9lw4tm0000gn/T/aml-HANQ11], 
Expected 
[asl:/var/folders/yj/r7khncsj4d77k04ybz9lw4tm0000gn/T/asl-XXGQ11.dsl, 
aml:tests/data/acpi/pc/DSDT.nosmm].
--- /var/folders/yj/r7khncsj4d77k04ybz9lw4tm0000gn/T/asl-XXGQ11.dsl 
2023-03-10 23:16:19
+++ /var/folders/yj/r7khncsj4d77k04ybz9lw4tm0000gn/T/asl-1CNQ11.dsl 
2023-03-10 23:16:19
@@ -1,30 +1,30 @@
  /*
   * Intel ACPI Component Architecture
   * AML/ASL+ Disassembler version 20221020 (64-bit version)
   * Copyright (c) 2000 - 2022 Intel Corporation
   *
   * Disassembling to symbolic ASL+ operators
   *
- * Disassembly of tests/data/acpi/pc/DSDT.nosmm, Fri Mar 10 23:16:19 2023
+ * Disassembly of 
/var/folders/yj/r7khncsj4d77k04ybz9lw4tm0000gn/T/aml-HANQ11, Fri Mar 10 
23:16:19 2023
   *
   * Original Table Header:
   *     Signature        "DSDT"
- *     Length           0x000018D8 (6360)
+ *     Length           0x00001958 (6488)
   *     Revision         0x01 **** 32-bit table (V1), no 64-bit math 
support
- *     Checksum         0xCE
+ *     Checksum         0xAF
   *     OEM ID           "BOCHS "
   *     OEM Table ID     "BXPC    "
   *     OEM Revision     0x00000001 (1)
   *     Compiler ID      "BXPC"
   *     Compiler Version 0x00000001 (1)
   */
  DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC    ", 0x00000001)
  {
      Scope (\)
      {
          OperationRegion (DBG, SystemIO, 0x0402, One)
          Field (DBG, ByteAcc, NoLock, Preserve)
          {
              DBGB,   8
          }

@@ -38,32 +38,66 @@
              {
                  DBGB = DerefOf (Local0 [Local2])
                  Local2++
              }

              DBGB = 0x0A
          }
      }

      Scope (_SB)
      {
          Device (PCI0)
          {
              Name (_HID, EisaId ("PNP0A03") /* PCI Bus */)  // _HID: 
Hardware ID
              Name (_ADR, Zero)  // _ADR: Address
              Name (_UID, Zero)  // _UID: Unique ID
+            Method (EDSM, 5, Serialized)
+            {
+                If ((Arg2 == Zero))
+                {
+                    Local0 = Buffer (One)
+                        {
+                             0x00 
       // .
+                        }
+                    If ((Arg0 != ToUUID 
("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */))
+                    {
+                        Return (Local0)
+                    }
+
+                    If ((Arg1 < 0x02))
+                    {
+                        Return (Local0)
+                    }
+
+                    Local0 [Zero] = 0x81
+                    Return (Local0)
+                }
+
+                If ((Arg2 == 0x07))
+                {
+                    Local0 = Package (0x02)
+                        {
+                            Zero,
+                            ""
+                        }
+                    Local1 = DerefOf (Arg4 [Zero])
+                    Local0 [Zero] = Local1
+                    Return (Local0)
+                }
+            }
          }
      }

      Scope (_SB.PCI0)
      {
          OperationRegion (PCST, SystemIO, 0xAE00, 0x08)
          Field (PCST, DWordAcc, NoLock, WriteAsZeros)
          {
              PCIU,   32,
              PCID,   32
          }

          OperationRegion (SEJ, SystemIO, 0xAE08, 0x04)
          Field (SEJ, DWordAcc, NoLock, WriteAsZeros)
          {
              B0EJ,   32
@@ -91,43 +125,43 @@
              Acquire (BLCK, 0xFFFF)
              BNUM = Arg0
              PIDX = (One << Arg1)
              Local0 = PIDX /* \_SB_.PCI0.PIDX */
              Release (BLCK)
              Return (Local0)
          }

          Method (PDSM, 5, Serialized)
          {
              If ((Arg2 == Zero))
              {
                  Local0 = Buffer (One)
                      {
                           0x00 
    // .
                      }
-                Local1 = Zero
                  If ((Arg0 != ToUUID 
("e5c937d0-3553-4d7a-9117-ea4d19c3434d") /* Device Labeling Interface */))
                  {
                      Return (Local0)
                  }

                  If ((Arg1 < 0x02))
                  {
                      Return (Local0)
                  }

+                Local1 = Zero
                  Local2 = AIDX (DerefOf (Arg4 [Zero]), DerefOf (Arg4 [One]
                      ))
                  If (!((Local2 == Zero) | (Local2 == 0xFFFFFFFF)))
                  {
                      Local1 |= One
                      Local1 |= (One << 0x07)
                  }

                  Local0 [Zero] = Local1
                  Return (Local0)
              }

              If ((Arg2 == 0x07))
              {
                  Local0 = Package (0x02)
                      {
@@ -915,32 +949,42 @@

                  Device (RTC)
                  {
                      Name (_HID, EisaId ("PNP0B00") /* AT Real-Time 
Clock */)  // _HID: Hardware ID
                      Name (_CRS, ResourceTemplate ()  // _CRS: Current 
Resource Settings
                      {
                          IO (Decode16,
                              0x0070,             // Range Minimum
                              0x0070,             // Range Maximum
                              0x01,               // Alignment
                              0x08,               // Length
                              )
                          IRQNoFlags ()
                              {8}
                      })
                  }
+            }
+
+            Device (S09)
+            {
+                Name (_ADR, 0x00010001)  // _ADR: Address
+            }
+
+            Device (S0B)
+            {
+                Name (_ADR, 0x00010003)  // _ADR: Address
              }

              Device (S10)
              {
                  Name (_ADR, 0x00020000)  // _ADR: Address
                  Method (_S1D, 0, NotSerialized)  // _S1D: S1 Device State
                  {
                      Return (Zero)
                  }

                  Method (_S2D, 0, NotSerialized)  // _S2D: S2 Device State
                  {
                      Return (Zero)
                  }

                  Method (_S3D, 0, NotSerialized)  // _S3D: S3 Device State
**
ERROR:../../tests/qtest/bios-tables-test.c:536:test_acpi_asl: assertion 
failed: (all_tables_match)

(test program exited with status code -6)

FYI:

$ iasl -v

Intel ACPI Component Architecture
ASL+ Optimizing Compiler/Disassembler version 20221020
Copyright (c) 2000 - 2022 Intel Corporation

Regards,

Phil.