Skip to contentSkip to conversation

virtio,pc,acpi: fixes, tests

GIT PULL Applied Michael S. Tsirkin 6 participants 62 messages Sep 29, 2020 – May 12, 2021 Page 1 of 2

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Changes from v3:
- dropped reconnect tests
- added more fixes, an smbios feature

The following changes since commit 74504514b154ebebdff577d88e4bf5c13074e9ed:

Merge remote-tracking branch 'remotes/alistair/tags/pull-register-20200927' into staging (2020-09-28 16:49:10 +0100)

are available in the Git repository at:

git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream

for you to fetch changes up to 8138405528c29af2a850cd672a8f8a0b33b7ab40:

libvhost-user: return on error in vu_log_queue_fill() (2020-09-29 03:06:12 -0400)

----------------------------------------------------------------
virtio,pc,acpi: fixes, tests

Fixes and tests all over the place. Batch iommu updates for vdpa. Removal of deprecated cpu hotplug commands. SMBIOS OEM string support.

----------------------------------------------------------------
Ani Sinha (11):
tests/acpi: mark addition of table DSDT.roothp for unit testing root pci hotplug tests/acpi: add new unit test to test hotplug off/on feature on the root pci bus tests/acpi: add a new ACPI table in order to test root pci hotplug on/off Fix a gap where acpi_pcihp_find_hotplug_bus() returns a non-hotpluggable bus i440fx/acpi: do not add hotplug related amls for cold plugged bridges tests/acpi: list added acpi table binary file for pci bridge hotplug test tests/acpi: unit test for 'acpi-pci-hotplug-with-bridge-support' bridge flag tests/acpi: add newly added acpi DSDT table blob for pci bridge hotplug flag Add ACPI DSDT tables for q35 that are being updated by the next patch
piix4: don't reserve hw resources when hotplug is off globally tests/acpi: update golden master DSDT binary table blobs for q35

Daniel P. Berrangé (3):
hw/smbios: support loading OEM strings values from a file hw/smbios: report error if table size is too large
qemu-options: document SMBIOS type 11 settings

David Hildenbrand (1):
pc: fix auto_enable_numa_with_memhp/auto_enable_numa_with_memdev for the 5.0 machine

Dima Stepanov (3):
vhost: recheck dev state in the vhost_migration_log routine
vhost: check queue state in the vhost_dev_set_log routine tests/qtest/vhost-user-test: prepare the tests for adding new dev class

Eric Auger (2):
virtio-iommu: Check gtrees are non null before destroying them
virtio-iommu-pci: force virtio version 1

Igor Mammedov (11):
cphp: remove deprecated cpu-add command(s)
x86: lpc9: let firmware negotiate 'CPU hotplug with SMI' features
x86: cpuhp: prevent guest crash on CPU hotplug when broadcast SMI is in use
x86: cpuhp: refuse cpu hot-unplug request earlier if not supported
acpi: add aml_land() and aml_break() primitives
tests: acpi: mark to be changed tables in bios-tables-test-allowed-diff
x86: ich9: expose "smi_negotiated_features" as a QOM property
x86: acpi: introduce AcpiPmInfo::smi_on_cpuhp
x86: acpi: introduce the PCI0.SMI0 ACPI device
x68: acpi: trigger SMI before sending hotplug Notify event to OSPM
tests: acpi: update acpi blobs with new AML

Jason Wang (3):
linux headers: sync to 5.9-rc4
vhost: switch to use IOTLB v2 format
vhost-vdpa: batch updating IOTLB mappings

Laurent Vivier (3):
util/hexdump: introduce qemu_hexdump_line()
vhost-vdpa: add trace-events
configure: Fix build dependencies with vhost-vdpa.

Li Qiang (3):
virtio-mem: detach the element from the virtqueue when error occurs
virtio: update MemoryRegionCaches when guest set bad features
hw: virtio-pmem: detach the element fromt the virtqueue when error occurs

Pankaj Gupta (1):
virtio-pmem-pci: force virtio version 1

Stefan Hajnoczi (2):
libvhost-user: return early on virtqueue errors
libvhost-user: return on error in vu_log_queue_fill()

Stefano Garzarella (4):
virtio: skip legacy support check on machine types less than 5.1
vhost-vsock-pci: force virtio version 1
vhost-user-vsock-pci: force virtio version 1
vhost-vsock-ccw: force virtio version 1

haibinzhang(张海斌) (1):
vhost-user: save features of multiqueues if chardev is closed

 configure                                          |    3 +-
 qapi/machine.json                                  |   24 -
 include/hw/acpi/aml-build.h                        |    2 +
 include/hw/acpi/cpu.h                              |    1 +
 include/hw/boards.h                                |    1 -
 include/hw/i386/ich9.h                             |    4 +
 include/hw/i386/pc.h                               |    1 -
 include/hw/virtio/vhost-backend.h                  |    2 +
 include/hw/virtio/vhost-user-blk.h                 |   10 +
 include/hw/virtio/vhost-vdpa.h                     |    1 +
 include/hw/virtio/vhost.h                          |    1 +
 include/hw/virtio/virtio.h                         |    2 +
 include/monitor/hmp.h                              |    1 -
 include/qemu-common.h                              |    8 +
 include/standard-headers/drm/drm_fourcc.h          |  140 +
 include/standard-headers/linux/ethtool.h           |   87 +
 include/standard-headers/linux/input-event-codes.h |    3 +-
 include/standard-headers/linux/vhost_types.h       |   11 +
 include/standard-headers/linux/virtio_9p.h         |    4 +-
 include/standard-headers/linux/virtio_blk.h        |   26 +-
 include/standard-headers/linux/virtio_config.h     |    8 +-
 include/standard-headers/linux/virtio_console.h    |    8 +-
 include/standard-headers/linux/virtio_net.h        |    6 +-
 include/standard-headers/linux/virtio_scsi.h       |   20 +-
 linux-headers/asm-generic/unistd.h                 |    6 +-
 linux-headers/asm-mips/unistd_n32.h                |    1 +
 linux-headers/asm-mips/unistd_n64.h                |    1 +
 linux-headers/asm-mips/unistd_o32.h                |    1 +
 linux-headers/asm-powerpc/kvm.h                    |    5 +
 linux-headers/asm-powerpc/unistd_32.h              |    1 +
 linux-headers/asm-powerpc/unistd_64.h              |    1 +
 linux-headers/asm-s390/kvm.h                       |    7 +-
 linux-headers/asm-s390/unistd_32.h                 |    1 +
 linux-headers/asm-s390/unistd_64.h                 |    1 +
 linux-headers/asm-x86/unistd_32.h                  |    1 +
 linux-headers/asm-x86/unistd_64.h                  |    1 +
 linux-headers/asm-x86/unistd_x32.h                 |    1 +
 linux-headers/linux/kvm.h                          |    4 +
 linux-headers/linux/vfio.h                         |    2 +-
 linux-headers/linux/vhost.h                        |    2 +
 contrib/libvhost-user/libvhost-user.c              |   26 +-
 hw/acpi/aml-build.c                                |   16 +
 hw/acpi/cpu.c                                      |  165 +-
 hw/acpi/ich9.c                                     |   24 +-
 hw/acpi/pcihp.c                                    |   15 +
 hw/acpi/piix4.c                                    |    6 +-
 hw/block/vhost-user-blk.c                          |   19 +-
 hw/core/machine-hmp-cmds.c                         |   12 -
 hw/core/machine-qmp-cmds.c                         |   12 -
 hw/core/machine.c                                  |    1 +
 hw/i386/acpi-build.c                               |   72 +-
 hw/i386/pc.c                                       |   31 +-
 hw/i386/pc_piix.c                                  |    1 -
 hw/i386/pc_q35.c                                   |    2 +-
 hw/i386/x86.c                                      |   11 +
 hw/isa/lpc_ich9.c                                  |   16 +
 hw/s390x/s390-virtio-ccw.c                         |   12 -
 hw/s390x/vhost-vsock-ccw.c                         |   12 +
 hw/s390x/virtio-ccw.c                              |   15 +-
 hw/smbios/smbios.c                                 |   85 +-
 hw/virtio/vhost-backend.c                          |   88 +-
 hw/virtio/vhost-user-vsock-pci.c                   |    4 +-
 hw/virtio/vhost-vdpa.c                             |  158 +-
 hw/virtio/vhost-vsock-pci.c                        |   10 +-
 hw/virtio/vhost.c                                  |   49 +-
 hw/virtio/virtio-iommu-pci.c                       |    2 +-
 hw/virtio/virtio-iommu.c                           |    8 +-
 hw/virtio/virtio-mem.c                             |    3 +
 hw/virtio/virtio-pci.c                             |   14 +-
 hw/virtio/virtio-pmem-pci.c                        |    1 +
 hw/virtio/virtio-pmem.c                            |    1 +
 hw/virtio/virtio.c                                 |   24 +-
 net/vhost-user.c                                   |   10 +-
 tests/qtest/bios-tables-test.c                     |   32 +
 tests/qtest/cpu-plug-test.c                        |  100 +-
 tests/qtest/test-hmp.c                             |    1 -
 tests/qtest/vhost-user-test.c                      |  105 +-
 tests/test-qapi-event.c                            |  198 ++
 tests/test-qmp-introspect.c                        |   58 +
 tests/test-qmp-marshal.c                           |  383 +++
 util/hexdump.c                                     |   54 +-
 Kconfig.host                                       |    4 +
 docs/system/deprecated.rst                         |   25 +-
 hmp-commands.hx                                    |   15 -
 hw/virtio/trace-events                             |   31 +
 meson.build                                        |    1 +
 qemu-options.hx                                    |   41 +
 tests/.vhost-user-test.c.swo                       |  Bin 0 -> 16384 bytes
 tests/Makefile.include.orig                        | 1012 ++++++
 tests/Makefile.orig                                |  569 ++++
 tests/bios-tables-test.c.orig                      |  925 +++++
 tests/data/acpi/diff-aml.sh                        |    0
 tests/data/acpi/disassemle-aml.py                  |   21 +
 tests/data/acpi/microvm/APIC.dsl                   |   56 +
 tests/data/acpi/microvm/DSDT.dsl                   |  121 +
 tests/data/acpi/microvm/FACP.dsl                   |  196 ++
 tests/data/acpi/pc/APIC.acpihmat.dsl               |  112 +
 tests/data/acpi/pc/APIC.bridge                     |  Bin 0 -> 120 bytes
 tests/data/acpi/pc/APIC.bridge.dsl                 |  104 +
 tests/data/acpi/pc/APIC.cphp.dsl                   |  146 +
 tests/data/acpi/pc/APIC.dimmpxm.dsl                |  129 +
 tests/data/acpi/pc/APIC.dsl                        |  104 +
 tests/data/acpi/pc/APIC.hpbridge                   |  Bin 0 -> 120 bytes
 tests/data/acpi/pc/APIC.ipmikcs                    |  Bin 0 -> 120 bytes
 tests/data/acpi/pc/APIC.ipmikcs.dsl                |  104 +
 tests/data/acpi/pc/APIC.memhp                      |  Bin 0 -> 120 bytes
 tests/data/acpi/pc/APIC.memhp.dsl                  |  104 +
 tests/data/acpi/pc/APIC.numamem                    |  Bin 0 -> 120 bytes
 tests/data/acpi/pc/APIC.numamem.dsl                |  104 +
 tests/data/acpi/pc/APIC.roothp                     |  Bin 0 -> 120 bytes
 tests/data/acpi/pc/DSDT                            |  Bin 4934 -> 5060 bytes
 tests/data/acpi/pc/DSDT.acpihmat                   |  Bin 6258 -> 6385 bytes
 tests/data/acpi/pc/DSDT.acpihmat.dsl               | 1619 +++++++++
 tests/data/acpi/pc/DSDT.bridge                     |  Bin 6793 -> 6919 bytes
 tests/data/acpi/pc/DSDT.bridge.dsl                 | 1800 ++++++++++
 tests/data/acpi/pc/DSDT.cphp                       |  Bin 5397 -> 5524 bytes
 tests/data/acpi/pc/DSDT.cphp.dsl                   | 1466 ++++++++
 tests/data/acpi/pc/DSDT.dimmpxm                    |  Bin 6587 -> 6714 bytes
 tests/data/acpi/pc/DSDT.dimmpxm.dsl                | 1719 ++++++++++
 tests/data/acpi/pc/DSDT.dsl                        | 1407 ++++++++
 tests/data/acpi/pc/DSDT.hpbridge                   |  Bin 0 -> 5021 bytes
 tests/data/acpi/pc/DSDT.ipmikcs                    |  Bin 5006 -> 5132 bytes
 tests/data/acpi/pc/DSDT.ipmikcs.dsl                | 1337 ++++++++
 tests/data/acpi/pc/DSDT.memhp                      |  Bin 6293 -> 6419 bytes
 tests/data/acpi/pc/DSDT.memhp.dsl                  | 1625 +++++++++
 tests/data/acpi/pc/DSDT.numamem                    |  Bin 4940 -> 5066 bytes
 tests/data/acpi/pc/DSDT.numamem.dsl                | 1321 ++++++++
 tests/data/acpi/pc/DSDT.roothp                     |  Bin 0 -> 5256 bytes
 tests/data/acpi/pc/FACP.acpihmat                   |  Bin 0 -> 116 bytes
 tests/data/acpi/pc/FACP.acpihmat.dsl               |   99 +
 tests/data/acpi/pc/FACP.bridge                     |  Bin 0 -> 116 bytes
 tests/data/acpi/pc/FACP.bridge.dsl                 |   99 +
 tests/data/acpi/pc/FACP.cphp                       |  Bin 0 -> 116 bytes
 tests/data/acpi/pc/FACP.cphp.dsl                   |   99 +
 tests/data/acpi/pc/FACP.dimmpxm                    |  Bin 0 -> 116 bytes
 tests/data/acpi/pc/FACP.dimmpxm.dsl                |   99 +
 tests/data/acpi/pc/FACP.dsl                        |   99 +
 tests/data/acpi/pc/FACP.hpbridge                   |  Bin 0 -> 116 bytes
 tests/data/acpi/pc/FACP.ipmikcs                    |  Bin 0 -> 116 bytes
 tests/data/acpi/pc/FACP.ipmikcs.dsl                |   99 +
 tests/data/acpi/pc/FACP.memhp                      |  Bin 0 -> 116 bytes
 tests/data/acpi/pc/FACP.memhp.dsl                  |   99 +
 tests/data/acpi/pc/FACP.numamem                    |  Bin 0 -> 116 bytes
 tests/data/acpi/pc/FACP.numamem.dsl                |   99 +
 tests/data/acpi/pc/FACP.roothp                     |  Bin 0 -> 116 bytes
 tests/data/acpi/pc/FACS.acpihmat                   |  Bin 0 -> 64 bytes
 tests/data/acpi/pc/FACS.acpihmat.dsl               |   32 +
 tests/data/acpi/pc/FACS.bridge                     |  Bin 0 -> 64 bytes
 tests/data/acpi/pc/FACS.bridge.dsl                 |   32 +
 tests/data/acpi/pc/FACS.cphp                       |  Bin 0 -> 64 bytes
 tests/data/acpi/pc/FACS.cphp.dsl                   |   32 +
 tests/data/acpi/pc/FACS.dimmpxm                    |  Bin 0 -> 64 bytes
 tests/data/acpi/pc/FACS.dimmpxm.dsl                |   32 +
 tests/data/acpi/pc/FACS.dsl                        |   32 +
 tests/data/acpi/pc/FACS.hpbridge                   |  Bin 0 -> 64 bytes
 tests/data/acpi/pc/FACS.ipmikcs                    |  Bin 0 -> 64 bytes
 tests/data/acpi/pc/FACS.ipmikcs.dsl                |   32 +
 tests/data/acpi/pc/FACS.memhp                      |  Bin 0 -> 64 bytes
 tests/data/acpi/pc/FACS.memhp.dsl                  |   32 +
 tests/data/acpi/pc/FACS.numamem                    |  Bin 0 -> 64 bytes
 tests/data/acpi/pc/FACS.numamem.dsl                |   32 +
 tests/data/acpi/pc/FACS.roothp                     |  Bin 0 -> 64 bytes
 tests/data/acpi/pc/HMAT.acpihmat.dsl               |  132 +
 tests/data/acpi/pc/HMAT.dsl                        |  132 +
 tests/data/acpi/pc/HPET.acpihmat                   |  Bin 0 -> 56 bytes
 tests/data/acpi/pc/HPET.acpihmat.dsl               |   43 +
 tests/data/acpi/pc/HPET.bridge                     |  Bin 0 -> 56 bytes
 tests/data/acpi/pc/HPET.bridge.dsl                 |   43 +
 tests/data/acpi/pc/HPET.cphp                       |  Bin 0 -> 56 bytes
 tests/data/acpi/pc/HPET.cphp.dsl                   |   43 +
 tests/data/acpi/pc/HPET.dimmpxm                    |  Bin 0 -> 56 bytes
 tests/data/acpi/pc/HPET.dimmpxm.dsl                |   43 +
 tests/data/acpi/pc/HPET.dsl                        |   43 +
 tests/data/acpi/pc/HPET.hpbridge                   |  Bin 0 -> 56 bytes
 tests/data/acpi/pc/HPET.ipmikcs                    |  Bin 0 -> 56 bytes
 tests/data/acpi/pc/HPET.ipmikcs.dsl                |   43 +
 tests/data/acpi/pc/HPET.memhp                      |  Bin 0 -> 56 bytes
 tests/data/acpi/pc/HPET.memhp.dsl                  |   43 +
 tests/data/acpi/pc/HPET.numamem                    |  Bin 0 -> 56 bytes
 tests/data/acpi/pc/HPET.numamem.dsl                |   43 +
 tests/data/acpi/pc/HPET.roothp                     |  Bin 0 -> 56 bytes
 tests/data/acpi/pc/NFIT.dimmpxm.dsl                |  115 +
 tests/data/acpi/pc/NFIT.dsl                        |  115 +
 tests/data/acpi/pc/SLIT.cphp.dsl                   |   31 +
 tests/data/acpi/pc/SLIT.dsl                        |   31 +
 tests/data/acpi/pc/SLIT.memhp.dsl                  |   31 +
 tests/data/acpi/pc/SRAT.acpihmat.dsl               |  137 +
 tests/data/acpi/pc/SRAT.cphp.dsl                   |  168 +
 tests/data/acpi/pc/SRAT.dimmpxm.dsl                |  194 ++
 tests/data/acpi/pc/SRAT.dsl                        |  108 +
 tests/data/acpi/pc/SRAT.memhp.dsl                  |  125 +
 tests/data/acpi/pc/SRAT.numamem.dsl                |  108 +
 tests/data/acpi/pc/SSDT.dsl                        |  205 ++
 tests/data/acpi/pc/WAET.acpihmat                   |  Bin 0 -> 40 bytes
 tests/data/acpi/pc/WAET.acpihmat.dsl               |   31 +
 tests/data/acpi/pc/WAET.bridge                     |  Bin 0 -> 40 bytes
 tests/data/acpi/pc/WAET.bridge.dsl                 |   31 +
 tests/data/acpi/pc/WAET.cphp                       |  Bin 0 -> 40 bytes
 tests/data/acpi/pc/WAET.cphp.dsl                   |   31 +
 tests/data/acpi/pc/WAET.dimmpxm                    |  Bin 0 -> 40 bytes
 tests/data/acpi/pc/WAET.dimmpxm.dsl                |   31 +
 tests/data/acpi/pc/WAET.dsl                        |   31 +
 tests/data/acpi/pc/WAET.hpbridge                   |  Bin 0 -> 40 bytes
 tests/data/acpi/pc/WAET.ipmikcs                    |  Bin 0 -> 40 bytes
 tests/data/acpi/pc/WAET.ipmikcs.dsl                |   31 +
 tests/data/acpi/pc/WAET.memhp                      |  Bin 0 -> 40 bytes
 tests/data/acpi/pc/WAET.memhp.dsl                  |   31 +
 tests/data/acpi/pc/WAET.numamem                    |  Bin 0 -> 40 bytes
 tests/data/acpi/pc/WAET.numamem.dsl                |   31 +
 tests/data/acpi/pc/WAET.roothp                     |  Bin 0 -> 40 bytes
 tests/data/acpi/q35/APIC.acpihmat.dsl              |  112 +
 tests/data/acpi/q35/APIC.bridge                    |  Bin 0 -> 120 bytes
 tests/data/acpi/q35/APIC.bridge.dsl                |  104 +
 tests/data/acpi/q35/APIC.cphp.dsl                  |  146 +
 tests/data/acpi/q35/APIC.dimmpxm.dsl               |  129 +
 tests/data/acpi/q35/APIC.dsl                       |  104 +
 tests/data/acpi/q35/APIC.ipmibt                    |  Bin 0 -> 120 bytes
 tests/data/acpi/q35/APIC.ipmibt.dsl                |  104 +
 tests/data/acpi/q35/APIC.memhp                     |  Bin 0 -> 120 bytes
 tests/data/acpi/q35/APIC.memhp.dsl                 |  104 +
 tests/data/acpi/q35/APIC.mmio64                    |  Bin 0 -> 120 bytes
 tests/data/acpi/q35/APIC.mmio64.dsl                |  104 +
 tests/data/acpi/q35/APIC.numamem                   |  Bin 0 -> 120 bytes
 tests/data/acpi/q35/APIC.numamem.dsl               |  104 +
 tests/data/acpi/q35/APIC.tis                       |  Bin 0 -> 120 bytes
 tests/data/acpi/q35/APIC.tis.dsl                   |  104 +
 tests/data/acpi/q35/DSDT                           |  Bin 7678 -> 7796 bytes
 tests/data/acpi/q35/DSDT.acpihmat                  |  Bin 9002 -> 9121 bytes
 tests/data/acpi/q35/DSDT.acpihmat.dsl              | 3436 +++++++++++++++++++
 tests/data/acpi/q35/DSDT.bridge                    |  Bin 7695 -> 7814 bytes
 tests/data/acpi/q35/DSDT.bridge.dsl                | 3141 +++++++++++++++++
 tests/data/acpi/q35/DSDT.cphp                      |  Bin 8141 -> 8260 bytes
 tests/data/acpi/q35/DSDT.cphp.dsl                  | 3283 ++++++++++++++++++
 tests/data/acpi/q35/DSDT.dimmpxm                   |  Bin 9331 -> 9450 bytes
 tests/data/acpi/q35/DSDT.dimmpxm.dsl               | 3535 ++++++++++++++++++++
 tests/data/acpi/q35/DSDT.dsl                       | 3351 +++++++++++++++++++
 tests/data/acpi/q35/DSDT.ipmibt                    |  Bin 7753 -> 7871 bytes
 tests/data/acpi/q35/DSDT.ipmibt.dsl                | 3156 +++++++++++++++++
 tests/data/acpi/q35/DSDT.memhp                     |  Bin 9037 -> 9155 bytes
 tests/data/acpi/q35/DSDT.memhp.dsl                 | 3442 +++++++++++++++++++
 tests/data/acpi/q35/DSDT.mmio64                    |  Bin 8808 -> 8927 bytes
 tests/data/acpi/q35/DSDT.mmio64.dsl                | 3377 +++++++++++++++++++
 tests/data/acpi/q35/DSDT.numamem                   |  Bin 7684 -> 7802 bytes
 tests/data/acpi/q35/DSDT.numamem.dsl               | 3138 +++++++++++++++++
 tests/data/acpi/q35/DSDT.tis                       |  Bin 8283 -> 8402 bytes
 tests/data/acpi/q35/DSDT.tis.dsl                   | 3321 ++++++++++++++++++
 tests/data/acpi/q35/FACP.acpihmat                  |  Bin 0 -> 244 bytes
 tests/data/acpi/q35/FACP.acpihmat.dsl              |  179 +
 tests/data/acpi/q35/FACP.bridge                    |  Bin 0 -> 244 bytes
 tests/data/acpi/q35/FACP.bridge.dsl                |  179 +
 tests/data/acpi/q35/FACP.cphp                      |  Bin 0 -> 244 bytes
 tests/data/acpi/q35/FACP.cphp.dsl                  |  179 +
 tests/data/acpi/q35/FACP.dimmpxm                   |  Bin 0 -> 244 bytes
 tests/data/acpi/q35/FACP.dimmpxm.dsl               |  179 +
 tests/data/acpi/q35/FACP.dsl                       |  179 +
 tests/data/acpi/q35/FACP.ipmibt                    |  Bin 0 -> 244 bytes
 tests/data/acpi/q35/FACP.ipmibt.dsl                |  179 +
 tests/data/acpi/q35/FACP.memhp                     |  Bin 0 -> 244 bytes
 tests/data/acpi/q35/FACP.memhp.dsl                 |  179 +
 tests/data/acpi/q35/FACP.mmio64                    |  Bin 0 -> 244 bytes
 tests/data/acpi/q35/FACP.mmio64.dsl                |  179 +
 tests/data/acpi/q35/FACP.numamem                   |  Bin 0 -> 244 bytes
 tests/data/acpi/q35/FACP.numamem.dsl               |  179 +
 tests/data/acpi/q35/FACP.tis                       |  Bin 0 -> 244 bytes
 tests/data/acpi/q35/FACP.tis.dsl                   |  179 +
 tests/data/acpi/q35/FACS.acpihmat                  |  Bin 0 -> 64 bytes
 tests/data/acpi/q35/FACS.acpihmat.dsl              |   32 +
 tests/data/acpi/q35/FACS.bridge                    |  Bin 0 -> 64 bytes
 tests/data/acpi/q35/FACS.bridge.dsl                |   32 +
 tests/data/acpi/q35/FACS.cphp                      |  Bin 0 -> 64 bytes
 tests/data/acpi/q35/FACS.cphp.dsl                  |   32 +
 tests/data/acpi/q35/FACS.dimmpxm                   |  Bin 0 -> 64 bytes
 tests/data/acpi/q35/FACS.dimmpxm.dsl               |   32 +
 tests/data/acpi/q35/FACS.dsl                       |   32 +
 tests/data/acpi/q35/FACS.ipmibt                    |  Bin 0 -> 64 bytes
 tests/data/acpi/q35/FACS.ipmibt.dsl                |   32 +
 tests/data/acpi/q35/FACS.memhp                     |  Bin 0 -> 64 bytes
 tests/data/acpi/q35/FACS.memhp.dsl                 |   32 +
 tests/data/acpi/q35/FACS.mmio64                    |  Bin 0 -> 64 bytes
 tests/data/acpi/q35/FACS.mmio64.dsl                |   32 +
 tests/data/acpi/q35/FACS.numamem                   |  Bin 0 -> 64 bytes
 tests/data/acpi/q35/FACS.numamem.dsl               |   32 +
 tests/data/acpi/q35/FACS.tis                       |  Bin 0 -> 64 bytes
 tests/data/acpi/q35/FACS.tis.dsl                   |   32 +
 tests/data/acpi/q35/HMAT.acpihmat.dsl              |  132 +
 tests/data/acpi/q35/HMAT.dsl                       |  132 +
 tests/data/acpi/q35/HPET.acpihmat                  |  Bin 0 -> 56 bytes
 tests/data/acpi/q35/HPET.acpihmat.dsl              |   43 +
 tests/data/acpi/q35/HPET.bridge                    |  Bin 0 -> 56 bytes
 tests/data/acpi/q35/HPET.bridge.dsl                |   43 +
 tests/data/acpi/q35/HPET.cphp                      |  Bin 0 -> 56 bytes
 tests/data/acpi/q35/HPET.cphp.dsl                  |   43 +
 tests/data/acpi/q35/HPET.dimmpxm                   |  Bin 0 -> 56 bytes
 tests/data/acpi/q35/HPET.dimmpxm.dsl               |   43 +
 tests/data/acpi/q35/HPET.dsl                       |   43 +
 tests/data/acpi/q35/HPET.ipmibt                    |  Bin 0 -> 56 bytes
 tests/data/acpi/q35/HPET.ipmibt.dsl                |   43 +
 tests/data/acpi/q35/HPET.memhp                     |  Bin 0 -> 56 bytes
 tests/data/acpi/q35/HPET.memhp.dsl                 |   43 +
 tests/data/acpi/q35/HPET.mmio64                    |  Bin 0 -> 56 bytes
 tests/data/acpi/q35/HPET.mmio64.dsl                |   43 +
 tests/data/acpi/q35/HPET.numamem                   |  Bin 0 -> 56 bytes
 tests/data/acpi/q35/HPET.numamem.dsl               |   43 +
 tests/data/acpi/q35/HPET.tis                       |  Bin 0 -> 56 bytes
 tests/data/acpi/q35/HPET.tis.dsl                   |   43 +
 tests/data/acpi/q35/MCFG.acpihmat                  |  Bin 0 -> 60 bytes
 tests/data/acpi/q35/MCFG.acpihmat.dsl              |   36 +
 tests/data/acpi/q35/MCFG.bridge                    |  Bin 0 -> 60 bytes
 tests/data/acpi/q35/MCFG.bridge.dsl                |   36 +
 tests/data/acpi/q35/MCFG.cphp                      |  Bin 0 -> 60 bytes
 tests/data/acpi/q35/MCFG.cphp.dsl                  |   36 +
 tests/data/acpi/q35/MCFG.dimmpxm                   |  Bin 0 -> 60 bytes
 tests/data/acpi/q35/MCFG.dimmpxm.dsl               |   36 +
 tests/data/acpi/q35/MCFG.dsl                       |   36 +
 tests/data/acpi/q35/MCFG.ipmibt                    |  Bin 0 -> 60 bytes
 tests/data/acpi/q35/MCFG.ipmibt.dsl                |   36 +
 tests/data/acpi/q35/MCFG.memhp                     |  Bin 0 -> 60 bytes
 tests/data/acpi/q35/MCFG.memhp.dsl                 |   36 +
 tests/data/acpi/q35/MCFG.mmio64                    |  Bin 0 -> 60 bytes
 tests/data/acpi/q35/MCFG.mmio64.dsl                |   36 +
 tests/data/acpi/q35/MCFG.numamem                   |  Bin 0 -> 60 bytes
 tests/data/acpi/q35/MCFG.numamem.dsl               |   36 +
 tests/data/acpi/q35/MCFG.tis                       |  Bin 0 -> 60 bytes
 tests/data/acpi/q35/MCFG.tis.dsl                   |   36 +
 tests/data/acpi/q35/NFIT.dimmpxm.dsl               |  115 +
 tests/data/acpi/q35/NFIT.dsl                       |  115 +
 tests/data/acpi/q35/SLIT.cphp.dsl                  |   31 +
 tests/data/acpi/q35/SLIT.dsl                       |   31 +
 tests/data/acpi/q35/SLIT.memhp.dsl                 |   31 +
 tests/data/acpi/q35/SRAT.acpihmat.dsl              |  137 +
 tests/data/acpi/q35/SRAT.cphp.dsl                  |  168 +
 tests/data/acpi/q35/SRAT.dimmpxm.dsl               |  194 ++
 tests/data/acpi/q35/SRAT.dsl                       |  108 +
 tests/data/acpi/q35/SRAT.memhp.dsl                 |  125 +
 tests/data/acpi/q35/SRAT.mmio64.dsl                |  108 +
 tests/data/acpi/q35/SRAT.numamem.dsl               |  108 +
 tests/data/acpi/q35/SSDT.dsl                       |  205 ++
 tests/data/acpi/q35/TPM2.dsl                       |   38 +
 tests/data/acpi/q35/TPM2.tis.dsl                   |   38 +
 tests/data/acpi/q35/WAET.acpihmat                  |  Bin 0 -> 40 bytes
 tests/data/acpi/q35/WAET.acpihmat.dsl              |   31 +
 tests/data/acpi/q35/WAET.bridge                    |  Bin 0 -> 40 bytes
 tests/data/acpi/q35/WAET.bridge.dsl                |   31 +
 tests/data/acpi/q35/WAET.cphp                      |  Bin 0 -> 40 bytes
 tests/data/acpi/q35/WAET.cphp.dsl                  |   31 +
 tests/data/acpi/q35/WAET.dimmpxm                   |  Bin 0 -> 40 bytes
 tests/data/acpi/q35/WAET.dimmpxm.dsl               |   31 +
 tests/data/acpi/q35/WAET.dsl                       |   31 +
 tests/data/acpi/q35/WAET.ipmibt                    |  Bin 0 -> 40 bytes
 tests/data/acpi/q35/WAET.ipmibt.dsl                |   31 +
 tests/data/acpi/q35/WAET.memhp                     |  Bin 0 -> 40 bytes
 tests/data/acpi/q35/WAET.memhp.dsl                 |   31 +
 tests/data/acpi/q35/WAET.mmio64                    |  Bin 0 -> 40 bytes
 tests/data/acpi/q35/WAET.mmio64.dsl                |   31 +
 tests/data/acpi/q35/WAET.numamem                   |  Bin 0 -> 40 bytes
 tests/data/acpi/q35/WAET.numamem.dsl               |   31 +
 tests/data/acpi/q35/WAET.tis                       |  Bin 0 -> 40 bytes
 tests/data/acpi/q35/WAET.tis.dsl                   |   31 +
 tests/data/acpi/virt/APIC.dsl                      |   78 +
 tests/data/acpi/virt/APIC.memhp.dsl                |   78 +
 tests/data/acpi/virt/APIC.numamem.dsl              |   78 +
 tests/data/acpi/virt/DSDT.dsl                      | 1906 +++++++++++
 tests/data/acpi/virt/DSDT.memhp.dsl                | 2215 ++++++++++++
 tests/data/acpi/virt/DSDT.numamem.dsl              | 1906 +++++++++++
 tests/data/acpi/virt/FACP.dsl                      |  196 ++
 tests/data/acpi/virt/FACP.memhp.dsl                |  196 ++
 tests/data/acpi/virt/FACP.numamem.dsl              |  196 ++
 tests/data/acpi/virt/GTDT.dsl                      |   61 +
 tests/data/acpi/virt/GTDT.memhp.dsl                |   61 +
 tests/data/acpi/virt/GTDT.numamem.dsl              |   61 +
 tests/data/acpi/virt/MCFG.dsl                      |   36 +
 tests/data/acpi/virt/MCFG.memhp.dsl                |   36 +
 tests/data/acpi/virt/MCFG.numamem.dsl              |   36 +
 tests/data/acpi/virt/NFIT.dsl                      |  103 +
 tests/data/acpi/virt/NFIT.memhp.dsl                |  103 +
 tests/data/acpi/virt/SLIT.dsl                      |   31 +
 tests/data/acpi/virt/SLIT.memhp.dsl                |   31 +
 tests/data/acpi/virt/SPCR.dsl                      |   57 +
 tests/data/acpi/virt/SPCR.memhp.dsl                |   57 +
 tests/data/acpi/virt/SPCR.numamem.dsl              |   57 +
 tests/data/acpi/virt/SRAT.dsl                      |   57 +
 tests/data/acpi/virt/SRAT.memhp.dsl                |  107 +
 tests/data/acpi/virt/SRAT.numamem.dsl              |   57 +
 tests/data/acpi/virt/SSDT.dsl                      |  205 ++
 .../bios-tables-test.x86_64.iso.raw                |  Bin 0 -> 425984 bytes
 tests/libqtest.c.orig                              | 1106 ++++++
 tests/qemu-iotests/core.12067                      |  Bin 0 -> 22716416 bytes
 tests/qtest/bios-tables-test-allowed-diff.h.orig   |   18 +
 tests/qtest/bios-tables-test-allowed-diff.h.rej    |    9 +
 tests/qtest/bios-tables-test.c.orig                | 1200 +++++++
 tests/qtest/bios-tables-test.c.rej                 |   22 +
 tests/vhost-user-bridge                            |  Bin 0 -> 83120 bytes
 tests/vhost-user-bridge.c.orig                     | 1432 ++++++++
 tests/vhost-user-test.c.orig                       |  364 ++
 394 files changed, 72814 insertions(+), 419 deletions(-)
 create mode 100644 tests/test-qapi-event.c
 create mode 100644 tests/test-qmp-introspect.c
 create mode 100644 tests/test-qmp-marshal.c
 create mode 100644 tests/.vhost-user-test.c.swo
 create mode 100644 tests/Makefile.include.orig
 create mode 100644 tests/Makefile.orig
 create mode 100644 tests/bios-tables-test.c.orig
 create mode 100644 tests/data/acpi/diff-aml.sh
 create mode 100644 tests/data/acpi/disassemle-aml.py
 create mode 100644 tests/data/acpi/microvm/APIC.dsl
 create mode 100644 tests/data/acpi/microvm/DSDT.dsl
 create mode 100644 tests/data/acpi/microvm/FACP.dsl
 create mode 100644 tests/data/acpi/pc/APIC.acpihmat.dsl
 create mode 100644 tests/data/acpi/pc/APIC.bridge
 create mode 100644 tests/data/acpi/pc/APIC.bridge.dsl
 create mode 100644 tests/data/acpi/pc/APIC.cphp.dsl
 create mode 100644 tests/data/acpi/pc/APIC.dimmpxm.dsl
 create mode 100644 tests/data/acpi/pc/APIC.dsl
 create mode 100644 tests/data/acpi/pc/APIC.hpbridge
 create mode 100644 tests/data/acpi/pc/APIC.ipmikcs
 create mode 100644 tests/data/acpi/pc/APIC.ipmikcs.dsl
 create mode 100644 tests/data/acpi/pc/APIC.memhp
 create mode 100644 tests/data/acpi/pc/APIC.memhp.dsl
 create mode 100644 tests/data/acpi/pc/APIC.numamem
 create mode 100644 tests/data/acpi/pc/APIC.numamem.dsl
 create mode 100644 tests/data/acpi/pc/APIC.roothp
 create mode 100644 tests/data/acpi/pc/DSDT.acpihmat.dsl
 create mode 100644 tests/data/acpi/pc/DSDT.bridge.dsl
 create mode 100644 tests/data/acpi/pc/DSDT.cphp.dsl
 create mode 100644 tests/data/acpi/pc/DSDT.dimmpxm.dsl
 create mode 100644 tests/data/acpi/pc/DSDT.dsl
 create mode 100644 tests/data/acpi/pc/DSDT.hpbridge
 create mode 100644 tests/data/acpi/pc/DSDT.ipmikcs.dsl
 create mode 100644 tests/data/acpi/pc/DSDT.memhp.dsl
 create mode 100644 tests/data/acpi/pc/DSDT.numamem.dsl
 create mode 100644 tests/data/acpi/pc/DSDT.roothp
 create mode 100644 tests/data/acpi/pc/FACP.acpihmat
 create mode 100644 tests/data/acpi/pc/FACP.acpihmat.dsl
 create mode 100644 tests/data/acpi/pc/FACP.bridge
 create mode 100644 tests/data/acpi/pc/FACP.bridge.dsl
 create mode 100644 tests/data/acpi/pc/FACP.cphp
 create mode 100644 tests/data/acpi/pc/FACP.cphp.dsl
 create mode 100644 tests/data/acpi/pc/FACP.dimmpxm
 create mode 100644 tests/data/acpi/pc/FACP.dimmpxm.dsl
 create mode 100644 tests/data/acpi/pc/FACP.dsl
 create mode 100644 tests/data/acpi/pc/FACP.hpbridge
 create mode 100644 tests/data/acpi/pc/FACP.ipmikcs
 create mode 100644 tests/data/acpi/pc/FACP.ipmikcs.dsl
 create mode 100644 tests/data/acpi/pc/FACP.memhp
 create mode 100644 tests/data/acpi/pc/FACP.memhp.dsl
 create mode 100644 tests/data/acpi/pc/FACP.numamem
 create mode 100644 tests/data/acpi/pc/FACP.numamem.dsl
 create mode 100644 tests/data/acpi/pc/FACP.roothp
 create mode 100644 tests/data/acpi/pc/FACS.acpihmat
 create mode 100644 tests/data/acpi/pc/FACS.acpihmat.dsl
 create mode 100644 tests/data/acpi/pc/FACS.bridge
 create mode 100644 tests/data/acpi/pc/FACS.bridge.dsl
 create mode 100644 tests/data/acpi/pc/FACS.cphp
 create mode 100644 tests/data/acpi/pc/FACS.cphp.dsl
 create mode 100644 tests/data/acpi/pc/FACS.dimmpxm
 create mode 100644 tests/data/acpi/pc/FACS.dimmpxm.dsl
 create mode 100644 tests/data/acpi/pc/FACS.dsl
 create mode 100644 tests/data/acpi/pc/FACS.hpbridge
 create mode 100644 tests/data/acpi/pc/FACS.ipmikcs
 create mode 100644 tests/data/acpi/pc/FACS.ipmikcs.dsl
 create mode 100644 tests/data/acpi/pc/FACS.memhp
 create mode 100644 tests/data/acpi/pc/FACS.memhp.dsl
 create mode 100644 tests/data/acpi/pc/FACS.numamem
 create mode 100644 tests/data/acpi/pc/FACS.numamem.dsl
 create mode 100644 tests/data/acpi/pc/FACS.roothp
 create mode 100644 tests/data/acpi/pc/HMAT.acpihmat.dsl
 create mode 100644 tests/data/acpi/pc/HMAT.dsl
 create mode 100644 tests/data/acpi/pc/HPET.acpihmat
 create mode 100644 tests/data/acpi/pc/HPET.acpihmat.dsl
 create mode 100644 tests/data/acpi/pc/HPET.bridge
 create mode 100644 tests/data/acpi/pc/HPET.bridge.dsl
 create mode 100644 tests/data/acpi/pc/HPET.cphp
 create mode 100644 tests/data/acpi/pc/HPET.cphp.dsl
 create mode 100644 tests/data/acpi/pc/HPET.dimmpxm
 create mode 100644 tests/data/acpi/pc/HPET.dimmpxm.dsl
 create mode 100644 tests/data/acpi/pc/HPET.dsl
 create mode 100644 tests/data/acpi/pc/HPET.hpbridge
 create mode 100644 tests/data/acpi/pc/HPET.ipmikcs
 create mode 100644 tests/data/acpi/pc/HPET.ipmikcs.dsl
 create mode 100644 tests/data/acpi/pc/HPET.memhp
 create mode 100644 tests/data/acpi/pc/HPET.memhp.dsl
 create mode 100644 tests/data/acpi/pc/HPET.numamem
 create mode 100644 tests/data/acpi/pc/HPET.numamem.dsl
 create mode 100644 tests/data/acpi/pc/HPET.roothp
 create mode 100644 tests/data/acpi/pc/NFIT.dimmpxm.dsl
 create mode 100644 tests/data/acpi/pc/NFIT.dsl
 create mode 100644 tests/data/acpi/pc/SLIT.cphp.dsl
 create mode 100644 tests/data/acpi/pc/SLIT.dsl
 create mode 100644 tests/data/acpi/pc/SLIT.memhp.dsl
 create mode 100644 tests/data/acpi/pc/SRAT.acpihmat.dsl
 create mode 100644 tests/data/acpi/pc/SRAT.cphp.dsl
 create mode 100644 tests/data/acpi/pc/SRAT.dimmpxm.dsl
 create mode 100644 tests/data/acpi/pc/SRAT.dsl
 create mode 100644 tests/data/acpi/pc/SRAT.memhp.dsl
 create mode 100644 tests/data/acpi/pc/SRAT.numamem.dsl
 create mode 100644 tests/data/acpi/pc/SSDT.dsl
 create mode 100644 tests/data/acpi/pc/WAET.acpihmat
 create mode 100644 tests/data/acpi/pc/WAET.acpihmat.dsl
 create mode 100644 tests/data/acpi/pc/WAET.bridge
 create mode 100644 tests/data/acpi/pc/WAET.bridge.dsl
 create mode 100644 tests/data/acpi/pc/WAET.cphp
 create mode 100644 tests/data/acpi/pc/WAET.cphp.dsl
 create mode 100644 tests/data/acpi/pc/WAET.dimmpxm
 create mode 100644 tests/data/acpi/pc/WAET.dimmpxm.dsl
 create mode 100644 tests/data/acpi/pc/WAET.dsl
 create mode 100644 tests/data/acpi/pc/WAET.hpbridge
 create mode 100644 tests/data/acpi/pc/WAET.ipmikcs
 create mode 100644 tests/data/acpi/pc/WAET.ipmikcs.dsl
 create mode 100644 tests/data/acpi/pc/WAET.memhp
 create mode 100644 tests/data/acpi/pc/WAET.memhp.dsl
 create mode 100644 tests/data/acpi/pc/WAET.numamem
 create mode 100644 tests/data/acpi/pc/WAET.numamem.dsl
 create mode 100644 tests/data/acpi/pc/WAET.roothp
 create mode 100644 tests/data/acpi/q35/APIC.acpihmat.dsl
 create mode 100644 tests/data/acpi/q35/APIC.bridge
 create mode 100644 tests/data/acpi/q35/APIC.bridge.dsl
 create mode 100644 tests/data/acpi/q35/APIC.cphp.dsl
 create mode 100644 tests/data/acpi/q35/APIC.dimmpxm.dsl
 create mode 100644 tests/data/acpi/q35/APIC.dsl
 create mode 100644 tests/data/acpi/q35/APIC.ipmibt
 create mode 100644 tests/data/acpi/q35/APIC.ipmibt.dsl
 create mode 100644 tests/data/acpi/q35/APIC.memhp
 create mode 100644 tests/data/acpi/q35/APIC.memhp.dsl
 create mode 100644 tests/data/acpi/q35/APIC.mmio64
 create mode 100644 tests/data/acpi/q35/APIC.mmio64.dsl
 create mode 100644 tests/data/acpi/q35/APIC.numamem
 create mode 100644 tests/data/acpi/q35/APIC.numamem.dsl
 create mode 100644 tests/data/acpi/q35/APIC.tis
 create mode 100644 tests/data/acpi/q35/APIC.tis.dsl
 create mode 100644 tests/data/acpi/q35/DSDT.acpihmat.dsl
 create mode 100644 tests/data/acpi/q35/DSDT.bridge.dsl
 create mode 100644 tests/data/acpi/q35/DSDT.cphp.dsl
 create mode 100644 tests/data/acpi/q35/DSDT.dimmpxm.dsl
 create mode 100644 tests/data/acpi/q35/DSDT.dsl
 create mode 100644 tests/data/acpi/q35/DSDT.ipmibt.dsl
 create mode 100644 tests/data/acpi/q35/DSDT.memhp.dsl
 create mode 100644 tests/data/acpi/q35/DSDT.mmio64.dsl
 create mode 100644 tests/data/acpi/q35/DSDT.numamem.dsl
 create mode 100644 tests/data/acpi/q35/DSDT.tis.dsl
 create mode 100644 tests/data/acpi/q35/FACP.acpihmat
 create mode 100644 tests/data/acpi/q35/FACP.acpihmat.dsl
 create mode 100644 tests/data/acpi/q35/FACP.bridge
 create mode 100644 tests/data/acpi/q35/FACP.bridge.dsl
 create mode 100644 tests/data/acpi/q35/FACP.cphp
 create mode 100644 tests/data/acpi/q35/FACP.cphp.dsl
 create mode 100644 tests/data/acpi/q35/FACP.dimmpxm
 create mode 100644 tests/data/acpi/q35/FACP.dimmpxm.dsl
 create mode 100644 tests/data/acpi/q35/FACP.dsl
 create mode 100644 tests/data/acpi/q35/FACP.ipmibt
 create mode 100644 tests/data/acpi/q35/FACP.ipmibt.dsl
 create mode 100644 tests/data/acpi/q35/FACP.memhp
 create mode 100644 tests/data/acpi/q35/FACP.memhp.dsl
 create mode 100644 tests/data/acpi/q35/FACP.mmio64
 create mode 100644 tests/data/acpi/q35/FACP.mmio64.dsl
 create mode 100644 tests/data/acpi/q35/FACP.numamem
 create mode 100644 tests/data/acpi/q35/FACP.numamem.dsl
 create mode 100644 tests/data/acpi/q35/FACP.tis
 create mode 100644 tests/data/acpi/q35/FACP.tis.dsl
 create mode 100644 tests/data/acpi/q35/FACS.acpihmat
 create mode 100644 tests/data/acpi/q35/FACS.acpihmat.dsl
 create mode 100644 tests/data/acpi/q35/FACS.bridge
 create mode 100644 tests/data/acpi/q35/FACS.bridge.dsl
 create mode 100644 tests/data/acpi/q35/FACS.cphp
 create mode 100644 tests/data/acpi/q35/FACS.cphp.dsl
 create mode 100644 tests/data/acpi/q35/FACS.dimmpxm
 create mode 100644 tests/data/acpi/q35/FACS.dimmpxm.dsl
 create mode 100644 tests/data/acpi/q35/FACS.dsl
 create mode 100644 tests/data/acpi/q35/FACS.ipmibt
 create mode 100644 tests/data/acpi/q35/FACS.ipmibt.dsl
 create mode 100644 tests/data/acpi/q35/FACS.memhp
 create mode 100644 tests/data/acpi/q35/FACS.memhp.dsl
 create mode 100644 tests/data/acpi/q35/FACS.mmio64
 create mode 100644 tests/data/acpi/q35/FACS.mmio64.dsl
 create mode 100644 tests/data/acpi/q35/FACS.numamem
 create mode 100644 tests/data/acpi/q35/FACS.numamem.dsl
 create mode 100644 tests/data/acpi/q35/FACS.tis
 create mode 100644 tests/data/acpi/q35/FACS.tis.dsl
 create mode 100644 tests/data/acpi/q35/HMAT.acpihmat.dsl
 create mode 100644 tests/data/acpi/q35/HMAT.dsl
 create mode 100644 tests/data/acpi/q35/HPET.acpihmat
 create mode 100644 tests/data/acpi/q35/HPET.acpihmat.dsl
 create mode 100644 tests/data/acpi/q35/HPET.bridge
 create mode 100644 tests/data/acpi/q35/HPET.bridge.dsl
 create mode 100644 tests/data/acpi/q35/HPET.cphp
 create mode 100644 tests/data/acpi/q35/HPET.cphp.dsl
 create mode 100644 tests/data/acpi/q35/HPET.dimmpxm
 create mode 100644 tests/data/acpi/q35/HPET.dimmpxm.dsl
 create mode 100644 tests/data/acpi/q35/HPET.dsl
 create mode 100644 tests/data/acpi/q35/HPET.ipmibt
 create mode 100644 tests/data/acpi/q35/HPET.ipmibt.dsl
 create mode 100644 tests/data/acpi/q35/HPET.memhp
 create mode 100644 tests/data/acpi/q35/HPET.memhp.dsl
 create mode 100644 tests/data/acpi/q35/HPET.mmio64
 create mode 100644 tests/data/acpi/q35/HPET.mmio64.dsl
 create mode 100644 tests/data/acpi/q35/HPET.numamem
 create mode 100644 tests/data/acpi/q35/HPET.numamem.dsl
 create mode 100644 tests/data/acpi/q35/HPET.tis
 create mode 100644 tests/data/acpi/q35/HPET.tis.dsl
 create mode 100644 tests/data/acpi/q35/MCFG.acpihmat
 create mode 100644 tests/data/acpi/q35/MCFG.acpihmat.dsl
 create mode 100644 tests/data/acpi/q35/MCFG.bridge
 create mode 100644 tests/data/acpi/q35/MCFG.bridge.dsl
 create mode 100644 tests/data/acpi/q35/MCFG.cphp
 create mode 100644 tests/data/acpi/q35/MCFG.cphp.dsl
 create mode 100644 tests/data/acpi/q35/MCFG.dimmpxm
 create mode 100644 tests/data/acpi/q35/MCFG.dimmpxm.dsl
 create mode 100644 tests/data/acpi/q35/MCFG.dsl
 create mode 100644 tests/data/acpi/q35/MCFG.ipmibt
 create mode 100644 tests/data/acpi/q35/MCFG.ipmibt.dsl
 create mode 100644 tests/data/acpi/q35/MCFG.memhp
 create mode 100644 tests/data/acpi/q35/MCFG.memhp.dsl
 create mode 100644 tests/data/acpi/q35/MCFG.mmio64
 create mode 100644 tests/data/acpi/q35/MCFG.mmio64.dsl
 create mode 100644 tests/data/acpi/q35/MCFG.numamem
 create mode 100644 tests/data/acpi/q35/MCFG.numamem.dsl
 create mode 100644 tests/data/acpi/q35/MCFG.tis
 create mode 100644 tests/data/acpi/q35/MCFG.tis.dsl
 create mode 100644 tests/data/acpi/q35/NFIT.dimmpxm.dsl
 create mode 100644 tests/data/acpi/q35/NFIT.dsl
 create mode 100644 tests/data/acpi/q35/SLIT.cphp.dsl
 create mode 100644 tests/data/acpi/q35/SLIT.dsl
 create mode 100644 tests/data/acpi/q35/SLIT.memhp.dsl
 create mode 100644 tests/data/acpi/q35/SRAT.acpihmat.dsl
 create mode 100644 tests/data/acpi/q35/SRAT.cphp.dsl
 create mode 100644 tests/data/acpi/q35/SRAT.dimmpxm.dsl
 create mode 100644 tests/data/acpi/q35/SRAT.dsl
 create mode 100644 tests/data/acpi/q35/SRAT.memhp.dsl
 create mode 100644 tests/data/acpi/q35/SRAT.mmio64.dsl
 create mode 100644 tests/data/acpi/q35/SRAT.numamem.dsl
 create mode 100644 tests/data/acpi/q35/SSDT.dsl
 create mode 100644 tests/data/acpi/q35/TPM2.dsl
 create mode 100644 tests/data/acpi/q35/TPM2.tis.dsl
 create mode 100644 tests/data/acpi/q35/WAET.acpihmat
 create mode 100644 tests/data/acpi/q35/WAET.acpihmat.dsl
 create mode 100644 tests/data/acpi/q35/WAET.bridge
 create mode 100644 tests/data/acpi/q35/WAET.bridge.dsl
 create mode 100644 tests/data/acpi/q35/WAET.cphp
 create mode 100644 tests/data/acpi/q35/WAET.cphp.dsl
 create mode 100644 tests/data/acpi/q35/WAET.dimmpxm
 create mode 100644 tests/data/acpi/q35/WAET.dimmpxm.dsl
 create mode 100644 tests/data/acpi/q35/WAET.dsl
 create mode 100644 tests/data/acpi/q35/WAET.ipmibt
 create mode 100644 tests/data/acpi/q35/WAET.ipmibt.dsl
 create mode 100644 tests/data/acpi/q35/WAET.memhp
 create mode 100644 tests/data/acpi/q35/WAET.memhp.dsl
 create mode 100644 tests/data/acpi/q35/WAET.mmio64
 create mode 100644 tests/data/acpi/q35/WAET.mmio64.dsl
 create mode 100644 tests/data/acpi/q35/WAET.numamem
 create mode 100644 tests/data/acpi/q35/WAET.numamem.dsl
 create mode 100644 tests/data/acpi/q35/WAET.tis
 create mode 100644 tests/data/acpi/q35/WAET.tis.dsl
 create mode 100644 tests/data/acpi/virt/APIC.dsl
 create mode 100644 tests/data/acpi/virt/APIC.memhp.dsl
 create mode 100644 tests/data/acpi/virt/APIC.numamem.dsl
 create mode 100644 tests/data/acpi/virt/DSDT.dsl
 create mode 100644 tests/data/acpi/virt/DSDT.memhp.dsl
 create mode 100644 tests/data/acpi/virt/DSDT.numamem.dsl
 create mode 100644 tests/data/acpi/virt/FACP.dsl
 create mode 100644 tests/data/acpi/virt/FACP.memhp.dsl
 create mode 100644 tests/data/acpi/virt/FACP.numamem.dsl
 create mode 100644 tests/data/acpi/virt/GTDT.dsl
 create mode 100644 tests/data/acpi/virt/GTDT.memhp.dsl
 create mode 100644 tests/data/acpi/virt/GTDT.numamem.dsl
 create mode 100644 tests/data/acpi/virt/MCFG.dsl
 create mode 100644 tests/data/acpi/virt/MCFG.memhp.dsl
 create mode 100644 tests/data/acpi/virt/MCFG.numamem.dsl
 create mode 100644 tests/data/acpi/virt/NFIT.dsl
 create mode 100644 tests/data/acpi/virt/NFIT.memhp.dsl
 create mode 100644 tests/data/acpi/virt/SLIT.dsl
 create mode 100644 tests/data/acpi/virt/SLIT.memhp.dsl
 create mode 100644 tests/data/acpi/virt/SPCR.dsl
 create mode 100644 tests/data/acpi/virt/SPCR.memhp.dsl
 create mode 100644 tests/data/acpi/virt/SPCR.numamem.dsl
 create mode 100644 tests/data/acpi/virt/SRAT.dsl
 create mode 100644 tests/data/acpi/virt/SRAT.memhp.dsl
 create mode 100644 tests/data/acpi/virt/SRAT.numamem.dsl
 create mode 100644 tests/data/acpi/virt/SSDT.dsl
 create mode 100644 tests/data/uefi-boot-images/bios-tables-test.x86_64.iso.raw
 create mode 100644 tests/libqtest.c.orig
 create mode 100644 tests/qemu-iotests/core.12067
 create mode 100644 tests/qtest/bios-tables-test-allowed-diff.h.orig
 create mode 100644 tests/qtest/bios-tables-test-allowed-diff.h.rej
 create mode 100644 tests/qtest/bios-tables-test.c.orig
 create mode 100644 tests/qtest/bios-tables-test.c.rej
 create mode 100755 tests/vhost-user-bridge
 create mode 100644 tests/vhost-user-bridge.c.orig
 create mode 100644 tests/vhost-user-test.c.orig
#1 lore raw

[PULL v4 03/48] vhost-vdpa: batch updating IOTLB mappings

From: Jason Wang <[email protected]>

To speed up the memory mapping updating between vhost-vDPA and vDPA device driver, this patch passes the IOTLB batching flags via IOTLB API. Two new flags was introduced, VHOST_IOTLB_BATCH_BEGIN is a hint that a bathced IOTLB updating may be initiated from the userspace. VHOST_IOTLB_BATCH_END is a hint that userspace has finished the updating:

VHOST_IOTLB_BATCH_BEGIN
VHOST_IOTLB_UPDATE/VHOST_IOTLB_INVALIDATE
...
VHOST_IOTLB_BATCH_END

Vhost-vDPA can then know that all mappings has been set and can do optimization like passing all the mappings to the vDPA device driver.

Message-Id: <[email protected]>

---
 include/hw/virtio/vhost-vdpa.h |  1 +
 hw/virtio/vhost-vdpa.c         | 66 ++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)
include/hw/virtio/vhost-vdpa.h +1 -0
index 6455663388..9b81a409da 100644
@@ -18,6 +18,7 @@ typedef struct vhost_vdpa {
     int device_fd;
     uint32_t msg_type;
     MemoryListener listener;
+    struct vhost_dev *dev;
 } VhostVDPA;
 
 extern AddressSpace address_space_memory;
hw/virtio/vhost-vdpa.c +66 -0

96 lines not on this page · raw message

Signature · 1 line
MST
#2 lore raw

[PULL v4 01/48] linux headers: sync to 5.9-rc4

In reply to Michael S. Tsirkin

From: Jason Wang <[email protected]>

Update against Linux 5.9-rc4.

Cc Cornelia Huck <[email protected]>
Cc Paolo Bonzini <[email protected]>

Message-Id: <[email protected]>

---
 include/standard-headers/drm/drm_fourcc.h     | 140 ++++++++++++++++++
 include/standard-headers/linux/ethtool.h      |  87 +++++++++++
 .../linux/input-event-codes.h                 |   3 +-
 include/standard-headers/linux/vhost_types.h  |  11 ++
 include/standard-headers/linux/virtio_9p.h    |   4 +-
 include/standard-headers/linux/virtio_blk.h   |  26 ++--
 .../standard-headers/linux/virtio_config.h    |   8 +-
 .../standard-headers/linux/virtio_console.h   |   8 +-
 include/standard-headers/linux/virtio_net.h   |   6 +-
 include/standard-headers/linux/virtio_scsi.h  |  20 +--
 linux-headers/asm-generic/unistd.h            |   6 +-
 linux-headers/asm-mips/unistd_n32.h           |   1 +
 linux-headers/asm-mips/unistd_n64.h           |   1 +
 linux-headers/asm-mips/unistd_o32.h           |   1 +
 linux-headers/asm-powerpc/kvm.h               |   5 +
 linux-headers/asm-powerpc/unistd_32.h         |   1 +
 linux-headers/asm-powerpc/unistd_64.h         |   1 +
 linux-headers/asm-s390/kvm.h                  |   7 +-
 linux-headers/asm-s390/unistd_32.h            |   1 +
 linux-headers/asm-s390/unistd_64.h            |   1 +
 linux-headers/asm-x86/unistd_32.h             |   1 +
 linux-headers/asm-x86/unistd_64.h             |   1 +
 linux-headers/asm-x86/unistd_x32.h            |   1 +
 linux-headers/linux/kvm.h                     |   4 +
 linux-headers/linux/vfio.h                    |   2 +-
 linux-headers/linux/vhost.h                   |   2 +
 26 files changed, 308 insertions(+), 41 deletions(-)
include/standard-headers/drm/drm_fourcc.h +140 -0
index 909a66753c..0de1a552ca 100644
@@ -235,6 +235,12 @@ extern "C" {
 #define DRM_FORMAT_NV61		fourcc_code('N', 'V', '6', '1') /* 2x1 subsampled Cb:Cr plane */
 #define DRM_FORMAT_NV24		fourcc_code('N', 'V', '2', '4') /* non-subsampled Cr:Cb plane */
 #define DRM_FORMAT_NV42		fourcc_code('N', 'V', '4', '2') /* non-subsampled Cb:Cr plane */
+/*
+ * 2 plane YCbCr
+ * index 0 = Y plane, [39:0] Y3:Y2:Y1:Y0 little endian
+ * index 1 = Cr:Cb plane, [39:0] Cr1:Cb1:Cr0:Cb0 little endian
+ */
+#define DRM_FORMAT_NV15		fourcc_code('N', 'V', '1', '5') /* 2x2 subsampled Cr:Cb plane */
 
 /*
  * 2 plane YCbCr MSB aligned
@@ -264,6 +270,22 @@ extern "C" {
  */
 #define DRM_FORMAT_P016		fourcc_code('P', '0', '1', '6') /* 2x2 subsampled Cr:Cb plane 16 bits per channel */
 
+/* 3 plane non-subsampled (444) YCbCr
+ * 16 bits per component, but only 10 bits are used and 6 bits are padded
+ * index 0: Y plane, [15:0] Y:x [10:6] little endian
+ * index 1: Cb plane, [15:0] Cb:x [10:6] little endian
+ * index 2: Cr plane, [15:0] Cr:x [10:6] little endian
+ */
+#define DRM_FORMAT_Q410		fourcc_code('Q', '4', '1', '0')
+
+/* 3 plane non-subsampled (444) YCrCb
+ * 16 bits per component, but only 10 bits are used and 6 bits are padded
+ * index 0: Y plane, [15:0] Y:x [10:6] little endian
+ * index 1: Cr plane, [15:0] Cr:x [10:6] little endian
+ * index 2: Cb plane, [15:0] Cb:x [10:6] little endian
+ */
+#define DRM_FORMAT_Q401		fourcc_code('Q', '4', '0', '1')
+
 /*
  * 3 plane YCbCr
  * index 0: Y plane, [7:0] Y
@@ -308,6 +330,7 @@ extern "C" {
 #define DRM_FORMAT_MOD_VENDOR_BROADCOM 0x07
 #define DRM_FORMAT_MOD_VENDOR_ARM     0x08
 #define DRM_FORMAT_MOD_VENDOR_ALLWINNER 0x09
+#define DRM_FORMAT_MOD_VENDOR_AMLOGIC 0x0a
 
 /* add more to the end as needed */
 
@@ -322,8 +345,33 @@ extern "C" {
  * When adding a new token please document the layout with a code comment,
  * similar to the fourcc codes above. drm_fourcc.h is considered the
  * authoritative source for all of these.
+ *
+ * Generic modifier names:
+ *
+ * DRM_FORMAT_MOD_GENERIC_* definitions are used to provide vendor-neutral names
+ * for layouts which are common across multiple vendors. To preserve
+ * compatibility, in cases where a vendor-specific definition already exists and
+ * a generic name for it is desired, the common name is a purely symbolic alias
+ * and must use the same numerical value as the original definition.
+ *
+ * Note that generic names should only be used for modifiers which describe
+ * generic layouts (such as pixel re-ordering), which may have
+ * independently-developed support across multiple vendors.
+ *
+ * In future cases where a generic layout is identified before merging with a
+ * vendor-specific modifier, a new 'GENERIC' vendor or modifier using vendor
+ * 'NONE' could be considered. This should only be for obvious, exceptional
+ * cases to avoid polluting the 'GENERIC' namespace with modifiers which only
+ * apply to a single vendor.
+ *
+ * Generic names should not be used for cases where multiple hardware vendors
+ * have implementations of the same standardised compression scheme (such as
+ * AFBC). In those cases, all implementations should use the same format
+ * modifier(s), reflecting the vendor of the standard.
  */
 
+#define DRM_FORMAT_MOD_GENERIC_16_16_TILE DRM_FORMAT_MOD_SAMSUNG_16_16_TILE
+
 /*
  * Invalid Modifier
  *
@@ -891,6 +939,18 @@ drm_fourcc_canonicalize_nvidia_format_mod(uint64_t modifier)
  */
 #define AFBC_FORMAT_MOD_BCH     (1ULL << 11)
 
+/* AFBC uncompressed storage mode
+ *
+ * Indicates that the buffer is using AFBC uncompressed storage mode.
+ * In this mode all superblock payloads in the buffer use the uncompressed
+ * storage mode, which is usually only used for data which cannot be compressed.
+ * The buffer layout is the same as for AFBC buffers without USM set, this only
+ * affects the storage mode of the individual superblocks. Note that even a
+ * buffer without USM set may use uncompressed storage mode for some or all
+ * superblocks, USM just guarantees it for all.
+ */
+#define AFBC_FORMAT_MOD_USM	(1ULL << 12)
+
 /*
  * Arm 16x16 Block U-Interleaved modifier
  *
@@ -915,6 +975,86 @@ drm_fourcc_canonicalize_nvidia_format_mod(uint64_t modifier)
  */
 #define DRM_FORMAT_MOD_ALLWINNER_TILED fourcc_mod_code(ALLWINNER, 1)
 
+/*
+ * Amlogic Video Framebuffer Compression modifiers
+ *
+ * Amlogic uses a proprietary lossless image compression protocol and format
+ * for their hardware video codec accelerators, either video decoders or
+ * video input encoders.
+ *
+ * It considerably reduces memory bandwidth while writing and reading
+ * frames in memory.
+ *
+ * The underlying storage is considered to be 3 components, 8bit or 10-bit
+ * per component YCbCr 420, single plane :
+ * - DRM_FORMAT_YUV420_8BIT
+ * - DRM_FORMAT_YUV420_10BIT
+ *
+ * The first 8 bits of the mode defines the layout, then the following 8 bits
+ * defines the options changing the layout.
+ *
+ * Not all combinations are valid, and different SoCs may support different
+ * combinations of layout and options.
+ */
+#define __fourcc_mod_amlogic_layout_mask 0xf
+#define __fourcc_mod_amlogic_options_shift 8
+#define __fourcc_mod_amlogic_options_mask 0xf
+
+#define DRM_FORMAT_MOD_AMLOGIC_FBC(__layout, __options) \
+	fourcc_mod_code(AMLOGIC, \
+			((__layout) & __fourcc_mod_amlogic_layout_mask) | \
+			(((__options) & __fourcc_mod_amlogic_options_mask) \
+			 << __fourcc_mod_amlogic_options_shift))
+
+/* Amlogic FBC Layouts */
+
+/*
+ * Amlogic FBC Basic Layout
+ *
+ * The basic layout is composed of:
+ * - a body content organized in 64x32 superblocks with 4096 bytes per
+ *   superblock in default mode.
+ * - a 32 bytes per 128x64 header block
+ *
+ * This layout is transferrable between Amlogic SoCs supporting this modifier.
+ */
+#define AMLOGIC_FBC_LAYOUT_BASIC		(1ULL)
+
+/*
+ * Amlogic FBC Scatter Memory layout
+ *
+ * Indicates the header contains IOMMU references to the compressed
+ * frames content to optimize memory access and layout.
+ *
+ * In this mode, only the header memory address is needed, thus the
+ * content memory organization is tied to the current producer
+ * execution and cannot be saved/dumped neither transferrable between
+ * Amlogic SoCs supporting this modifier.
+ *
+ * Due to the nature of the layout, these buffers are not expected to
+ * be accessible by the user-space clients, but only accessible by the
+ * hardware producers and consumers.
+ *
+ * The user-space clients should expect a failure while trying to mmap
+ * the DMA-BUF handle returned by the producer.
+ */
+#define AMLOGIC_FBC_LAYOUT_SCATTER		(2ULL)
+
+/* Amlogic FBC Layout Options Bit Mask */
+
+/*
+ * Amlogic FBC Memory Saving mode
+ *
+ * Indicates the storage is packed when pixel size is multiple of word
+ * boudaries, i.e. 8bit should be stored in this mode to save allocation
+ * memory.
+ *
+ * This mode reduces body layout to 3072 bytes per 64x32 superblock with
+ * the basic layout and 3200 bytes per 64x32 superblock combined with
+ * the scatter layout.
+ */
+#define AMLOGIC_FBC_OPTION_MEM_SAVING		(1ULL << 0)
+
 #if defined(__cplusplus)
 }
 #endif
include/standard-headers/linux/ethtool.h +87 -0

111 lines not on this page · raw message

include/standard-headers/linux/input-event-codes.h +2 -1
index ebf72c1031..e740ad9f2e 100644
@@ -888,7 +888,8 @@
 #define SW_LINEIN_INSERT	0x0d  /* set = inserted */
 #define SW_MUTE_DEVICE		0x0e  /* set = device disabled */
 #define SW_PEN_INSERTED		0x0f  /* set = pen inserted */
-#define SW_MAX_			0x0f
+#define SW_MACHINE_COVER	0x10  /* set = cover closed */
+#define SW_MAX_			0x10
 #define SW_CNT			(SW_MAX_+1)
 
 /*
include/standard-headers/linux/vhost_types.h +11 -0
index a678d8fbaa..486630b332 100644
@@ -60,6 +60,17 @@ struct vhost_iotlb_msg {
 #define VHOST_IOTLB_UPDATE         2
 #define VHOST_IOTLB_INVALIDATE     3
 #define VHOST_IOTLB_ACCESS_FAIL    4
+/*
+ * VHOST_IOTLB_BATCH_BEGIN and VHOST_IOTLB_BATCH_END allow modifying
+ * multiple mappings in one go: beginning with
+ * VHOST_IOTLB_BATCH_BEGIN, followed by any number of
+ * VHOST_IOTLB_UPDATE messages, and ending with VHOST_IOTLB_BATCH_END.
+ * When one of these two values is used as the message type, the rest
+ * of the fields in the message are ignored. There's no guarantee that
+ * these changes take place automatically in the device.
+ */
+#define VHOST_IOTLB_BATCH_BEGIN    5
+#define VHOST_IOTLB_BATCH_END      6
 	uint8_t type;
 };
 
include/standard-headers/linux/virtio_9p.h +2 -2
index e68f71dbe6..f5604fc5fb 100644
@@ -25,7 +25,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE. */
-#include "standard-headers/linux/types.h"
+#include "standard-headers/linux/virtio_types.h"
 #include "standard-headers/linux/virtio_ids.h"
 #include "standard-headers/linux/virtio_config.h"
 
@@ -36,7 +36,7 @@
 
 struct virtio_9p_config {
 	/* length of the tag name */
-	uint16_t tag_len;
+	__virtio16 tag_len;
 	/* non-NULL terminated tag name */
 	uint8_t tag[0];
 } QEMU_PACKED;
include/standard-headers/linux/virtio_blk.h +13 -13
index 0229b0fbe4..2dcc90826a 100644
@@ -55,20 +55,20 @@
 
 struct virtio_blk_config {
 	/* The capacity (in 512-byte sectors). */
-	uint64_t capacity;
+	__virtio64 capacity;
 	/* The maximum segment size (if VIRTIO_BLK_F_SIZE_MAX) */
-	uint32_t size_max;
+	__virtio32 size_max;
 	/* The maximum number of segments (if VIRTIO_BLK_F_SEG_MAX) */
-	uint32_t seg_max;
+	__virtio32 seg_max;
 	/* geometry of the device (if VIRTIO_BLK_F_GEOMETRY) */
 	struct virtio_blk_geometry {
-		uint16_t cylinders;
+		__virtio16 cylinders;
 		uint8_t heads;
 		uint8_t sectors;
 	} geometry;
 
 	/* block size of device (if VIRTIO_BLK_F_BLK_SIZE) */
-	uint32_t blk_size;
+	__virtio32 blk_size;
 
 	/* the next 4 entries are guarded by VIRTIO_BLK_F_TOPOLOGY  */
 	/* exponent for physical block per logical block. */
@@ -76,42 +76,42 @@ struct virtio_blk_config {
 	/* alignment offset in logical blocks. */
 	uint8_t alignment_offset;
 	/* minimum I/O size without performance penalty in logical blocks. */
-	uint16_t min_io_size;
+	__virtio16 min_io_size;
 	/* optimal sustained I/O size in logical blocks. */
-	uint32_t opt_io_size;
+	__virtio32 opt_io_size;
 
 	/* writeback mode (if VIRTIO_BLK_F_CONFIG_WCE) */
 	uint8_t wce;
 	uint8_t unused;
 
 	/* number of vqs, only available when VIRTIO_BLK_F_MQ is set */
-	uint16_t num_queues;
+	__virtio16 num_queues;
 
 	/* the next 3 entries are guarded by VIRTIO_BLK_F_DISCARD */
 	/*
 	 * The maximum discard sectors (in 512-byte sectors) for
 	 * one segment.
 	 */
-	uint32_t max_discard_sectors;
+	__virtio32 max_discard_sectors;
 	/*
 	 * The maximum number of discard segments in a
 	 * discard command.
 	 */
-	uint32_t max_discard_seg;
+	__virtio32 max_discard_seg;
 	/* Discard commands must be aligned to this number of sectors. */
-	uint32_t discard_sector_alignment;
+	__virtio32 discard_sector_alignment;
 
 	/* the next 3 entries are guarded by VIRTIO_BLK_F_WRITE_ZEROES */
 	/*
 	 * The maximum number of write zeroes sectors (in 512-byte sectors) in
 	 * one segment.
 	 */
-	uint32_t max_write_zeroes_sectors;
+	__virtio32 max_write_zeroes_sectors;
 	/*
 	 * The maximum number of segments in a write zeroes
 	 * command.
 	 */
-	uint32_t max_write_zeroes_seg;
+	__virtio32 max_write_zeroes_seg;
 	/*
 	 * Set if a VIRTIO_BLK_T_WRITE_ZEROES request may result in the
 	 * deallocation of one or more of the sectors.
include/standard-headers/linux/virtio_config.h +5 -3
index 9a69d9e242..22e3a85f67 100644
@@ -67,13 +67,15 @@
 #define VIRTIO_F_VERSION_1		32
 
 /*
- * If clear - device has the IOMMU bypass quirk feature.
- * If set - use platform tools to detect the IOMMU.
+ * If clear - device has the platform DMA (e.g. IOMMU) bypass quirk feature.
+ * If set - use platform DMA tools to access the memory.
  *
  * Note the reverse polarity (compared to most other features),
  * this is for compatibility with legacy systems.
  */
-#define VIRTIO_F_IOMMU_PLATFORM		33
+#define VIRTIO_F_ACCESS_PLATFORM	33
+/* Legacy name for VIRTIO_F_ACCESS_PLATFORM (for compatibility with old userspace) */
+#define VIRTIO_F_IOMMU_PLATFORM		VIRTIO_F_ACCESS_PLATFORM
 
 /* This feature indicates support for the packed virtqueue layout. */
 #define VIRTIO_F_RING_PACKED		34
include/standard-headers/linux/virtio_console.h +4 -4
index 0dedc9e6f5..71f5f648e3 100644
@@ -45,13 +45,13 @@
 
 struct virtio_console_config {
 	/* colums of the screens */
-	uint16_t cols;
+	__virtio16 cols;
 	/* rows of the screens */
-	uint16_t rows;
+	__virtio16 rows;
 	/* max. number of ports this device can hold */
-	uint32_t max_nr_ports;
+	__virtio32 max_nr_ports;
 	/* emergency write register */
-	uint32_t emerg_wr;
+	__virtio32 emerg_wr;
 } QEMU_PACKED;
 
 /*
include/standard-headers/linux/virtio_net.h +3 -3
index a90f79e1b1..e0a070518f 100644
@@ -87,14 +87,14 @@ struct virtio_net_config {
 	/* The config defining mac address (if VIRTIO_NET_F_MAC) */
 	uint8_t mac[ETH_ALEN];
 	/* See VIRTIO_NET_F_STATUS and VIRTIO_NET_S_* above */
-	uint16_t status;
+	__virtio16 status;
 	/* Maximum number of each of transmit and receive queues;
 	 * see VIRTIO_NET_F_MQ and VIRTIO_NET_CTRL_MQ.
 	 * Legal values are between 1 and 0x8000
 	 */
-	uint16_t max_virtqueue_pairs;
+	__virtio16 max_virtqueue_pairs;
 	/* Default maximum transmit unit advice */
-	uint16_t mtu;
+	__virtio16 mtu;
 	/*
 	 * speed, in units of 1Mb. All values 0 to INT_MAX are legal.
 	 * Any other value stands for unknown.
include/standard-headers/linux/virtio_scsi.h +10 -10
index ab66166b6a..663f36cbb7 100644
@@ -103,16 +103,16 @@ struct virtio_scsi_event {
 } QEMU_PACKED;
 
 struct virtio_scsi_config {
-	uint32_t num_queues;
-	uint32_t seg_max;
-	uint32_t max_sectors;
-	uint32_t cmd_per_lun;
-	uint32_t event_info_size;
-	uint32_t sense_size;
-	uint32_t cdb_size;
-	uint16_t max_channel;
-	uint16_t max_target;
-	uint32_t max_lun;
+	__virtio32 num_queues;
+	__virtio32 seg_max;
+	__virtio32 max_sectors;
+	__virtio32 cmd_per_lun;
+	__virtio32 event_info_size;
+	__virtio32 sense_size;
+	__virtio32 cdb_size;
+	__virtio16 max_channel;
+	__virtio16 max_target;
+	__virtio32 max_lun;
 } QEMU_PACKED;
 
 /* Feature Bits */
linux-headers/asm-generic/unistd.h +4 -2
index f4a01305d9..995b36c2ea 100644
@@ -606,9 +606,9 @@ __SYSCALL(__NR_sendto, sys_sendto)
 #define __NR_recvfrom 207
 __SC_COMP(__NR_recvfrom, sys_recvfrom, compat_sys_recvfrom)
 #define __NR_setsockopt 208
-__SC_COMP(__NR_setsockopt, sys_setsockopt, compat_sys_setsockopt)
+__SC_COMP(__NR_setsockopt, sys_setsockopt, sys_setsockopt)
 #define __NR_getsockopt 209
-__SC_COMP(__NR_getsockopt, sys_getsockopt, compat_sys_getsockopt)
+__SC_COMP(__NR_getsockopt, sys_getsockopt, sys_getsockopt)
 #define __NR_shutdown 210
 __SYSCALL(__NR_shutdown, sys_shutdown)
 #define __NR_sendmsg 211
@@ -850,6 +850,8 @@ __SYSCALL(__NR_pidfd_open, sys_pidfd_open)
 #define __NR_clone3 435
 __SYSCALL(__NR_clone3, sys_clone3)
 #endif
+#define __NR_close_range 436
+__SYSCALL(__NR_close_range, sys_close_range)
 
 #define __NR_openat2 437
 __SYSCALL(__NR_openat2, sys_openat2)
linux-headers/asm-mips/unistd_n32.h +1 -0
index 3b9eda7e7d..246fbb6a78 100644
@@ -365,6 +365,7 @@
 #define __NR_fspick	(__NR_Linux + 433)
 #define __NR_pidfd_open	(__NR_Linux + 434)
 #define __NR_clone3	(__NR_Linux + 435)
+#define __NR_close_range	(__NR_Linux + 436)
 #define __NR_openat2	(__NR_Linux + 437)
 #define __NR_pidfd_getfd	(__NR_Linux + 438)
 #define __NR_faccessat2	(__NR_Linux + 439)
linux-headers/asm-mips/unistd_n64.h +1 -0
index 9cdf9b6c60..194d777dfd 100644
@@ -341,6 +341,7 @@
 #define __NR_fspick	(__NR_Linux + 433)
 #define __NR_pidfd_open	(__NR_Linux + 434)
 #define __NR_clone3	(__NR_Linux + 435)
+#define __NR_close_range	(__NR_Linux + 436)
 #define __NR_openat2	(__NR_Linux + 437)
 #define __NR_pidfd_getfd	(__NR_Linux + 438)
 #define __NR_faccessat2	(__NR_Linux + 439)
linux-headers/asm-mips/unistd_o32.h +1 -0
index e3e5e238f0..3e093dd913 100644
@@ -411,6 +411,7 @@
 #define __NR_fspick	(__NR_Linux + 433)
 #define __NR_pidfd_open	(__NR_Linux + 434)
 #define __NR_clone3	(__NR_Linux + 435)
+#define __NR_close_range	(__NR_Linux + 436)
 #define __NR_openat2	(__NR_Linux + 437)
 #define __NR_pidfd_getfd	(__NR_Linux + 438)
 #define __NR_faccessat2	(__NR_Linux + 439)
linux-headers/asm-powerpc/kvm.h +5 -0
index 264e266a85..c3af3f324c 100644
@@ -640,6 +640,11 @@ struct kvm_ppc_cpu_char {
 #define KVM_REG_PPC_ONLINE	(KVM_REG_PPC | KVM_REG_SIZE_U32 | 0xbf)
 #define KVM_REG_PPC_PTCR	(KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc0)
 
+/* POWER10 registers */
+#define KVM_REG_PPC_MMCR3	(KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc1)
+#define KVM_REG_PPC_SIER2	(KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc2)
+#define KVM_REG_PPC_SIER3	(KVM_REG_PPC | KVM_REG_SIZE_U64 | 0xc3)
+
 /* Transactional Memory checkpointed state:
  * This is all GPRs, all VSX regs and a subset of SPRs
  */
linux-headers/asm-powerpc/unistd_32.h +1 -0
index 862edb7448..0db9481d49 100644
@@ -418,6 +418,7 @@
 #define __NR_fspick	433
 #define __NR_pidfd_open	434
 #define __NR_clone3	435
+#define __NR_close_range	436
 #define __NR_openat2	437
 #define __NR_pidfd_getfd	438
 #define __NR_faccessat2	439
linux-headers/asm-powerpc/unistd_64.h +1 -0
index f553224ce4..9f74310988 100644
@@ -390,6 +390,7 @@
 #define __NR_fspick	433
 #define __NR_pidfd_open	434
 #define __NR_clone3	435
+#define __NR_close_range	436
 #define __NR_openat2	437
 #define __NR_pidfd_getfd	438
 #define __NR_faccessat2	439
linux-headers/asm-s390/kvm.h +5 -2
index 0138ccb0d8..f053b8304a 100644
@@ -231,11 +231,13 @@ struct kvm_guest_debug_arch {
 #define KVM_SYNC_GSCB   (1UL << 9)
 #define KVM_SYNC_BPBC   (1UL << 10)
 #define KVM_SYNC_ETOKEN (1UL << 11)
+#define KVM_SYNC_DIAG318 (1UL << 12)
 
 #define KVM_SYNC_S390_VALID_FIELDS \
 	(KVM_SYNC_PREFIX | KVM_SYNC_GPRS | KVM_SYNC_ACRS | KVM_SYNC_CRS | \
 	 KVM_SYNC_ARCH0 | KVM_SYNC_PFAULT | KVM_SYNC_VRS | KVM_SYNC_RICCB | \
-	 KVM_SYNC_FPRS | KVM_SYNC_GSCB | KVM_SYNC_BPBC | KVM_SYNC_ETOKEN)
+	 KVM_SYNC_FPRS | KVM_SYNC_GSCB | KVM_SYNC_BPBC | KVM_SYNC_ETOKEN | \
+	 KVM_SYNC_DIAG318)
 
 /* length and alignment of the sdnx as a power of two */
 #define SDNXC 8
@@ -264,7 +266,8 @@ struct kvm_sync_regs {
 	__u8 reserved2 : 7;
 	__u8 padding1[51];	/* riccb needs to be 64byte aligned */
 	__u8 riccb[64];		/* runtime instrumentation controls block */
-	__u8 padding2[192];	/* sdnx needs to be 256byte aligned */
+	__u64 diag318;		/* diagnose 0x318 info */
+	__u8 padding2[184];	/* sdnx needs to be 256byte aligned */
 	union {
 		__u8 sdnx[SDNXL];  /* state description annex */
 		struct {
linux-headers/asm-s390/unistd_32.h +1 -0
index e08233c0c3..1803cd0c3b 100644
@@ -408,6 +408,7 @@
 #define __NR_fspick 433
 #define __NR_pidfd_open 434
 #define __NR_clone3 435
+#define __NR_close_range 436
 #define __NR_openat2 437
 #define __NR_pidfd_getfd 438
 #define __NR_faccessat2 439
linux-headers/asm-s390/unistd_64.h +1 -0
index 560e19ae2b..228d5004e5 100644
@@ -356,6 +356,7 @@
 #define __NR_fspick 433
 #define __NR_pidfd_open 434
 #define __NR_clone3 435
+#define __NR_close_range 436
 #define __NR_openat2 437
 #define __NR_pidfd_getfd 438
 #define __NR_faccessat2 439
linux-headers/asm-x86/unistd_32.h +1 -0
index c727981d4a..356c12c2db 100644
@@ -426,6 +426,7 @@
 #define __NR_fspick 433
 #define __NR_pidfd_open 434
 #define __NR_clone3 435
+#define __NR_close_range 436
 #define __NR_openat2 437
 #define __NR_pidfd_getfd 438
 #define __NR_faccessat2 439
linux-headers/asm-x86/unistd_64.h +1 -0
index 843fa62745..ef70e1c7c9 100644
@@ -348,6 +348,7 @@
 #define __NR_fspick 433
 #define __NR_pidfd_open 434
 #define __NR_clone3 435
+#define __NR_close_range 436
 #define __NR_openat2 437
 #define __NR_pidfd_getfd 438
 #define __NR_faccessat2 439
linux-headers/asm-x86/unistd_x32.h +1 -0
index 7d63d703ca..84ae8e9f5f 100644
@@ -301,6 +301,7 @@
 #define __NR_fspick (__X32_SYSCALL_BIT + 433)
 #define __NR_pidfd_open (__X32_SYSCALL_BIT + 434)
 #define __NR_clone3 (__X32_SYSCALL_BIT + 435)
+#define __NR_close_range (__X32_SYSCALL_BIT + 436)
 #define __NR_openat2 (__X32_SYSCALL_BIT + 437)
 #define __NR_pidfd_getfd (__X32_SYSCALL_BIT + 438)
 #define __NR_faccessat2 (__X32_SYSCALL_BIT + 439)
linux-headers/linux/kvm.h +4 -0
index a28c366737..6683e2e1b0 100644
@@ -289,6 +289,7 @@ struct kvm_run {
 		/* KVM_EXIT_FAIL_ENTRY */
 		struct {
 			__u64 hardware_entry_failure_reason;
+			__u32 cpu;
 		} fail_entry;
 		/* KVM_EXIT_EXCEPTION */
 		struct {
@@ -1031,6 +1032,9 @@ struct kvm_ppc_resize_hpt {
 #define KVM_CAP_PPC_SECURE_GUEST 181
 #define KVM_CAP_HALT_POLL 182
 #define KVM_CAP_ASYNC_PF_INT 183
+#define KVM_CAP_LAST_CPU 184
+#define KVM_CAP_SMALLER_MAXPHYADDR 185
+#define KVM_CAP_S390_DIAG318 186
 
 #ifdef KVM_CAP_IRQ_ROUTING
 
linux-headers/linux/vfio.h +1 -1
index f09df262c4..a90672494d 100644
@@ -1030,7 +1030,7 @@ struct vfio_iommu_type1_info_cap_iova_range {
  * size in bytes that can be used by user applications when getting the dirty
  * bitmap.
  */
-#define VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION  1
+#define VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION  2
 
 struct vfio_iommu_type1_info_cap_migration {
 	struct	vfio_info_cap_header header;
linux-headers/linux/vhost.h +2 -0
index 0c2349612e..7523218532 100644
@@ -91,6 +91,8 @@
 
 /* Use message type V2 */
 #define VHOST_BACKEND_F_IOTLB_MSG_V2 0x1
+/* IOTLB can accept batching hints */
+#define VHOST_BACKEND_F_IOTLB_BATCH  0x2
 
 #define VHOST_SET_BACKEND_FEATURES _IOW(VHOST_VIRTIO, 0x25, __u64)
 #define VHOST_GET_BACKEND_FEATURES _IOR(VHOST_VIRTIO, 0x26, __u64)
Signature · 1 line
MST
#3 lore raw

[PULL v4 07/48] vhost: check queue state in the vhost_dev_set_log routine

In reply to Michael S. Tsirkin

From: Dima Stepanov <[email protected]>

If the vhost-user-blk daemon provides only one virtqueue, but device was added with several queues, then QEMU will send more VHOST-USER command than expected by daemon side. The vhost_virtqueue_start() routine handles such case by checking the return value from the virtio_queue_get_desc_addr() function call. Add the same check to the vhost_dev_set_log() routine.

Message-Id: <6232946d5af09e9775076645909964a6539b8ab5.1599813294.git.dimastep@yandex-team.ru>

---
 hw/virtio/vhost.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
hw/virtio/vhost.c +12 -0
index 60bc516003..68f0a75134 100644
@@ -835,12 +835,24 @@ out:
 static int vhost_dev_set_log(struct vhost_dev *dev, bool enable_log)
 {
     int r, i, idx;
+    hwaddr addr;
+
     r = vhost_dev_set_features(dev, enable_log);
     if (r < 0) {
         goto err_features;
     }
     for (i = 0; i < dev->nvqs; ++i) {
         idx = dev->vhost_ops->vhost_get_vq_index(dev, dev->vq_index + i);
+        addr = virtio_queue_get_desc_addr(dev->vdev, idx);
+        if (!addr) {
+            /*
+             * The queue might not be ready for start. If this
+             * is the case there is no reason to continue the process.
+             * The similar logic is used by the vhost_virtqueue_start()
+             * routine.
+             */
+            continue;
+        }
         r = vhost_virtqueue_set_addr(dev, dev->vqs + i, idx,
                                      enable_log);
         if (r < 0) {
Signature · 1 line
MST
#4 lore raw

[PULL v4 06/48] vhost: recheck dev state in the vhost_migration_log routine

In reply to Michael S. Tsirkin

From: Dima Stepanov <[email protected]>

vhost-user devices can get a disconnect in the middle of the VHOST-USER handshake on the migration start. If disconnect event happened right before sending next VHOST-USER command, then the vhost_dev_set_log() call in the vhost_migration_log() function will return error. This error will lead to the assert() and close the QEMU migration source process. For the vhost-user devices the disconnect event should not break the migration process, because:
- the device will be in the stopped state, so it will not be changed during migration
- if reconnect will be made the migration log will be reinitialized as

    part of reconnect/init process:
    #0  vhost_log_global_start (listener=0x563989cf7be0)
    at hw/virtio/vhost.c:920
    #1  0x000056398603d8bc in listener_add_address_space (listener=0x563989cf7be0,
        as=0x563986ea4340 <address_space_memory>)
    at softmmu/memory.c:2664
    #2  0x000056398603dd30 in memory_listener_register (listener=0x563989cf7be0,
        as=0x563986ea4340 <address_space_memory>)
    at softmmu/memory.c:2740
    #3  0x0000563985fd6956 in vhost_dev_init (hdev=0x563989cf7bd8,
        opaque=0x563989cf7e30, backend_type=VHOST_BACKEND_TYPE_USER,
        busyloop_timeout=0)
    at hw/virtio/vhost.c:1385
    #4  0x0000563985f7d0b8 in vhost_user_blk_connect (dev=0x563989cf7990)
    at hw/block/vhost-user-blk.c:315
    #5  0x0000563985f7d3f6 in vhost_user_blk_event (opaque=0x563989cf7990,
        event=CHR_EVENT_OPENED)
    at hw/block/vhost-user-blk.c:379

Update the vhost-user-blk device with the internal started_vu field which will be used for initialization (vhost_user_blk_start) and clean up (vhost_user_blk_stop). This additional flag in the VhostUserBlk structure will be used to track whether the device really needs to be stopped and cleaned up on a vhost-user level.
The disconnect event will set the overall VHOST device (not vhost-user) to the stopped state, so it can be used by the general vhost_migration_log routine.
Such approach could be propogated to the other vhost-user devices, but better idea is just to make the same connect/disconnect code for all the vhost-user devices.

This migration issue was slightly discussed earlier:
- https://lists.gnu.org/archive/html/qemu-devel/2020-05/msg01509.html
- https://lists.gnu.org/archive/html/qemu-devel/2020-05/msg05241.html

Message-Id: <9fbfba06791a87813fcee3e2315f0b904cc6789a.1599813294.git.dimastep@yandex-team.ru>

---
 include/hw/virtio/vhost-user-blk.h | 10 ++++++++++
 hw/block/vhost-user-blk.c          | 19 ++++++++++++++++---
 hw/virtio/vhost.c                  | 27 ++++++++++++++++++++++++---
 3 files changed, 50 insertions(+), 6 deletions(-)
include/hw/virtio/vhost-user-blk.h +10 -0
index f536576d20..7c91f15040 100644
@@ -40,7 +40,17 @@ struct VHostUserBlk {
     VhostUserState vhost_user;
     struct vhost_virtqueue *vhost_vqs;
     VirtQueue **virtqs;
+
+    /*
+     * There are at least two steps of initialization of the
+     * vhost-user device. The first is a "connect" step and
+     * second is a "start" step. Make a separation between
+     * those initialization phases by using two fields.
+     */
+    /* vhost_user_blk_connect/vhost_user_blk_disconnect */
     bool connected;
+    /* vhost_user_blk_start/vhost_user_blk_stop */
+    bool started_vu;
 };
 
 #endif
hw/block/vhost-user-blk.c +16 -3
index 39aec42dae..a076b1e54d 100644
@@ -150,6 +150,7 @@ static int vhost_user_blk_start(VirtIODevice *vdev)
         error_report("Error starting vhost: %d", -ret);
         goto err_guest_notifiers;
     }
+    s->started_vu = true;
 
     /* guest_notifier_mask/pending not used yet, so just unmask
      * everything here. virtio-pci will do the right thing by
@@ -175,6 +176,11 @@ static void vhost_user_blk_stop(VirtIODevice *vdev)
     VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
     int ret;
 
+    if (!s->started_vu) {
+        return;
+    }
+    s->started_vu = false;
+
     if (!k->set_guest_notifiers) {
         return;
     }
@@ -341,9 +347,7 @@ static void vhost_user_blk_disconnect(DeviceState *dev)
     }
     s->connected = false;
 
-    if (s->dev.started) {
-        vhost_user_blk_stop(vdev);
-    }
+    vhost_user_blk_stop(vdev);
 
     vhost_dev_cleanup(&s->dev);
 }
@@ -399,6 +403,15 @@ static void vhost_user_blk_event(void *opaque, QEMUChrEvent event)
                     NULL, NULL, false);
             aio_bh_schedule_oneshot(ctx, vhost_user_blk_chr_closed_bh, opaque);
         }
+
+        /*
+         * Move vhost device to the stopped state. The vhost-user device
+         * will be clean up and disconnected in BH. This can be useful in
+         * the vhost migration code. If disconnect was caught there is an
+         * option for the general vhost code to get the dev state without
+         * knowing its type (in this case vhost-user).
+         */
+        s->dev.started = false;
         break;
     case CHR_EVENT_BREAK:
     case CHR_EVENT_MUX_IN:
hw/virtio/vhost.c +24 -3
index 8087f200e9..60bc516003 100644
@@ -871,21 +871,42 @@ static int vhost_migration_log(MemoryListener *listener, bool enable)
         dev->log_enabled = enable;
         return 0;
     }
+
+    r = 0;
     if (!enable) {
         r = vhost_dev_set_log(dev, false);
         if (r < 0) {
-            return r;
+            goto check_dev_state;
         }
         vhost_log_put(dev, false);
     } else {
         vhost_dev_log_resize(dev, vhost_get_log_size(dev));
         r = vhost_dev_set_log(dev, true);
         if (r < 0) {
-            return r;
+            goto check_dev_state;
         }
     }
+
+check_dev_state:
     dev->log_enabled = enable;
-    return 0;
+    /*
+     * vhost-user-* devices could change their state during log
+     * initialization due to disconnect. So check dev state after
+     * vhost communication.
+     */
+    if (!dev->started) {
+        /*
+         * Since device is in the stopped state, it is okay for
+         * migration. Return success.
+         */
+        r = 0;
+    }
+    if (r) {
+        /* An error is occured. */
+        dev->log_enabled = false;
+    }
+
+    return r;
 }
 
 static void vhost_log_global_start(MemoryListener *listener)
Signature · 1 line
MST
#5 lore raw

[PULL v4 05/48] pc: fix auto_enable_numa_with_memhp/auto_enable_numa_with_memdev for the 5.0 machine

In reply to Michael S. Tsirkin

From: David Hildenbrand <[email protected]>

Unfortunately, a typo sneeked in: we want to set auto_enable_numa_with_memdev to false, not auto_enable_numa_with_memhp.

Fixes 195784a0cfad (numa: Auto-enable NUMA when any memory devices are possible)
Cc Paolo Bonzini <[email protected]>
Cc Richard Henderson <[email protected]>
Cc Eduardo Habkost <[email protected]>
Cc "Michael S. Tsirkin" <[email protected]>

Message-Id: <[email protected]>

---
 hw/i386/pc_q35.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/i386/pc_q35.c +1 -1
index 622d039717..e1c415f57d 100644
@@ -382,7 +382,7 @@ static void pc_q35_5_0_machine_options(MachineClass *m)
     m->numa_mem_supported = true;
     compat_props_add(m->compat_props, hw_compat_5_0, hw_compat_5_0_len);
     compat_props_add(m->compat_props, pc_compat_5_0, pc_compat_5_0_len);
-    m->auto_enable_numa_with_memhp = false;
+    m->auto_enable_numa_with_memdev = false;
 }
 
 DEFINE_Q35_MACHINE(v5_0, "pc-q35-5.0", NULL,
Signature · 1 line
MST
#6 lore raw

[PULL v4 04/48] virtio-mem: detach the element from the virtqueue when error occurs

In reply to Michael S. Tsirkin

From: Li Qiang <[email protected]>

If error occurs while processing the virtio request we should call 'virtqueue_detach_element' to detach the element from the virtqueue before free the elem.

Message-Id: <[email protected]>

Fixes 910b25766b ("virtio-mem: Paravirtualized memory hot(un)plug")
---
 hw/virtio/virtio-mem.c | 3 +++
 1 file changed, 3 insertions(+)
hw/virtio/virtio-mem.c +3 -0
index 8fbec77ccc..7c8ca9f28b 100644
@@ -318,6 +318,7 @@ static void virtio_mem_handle_request(VirtIODevice *vdev, VirtQueue *vq)
         if (iov_to_buf(elem->out_sg, elem->out_num, 0, &req, len) < len) {
             virtio_error(vdev, "virtio-mem protocol violation: invalid request"
                          " size: %d", len);
+            virtqueue_detach_element(vq, elem, 0);
             g_free(elem);
             return;
         }
@@ -327,6 +328,7 @@ static void virtio_mem_handle_request(VirtIODevice *vdev, VirtQueue *vq)
             virtio_error(vdev, "virtio-mem protocol violation: not enough space"
                          " for response: %zu",
                          iov_size(elem->in_sg, elem->in_num));
+            virtqueue_detach_element(vq, elem, 0);
             g_free(elem);
             return;
         }
@@ -348,6 +350,7 @@ static void virtio_mem_handle_request(VirtIODevice *vdev, VirtQueue *vq)
         default:
             virtio_error(vdev, "virtio-mem protocol violation: unknown request"
                          " type: %d", type);
+            virtqueue_detach_element(vq, elem, 0);
             g_free(elem);
             return;
         }
Signature · 1 line
MST
#7 lore raw

[PULL v4 13/48] util/hexdump: introduce qemu_hexdump_line()

In reply to Michael S. Tsirkin

From: Laurent Vivier <[email protected]>

Dumping one line of hexadecimal/ASCII from a buffer is often needed. Move this part from qemu_hexdump() and use it

Message-Id: <[email protected]>

---
 include/qemu-common.h |  8 +++++++
 util/hexdump.c        | 54 +++++++++++++++++++++++++++----------------
 2 files changed, 42 insertions(+), 20 deletions(-)
include/qemu-common.h +8 -0
index 9cfd62669b..cc902b690d 100644
@@ -134,6 +134,14 @@ void os_setup_early_signal_handling(void);
 char *os_find_datadir(void);
 int os_parse_cmd_args(int index, const char *optarg);
 
+/*
+ * Hexdump a line of a byte buffer into a hexadecimal/ASCII buffer
+ */
+#define QEMU_HEXDUMP_LINE_BYTES 16 /* Number of bytes to dump */
+#define QEMU_HEXDUMP_LINE_LEN 75   /* Number of characters in line */
+void qemu_hexdump_line(char *line, unsigned int b, const void *bufptr,
+                       unsigned int len, bool ascii);
+
 /*
  * Hexdump a buffer to a file. An optional string prefix is added to every line
  */
util/hexdump.c +34 -20

70 lines not on this page · raw message

Signature · 1 line
MST
#8 lore raw

[PULL v4 09/48] cphp: remove deprecated cpu-add command(s)

In reply to Michael S. Tsirkin

From: Igor Mammedov <[email protected]>

These were deprecated since 4.0, remove both HMP and QMP variants.

Users should use device_add command instead. To get list of possible CPUs and options, use 'info hotpluggable-cpus' HMP or query-hotpluggable-cpus QMP command.

Message-Id: <[email protected]>

---
 qapi/machine.json           |  24 ---------
 include/hw/boards.h         |   1 -
 include/hw/i386/pc.h        |   1 -
 include/monitor/hmp.h       |   1 -
 hw/core/machine-hmp-cmds.c  |  12 -----
 hw/core/machine-qmp-cmds.c  |  12 -----
 hw/i386/pc.c                |  27 ----------
 hw/i386/pc_piix.c           |   1 -
 hw/s390x/s390-virtio-ccw.c  |  12 -----
 tests/qtest/cpu-plug-test.c | 100 ++++--------------------------------
 tests/qtest/test-hmp.c      |   1 -
 docs/system/deprecated.rst  |  25 +++++----
 hmp-commands.hx             |  15 ------
 13 files changed, 21 insertions(+), 211 deletions(-)
qapi/machine.json +0 -24
index 0ac1880e4a..d8ed096e9a 100644
@@ -307,30 +307,6 @@
 ##
 { 'command': 'query-cpus-fast', 'returns': [ 'CpuInfoFast' ] }
 
-##
-# @cpu-add:
-#
-# Adds CPU with specified ID.
-#
-# @id: ID of CPU to be created, valid values [0..max_cpus)
-#
-# Features:
-# @deprecated: This command is deprecated.  Use `device_add` instead.
-#              See the `query-hotpluggable-cpus` command for details.
-#
-# Returns: Nothing on success
-#
-# Since: 1.5
-#
-# Example:
-#
-# -> { "execute": "cpu-add", "arguments": { "id": 2 } }
-# <- { "return": {} }
-#
-##
-{ 'command': 'cpu-add', 'data': {'id': 'int'},
-  'features': [ 'deprecated' ] }
-
 ##
 # @MachineInfo:
 #
include/hw/boards.h +0 -1
index 56aa1ca335..482d2833f6 100644
@@ -168,7 +168,6 @@ struct MachineClass {
     void (*init)(MachineState *state);
     void (*reset)(MachineState *state);
     void (*wakeup)(MachineState *state);
-    void (*hot_add_cpu)(MachineState *state, const int64_t id, Error **errp);
     int (*kvm_type)(MachineState *machine, const char *arg);
     void (*smp_parse)(MachineState *ms, QemuOpts *opts);
 
include/hw/i386/pc.h +0 -1
index b2da2c8d2b..c71b02cafd 100644
@@ -132,7 +132,6 @@ extern int fd_bootchk;
 
 void pc_acpi_smi_interrupt(void *opaque, int irq, int level);
 
-void pc_hot_add_cpu(MachineState *ms, const int64_t id, Error **errp);
 void pc_smp_parse(MachineState *ms, QemuOpts *opts);
 
 void pc_guest_info_init(PCMachineState *pcms);
include/monitor/hmp.h +0 -1
index c986cfd28b..642e9e91f9 100644
@@ -89,7 +89,6 @@ void hmp_chardev_add(Monitor *mon, const QDict *qdict);
 void hmp_chardev_change(Monitor *mon, const QDict *qdict);
 void hmp_chardev_remove(Monitor *mon, const QDict *qdict);
 void hmp_chardev_send_break(Monitor *mon, const QDict *qdict);
-void hmp_cpu_add(Monitor *mon, const QDict *qdict);
 void hmp_object_add(Monitor *mon, const QDict *qdict);
 void hmp_object_del(Monitor *mon, const QDict *qdict);
 void hmp_info_memdev(Monitor *mon, const QDict *qdict);
hw/core/machine-hmp-cmds.c +0 -12
index 39999c47c5..f4092b98cc 100644
@@ -46,18 +46,6 @@ void hmp_info_cpus(Monitor *mon, const QDict *qdict)
     qapi_free_CpuInfoFastList(cpu_list);
 }
 
-void hmp_cpu_add(Monitor *mon, const QDict *qdict)
-{
-    int cpuid;
-    Error *err = NULL;
-
-    error_report("cpu_add is deprecated, please use device_add instead");
-
-    cpuid = qdict_get_int(qdict, "id");
-    qmp_cpu_add(cpuid, &err);
-    hmp_handle_error(mon, err);
-}
-
 void hmp_hotpluggable_cpus(Monitor *mon, const QDict *qdict)
 {
     Error *err = NULL;
hw/core/machine-qmp-cmds.c +0 -12
index 21551221ad..5362c80a18 100644
@@ -284,18 +284,6 @@ HotpluggableCPUList *qmp_query_hotpluggable_cpus(Error **errp)
     return machine_query_hotpluggable_cpus(ms);
 }
 
-void qmp_cpu_add(int64_t id, Error **errp)
-{
-    MachineClass *mc;
-
-    mc = MACHINE_GET_CLASS(current_machine);
-    if (mc->hot_add_cpu) {
-        mc->hot_add_cpu(current_machine, id, errp);
-    } else {
-        error_setg(errp, "Not supported");
-    }
-}
-
 void qmp_set_numa_node(NumaOptions *cmd, Error **errp)
 {
     if (!runstate_check(RUN_STATE_PRECONFIG)) {
hw/i386/pc.c +0 -27
index 1e2ab5ebe7..50e8317342 100644
@@ -769,32 +769,6 @@ void pc_smp_parse(MachineState *ms, QemuOpts *opts)
     }
 }
 
-void pc_hot_add_cpu(MachineState *ms, const int64_t id, Error **errp)
-{
-    X86MachineState *x86ms = X86_MACHINE(ms);
-    int64_t apic_id = x86_cpu_apic_id_from_index(x86ms, id);
-    Error *local_err = NULL;
-
-    if (id < 0) {
-        error_setg(errp, "Invalid CPU id: %" PRIi64, id);
-        return;
-    }
-
-    if (apic_id >= ACPI_CPU_HOTPLUG_ID_LIMIT) {
-        error_setg(errp, "Unable to add CPU: %" PRIi64
-                   ", resulting APIC ID (%" PRIi64 ") is too large",
-                   id, apic_id);
-        return;
-    }
-
-
-    x86_cpu_new(X86_MACHINE(ms), apic_id, &local_err);
-    if (local_err) {
-        error_propagate(errp, local_err);
-        return;
-    }
-}
-
 static
 void pc_machine_done(Notifier *notifier, void *data)
 {
@@ -1691,7 +1665,6 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
     mc->auto_enable_numa_with_memdev = true;
     mc->has_hotpluggable_cpus = true;
     mc->default_boot_order = "cad";
-    mc->hot_add_cpu = pc_hot_add_cpu;
     mc->smp_parse = pc_smp_parse;
     mc->block_default_type = IF_IDE;
     mc->max_cpus = 255;
hw/i386/pc_piix.c +0 -1
index 6f3e78bb60..2d8413a0ce 100644
@@ -752,7 +752,6 @@ static void pc_i440fx_1_4_machine_options(MachineClass *m)
 {
     pc_i440fx_1_5_machine_options(m);
     m->hw_version = "1.4.0";
-    m->hot_add_cpu = NULL;
     compat_props_add(m->compat_props, pc_compat_1_4, pc_compat_1_4_len);
 }
 
hw/s390x/s390-virtio-ccw.c +0 -12
index 3106bbea33..28266a3a35 100644
@@ -553,17 +553,6 @@ static HotplugHandler *s390_get_hotplug_handler(MachineState *machine,
     return NULL;
 }
 
-static void s390_hot_add_cpu(MachineState *machine,
-                             const int64_t id, Error **errp)
-{
-    ObjectClass *oc;
-
-    g_assert(machine->possible_cpus->cpus[0].cpu);
-    oc = OBJECT_CLASS(CPU_GET_CLASS(machine->possible_cpus->cpus[0].cpu));
-
-    s390x_new_cpu(object_class_get_name(oc), id, errp);
-}
-
 static void s390_nmi(NMIState *n, int cpu_index, Error **errp)
 {
     CPUState *cs = qemu_get_cpu(cpu_index);
@@ -604,7 +593,6 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data)
     s390mc->hpage_1m_allowed = true;
     mc->init = ccw_init;
     mc->reset = s390_machine_reset;
-    mc->hot_add_cpu = s390_hot_add_cpu;
     mc->block_default_type = IF_VIRTIO;
     mc->no_cdrom = 1;
     mc->no_floppy = 1;
tests/qtest/cpu-plug-test.c +9 -91

127 lines not on this page · raw message

tests/qtest/test-hmp.c +0 -1
index aea1384bac..94a8023173 100644
@@ -27,7 +27,6 @@ static const char *hmp_cmds[] = {
     "chardev-change testchardev1 ringbuf",
     "chardev-remove testchardev1",
     "commit all",
-    "cpu-add 1",
     "cpu 0",
     "device_add ?",
     "device_add usb-mouse,id=mouse1",
docs/system/deprecated.rst +12 -13
index 17aa74531c..5326141cee 100644
@@ -272,13 +272,6 @@ The ``query-cpus`` command is replaced by the ``query-cpus-fast`` command.
 The ``arch`` output member of the ``query-cpus-fast`` command is
 replaced by the ``target`` output member.
 
-``cpu-add`` (since 4.0)
-'''''''''''''''''''''''
-
-Use ``device_add`` for hotplugging vCPUs instead of ``cpu-add``.  See
-documentation of ``query-hotpluggable-cpus`` for additional
-details.
-
 ``query-events`` (since 4.0)
 ''''''''''''''''''''''''''''
 
@@ -294,12 +287,6 @@ the 'wait' field, which is only applicable to sockets in server mode
 Human Monitor Protocol (HMP) commands
 -------------------------------------
 
-``cpu-add`` (since 4.0)
-'''''''''''''''''''''''
-
-Use ``device_add`` for hotplugging vCPUs instead of ``cpu-add``.  See
-documentation of ``query-hotpluggable-cpus`` for additional details.
-
 ``acl_show``, ``acl_reset``, ``acl_policy``, ``acl_add``, ``acl_remove`` (since 4.0.0)
 ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
 
@@ -517,6 +504,12 @@ QEMU Machine Protocol (QMP) commands
 The "autoload" parameter has been ignored since 2.12.0. All bitmaps
 are automatically loaded from qcow2 images.
 
+``cpu-add`` (removed in 5.2)
+''''''''''''''''''''''''''''
+
+Use ``device_add`` for hotplugging vCPUs instead of ``cpu-add``.  See
+documentation of ``query-hotpluggable-cpus`` for additional details.
+
 Human Monitor Protocol (HMP) commands
 -------------------------------------
 
@@ -526,6 +519,12 @@ The ``hub_id`` parameter of ``hostfwd_add`` / ``hostfwd_remove`` (removed in 5.0
 The ``[hub_id name]`` parameter tuple of the 'hostfwd_add' and
 'hostfwd_remove' HMP commands has been replaced by ``netdev_id``.
 
+``cpu-add`` (removed in 5.2)
+''''''''''''''''''''''''''''
+
+Use ``device_add`` for hotplugging vCPUs instead of ``cpu-add``.  See
+documentation of ``query-hotpluggable-cpus`` for additional details.
+
 Guest Emulator ISAs
 -------------------
 
hmp-commands.hx +0 -15
index 27c4bbe0f2..1088d64503 100644
@@ -1761,21 +1761,6 @@ SRST
   Executes a qemu-io command on the given block device.
 ERST
 
-    {
-        .name       = "cpu-add",
-        .args_type  = "id:i",
-        .params     = "id",
-        .help       = "add cpu (deprecated, use device_add instead)",
-        .cmd        = hmp_cpu_add,
-    },
-
-SRST
-``cpu-add`` *id*
-  Add CPU with id *id*.  This command is deprecated, please
-  +use ``device_add`` instead. For details, refer to
-  'docs/cpu-hotplug.rst'.
-ERST
-
     {
         .name       = "qom-list",
         .args_type  = "path:s?",
Signature · 1 line
MST
#9 lore raw

[PULL v4 08/48] tests/qtest/vhost-user-test: prepare the tests for adding new dev class

In reply to Michael S. Tsirkin

From: Dima Stepanov <[email protected]>

For now only vhost-user-net device is supported by the test. Other vhost-user devices are not tested. As a first step make source code refactoring so new devices can reuse the same test routines. To make this provide a new vhost_user_ops structure with the methods to initialize device, its command line or make a proper vhost-user responses.

Message-Id: <a48b60fb96fef230b75fff72a2d77040dcb5ef7c.1599813294.git.dimastep@yandex-team.ru>

---
 tests/qtest/vhost-user-test.c | 105 ++++++++++++++++++++++++----------
 1 file changed, 76 insertions(+), 29 deletions(-)
tests/qtest/vhost-user-test.c +76 -29
index 9ee0f1e4fd..3df5322614 100644
@@ -135,6 +135,10 @@ enum {
     TEST_FLAGS_END,
 };
 
+enum {
+    VHOST_USER_NET,
+};
+
 typedef struct TestServer {
     gchar *socket_path;
     gchar *mig_path;
@@ -154,10 +158,25 @@ typedef struct TestServer {
     bool test_fail;
     int test_flags;
     int queues;
+    struct vhost_user_ops *vu_ops;
 } TestServer;
 
+struct vhost_user_ops {
+    /* Device types. */
+    int type;
+    void (*append_opts)(TestServer *s, GString *cmd_line,
+            const char *chr_opts);
+
+    /* VHOST-USER commands. */
+    void (*set_features)(TestServer *s, CharBackend *chr,
+            VhostUserMsg *msg);
+    void (*get_protocol_features)(TestServer *s,
+            CharBackend *chr, VhostUserMsg *msg);
+};
+
 static const char *init_hugepagefs(void);
-static TestServer *test_server_new(const gchar *name);
+static TestServer *test_server_new(const gchar *name,
+        struct vhost_user_ops *ops);
 static void test_server_free(TestServer *server);
 static void test_server_listen(TestServer *server);
 
@@ -167,7 +186,7 @@ enum test_memfd {
     TEST_MEMFD_NO,
 };
 
-static void append_vhost_opts(TestServer *s, GString *cmd_line,
+static void append_vhost_net_opts(TestServer *s, GString *cmd_line,
                              const char *chr_opts)
 {
     g_string_append_printf(cmd_line, QEMU_CMD_CHR QEMU_CMD_NETDEV,
@@ -332,25 +351,15 @@ static void chr_read(void *opaque, const uint8_t *buf, int size)
         break;
 
     case VHOST_USER_SET_FEATURES:
-        g_assert_cmpint(msg.payload.u64 & (0x1ULL << VHOST_USER_F_PROTOCOL_FEATURES),
-                        !=, 0ULL);
-        if (s->test_flags == TEST_FLAGS_DISCONNECT) {
-            qemu_chr_fe_disconnect(chr);
-            s->test_flags = TEST_FLAGS_BAD;
+        if (s->vu_ops->set_features) {
+            s->vu_ops->set_features(s, chr, &msg);
         }
         break;
 
     case VHOST_USER_GET_PROTOCOL_FEATURES:
-        /* send back features to qemu */
-        msg.flags |= VHOST_USER_REPLY_MASK;
-        msg.size = sizeof(m.payload.u64);
-        msg.payload.u64 = 1 << VHOST_USER_PROTOCOL_F_LOG_SHMFD;
-        msg.payload.u64 |= 1 << VHOST_USER_PROTOCOL_F_CROSS_ENDIAN;
-        if (s->queues > 1) {
-            msg.payload.u64 |= 1 << VHOST_USER_PROTOCOL_F_MQ;
+        if (s->vu_ops->get_protocol_features) {
+            s->vu_ops->get_protocol_features(s, chr, &msg);
         }
-        p = (uint8_t *) &msg;
-        qemu_chr_fe_write_all(chr, p, VHOST_USER_HDR_SIZE + msg.size);
         break;
 
     case VHOST_USER_GET_VRING_BASE:
@@ -467,7 +476,8 @@ static const char *init_hugepagefs(void)
 #endif
 }
 
-static TestServer *test_server_new(const gchar *name)
+static TestServer *test_server_new(const gchar *name,
+        struct vhost_user_ops *ops)
 {
     TestServer *server = g_new0(TestServer, 1);
     char template[] = "/tmp/vhost-test-XXXXXX";
@@ -495,6 +505,7 @@ static TestServer *test_server_new(const gchar *name)
 
     server->log_fd = -1;
     server->queues = 1;
+    server->vu_ops = ops;
 
     return server;
 }
@@ -669,11 +680,11 @@ static void vhost_user_test_cleanup(void *s)
 
 static void *vhost_user_test_setup(GString *cmd_line, void *arg)
 {
-    TestServer *server = test_server_new("vhost-user-test");
+    TestServer *server = test_server_new("vhost-user-test", arg);
     test_server_listen(server);
 
     append_mem_opts(server, cmd_line, 256, TEST_MEMFD_AUTO);
-    append_vhost_opts(server, cmd_line, "");
+    server->vu_ops->append_opts(server, cmd_line, "");
 
     g_test_queue_destroy(vhost_user_test_cleanup, server);
 
@@ -682,11 +693,11 @@ static void *vhost_user_test_setup(GString *cmd_line, void *arg)
 
 static void *vhost_user_test_setup_memfd(GString *cmd_line, void *arg)
 {
-    TestServer *server = test_server_new("vhost-user-test");
+    TestServer *server = test_server_new("vhost-user-test", arg);
     test_server_listen(server);
 
     append_mem_opts(server, cmd_line, 256, TEST_MEMFD_YES);
-    append_vhost_opts(server, cmd_line, "");
+    server->vu_ops->append_opts(server, cmd_line, "");
 
     g_test_queue_destroy(vhost_user_test_cleanup, server);
 
@@ -720,7 +731,7 @@ static void test_migrate(void *obj, void *arg, QGuestAllocator *alloc)
         return;
     }
 
-    dest = test_server_new("dest");
+    dest = test_server_new("dest", s->vu_ops);
     dest_cmdline = g_string_new(qos_get_current_command_line());
     uri = g_strdup_printf("%s%s", "unix:", dest->mig_path);
 
@@ -730,7 +741,7 @@ static void test_migrate(void *obj, void *arg, QGuestAllocator *alloc)
     test_server_listen(dest);
     g_string_append_printf(dest_cmdline, " -incoming %s", uri);
     append_mem_opts(dest, dest_cmdline, 256, TEST_MEMFD_AUTO);
-    append_vhost_opts(dest, dest_cmdline, "");
+    dest->vu_ops->append_opts(dest, dest_cmdline, "");
     to = qtest_init(dest_cmdline->str);
 
     /* This would be where you call qos_allocate_objects(to, NULL), if you want
@@ -831,11 +842,11 @@ connect_thread(gpointer data)
 
 static void *vhost_user_test_setup_reconnect(GString *cmd_line, void *arg)
 {
-    TestServer *s = test_server_new("reconnect");
+    TestServer *s = test_server_new("reconnect", arg);
 
     g_thread_new("connect", connect_thread, s);
     append_mem_opts(s, cmd_line, 256, TEST_MEMFD_AUTO);
-    append_vhost_opts(s, cmd_line, ",server");
+    s->vu_ops->append_opts(s, cmd_line, ",server");
 
     g_test_queue_destroy(vhost_user_test_cleanup, s);
 
@@ -866,13 +877,13 @@ static void test_reconnect(void *obj, void *arg, QGuestAllocator *alloc)
 
 static void *vhost_user_test_setup_connect_fail(GString *cmd_line, void *arg)
 {
-    TestServer *s = test_server_new("connect-fail");
+    TestServer *s = test_server_new("connect-fail", arg);
 
     s->test_fail = true;
 
     g_thread_new("connect", connect_thread, s);
     append_mem_opts(s, cmd_line, 256, TEST_MEMFD_AUTO);
-    append_vhost_opts(s, cmd_line, ",server");
+    s->vu_ops->append_opts(s, cmd_line, ",server");
 
     g_test_queue_destroy(vhost_user_test_cleanup, s);
 
@@ -881,13 +892,13 @@ static void *vhost_user_test_setup_connect_fail(GString *cmd_line, void *arg)
 
 static void *vhost_user_test_setup_flags_mismatch(GString *cmd_line, void *arg)
 {
-    TestServer *s = test_server_new("flags-mismatch");
+    TestServer *s = test_server_new("flags-mismatch", arg);
 
     s->test_flags = TEST_FLAGS_DISCONNECT;
 
     g_thread_new("connect", connect_thread, s);
     append_mem_opts(s, cmd_line, 256, TEST_MEMFD_AUTO);
-    append_vhost_opts(s, cmd_line, ",server");
+    s->vu_ops->append_opts(s, cmd_line, ",server");
 
     g_test_queue_destroy(vhost_user_test_cleanup, s);
 
@@ -924,11 +935,47 @@ static void test_multiqueue(void *obj, void *arg, QGuestAllocator *alloc)
     wait_for_rings_started(s, s->queues * 2);
 }
 
+static void vu_net_set_features(TestServer *s, CharBackend *chr,
+        VhostUserMsg *msg)
+{
+    g_assert_cmpint(msg->payload.u64 &
+            (0x1ULL << VHOST_USER_F_PROTOCOL_FEATURES), !=, 0ULL);
+    if (s->test_flags == TEST_FLAGS_DISCONNECT) {
+        qemu_chr_fe_disconnect(chr);
+        s->test_flags = TEST_FLAGS_BAD;
+    }
+}
+
+static void vu_net_get_protocol_features(TestServer *s, CharBackend *chr,
+        VhostUserMsg *msg)
+{
+    /* send back features to qemu */
+    msg->flags |= VHOST_USER_REPLY_MASK;
+    msg->size = sizeof(m.payload.u64);
+    msg->payload.u64 = 1 << VHOST_USER_PROTOCOL_F_LOG_SHMFD;
+    msg->payload.u64 |= 1 << VHOST_USER_PROTOCOL_F_CROSS_ENDIAN;
+    if (s->queues > 1) {
+        msg->payload.u64 |= 1 << VHOST_USER_PROTOCOL_F_MQ;
+    }
+    qemu_chr_fe_write_all(chr, (uint8_t *)msg, VHOST_USER_HDR_SIZE + msg->size);
+}
+
+/* Each VHOST-USER device should have its ops structure defined. */
+static struct vhost_user_ops g_vu_net_ops = {
+    .type = VHOST_USER_NET,
+
+    .append_opts = append_vhost_net_opts,
+
+    .set_features = vu_net_set_features,
+    .get_protocol_features = vu_net_get_protocol_features,
+};
+
 static void register_vhost_user_test(void)
 {
     QOSGraphTestOptions opts = {
         .before = vhost_user_test_setup,
         .subprocess = true,
+        .arg = &g_vu_net_ops,
     };
 
     qemu_add_opts(&qemu_chardev_opts);
Signature · 1 line
MST
#10 lore raw

[PULL v4 14/48] vhost-vdpa: add trace-events

In reply to Michael S. Tsirkin

From: Laurent Vivier <[email protected]>

Add trace functions in vhost-vdpa.c.

All traces from this file can be enabled with '-trace vhost_vdpa*'.

Message-Id: <[email protected]>

---
 hw/virtio/vhost-vdpa.c | 92 +++++++++++++++++++++++++++++++++++++++---
 hw/virtio/trace-events | 31 ++++++++++++++
 2 files changed, 118 insertions(+), 5 deletions(-)
hw/virtio/vhost-vdpa.c +87 -5
index dbf2643ff7..4f1039910a 100644
@@ -20,6 +20,8 @@
 #include "hw/virtio/vhost-vdpa.h"
 #include "qemu/main-loop.h"
 #include "cpu.h"
+#include "trace.h"
+#include "qemu-common.h"
 
 static bool vhost_vdpa_listener_skipped_section(MemoryRegionSection *section)
 {
@@ -48,6 +50,9 @@ static int vhost_vdpa_dma_map(struct vhost_vdpa *v, hwaddr iova, hwaddr size,
     msg.iotlb.perm = readonly ? VHOST_ACCESS_RO : VHOST_ACCESS_RW;
     msg.iotlb.type = VHOST_IOTLB_UPDATE;
 
+   trace_vhost_vdpa_dma_map(v, fd, msg.type, msg.iotlb.iova, msg.iotlb.size,
+                            msg.iotlb.uaddr, msg.iotlb.perm, msg.iotlb.type);
+
     if (write(fd, &msg, sizeof(msg)) != sizeof(msg)) {
         error_report("failed to write, fd=%d, errno=%d (%s)",
             fd, errno, strerror(errno));
@@ -69,6 +74,9 @@ static int vhost_vdpa_dma_unmap(struct vhost_vdpa *v, hwaddr iova,
     msg.iotlb.size = size;
     msg.iotlb.type = VHOST_IOTLB_INVALIDATE;
 
+    trace_vhost_vdpa_dma_unmap(v, fd, msg.type, msg.iotlb.iova,
+                               msg.iotlb.size, msg.iotlb.type);
+
     if (write(fd, &msg, sizeof(msg)) != sizeof(msg)) {
         error_report("failed to write, fd=%d, errno=%d (%s)",
             fd, errno, strerror(errno));
@@ -154,6 +162,9 @@ static void vhost_vdpa_listener_region_add(MemoryListener *listener,
             section->offset_within_region +
             (iova - section->offset_within_address_space);
 
+    trace_vhost_vdpa_listener_region_add(v, iova, int128_get64(llend),
+                                         vaddr, section->readonly);
+
     llsize = int128_sub(llend, int128_make64(iova));
 
     ret = vhost_vdpa_dma_map(v, iova, int128_get64(llsize),
@@ -209,6 +220,8 @@ static void vhost_vdpa_listener_region_del(MemoryListener *listener,
     llend = int128_add(llend, section->size);
     llend = int128_and(llend, int128_exts64(TARGET_PAGE_MASK));
 
+    trace_vhost_vdpa_listener_region_del(v, iova, int128_get64(llend));
+
     if (int128_ge(int128_make64(iova), llend)) {
         return;
     }
@@ -249,6 +262,7 @@ static void vhost_vdpa_add_status(struct vhost_dev *dev, uint8_t status)
 {
     uint8_t s;
 
+    trace_vhost_vdpa_add_status(dev, status);
     if (vhost_vdpa_call(dev, VHOST_VDPA_GET_STATUS, &s)) {
         return;
     }
@@ -263,6 +277,7 @@ static int vhost_vdpa_init(struct vhost_dev *dev, void *opaque)
     struct vhost_vdpa *v;
     uint64_t features;
     assert(dev->vhost_ops->backend_type == VHOST_BACKEND_TYPE_VDPA);
+    trace_vhost_vdpa_init(dev, opaque);
 
     v = opaque;
     v->dev = dev;
@@ -283,6 +298,7 @@ static int vhost_vdpa_cleanup(struct vhost_dev *dev)
     struct vhost_vdpa *v;
     assert(dev->vhost_ops->backend_type == VHOST_BACKEND_TYPE_VDPA);
     v = dev->opaque;
+    trace_vhost_vdpa_cleanup(dev, v);
     memory_listener_unregister(&v->listener);
 
     dev->opaque = NULL;
@@ -291,13 +307,25 @@ static int vhost_vdpa_cleanup(struct vhost_dev *dev)
 
 static int vhost_vdpa_memslots_limit(struct vhost_dev *dev)
 {
+    trace_vhost_vdpa_memslots_limit(dev, INT_MAX);
     return INT_MAX;
 }
 
 static int vhost_vdpa_set_mem_table(struct vhost_dev *dev,
                                     struct vhost_memory *mem)
 {
-
+    trace_vhost_vdpa_set_mem_table(dev, mem->nregions, mem->padding);
+    if (trace_event_get_state_backends(TRACE_VHOST_VDPA_SET_MEM_TABLE) &&
+        trace_event_get_state_backends(TRACE_VHOST_VDPA_DUMP_REGIONS)) {
+        int i;
+        for (i = 0; i < mem->nregions; i++) {
+            trace_vhost_vdpa_dump_regions(dev, i,
+                                          mem->regions[i].guest_phys_addr,
+                                          mem->regions[i].memory_size,
+                                          mem->regions[i].userspace_addr,
+                                          mem->regions[i].flags_padding);
+        }
+    }
     if (mem->padding) {
         return -1;
     }
@@ -309,6 +337,7 @@ static int vhost_vdpa_set_features(struct vhost_dev *dev,
                                    uint64_t features)
 {
     int ret;
+    trace_vhost_vdpa_set_features(dev, features);
     ret = vhost_vdpa_call(dev, VHOST_SET_FEATURES, &features);
     uint8_t status = 0;
     if (ret) {
@@ -345,26 +374,34 @@ static int vhost_vdpa_set_backend_cap(struct vhost_dev *dev)
 int vhost_vdpa_get_device_id(struct vhost_dev *dev,
                                    uint32_t *device_id)
 {
-    return vhost_vdpa_call(dev, VHOST_VDPA_GET_DEVICE_ID, device_id);
+    int ret;
+    ret = vhost_vdpa_call(dev, VHOST_VDPA_GET_DEVICE_ID, device_id);
+    trace_vhost_vdpa_get_device_id(dev, *device_id);
+    return ret;
 }
 
 static int vhost_vdpa_reset_device(struct vhost_dev *dev)
 {
+    int ret;
     uint8_t status = 0;
 
-    return vhost_vdpa_call(dev, VHOST_VDPA_SET_STATUS, &status);
+    ret = vhost_vdpa_call(dev, VHOST_VDPA_SET_STATUS, &status);
+    trace_vhost_vdpa_reset_device(dev, status);
+    return ret;
 }
 
 static int vhost_vdpa_get_vq_index(struct vhost_dev *dev, int idx)
 {
     assert(idx >= dev->vq_index && idx < dev->vq_index + dev->nvqs);
 
+    trace_vhost_vdpa_get_vq_index(dev, idx, idx - dev->vq_index);
     return idx - dev->vq_index;
 }
 
 static int vhost_vdpa_set_vring_ready(struct vhost_dev *dev)
 {
     int i;
+    trace_vhost_vdpa_set_vring_ready(dev);
     for (i = 0; i < dev->nvqs; ++i) {
         struct vhost_vring_state state = {
             .index = dev->vq_index + i,
@@ -375,6 +412,19 @@ static int vhost_vdpa_set_vring_ready(struct vhost_dev *dev)
     return 0;
 }
 
+static void vhost_vdpa_dump_config(struct vhost_dev *dev, const uint8_t *config,
+                                   uint32_t config_len)
+{
+    int b, len;
+    char line[QEMU_HEXDUMP_LINE_LEN];
+
+    for (b = 0; b < config_len; b += 16) {
+        len = config_len - b;
+        qemu_hexdump_line(line, b, config, len, false);
+        trace_vhost_vdpa_dump_config(dev, line);
+    }
+}
+
 static int vhost_vdpa_set_config(struct vhost_dev *dev, const uint8_t *data,
                                    uint32_t offset, uint32_t size,
                                    uint32_t flags)
@@ -383,10 +433,15 @@ static int vhost_vdpa_set_config(struct vhost_dev *dev, const uint8_t *data,
     int ret;
     unsigned long config_size = offsetof(struct vhost_vdpa_config, buf);
 
+    trace_vhost_vdpa_set_config(dev, offset, size, flags);
     config = g_malloc(size + config_size);
     config->off = offset;
     config->len = size;
     memcpy(config->buf, data, size);
+    if (trace_event_get_state_backends(TRACE_VHOST_VDPA_SET_CONFIG) &&
+        trace_event_get_state_backends(TRACE_VHOST_VDPA_DUMP_CONFIG)) {
+        vhost_vdpa_dump_config(dev, data, size);
+    }
     ret = vhost_vdpa_call(dev, VHOST_VDPA_SET_CONFIG, config);
     g_free(config);
     return ret;
@@ -399,18 +454,24 @@ static int vhost_vdpa_get_config(struct vhost_dev *dev, uint8_t *config,
     unsigned long config_size = offsetof(struct vhost_vdpa_config, buf);
     int ret;
 
+    trace_vhost_vdpa_get_config(dev, config, config_len);
     v_config = g_malloc(config_len + config_size);
     v_config->len = config_len;
     v_config->off = 0;
     ret = vhost_vdpa_call(dev, VHOST_VDPA_GET_CONFIG, v_config);
     memcpy(config, v_config->buf, config_len);
     g_free(v_config);
+    if (trace_event_get_state_backends(TRACE_VHOST_VDPA_GET_CONFIG) &&
+        trace_event_get_state_backends(TRACE_VHOST_VDPA_DUMP_CONFIG)) {
+        vhost_vdpa_dump_config(dev, config, config_len);
+    }
     return ret;
  }
 
 static int vhost_vdpa_dev_start(struct vhost_dev *dev, bool started)
 {
     struct vhost_vdpa *v = dev->opaque;
+    trace_vhost_vdpa_dev_start(dev, started);
     if (started) {
         uint8_t status = 0;
         memory_listener_register(&v->listener, &address_space_memory);
@@ -432,53 +493,72 @@ static int vhost_vdpa_dev_start(struct vhost_dev *dev, bool started)
 static int vhost_vdpa_set_log_base(struct vhost_dev *dev, uint64_t base,
                                      struct vhost_log *log)
 {
+    trace_vhost_vdpa_set_log_base(dev, base, log->size, log->refcnt, log->fd,
+                                  log->log);
     return vhost_vdpa_call(dev, VHOST_SET_LOG_BASE, &base);
 }
 
 static int vhost_vdpa_set_vring_addr(struct vhost_dev *dev,
                                        struct vhost_vring_addr *addr)
 {
+    trace_vhost_vdpa_set_vring_addr(dev, addr->index, addr->flags,
+                                    addr->desc_user_addr, addr->used_user_addr,
+                                    addr->avail_user_addr,
+                                    addr->log_guest_addr);
     return vhost_vdpa_call(dev, VHOST_SET_VRING_ADDR, addr);
 }
 
 static int vhost_vdpa_set_vring_num(struct vhost_dev *dev,
                                       struct vhost_vring_state *ring)
 {
+    trace_vhost_vdpa_set_vring_num(dev, ring->index, ring->num);
     return vhost_vdpa_call(dev, VHOST_SET_VRING_NUM, ring);
 }
 
 static int vhost_vdpa_set_vring_base(struct vhost_dev *dev,
                                        struct vhost_vring_state *ring)
 {
+    trace_vhost_vdpa_set_vring_base(dev, ring->index, ring->num);
     return vhost_vdpa_call(dev, VHOST_SET_VRING_BASE, ring);
 }
 
 static int vhost_vdpa_get_vring_base(struct vhost_dev *dev,
                                        struct vhost_vring_state *ring)
 {
-    return vhost_vdpa_call(dev, VHOST_GET_VRING_BASE, ring);
+    int ret;
+
+    ret = vhost_vdpa_call(dev, VHOST_GET_VRING_BASE, ring);
+    trace_vhost_vdpa_get_vring_base(dev, ring->index, ring->num);
+    return ret;
 }
 
 static int vhost_vdpa_set_vring_kick(struct vhost_dev *dev,
                                        struct vhost_vring_file *file)
 {
+    trace_vhost_vdpa_set_vring_kick(dev, file->index, file->fd);
     return vhost_vdpa_call(dev, VHOST_SET_VRING_KICK, file);
 }
 
 static int vhost_vdpa_set_vring_call(struct vhost_dev *dev,
                                        struct vhost_vring_file *file)
 {
+    trace_vhost_vdpa_set_vring_call(dev, file->index, file->fd);
     return vhost_vdpa_call(dev, VHOST_SET_VRING_CALL, file);
 }
 
 static int vhost_vdpa_get_features(struct vhost_dev *dev,
                                      uint64_t *features)
 {
-    return vhost_vdpa_call(dev, VHOST_GET_FEATURES, features);
+    int ret;
+
+    ret = vhost_vdpa_call(dev, VHOST_GET_FEATURES, features);
+    trace_vhost_vdpa_get_features(dev, *features);
+    return ret;
 }
 
 static int vhost_vdpa_set_owner(struct vhost_dev *dev)
 {
+    trace_vhost_vdpa_set_owner(dev);
     return vhost_vdpa_call(dev, VHOST_SET_OWNER, NULL);
 }
 
@@ -489,6 +569,8 @@ static int vhost_vdpa_vq_get_addr(struct vhost_dev *dev,
     addr->desc_user_addr = (uint64_t)(unsigned long)vq->desc_phys;
     addr->avail_user_addr = (uint64_t)(unsigned long)vq->avail_phys;
     addr->used_user_addr = (uint64_t)(unsigned long)vq->used_phys;
+    trace_vhost_vdpa_vq_get_addr(dev, vq, addr->desc_user_addr,
+                                 addr->avail_user_addr, addr->used_user_addr);
     return 0;
 }
 
hw/virtio/trace-events +31 -0
index 845200bf10..cf1e59de30 100644
@@ -22,6 +22,37 @@ vhost_user_postcopy_waker(const char *rb, uint64_t rb_offset) "%s + 0x%"PRIx64
 vhost_user_postcopy_waker_found(uint64_t client_addr) "0x%"PRIx64
 vhost_user_postcopy_waker_nomatch(const char *rb, uint64_t rb_offset) "%s + 0x%"PRIx64
 
+# vhost-vdpa.c
+vhost_vdpa_dma_map(void *vdpa, int fd, uint32_t msg_type, uint64_t iova, uint64_t size, uint64_t uaddr, uint8_t perm, uint8_t type) "vdpa:%p fd: %d msg_type: %"PRIu32" iova: 0x%"PRIx64" size: 0x%"PRIx64" uaddr: 0x%"PRIx64" perm: 0x%"PRIx8" type: %"PRIu8
+vhost_vdpa_dma_unmap(void *vdpa, int fd, uint32_t msg_type, uint64_t iova, uint64_t size, uint8_t type) "vdpa:%p fd: %d msg_type: %"PRIu32" iova: 0x%"PRIx64" size: 0x%"PRIx64" type: %"PRIu8
+vhost_vdpa_listener_region_add(void *vdpa, uint64_t iova, uint64_t llend, void *vaddr, bool readonly) "vdpa: %p iova 0x%"PRIx64" llend 0x%"PRIx64" vaddr: %p read-only: %d"
+vhost_vdpa_listener_region_del(void *vdpa, uint64_t iova, uint64_t llend) "vdpa: %p iova 0x%"PRIx64" llend 0x%"PRIx64
+vhost_vdpa_add_status(void *dev, uint8_t status) "dev: %p status: 0x%"PRIx8
+vhost_vdpa_init(void *dev, void *vdpa) "dev: %p vdpa: %p"
+vhost_vdpa_cleanup(void *dev, void *vdpa) "dev: %p vdpa: %p"
+vhost_vdpa_memslots_limit(void *dev, int ret) "dev: %p = 0x%x"
+vhost_vdpa_set_mem_table(void *dev, uint32_t nregions, uint32_t padding) "dev: %p nregions: %"PRIu32" padding: 0x%"PRIx32
+vhost_vdpa_dump_regions(void *dev, int i, uint64_t guest_phys_addr, uint64_t memory_size, uint64_t userspace_addr, uint64_t flags_padding) "dev: %p %d: guest_phys_addr: 0x%"PRIx64" memory_size: 0x%"PRIx64" userspace_addr: 0x%"PRIx64" flags_padding: 0x%"PRIx64
+vhost_vdpa_set_features(void *dev, uint64_t features) "dev: %p features: 0x%"PRIx64
+vhost_vdpa_get_device_id(void *dev, uint32_t device_id) "dev: %p device_id %"PRIu32
+vhost_vdpa_reset_device(void *dev, uint8_t status) "dev: %p status: 0x%"PRIx8
+vhost_vdpa_get_vq_index(void *dev, int idx, int vq_idx) "dev: %p idx: %d vq idx: %d"
+vhost_vdpa_set_vring_ready(void *dev) "dev: %p"
+vhost_vdpa_dump_config(void *dev, const char *line) "dev: %p %s"
+vhost_vdpa_set_config(void *dev, uint32_t offset, uint32_t size, uint32_t flags) "dev: %p offset: %"PRIu32" size: %"PRIu32" flags: 0x%"PRIx32
+vhost_vdpa_get_config(void *dev, void *config, uint32_t config_len) "dev: %p config: %p config_len: %"PRIu32
+vhost_vdpa_dev_start(void *dev, bool started) "dev: %p started: %d"
+vhost_vdpa_set_log_base(void *dev, uint64_t base, unsigned long long size, int refcnt, int fd, void *log) "dev: %p base: 0x%"PRIx64" size: %llu refcnt: %d fd: %d log: %p"
+vhost_vdpa_set_vring_addr(void *dev, unsigned int index, unsigned int flags, uint64_t desc_user_addr, uint64_t used_user_addr, uint64_t avail_user_addr, uint64_t log_guest_addr) "dev: %p index: %u flags: 0x%x desc_user_addr: 0x%"PRIx64" used_user_addr: 0x%"PRIx64" avail_user_addr: 0x%"PRIx64" log_guest_addr: 0x%"PRIx64
+vhost_vdpa_set_vring_num(void *dev, unsigned int index, unsigned int num) "dev: %p index: %u num: %u"
+vhost_vdpa_set_vring_base(void *dev, unsigned int index, unsigned int num) "dev: %p index: %u num: %u"
+vhost_vdpa_get_vring_base(void *dev, unsigned int index, unsigned int num) "dev: %p index: %u num: %u"
+vhost_vdpa_set_vring_kick(void *dev, unsigned int index, int fd) "dev: %p index: %u fd: %d"
+vhost_vdpa_set_vring_call(void *dev, unsigned int index, int fd) "dev: %p index: %u fd: %d"
+vhost_vdpa_get_features(void *dev, uint64_t features) "dev: %p features: 0x%"PRIx64
+vhost_vdpa_set_owner(void *dev) "dev: %p"
+vhost_vdpa_vq_get_addr(void *dev, void *vq, uint64_t desc_user_addr, uint64_t avail_user_addr, uint64_t used_user_addr) "dev: %p vq: %p desc_user_addr: 0x%"PRIx64" avail_user_addr: 0x%"PRIx64" used_user_addr: 0x%"PRIx64
+
 # virtio.c
 virtqueue_alloc_element(void *elem, size_t sz, unsigned in_num, unsigned out_num) "elem %p size %zd in_num %u out_num %u"
 virtqueue_fill(void *vq, const void *elem, unsigned int len, unsigned int idx) "vq %p elem %p len %u idx %u"
Signature · 1 line
MST
#11 lore raw

[PULL v4 19/48] vhost-vsock-ccw: force virtio version 1

In reply to Michael S. Tsirkin

From: Stefano Garzarella <[email protected]>

virtio-vsock was introduced after the release of VIRTIO 1.0 specifications, so it should be 'modern-only'.

This patch forces virtio version 1 as done for vhost-vsock-pci.

To avoid migration issues, we force virtio version 1 only when legacy check is enabled in the new machine types (>= 5.1).

Message-Id: <[email protected]>

---
 hw/s390x/vhost-vsock-ccw.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
hw/s390x/vhost-vsock-ccw.c +12 -0
index 0822ecca89..246416a8f9 100644
@@ -40,9 +40,21 @@ static void vhost_vsock_ccw_class_init(ObjectClass *klass, void *data)
 static void vhost_vsock_ccw_instance_init(Object *obj)
 {
     VHostVSockCCWState *dev = VHOST_VSOCK_CCW(obj);
+    VirtioCcwDevice *ccw_dev = VIRTIO_CCW_DEVICE(obj);
+    VirtIODevice *virtio_dev;
 
     virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),
                                 TYPE_VHOST_VSOCK);
+
+    virtio_dev = VIRTIO_DEVICE(&dev->vdev);
+
+    /*
+     * To avoid migration issues, we force virtio version 1 only when
+     * legacy check is enabled in the new machine types (>= 5.1).
+     */
+    if (!virtio_legacy_check_disabled(virtio_dev)) {
+        ccw_dev->force_revision_1 = true;
+    }
 }
 
 static const TypeInfo vhost_vsock_ccw_info = {
Signature · 1 line
MST
#12 lore raw

[PULL v4 15/48] configure: Fix build dependencies with vhost-vdpa.

In reply to Michael S. Tsirkin

From: Laurent Vivier <[email protected]>

Following the same logic as for vhost-net-user and vhost-kernel, enable vhost-net if vhost-net-vdpa is enabled and vhost-net is not explicitly disabled.
See 299e6f19b3e2 ("vhost-net: revamp configure logic")

Autoselect VHOST if VHOST_VDPA is set
See 21c6b0c87e85 ("configure: simplify vhost condition with Kconfig") See 2becc36a3e53 ("meson: infrastructure for building emulators"

Problems can be triggered using;
... --enable-vhost-vdpa --disable-vhost-user --disable-vhost-kernel ...

Fixes 108a64818e69 ("vhost-vdpa: introduce vhost-vdpa backend")

Message-Id: <[email protected]>

---
 configure    | 3 ++-
 Kconfig.host | 4 ++++
 meson.build  | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)
configure +2 -1
index e8e8e984f2..8ee15810c8 100755
@@ -2494,9 +2494,10 @@ if test "$vhost_net_vdpa" = "yes" && test "$vhost_vdpa" = "no"; then
   error_exit "--enable-vhost-net-vdpa requires --enable-vhost-vdpa"
 fi
 
-# OR the vhost-kernel and vhost-user values for simplicity
+# OR the vhost-kernel, vhost-vdpa and vhost-user values for simplicity
 if test "$vhost_net" = ""; then
   test "$vhost_net_user" = "yes" && vhost_net=yes
+  test "$vhost_net_vdpa" = "yes" && vhost_net=yes
   test "$vhost_kernel" = "yes" && vhost_net=yes
 fi
 
Kconfig.host +4 -0
index 4af19bf70e..a9a55a9c31 100644
@@ -24,6 +24,10 @@ config VHOST_USER
     bool
     select VHOST
 
+config VHOST_VDPA
+    bool
+    select VHOST
+
 config VHOST_KERNEL
     bool
     select VHOST
meson.build +1 -0
index b26c8bffc6..d36dd085b5 100644
@@ -521,6 +521,7 @@ kconfig_external_symbols = [
   'CONFIG_OPENGL',
   'CONFIG_X11',
   'CONFIG_VHOST_USER',
+  'CONFIG_VHOST_VDPA',
   'CONFIG_VHOST_KERNEL',
   'CONFIG_VIRTFS',
   'CONFIG_LINUX',
Signature · 1 line
MST
#13 lore raw

[PULL v4 10/48] virtio-iommu: Check gtrees are non null before destroying them

In reply to Michael S. Tsirkin

From: Eric Auger <[email protected]>

If realize fails, domains and endpoints trees may be NULL. On unrealize(), this produces assertions:

"GLib: g_tree_destroy: assertion 'tree != NULL' failed"

Check that the trees are non NULL before destroying them.

Message-Id: <[email protected]>

---
 hw/virtio/virtio-iommu.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
hw/virtio/virtio-iommu.c +6 -2
index 5d56865e56..21ec63b108 100644
@@ -801,8 +801,12 @@ static void virtio_iommu_device_unrealize(DeviceState *dev)
     VirtIOIOMMU *s = VIRTIO_IOMMU(dev);
 
     g_hash_table_destroy(s->as_by_busptr);
-    g_tree_destroy(s->domains);
-    g_tree_destroy(s->endpoints);
+    if (s->domains) {
+        g_tree_destroy(s->domains);
+    }
+    if (s->endpoints) {
+        g_tree_destroy(s->endpoints);
+    }
 
     virtio_delete_queue(s->req_vq);
     virtio_delete_queue(s->event_vq);
Signature · 1 line
MST
#14 lore raw

[PULL v4 17/48] vhost-vsock-pci: force virtio version 1

In reply to Michael S. Tsirkin

From: Stefano Garzarella <[email protected]>

Commit 9b3a35ec82 ("virtio: verify that legacy support is not accidentally on") added a safety check that requires to set 'disable-legacy=on' on vhost-vsock-pci device:

    $ ./qemu-system-x86_64 ... -device vhost-vsock-pci,guest-cid=5
        qemu-system-x86_64: -device vhost-vsock-pci,guest-cid=5:
        device is modern-only, use disable-legacy=on

virtio-vsock was introduced after the release of VIRTIO 1.0 specifications, so it should be 'modern-only'.
In addition Cornelia verified that forcing a legacy mode on vhost-vsock-pci device using x86-64 host and s390x guest, so with different endianness, produces strange behaviours.

This patch forces virtio version 1 and removes the 'transitional_name' property removing the need to specify 'disable-legacy=on' on vhost-vsock-pci device.

To avoid migration issues, we force virtio version 1 only when legacy check is enabled in the new machine types (>= 5.1).

As the transitional device name is not commonly used, we do not provide compatibility handling for it.

Message-Id: <[email protected]>

---
 hw/virtio/vhost-vsock-pci.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
hw/virtio/vhost-vsock-pci.c +9 -1
index e56067b427..205da8d1f5 100644
@@ -44,6 +44,15 @@ static void vhost_vsock_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
 {
     VHostVSockPCI *dev = VHOST_VSOCK_PCI(vpci_dev);
     DeviceState *vdev = DEVICE(&dev->vdev);
+    VirtIODevice *virtio_dev = VIRTIO_DEVICE(vdev);
+
+    /*
+     * To avoid migration issues, we force virtio version 1 only when
+     * legacy check is enabled in the new machine types (>= 5.1).
+     */
+    if (!virtio_legacy_check_disabled(virtio_dev)) {
+        virtio_pci_force_virtio_1(vpci_dev);
+    }
 
     qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
 }
@@ -73,7 +82,6 @@ static void vhost_vsock_pci_instance_init(Object *obj)
 static const VirtioPCIDeviceTypeInfo vhost_vsock_pci_info = {
     .base_name             = TYPE_VHOST_VSOCK_PCI,
     .generic_name          = "vhost-vsock-pci",
-    .transitional_name     = "vhost-vsock-pci-transitional",
     .non_transitional_name = "vhost-vsock-pci-non-transitional",
     .instance_size = sizeof(VHostVSockPCI),
     .instance_init = vhost_vsock_pci_instance_init,
Signature · 1 line
MST
#15 lore raw

[PULL v4 26/48] x86: ich9: expose "smi_negotiated_features" as a QOM property

In reply to Michael S. Tsirkin

From: Igor Mammedov <[email protected]>

Expose the "smi_negotiated_features" field of ICH9LPCState as a QOM property.

Message-Id: <[email protected]>

---
 include/hw/i386/ich9.h | 2 ++
 hw/isa/lpc_ich9.c      | 3 +++
 2 files changed, 5 insertions(+)
include/hw/i386/ich9.h +2 -0
index 703d56036a..294024be5f 100644
@@ -245,6 +245,8 @@ struct ICH9LPCState {
 #define ICH9_SMB_HST_D1                         0x06
 #define ICH9_SMB_HOST_BLOCK_DB                  0x07
 
+#define ICH9_LPC_SMI_NEGOTIATED_FEAT_PROP "x-smi-negotiated-features"
+
 /* bit positions used in fw_cfg SMI feature negotiation */
 #define ICH9_LPC_SMI_F_BROADCAST_BIT            0
 #define ICH9_LPC_SMI_F_CPU_HOTPLUG_BIT          1
hw/isa/lpc_ich9.c +3 -0
index a54b3ec8bd..04e5323140 100644
@@ -647,6 +647,9 @@ static void ich9_lpc_initfn(Object *obj)
                                   &acpi_enable_cmd, OBJ_PROP_FLAG_READ);
     object_property_add_uint8_ptr(OBJECT(lpc), ACPI_PM_PROP_ACPI_DISABLE_CMD,
                                   &acpi_disable_cmd, OBJ_PROP_FLAG_READ);
+    object_property_add_uint64_ptr(obj, ICH9_LPC_SMI_NEGOTIATED_FEAT_PROP,
+                                   &lpc->smi_negotiated_features,
+                                   OBJ_PROP_FLAG_READ);
 
     ich9_pm_add_properties(obj, &lpc->pm);
 }
Signature · 1 line
MST
#16 lore raw

[PULL v4 25/48] tests: acpi: mark to be changed tables in bios-tables-test-allowed-diff

In reply to Michael S. Tsirkin

From: Igor Mammedov <[email protected]>

... to let tests pass until binary blobs are updated with new AML

Message-Id: <[email protected]>

---
 tests/qtest/bios-tables-test-allowed-diff.h | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
tests/qtest/bios-tables-test-allowed-diff.h +19 -0
index dfb8523c8b..dba32d5613 100644
@@ -1 +1,20 @@
 /* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/pc/DSDT",
+"tests/data/acpi/q35/DSDT",
+"tests/data/acpi/q35/DSDT.tis",
+"tests/data/acpi/q35/DSDT.bridge",
+"tests/data/acpi/q35/DSDT.mmio64",
+"tests/data/acpi/q35/DSDT.ipmibt",
+"tests/data/acpi/q35/DSDT.cphp",
+"tests/data/acpi/q35/DSDT.memhp",
+"tests/data/acpi/q35/DSDT.numamem",
+"tests/data/acpi/q35/DSDT.dimmpxm",
+"tests/data/acpi/q35/DSDT.acpihmat",
+"tests/data/acpi/pc/DSDT.bridge",
+"tests/data/acpi/pc/DSDT.ipmikcs",
+"tests/data/acpi/pc/DSDT.cphp",
+"tests/data/acpi/pc/DSDT.memhp",
+"tests/data/acpi/pc/DSDT.numamem",
+"tests/data/acpi/pc/DSDT.dimmpxm",
+"tests/data/acpi/pc/DSDT.acpihmat",
+"tests/data/acpi/pc/DSDT.acpihmat",
Signature · 1 line
MST
#17 lore raw

[PULL v4 11/48] virtio-iommu-pci: force virtio version 1

In reply to Michael S. Tsirkin

From: Eric Auger <[email protected]>

Commit 9b3a35ec82 ("virtio: verify that legacy support is not accidentally on") added a safety check that requires to set 'disable-legacy=on' on virtio-iommu-pci:

qemu-system-aarch64: -device virtio-iommu-pci: device is modern-only, use disable-legacy=on

virtio-iommu was introduced after the release of VIRTIO 1.0 specifications, so it should be 'modern-only'.

This patch forces virtio version 1 and removes the 'transitional_name' property removing the need to specify 'disable-legacy=on' on virtio-iommu-pci device.

Message-Id: <[email protected]>

---
 hw/virtio/virtio-iommu-pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
hw/virtio/virtio-iommu-pci.c +1 -1
index 76540e57b1..378f63b210 100644
@@ -69,6 +69,7 @@ static void virtio_iommu_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
     object_property_set_link(OBJECT(dev), "primary-bus",
                              OBJECT(pci_get_bus(&vpci_dev->pci_dev)),
                              &error_abort);
+    virtio_pci_force_virtio_1(vpci_dev);
     qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
 }
 
@@ -98,7 +99,6 @@ static void virtio_iommu_pci_instance_init(Object *obj)
 static const VirtioPCIDeviceTypeInfo virtio_iommu_pci_info = {
     .base_name             = TYPE_VIRTIO_IOMMU_PCI,
     .generic_name          = "virtio-iommu-pci",
-    .transitional_name     = "virtio-iommu-pci-transitional",
     .non_transitional_name = "virtio-iommu-pci-non-transitional",
     .instance_size = sizeof(VirtIOIOMMUPCI),
     .instance_init = virtio_iommu_pci_instance_init,
Signature · 1 line
MST
#18 lore raw

[PULL v4 28/48] x86: acpi: introduce the PCI0.SMI0 ACPI device

In reply to Michael S. Tsirkin

From: Igor Mammedov <[email protected]>

When CPU hotplug with SMI has been negotiated, describe the SMI register block in the DSDT. Pass the ACPI name of the SMI control register to build_cpus_aml(), so that CPU_SCAN_METHOD can access the register in the next patch.

Message-Id: <[email protected]>

---
 include/hw/acpi/cpu.h |  1 +
 hw/i386/acpi-build.c  | 29 ++++++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
include/hw/acpi/cpu.h +1 -0
index 62f0278ba2..0eeedaa491 100644
@@ -50,6 +50,7 @@ void cpu_hotplug_hw_init(MemoryRegion *as, Object *owner,
 typedef struct CPUHotplugFeatures {
     bool acpi_1_compatible;
     bool has_legacy_cphp;
+    const char *smi_path;
 } CPUHotplugFeatures;
 
 void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts,
hw/i386/acpi-build.c +28 -1
index b408d62560..b49d360ab2 100644
@@ -1521,6 +1521,32 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
         aml_append(dev, aml_name_decl("_UID", aml_int(0)));
         aml_append(dev, build_q35_osc_method());
         aml_append(sb_scope, dev);
+
+        if (pm->smi_on_cpuhp) {
+            /* reserve SMI block resources, IO ports 0xB2, 0xB3 */
+            dev = aml_device("PCI0.SMI0");
+            aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0A06")));
+            aml_append(dev, aml_name_decl("_UID", aml_string("SMI resources")));
+            crs = aml_resource_template();
+            aml_append(crs,
+                aml_io(
+                       AML_DECODE16,
+                       ACPI_PORT_SMI_CMD,
+                       ACPI_PORT_SMI_CMD,
+                       1,
+                       2)
+            );
+            aml_append(dev, aml_name_decl("_CRS", crs));
+            aml_append(dev, aml_operation_region("SMIR", AML_SYSTEM_IO,
+                aml_int(ACPI_PORT_SMI_CMD), 2));
+            field = aml_field("SMIR", AML_BYTE_ACC, AML_NOLOCK,
+                              AML_WRITE_AS_ZEROS);
+            aml_append(field, aml_named_field("SMIC", 8));
+            aml_append(field, aml_reserved_field(8));
+            aml_append(dev, field);
+            aml_append(sb_scope, dev);
+        }
+
         aml_append(dsdt, sb_scope);
 
         build_hpet_aml(dsdt);
@@ -1536,7 +1562,8 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
         build_legacy_cpu_hotplug_aml(dsdt, machine, pm->cpu_hp_io_base);
     } else {
         CPUHotplugFeatures opts = {
-            .acpi_1_compatible = true, .has_legacy_cphp = true
+            .acpi_1_compatible = true, .has_legacy_cphp = true,
+            .smi_path = pm->smi_on_cpuhp ? "\\_SB.PCI0.SMI0.SMIC" : NULL,
         };
         build_cpus_aml(dsdt, machine, opts, pm->cpu_hp_io_base,
                        "\\_SB.PCI0", "\\_GPE._E02");
Signature · 1 line
MST
#19 lore raw

[PULL v4 18/48] vhost-user-vsock-pci: force virtio version 1

In reply to Michael S. Tsirkin

From: Stefano Garzarella <[email protected]>

Commit 9b3a35ec82 ("virtio: verify that legacy support is not accidentally on") added a safety check that requires to set 'disable-legacy=on' on vhost-user-vsock-pci device:

    $ ./qemu-system-x86_64 ... \
    -chardev socket,id=char0,reconnect=0,path=/tmp/vhost4.socket \
    -device vhost-user-vsock-pci,chardev=char0
        qemu-system-x86_64: -device vhost-user-vsock-pci,chardev=char0:
        device is modern-only, use disable-legacy=on

virtio-vsock was introduced after the release of VIRTIO 1.0 specifications, so it should be 'modern-only'.

This patch forces virtio version 1 and removes the 'transitional_name' property, as done for vhost-vsock-pci, removing the need to specify 'disable-legacy=on' on vhost-user-vsock-pci device.

Message-Id: <[email protected]>

---
 hw/virtio/vhost-user-vsock-pci.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
hw/virtio/vhost-user-vsock-pci.c +3 -1
index 763f89984e..72a96199cd 100644
@@ -41,6 +41,9 @@ static void vhost_user_vsock_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
     VHostUserVSockPCI *dev = VHOST_USER_VSOCK_PCI(vpci_dev);
     DeviceState *vdev = DEVICE(&dev->vdev);
 
+    /* unlike vhost-vsock, we do not need to care about pre-5.1 compat */
+    virtio_pci_force_virtio_1(vpci_dev);
+
     qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
 }
 
@@ -69,7 +72,6 @@ static void vhost_user_vsock_pci_instance_init(Object *obj)
 static const VirtioPCIDeviceTypeInfo vhost_user_vsock_pci_info = {
     .base_name             = TYPE_VHOST_USER_VSOCK_PCI,
     .generic_name          = "vhost-user-vsock-pci",
-    .transitional_name     = "vhost-user-vsock-pci-transitional",
     .non_transitional_name = "vhost-user-vsock-pci-non-transitional",
     .instance_size = sizeof(VHostUserVSockPCI),
     .instance_init = vhost_user_vsock_pci_instance_init,
Signature · 1 line
MST
#20 lore raw

[PULL v4 33/48] qemu-options: document SMBIOS type 11 settings

In reply to Michael S. Tsirkin

From: Daniel P. Berrangé <[email protected]>

Message-Id: <[email protected]>

---
 qemu-options.hx | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
qemu-options.hx +41 -0
index 47f64be0c0..3564c2303f 100644
@@ -2296,6 +2296,8 @@ DEF("smbios", HAS_ARG, QEMU_OPTION_smbios,
     "-smbios type=4[,sock_pfx=str][,manufacturer=str][,version=str][,serial=str]\n"
     "              [,asset=str][,part=str][,max-speed=%d][,current-speed=%d]\n"
     "                specify SMBIOS type 4 fields\n"
+    "-smbios type=11[,value=str][,path=filename]\n"
+    "                specify SMBIOS type 11 fields\n"
     "-smbios type=17[,loc_pfx=str][,bank=str][,manufacturer=str][,serial=str]\n"
     "               [,asset=str][,part=str][,speed=%d]\n"
     "                specify SMBIOS type 17 fields\n",
@@ -2319,6 +2321,45 @@ SRST
 ``-smbios type=4[,sock_pfx=str][,manufacturer=str][,version=str][,serial=str][,asset=str][,part=str]``
     Specify SMBIOS type 4 fields
 
+``-smbios type=11[,value=str][,path=filename]``
+    Specify SMBIOS type 11 fields
+
+    This argument can be repeated multiple times, and values are added in the order they are parsed.
+    Applications intending to use OEM strings data are encouraged to use their application name as
+    a prefix for the value string. This facilitates passing information for multiple applications
+    concurrently.
+
+    The ``value=str`` syntax provides the string data inline, while the ``path=filename`` syntax
+    loads data from a file on disk. Note that the file is not permitted to contain any NUL bytes.
+
+    Both the ``value`` and ``path`` options can be repeated multiple times and will be added to
+    the SMBIOS table in the order in which they appear.
+
+    Note that on the x86 architecture, the total size of all SMBIOS tables is limited to 65535
+    bytes. Thus the OEM strings data is not suitable for passing large amounts of data into the
+    guest. Instead it should be used as a indicator to inform the guest where to locate the real
+    data set, for example, by specifying the serial ID of a block device.
+
+    An example passing three strings is
+
+    .. parsed-literal::
+
+        -smbios type=11,value=cloud-init:ds=nocloud-net;s=http://10.10.0.1:8000/,\\
+                        value=anaconda:method=http://dl.fedoraproject.org/pub/fedora/linux/releases/25/x86_64/os,\\
+                        path=/some/file/with/oemstringsdata.txt
+
+    In the guest OS this is visible with the ``dmidecode`` command
+
+     .. parsed-literal::
+
+         $ dmidecode -t 11
+         Handle 0x0E00, DMI type 11, 5 bytes
+         OEM Strings
+              String 1: cloud-init:ds=nocloud-net;s=http://10.10.0.1:8000/
+              String 2: anaconda:method=http://dl.fedoraproject.org/pub/fedora/linux/releases/25/x86_64/os
+              String 3: myapp:some extra data
+
+
 ``-smbios type=17[,loc_pfx=str][,bank=str][,manufacturer=str][,serial=str][,asset=str][,part=str][,speed=%d]``
     Specify SMBIOS type 17 fields
 ERST
Signature · 1 line
MST
#21 lore raw

[PULL v4 31/48] hw/smbios: support loading OEM strings values from a file

In reply to Michael S. Tsirkin

From: Daniel P. Berrangé <[email protected]>

Some applications want to pass quite large values for the OEM strings entries. Rather than having huge strings on the command line, it would be better to load them from a file, as supported with -fw_cfg.

This introduces the "path" parameter allowing for:

  $ echo -n "thisthing" > mydata.txt
  $ qemu-system-x86_64 \
    -smbios type=11,value=something \
    -smbios type=11,path=mydata.txt \
    -smbios type=11,value=somemore \
    ...other args...

Now in the guest

$ dmidecode -t 11
Getting SMBIOS data from sysfs.
SMBIOS 2.8 present.

Handle 0x0E00, DMI type 11, 5 bytes
OEM Strings
String 1: something
String 2: thisthing
String 3: somemore

Message-Id: <[email protected]>

---
 hw/smbios/smbios.c | 71 +++++++++++++++++++++++++++++++++++++---------
 1 file changed, 58 insertions(+), 13 deletions(-)
hw/smbios/smbios.c +58 -13
index 7cc950b41c..d993448087 100644
@@ -110,7 +110,7 @@ static struct {
 
 static struct {
     size_t nvalues;
-    const char **values;
+    char **values;
 } type11;
 
 static struct {
@@ -314,6 +314,11 @@ static const QemuOptDesc qemu_smbios_type11_opts[] = {
         .type = QEMU_OPT_STRING,
         .help = "OEM string data",
     },
+    {
+        .name = "path",
+        .type = QEMU_OPT_STRING,
+        .help = "OEM string data from file",
+    },
 };
 
 static const QemuOptDesc qemu_smbios_type17_opts[] = {
@@ -641,6 +646,8 @@ static void smbios_build_type_11_table(void)
 
     for (i = 0; i < type11.nvalues; i++) {
         SMBIOS_TABLE_SET_STR_LIST(11, type11.values[i]);
+        g_free(type11.values[i]);
+        type11.values[i] = NULL;
     }
 
     SMBIOS_BUILD_TABLE_POST;
@@ -940,9 +947,8 @@ static void save_opt(const char **dest, QemuOpts *opts, const char *name)
 
 
 struct opt_list {
-    const char *name;
     size_t *ndest;
-    const char ***dest;
+    char ***dest;
 };
 
 static int save_opt_one(void *opaque,
@@ -951,23 +957,60 @@ static int save_opt_one(void *opaque,
 {
     struct opt_list *opt = opaque;
 
-    if (!g_str_equal(name, opt->name)) {
-        return 0;
+    if (g_str_equal(name, "path")) {
+        g_autoptr(GByteArray) data = g_byte_array_new();
+        g_autofree char *buf = g_new(char, 4096);
+        ssize_t ret;
+        int fd = qemu_open(value, O_RDONLY, errp);
+        if (fd < 0) {
+            return -1;
+        }
+
+        while (1) {
+            ret = read(fd, buf, 4096);
+            if (ret == 0) {
+                break;
+            }
+            if (ret < 0) {
+                error_setg(errp, "Unable to read from %s: %s",
+                           value, strerror(errno));
+                return -1;
+            }
+            if (memchr(buf, '\0', ret)) {
+                error_setg(errp, "NUL in OEM strings value in %s", value);
+                return -1;
+            }
+            g_byte_array_append(data, (guint8 *)buf, ret);
+        }
+
+        close(fd);
+
+        *opt->dest = g_renew(char *, *opt->dest, (*opt->ndest) + 1);
+        (*opt->dest)[*opt->ndest] = (char *)g_byte_array_free(data,  FALSE);
+        (*opt->ndest)++;
+        data = NULL;
+   } else if (g_str_equal(name, "value")) {
+        *opt->dest = g_renew(char *, *opt->dest, (*opt->ndest) + 1);
+        (*opt->dest)[*opt->ndest] = g_strdup(value);
+        (*opt->ndest)++;
+    } else if (!g_str_equal(name, "type")) {
+        error_setg(errp, "Unexpected option %s", name);
+        return -1;
     }
 
-    *opt->dest = g_renew(const char *, *opt->dest, (*opt->ndest) + 1);
-    (*opt->dest)[*opt->ndest] = value;
-    (*opt->ndest)++;
     return 0;
 }
 
-static void save_opt_list(size_t *ndest, const char ***dest,
-                          QemuOpts *opts, const char *name)
+static bool save_opt_list(size_t *ndest, char ***dest, QemuOpts *opts,
+                          Error **errp)
 {
     struct opt_list opt = {
-        name, ndest, dest,
+        ndest, dest,
     };
-    qemu_opt_foreach(opts, save_opt_one, &opt, NULL);
+    if (!qemu_opt_foreach(opts, save_opt_one, &opt, errp)) {
+        return false;
+    }
+    return true;
 }
 
 void smbios_entry_add(QemuOpts *opts, Error **errp)
@@ -1149,7 +1192,9 @@ void smbios_entry_add(QemuOpts *opts, Error **errp)
             if (!qemu_opts_validate(opts, qemu_smbios_type11_opts, errp)) {
                 return;
             }
-            save_opt_list(&type11.nvalues, &type11.values, opts, "value");
+            if (!save_opt_list(&type11.nvalues, &type11.values, opts, errp)) {
+                return;
+            }
             return;
         case 17:
             if (!qemu_opts_validate(opts, qemu_smbios_type17_opts, errp)) {
Signature · 1 line
MST
#22 lore raw

[PULL v4 21/48] x86: lpc9: let firmware negotiate 'CPU hotplug with SMI' features

In reply to Michael S. Tsirkin

From: Igor Mammedov <[email protected]>

It will allow firmware to notify QEMU that firmware requires SMI being triggered on CPU hot[un]plug, so that it would be able to account for hotplugged CPU and relocate it to new SMM base and/or safely remove CPU on unplug.

Using negotiated features, follow up patches will insert SMI upcall into AML code, to make sure that firmware processes hotplug before guest OS would attempt to use new CPU.

Message-Id: <[email protected]>

---
 include/hw/i386/ich9.h |  2 ++
 hw/i386/pc.c           |  4 +++-
 hw/isa/lpc_ich9.c      | 13 +++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)
include/hw/i386/ich9.h +2 -0
index 48b442bc0b..703d56036a 100644
@@ -247,5 +247,7 @@ struct ICH9LPCState {
 
 /* bit positions used in fw_cfg SMI feature negotiation */
 #define ICH9_LPC_SMI_F_BROADCAST_BIT            0
+#define ICH9_LPC_SMI_F_CPU_HOTPLUG_BIT          1
+#define ICH9_LPC_SMI_F_CPU_HOT_UNPLUG_BIT       2
 
 #endif /* HW_ICH9_H */
hw/i386/pc.c +3 -1
index 50e8317342..2c6194e57f 100644
@@ -97,7 +97,9 @@
 #include "trace.h"
 #include CONFIG_DEVICES
 
-GlobalProperty pc_compat_5_1[] = {};
+GlobalProperty pc_compat_5_1[] = {
+    { "ICH9-LPC", "x-smi-cpu-hotplug", "off" },
+};
 const size_t pc_compat_5_1_len = G_N_ELEMENTS(pc_compat_5_1);
 
 GlobalProperty pc_compat_5_0[] = {
hw/isa/lpc_ich9.c +13 -0
index 3303d2eab6..a54b3ec8bd 100644
@@ -373,6 +373,15 @@ static void smi_features_ok_callback(void *opaque)
         /* guest requests invalid features, leave @features_ok at zero */
         return;
     }
+    if (!(guest_features & BIT_ULL(ICH9_LPC_SMI_F_BROADCAST_BIT)) &&
+        guest_features & (BIT_ULL(ICH9_LPC_SMI_F_CPU_HOTPLUG_BIT) |
+                          BIT_ULL(ICH9_LPC_SMI_F_CPU_HOT_UNPLUG_BIT))) {
+        /*
+         * cpu hot-[un]plug with SMI requires SMI broadcast,
+         * leave @features_ok at zero
+         */
+        return;
+    }
 
     /* valid feature subset requested, lock it down, report success */
     lpc->smi_negotiated_features = guest_features;
@@ -747,6 +756,10 @@ static Property ich9_lpc_properties[] = {
     DEFINE_PROP_BOOL("noreboot", ICH9LPCState, pin_strap.spkr_hi, true),
     DEFINE_PROP_BIT64("x-smi-broadcast", ICH9LPCState, smi_host_features,
                       ICH9_LPC_SMI_F_BROADCAST_BIT, true),
+    DEFINE_PROP_BIT64("x-smi-cpu-hotplug", ICH9LPCState, smi_host_features,
+                      ICH9_LPC_SMI_F_CPU_HOTPLUG_BIT, true),
+    DEFINE_PROP_BIT64("x-smi-cpu-hotunplug", ICH9LPCState, smi_host_features,
+                      ICH9_LPC_SMI_F_CPU_HOT_UNPLUG_BIT, false),
     DEFINE_PROP_END_OF_LIST(),
 };
 
Signature · 1 line
MST
#23 lore raw

[PULL v4 42/48] tests/acpi: add newly added acpi DSDT table blob for pci bridge hotplug flag

In reply to Michael S. Tsirkin

From: Ani Sinha <[email protected]>

This patch adds a binary blob corresponding to the DSDT acpi table. It is used to unit test the flag 'acpi-pci-hotplug-with-bridge-support' used with pci bridges.

This change also clears the file tests/qtest/bios-tables-test-allowed-diff.h so that future changes which affect the table can be caught.

The following is the diff between files tests/data/acpi/pc/DSDT.bridge and tests/data/acpi/pc/DSDT.hpbridge after disassembly :

@@ -1,30 +1,30 @@
/*
* Intel ACPI Component Architecture
* AML/ASL+ Disassembler version 20180105 (64-bit version)
* Copyright (c) 2000 - 2018 Intel Corporation
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/pc/DSDT.bridge, Fri Sep 11 23:21:34 2020
+ * Disassembly of /tmp/aml-7UURQ0, Fri Sep 11 23:21:34 2020
*
* Original Table Header:

  *     Signature        "DSDT"
- *     Length           0x00001A89 (6793)
+ *     Length           0x0000131F (4895)
  *     Revision         0x01 **** 32-bit table (V1), no 64-bit math support
- *     Checksum         0x09
+ *     Checksum         0xF9
  *     OEM ID           "BOCHS "
  *     OEM Table ID     "BXPCDSDT"
  *     OEM Revision     0x00000001 (1)
  *     Compiler ID      "BXPC"
  *     Compiler Version 0x00000001 (1)
  */
 DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPCDSDT", 0x00000001)
 {
     Scope (\)
     {
         OperationRegion (DBG, SystemIO, 0x0402, One)
         Field (DBG, ByteAcc, NoLock, Preserve)
         {
             DBGB,   8
         }

@@ -859,522 +859,32 @@

                 }

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

                 Method (_S3D, 0, NotSerialized)  // _S3D: S3 Device State
                 {
                     Return (Zero)
                 }
             }

             Device (S18)
             {
                 Name (_ADR, 0x00030000)  // _ADR: Address
-                Name (BSEL, One)
-                Device (S00)
-                {
-                    Name (_SUN, Zero)  // _SUN: Slot User Number
-                    Name (_ADR, Zero)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S08)
- {

-                    Name (_SUN, One)  // _SUN: Slot User Number
-                    Name (_ADR, 0x00010000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S10)
- {

-                    Name (_SUN, 0x02)  // _SUN: Slot User Number
-                    Name (_ADR, 0x00020000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S18)
- {

-                    Name (_SUN, 0x03)  // _SUN: Slot User Number
-                    Name (_ADR, 0x00030000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S20)
- {

-                    Name (_SUN, 0x04)  // _SUN: Slot User Number
-                    Name (_ADR, 0x00040000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S28)
- {

-                    Name (_SUN, 0x05)  // _SUN: Slot User Number
-                    Name (_ADR, 0x00050000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S30)
- {

-                    Name (_SUN, 0x06)  // _SUN: Slot User Number
-                    Name (_ADR, 0x00060000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S38)
- {

-                    Name (_SUN, 0x07)  // _SUN: Slot User Number
-                    Name (_ADR, 0x00070000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S40)
- {

-                    Name (_SUN, 0x08)  // _SUN: Slot User Number
-                    Name (_ADR, 0x00080000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S48)
- {

-                    Name (_SUN, 0x09)  // _SUN: Slot User Number
-                    Name (_ADR, 0x00090000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S50)
- {

-                    Name (_SUN, 0x0A)  // _SUN: Slot User Number
-                    Name (_ADR, 0x000A0000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S58)
- {

-                    Name (_SUN, 0x0B)  // _SUN: Slot User Number
-                    Name (_ADR, 0x000B0000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S60)
- {

-                    Name (_SUN, 0x0C)  // _SUN: Slot User Number
-                    Name (_ADR, 0x000C0000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S68)
- {

-                    Name (_SUN, 0x0D)  // _SUN: Slot User Number
-                    Name (_ADR, 0x000D0000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S70)
- {

-                    Name (_SUN, 0x0E)  // _SUN: Slot User Number
-                    Name (_ADR, 0x000E0000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S78)
- {

-                    Name (_SUN, 0x0F)  // _SUN: Slot User Number
-                    Name (_ADR, 0x000F0000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S80)
- {

-                    Name (_SUN, 0x10)  // _SUN: Slot User Number
-                    Name (_ADR, 0x00100000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S88)
- {

-                    Name (_SUN, 0x11)  // _SUN: Slot User Number
-                    Name (_ADR, 0x00110000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S90)
- {

-                    Name (_SUN, 0x12)  // _SUN: Slot User Number
-                    Name (_ADR, 0x00120000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S98)
- {

-                    Name (_SUN, 0x13)  // _SUN: Slot User Number
-                    Name (_ADR, 0x00130000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (SA0)
- {

-                    Name (_SUN, 0x14)  // _SUN: Slot User Number
-                    Name (_ADR, 0x00140000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (SA8)
- {

-                    Name (_SUN, 0x15)  // _SUN: Slot User Number
-                    Name (_ADR, 0x00150000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (SB0)
- {

-                    Name (_SUN, 0x16)  // _SUN: Slot User Number
-                    Name (_ADR, 0x00160000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (SB8)
- {

-                    Name (_SUN, 0x17)  // _SUN: Slot User Number
-                    Name (_ADR, 0x00170000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (SC0)
- {

-                    Name (_SUN, 0x18)  // _SUN: Slot User Number
-                    Name (_ADR, 0x00180000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (SC8)
- {

-                    Name (_SUN, 0x19)  // _SUN: Slot User Number
-                    Name (_ADR, 0x00190000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (SD0)
- {

-                    Name (_SUN, 0x1A)  // _SUN: Slot User Number
-                    Name (_ADR, 0x001A0000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (SD8)
- {

-                    Name (_SUN, 0x1B)  // _SUN: Slot User Number
-                    Name (_ADR, 0x001B0000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (SE0)
- {

-                    Name (_SUN, 0x1C)  // _SUN: Slot User Number
-                    Name (_ADR, 0x001C0000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (SE8)
- {

-                    Name (_SUN, 0x1D)  // _SUN: Slot User Number
-                    Name (_ADR, 0x001D0000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (SF0)
- {

-                    Name (_SUN, 0x1E)  // _SUN: Slot User Number
-                    Name (_ADR, 0x001E0000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (SF8)
- {

-                    Name (_SUN, 0x1F)  // _SUN: Slot User Number
-                    Name (_ADR, 0x001F0000)  // _ADR: Address
-                    Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                    {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Method (DVNT, 2, NotSerialized)
- {
- If ((Arg0 & One))
- {
- Notify (S00, Arg1)
- }
-
- If ((Arg0 & 0x02))
- {
- Notify (S08, Arg1)
- }
-
- If ((Arg0 & 0x04))
- {
- Notify (S10, Arg1)
- }
-
- If ((Arg0 & 0x08))
- {
- Notify (S18, Arg1)
- }
-
- If ((Arg0 & 0x10))
- {
- Notify (S20, Arg1)
- }
-
- If ((Arg0 & 0x20))
- {
- Notify (S28, Arg1)
- }
-
- If ((Arg0 & 0x40))
- {
- Notify (S30, Arg1)
- }
-
- If ((Arg0 & 0x80))
- {
- Notify (S38, Arg1)
- }
-
- If ((Arg0 & 0x0100))
- {
- Notify (S40, Arg1)
- }
-
- If ((Arg0 & 0x0200))
- {
- Notify (S48, Arg1)
- }
-
- If ((Arg0 & 0x0400))
- {
- Notify (S50, Arg1)
- }
-
- If ((Arg0 & 0x0800))
- {
- Notify (S58, Arg1)
- }
-
- If ((Arg0 & 0x1000))
- {
- Notify (S60, Arg1)
- }
-
- If ((Arg0 & 0x2000))
- {
- Notify (S68, Arg1)
- }
-
- If ((Arg0 & 0x4000))
- {
- Notify (S70, Arg1)
- }
-
- If ((Arg0 & 0x8000))
- {
- Notify (S78, Arg1)
- }
-
- If ((Arg0 & 0x00010000))
- {
- Notify (S80, Arg1)
- }
-
- If ((Arg0 & 0x00020000))
- {
- Notify (S88, Arg1)
- }
-
- If ((Arg0 & 0x00040000))
- {
- Notify (S90, Arg1)
- }
-
- If ((Arg0 & 0x00080000))
- {
- Notify (S98, Arg1)
- }
-
- If ((Arg0 & 0x00100000))
- {
- Notify (SA0, Arg1)
- }
-
- If ((Arg0 & 0x00200000))
- {
- Notify (SA8, Arg1)
- }
-
- If ((Arg0 & 0x00400000))
- {
- Notify (SB0, Arg1)
- }
-
- If ((Arg0 & 0x00800000))
- {
- Notify (SB8, Arg1)
- }
-
- If ((Arg0 & 0x01000000))
- {
- Notify (SC0, Arg1)
- }
-
- If ((Arg0 & 0x02000000))
- {
- Notify (SC8, Arg1)
- }
-
- If ((Arg0 & 0x04000000))
- {
- Notify (SD0, Arg1)
- }
-
- If ((Arg0 & 0x08000000))
- {
- Notify (SD8, Arg1)
- }
-
- If ((Arg0 & 0x10000000))
- {
- Notify (SE0, Arg1)
- }
-
- If ((Arg0 & 0x20000000))
- {
- Notify (SE8, Arg1)
- }
-
- If ((Arg0 & 0x40000000))
- {
- Notify (SF0, Arg1)
- }
-
- If ((Arg0 & 0x80000000))
- {
- Notify (SF8, Arg1)
- }
- }
-
- Method (PCNT, 0, NotSerialized)
- {

-                    BNUM = One
-                    DVNT (PCIU, One)
-                    DVNT (PCID, 0x03)
-                }
             }

             Device (S20)
             {
                 Name (_SUN, 0x04)  // _SUN: Slot User Number
                 Name (_ADR, 0x00040000)  // _ADR: Address
                 Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
                 {
                     PCEJ (BSEL, _SUN)
                 }
             }

             Device (S28)
             {
                 Name (_SUN, 0x05)  // _SUN: Slot User Number
                 Name (_ADR, 0x00050000)  // _ADR: Address
@@ -1779,22 +1289,21 @@
                 If ((Arg0 & 0x40000000))
                 {
                     Notify (SF0, Arg1)
                 }

                 If ((Arg0 & 0x80000000))
                 {
                     Notify (SF8, Arg1)
                 }
             }

             Method (PCNT, 0, NotSerialized)
             {
                 BNUM = Zero
                 DVNT (PCIU, One)
                 DVNT (PCID, 0x03)
-                ^S18.PCNT ()
             }
         }
     }

}

Message-Id: <[email protected]>

---
 tests/qtest/bios-tables-test-allowed-diff.h |   1 -
 tests/data/acpi/pc/DSDT.hpbridge            | Bin 0 -> 4895 bytes
 2 files changed, 1 deletion(-)
 create mode 100644 tests/data/acpi/pc/DSDT.hpbridge
tests/qtest/bios-tables-test-allowed-diff.h +0 -1
index 96a9237355..dfb8523c8b 100644
@@ -1,2 +1 @@
 /* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/pc/DSDT.hpbridge",
tests/data/acpi/pc/DSDT.hpbridge new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..b0751398541bdf88ce405be9742aeba0b375dbc3
GIT binary patch
Signature · 1 line
MST
#24 lore raw

[PULL v4 16/48] virtio: skip legacy support check on machine types less than 5.1

In reply to Michael S. Tsirkin

From: Stefano Garzarella <[email protected]>

Commit 9b3a35ec82 ("virtio: verify that legacy support is not accidentally on") added a check that returns an error if legacy support is on, but the device does not support legacy.

Unfortunately some devices were wrongly declared legacy capable even if they were not (e.g vhost-vsock).

To avoid migration issues, we add a virtio-device property (x-disable-legacy-check) to skip the legacy error, printing a warning instead, for machine types < 5.1.

Fixes 9b3a35ec82 ("virtio: verify that legacy support is not accidentally on")

Message-Id: <[email protected]>

---
 include/hw/virtio/virtio.h |  2 ++
 hw/core/machine.c          |  1 +
 hw/s390x/virtio-ccw.c      | 15 ++++++++++++---
 hw/virtio/virtio-pci.c     | 14 ++++++++++++--
 hw/virtio/virtio.c         |  7 +++++++
 5 files changed, 34 insertions(+), 5 deletions(-)
include/hw/virtio/virtio.h +2 -0
index 28cf3b9120..b7ece7a6a8 100644
@@ -101,6 +101,7 @@ struct VirtIODevice
     bool use_started;
     bool started;
     bool start_on_kick; /* when virtio 1.0 feature has not been negotiated */
+    bool disable_legacy_check;
     VMChangeStateEntry *vmstate;
     char *bus_name;
     uint8_t device_endian;
@@ -394,5 +395,6 @@ static inline bool virtio_device_disabled(VirtIODevice *vdev)
 }
 
 bool virtio_legacy_allowed(VirtIODevice *vdev);
+bool virtio_legacy_check_disabled(VirtIODevice *vdev);
 
 #endif
hw/core/machine.c +1 -0
index 9b02fb2f5e..d7f4a0d259 100644
@@ -44,6 +44,7 @@ GlobalProperty hw_compat_5_0[] = {
     { "vmport", "x-signal-unsupported-cmd", "off" },
     { "vmport", "x-report-vmx-type", "off" },
     { "vmport", "x-cmds-v2", "off" },
+    { "virtio-device", "x-disable-legacy-check", "true" },
 };
 const size_t hw_compat_5_0_len = G_N_ELEMENTS(hw_compat_5_0);
 
hw/s390x/virtio-ccw.c +12 -3
index 8d140dc50f..4582e94ae7 100644
@@ -1122,9 +1122,18 @@ static void virtio_ccw_device_plugged(DeviceState *d, Error **errp)
     }
 
     if (!virtio_ccw_rev_max(dev) && !virtio_legacy_allowed(vdev)) {
-        error_setg(errp, "Invalid value of property max_rev "
-                   "(is %d expected >= 1)", virtio_ccw_rev_max(dev));
-        return;
+        /*
+         * To avoid migration issues, we allow legacy mode when legacy
+         * check is disabled in the old machine types (< 5.1).
+         */
+        if (virtio_legacy_check_disabled(vdev)) {
+            warn_report("device requires revision >= 1, but for backward "
+                        "compatibility max_revision=0 is allowed");
+        } else {
+            error_setg(errp, "Invalid value of property max_rev "
+                       "(is %d expected >= 1)", virtio_ccw_rev_max(dev));
+            return;
+        }
     }
 
     if (virtio_get_num_queues(vdev) > VIRTIO_QUEUE_MAX) {
hw/virtio/virtio-pci.c +12 -2
index 02790e3237..36524a5728 100644
@@ -1597,8 +1597,18 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp)
 
     if (legacy) {
         if (!virtio_legacy_allowed(vdev)) {
-            error_setg(errp, "device is modern-only, use disable-legacy=on");
-            return;
+            /*
+             * To avoid migration issues, we allow legacy mode when legacy
+             * check is disabled in the old machine types (< 5.1).
+             */
+            if (virtio_legacy_check_disabled(vdev)) {
+                warn_report("device is modern-only, but for backward "
+                            "compatibility legacy is allowed");
+            } else {
+                error_setg(errp,
+                           "device is modern-only, use disable-legacy=on");
+                return;
+            }
         }
         if (virtio_host_has_feature(vdev, VIRTIO_F_IOMMU_PLATFORM)) {
             error_setg(errp, "VIRTIO_F_IOMMU_PLATFORM was supported by"
hw/virtio/virtio.c +7 -0
index 3a3d012d9f..a2edb4f386 100644
@@ -3304,6 +3304,11 @@ bool virtio_legacy_allowed(VirtIODevice *vdev)
     }
 }
 
+bool virtio_legacy_check_disabled(VirtIODevice *vdev)
+{
+    return vdev->disable_legacy_check;
+}
+
 hwaddr virtio_queue_get_desc_addr(VirtIODevice *vdev, int n)
 {
     return vdev->vq[n].vring.desc;
@@ -3713,6 +3718,8 @@ static Property virtio_properties[] = {
     DEFINE_VIRTIO_COMMON_FEATURES(VirtIODevice, host_features),
     DEFINE_PROP_BOOL("use-started", VirtIODevice, use_started, true),
     DEFINE_PROP_BOOL("use-disabled-flag", VirtIODevice, use_disabled_flag, true),
+    DEFINE_PROP_BOOL("x-disable-legacy-check", VirtIODevice,
+                     disable_legacy_check, false),
     DEFINE_PROP_END_OF_LIST(),
 };
 
Signature · 1 line
MST
#25 lore raw

[PULL v4 32/48] hw/smbios: report error if table size is too large

In reply to Michael S. Tsirkin

From: Daniel P. Berrangé <[email protected]>

The SMBIOS 2.1 entry point uses a uint16 data type for reporting the total length of the tables. If the user passes -smbios configuration to QEMU that causes the table size to exceed this limit then various bad behaviours result, including

- firmware hangs in an infinite loop
- firmware triggers a KVM crash on bad memory access
- firmware silently discards user's SMBIOS data replacing it with a generic data set.

Limiting the size to 0xffff in QEMU avoids triggering most of these problems. There is a remaining bug in SeaBIOS which tries to prepend its own data for table 0, and does not check whether there is sufficient space before attempting this.

Message-Id: <[email protected]>

---
 hw/smbios/smbios.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
hw/smbios/smbios.c +14 -0
index d993448087..8b30906e50 100644
@@ -365,6 +365,13 @@ static void smbios_register_config(void)
 
 opts_init(smbios_register_config);
 
+/*
+ * The SMBIOS 2.1 "structure table length" field in the
+ * entry point uses a 16-bit integer, so we're limited
+ * in total table size
+ */
+#define SMBIOS_21_MAX_TABLES_LEN 0xffff
+
 static void smbios_validate_table(MachineState *ms)
 {
     uint32_t expect_t4_count = smbios_legacy ?
@@ -375,6 +382,13 @@ static void smbios_validate_table(MachineState *ms)
                      expect_t4_count, smbios_type4_count);
         exit(1);
     }
+
+    if (smbios_ep_type == SMBIOS_ENTRY_POINT_21 &&
+        smbios_tables_len > SMBIOS_21_MAX_TABLES_LEN) {
+        error_report("SMBIOS 2.1 table length %zu exceeds %d",
+                     smbios_tables_len, SMBIOS_21_MAX_TABLES_LEN);
+        exit(1);
+    }
 }
 
 
Signature · 1 line
MST
#26 lore raw

[PULL v4 22/48] x86: cpuhp: prevent guest crash on CPU hotplug when broadcast SMI is in use

In reply to Michael S. Tsirkin

From: Igor Mammedov <[email protected]>

There were reports of guest crash on CPU hotplug, when using q35 machine type and OVMF with SMM, due to hotplugged CPU trying to process SMI at default SMI handler location without it being relocated by firmware first.

Fix it by refusing hotplug if firmware hasn't negotiated CPU hotplug with SMI support while SMI broadcast is in use.

Message-Id: <[email protected]>

---
 hw/acpi/ich9.c | 12 +++++++++++-
 hw/i386/x86.c  | 11 +++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
hw/acpi/ich9.c +11 -1
index 6a19070cec..0acc9a3107 100644
@@ -408,10 +408,20 @@ void ich9_pm_device_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
     ICH9LPCState *lpc = ICH9_LPC_DEVICE(hotplug_dev);
 
     if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM) &&
-        !lpc->pm.acpi_memory_hotplug.is_enabled)
+        !lpc->pm.acpi_memory_hotplug.is_enabled) {
         error_setg(errp,
                    "memory hotplug is not enabled: %s.memory-hotplug-support "
                    "is not set", object_get_typename(OBJECT(lpc)));
+    } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) {
+        uint64_t negotiated = lpc->smi_negotiated_features;
+
+        if (negotiated & BIT_ULL(ICH9_LPC_SMI_F_BROADCAST_BIT) &&
+            !(negotiated & BIT_ULL(ICH9_LPC_SMI_F_CPU_HOTPLUG_BIT))) {
+            error_setg(errp, "cpu hotplug with SMI wasn't enabled by firmware");
+            error_append_hint(errp, "update machine type to newer than 5.1 "
+                "and firmware that suppors CPU hotplug with SMM");
+        }
+    }
 }
 
 void ich9_pm_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
hw/i386/x86.c +11 -0
index c2ea989579..403c2b1dad 100644
@@ -279,6 +279,17 @@ void x86_cpu_pre_plug(HotplugHandler *hotplug_dev,
         return;
     }
 
+    if (x86ms->acpi_dev) {
+        Error *local_err = NULL;
+
+        hotplug_handler_pre_plug(HOTPLUG_HANDLER(x86ms->acpi_dev), dev,
+                                 &local_err);
+        if (local_err) {
+            error_propagate(errp, local_err);
+            return;
+        }
+    }
+
     init_topo_info(&topo_info, x86ms);
 
     env->nr_dies = x86ms->smp_dies;
Signature · 1 line
MST
#27 lore raw

[PULL v4 24/48] acpi: add aml_land() and aml_break() primitives

In reply to Michael S. Tsirkin

From: Igor Mammedov <[email protected]>

Message-Id: <[email protected]>

---
 include/hw/acpi/aml-build.h |  2 ++
 hw/acpi/aml-build.c         | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)
include/hw/acpi/aml-build.h +2 -0
index d27da03d64..fe0055fffb 100644
@@ -290,6 +290,7 @@ Aml *aml_to_buffer(Aml *src, Aml *dst);
 Aml *aml_store(Aml *val, Aml *target);
 Aml *aml_and(Aml *arg1, Aml *arg2, Aml *dst);
 Aml *aml_or(Aml *arg1, Aml *arg2, Aml *dst);
+Aml *aml_land(Aml *arg1, Aml *arg2);
 Aml *aml_lor(Aml *arg1, Aml *arg2);
 Aml *aml_shiftleft(Aml *arg1, Aml *count);
 Aml *aml_shiftright(Aml *arg1, Aml *count, Aml *dst);
@@ -300,6 +301,7 @@ Aml *aml_increment(Aml *arg);
 Aml *aml_decrement(Aml *arg);
 Aml *aml_index(Aml *arg1, Aml *idx);
 Aml *aml_notify(Aml *arg1, Aml *arg2);
+Aml *aml_break(void);
 Aml *aml_call0(const char *method);
 Aml *aml_call1(const char *method, Aml *arg1);
 Aml *aml_call2(const char *method, Aml *arg1, Aml *arg2);
hw/acpi/aml-build.c +16 -0
index f6fbc9b95d..3792ba96ce 100644
@@ -556,6 +556,15 @@ Aml *aml_or(Aml *arg1, Aml *arg2, Aml *dst)
     return build_opcode_2arg_dst(0x7D /* OrOp */, arg1, arg2, dst);
 }
 
+/* ACPI 1.0b: 16.2.5.4 Type 2 Opcodes Encoding: DefLAnd */
+Aml *aml_land(Aml *arg1, Aml *arg2)
+{
+    Aml *var = aml_opcode(0x90 /* LAndOp */);
+    aml_append(var, arg1);
+    aml_append(var, arg2);
+    return var;
+}
+
 /* ACPI 1.0b: 16.2.5.4 Type 2 Opcodes Encoding: DefLOr */
 Aml *aml_lor(Aml *arg1, Aml *arg2)
 {
@@ -629,6 +638,13 @@ Aml *aml_notify(Aml *arg1, Aml *arg2)
     return var;
 }
 
+/* ACPI 1.0b: 16.2.5.3 Type 1 Opcodes Encoding: DefBreak */
+Aml *aml_break(void)
+{
+    Aml *var = aml_opcode(0xa5 /* BreakOp */);
+    return var;
+}
+
 /* helper to call method without argument */
 Aml *aml_call0(const char *method)
 {
Signature · 1 line
MST
#28 lore raw

[PULL v4 44/48] piix4: don't reserve hw resources when hotplug is off globally

In reply to Michael S. Tsirkin

From: Ani Sinha <[email protected]>

When acpi hotplug is turned off for both root pci bus as well as for pci bridges, we should not generate the related ACPI code for DSDT table or initialize related hw ports or reserve hw resources. This change makes sure all those operations are turned off in the case ACPI pci hotplug is off globally.

In this change, we also make sure ACPI code for the PCNT method are only added when bsel is enabled for the corresponding pci bus or bridge hotplug is turned on.

As q35 machines do not use bsel for it's pci buses at this point in time, this change affects DSDT acpi table for q35 machines as well. Therefore, we will also need to commit the updated golden master DSDT table acpi binary blobs as well. Following is the list of blobs which needs updating:

tests/data/acpi/q35/DSDT
tests/data/acpi/q35/DSDT.acpihmat
tests/data/acpi/q35/DSDT.bridge
tests/data/acpi/q35/DSDT.cphp
tests/data/acpi/q35/DSDT.dimmpxm
tests/data/acpi/q35/DSDT.ipmibt
tests/data/acpi/q35/DSDT.memhp
tests/data/acpi/q35/DSDT.mmio64
tests/data/acpi/q35/DSDT.numamem
tests/data/acpi/q35/DSDT.tis

These tables are updated in the following commit. Without the updated table blobs, the unit tests would fail with this patch.

Message-Id: <[email protected]>

---
 hw/acpi/piix4.c      |  6 ++++--
 hw/i386/acpi-build.c | 25 ++++++++++++++++++-------
 2 files changed, 22 insertions(+), 9 deletions(-)
hw/acpi/piix4.c +4 -2
index 832f8fba82..894d357f8c 100644
@@ -596,8 +596,10 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent,
                           "acpi-gpe0", GPE_LEN);
     memory_region_add_subregion(parent, GPE_BASE, &s->io_gpe);
 
-    acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent,
-                    s->use_acpi_hotplug_bridge);
+    if (s->use_acpi_hotplug_bridge || s->use_acpi_root_pci_hotplug) {
+        acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent,
+                        s->use_acpi_hotplug_bridge);
+    }
 
     s->cpu_hotplug_legacy = true;
     object_property_add_bool(OBJECT(s), "cpu-hotplug-legacy",
hw/i386/acpi-build.c +18 -7
index 2b17843837..8d14e4667a 100644
@@ -96,6 +96,7 @@ typedef struct AcpiPmInfo {
     bool s4_disabled;
     bool pcihp_bridge_en;
     bool smi_on_cpuhp;
+    bool pcihp_root_en;
     uint8_t s4_val;
     AcpiFadtData fadt;
     uint16_t cpu_hp_io_base;
@@ -251,6 +252,9 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm)
     pm->pcihp_bridge_en =
         object_property_get_bool(obj, "acpi-pci-hotplug-with-bridge-support",
                                  NULL);
+    pm->pcihp_root_en =
+        object_property_get_bool(obj, "acpi-root-pci-hotplug",
+                                 NULL);
 }
 
 static void acpi_get_misc_info(AcpiMiscInfo *info)
@@ -456,10 +460,12 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
     }
 
     /* Append PCNT method to notify about events on local and child buses.
-     * Add unconditionally for root since DSDT expects it.
+     * Add this method for root bus only when hotplug is enabled since DSDT
+     * expects it.
      */
-    method = aml_method("PCNT", 0, AML_NOTSERIALIZED);
-
+    if (bsel || pcihp_bridge_en) {
+        method = aml_method("PCNT", 0, AML_NOTSERIALIZED);
+    }
     /* If bus supports hotplug select it and notify about local events */
     if (bsel) {
         uint64_t bsel_val = qnum_get_uint(qobject_to(QNum, bsel));
@@ -485,7 +491,10 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
             aml_append(method, aml_name("^S%.02X.PCNT", devfn));
         }
     }
-    aml_append(parent_scope, method);
+
+    if (bsel || pcihp_bridge_en) {
+        aml_append(parent_scope, method);
+    }
     qobject_unref(bsel);
 }
 
@@ -1510,7 +1519,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
         build_hpet_aml(dsdt);
         build_piix4_isa_bridge(dsdt);
         build_isa_devices_aml(dsdt);
-        build_piix4_pci_hotplug(dsdt);
+        if (pm->pcihp_bridge_en || pm->pcihp_root_en) {
+            build_piix4_pci_hotplug(dsdt);
+        }
         build_piix4_pci0_int(dsdt);
     } else {
         sb_scope = aml_scope("_SB");
@@ -1579,7 +1590,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
     {
         aml_append(scope, aml_name_decl("_HID", aml_string("ACPI0006")));
 
-        if (misc->is_piix4) {
+        if (misc->is_piix4 && (pm->pcihp_bridge_en || pm->pcihp_root_en)) {
             method = aml_method("_E01", 0, AML_NOTSERIALIZED);
             aml_append(method,
                 aml_acquire(aml_name("\\_SB.PCI0.BLCK"), 0xFFFF));
@@ -1731,7 +1742,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
     crs_range_set_free(&crs_range_set);
 
     /* reserve PCIHP resources */
-    if (pm->pcihp_io_len) {
+    if (pm->pcihp_io_len && (pm->pcihp_bridge_en || pm->pcihp_root_en)) {
         dev = aml_device("PHPR");
         aml_append(dev, aml_name_decl("_HID", aml_string("PNP0A06")));
         aml_append(dev,
Signature · 1 line
MST
#29 lore raw

Re: [PULL v4 44/48] piix4: don't reserve hw resources when hotplug is off globally

Hi,

Quoted 11 lines · Michael S. Tsirkin

From: Ani Sinha <[email protected]>

When acpi hotplug is turned off for both root pci bus as well as for pci bridges, we should not generate the related ACPI code for DSDT table or initialize related hw ports or reserve hw resources. This change makes sure all those operations are turned off in the case ACPI pci hotplug is off globally.

In this change, we also make sure ACPI code for the PCNT method are only added when bsel is enabled for the corresponding pci bus or bridge hotplug is turned on.

I'm trying to understand the following build failure using gcc 9.3.0 on Ubuntu:

[2567/3684] Compiling C object libqemu-x86_64-softmmu.fa.p/hw_i386_acpi-build.c.o
FAILED: libqemu-x86_64-softmmu.fa.p/hw_i386_acpi-build.c.o ../hw/i386/acpi-build.c: In function 'build_append_pci_bus_devices':
../hw/i386/acpi-build.c:496:9: error: 'method' may be used uninitialized in this function [-Werror=maybe-uninitialized]

  496 |         aml_append(parent_scope, method);
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

cc1: all warnings being treated as errors

Quoted 72 lines

As q35 machines do not use bsel for it's pci buses at this point in time, this change affects DSDT acpi table for q35 machines as well. Therefore, we will also need to commit the updated golden master DSDT table acpi binary blobs as well. Following is the list of blobs which needs updating:

tests/data/acpi/q35/DSDT
tests/data/acpi/q35/DSDT.acpihmat
tests/data/acpi/q35/DSDT.bridge
tests/data/acpi/q35/DSDT.cphp
tests/data/acpi/q35/DSDT.dimmpxm
tests/data/acpi/q35/DSDT.ipmibt
tests/data/acpi/q35/DSDT.memhp
tests/data/acpi/q35/DSDT.mmio64
tests/data/acpi/q35/DSDT.numamem
tests/data/acpi/q35/DSDT.tis

These tables are updated in the following commit. Without the updated table blobs, the unit tests would fail with this patch.

Message-Id: <[email protected]>

---
 hw/acpi/piix4.c      |  6 ++++--
 hw/i386/acpi-build.c | 25 ++++++++++++++++++-------
 2 files changed, 22 insertions(+), 9 deletions(-)
hw/acpi/piix4.c +4 -2
index 832f8fba82..894d357f8c 100644
@@ -596,8 +596,10 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent,
                           "acpi-gpe0", GPE_LEN);
     memory_region_add_subregion(parent, GPE_BASE, &s->io_gpe);
 
-    acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent,
-                    s->use_acpi_hotplug_bridge);
+    if (s->use_acpi_hotplug_bridge || s->use_acpi_root_pci_hotplug) {
+        acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent,
+                        s->use_acpi_hotplug_bridge);
+    }
 
     s->cpu_hotplug_legacy = true;
     object_property_add_bool(OBJECT(s), "cpu-hotplug-legacy",
hw/i386/acpi-build.c +4 -0
index 2b17843837..8d14e4667a 100644
@@ -96,6 +96,7 @@ typedef struct AcpiPmInfo {
     bool s4_disabled;
     bool pcihp_bridge_en;
     bool smi_on_cpuhp;
+    bool pcihp_root_en;
     uint8_t s4_val;
     AcpiFadtData fadt;
     uint16_t cpu_hp_io_base;
@@ -251,6 +252,9 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm)
     pm->pcihp_bridge_en =
         object_property_get_bool(obj, "acpi-pci-hotplug-with-bridge-support",
                                  NULL);
+    pm->pcihp_root_en =
+        object_property_get_bool(obj, "acpi-root-pci-hotplug",
+                                 NULL);
 }
 
 static void acpi_get_misc_info(AcpiMiscInfo *info)
@@ -456,10 +460,12 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
     }
 

hw/i386/acpi-build.c static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, · line 468

Quoted 10 lines
hw/i386/acpi-build.c +5 -3
     /* Append PCNT method to notify about events on local and child buses.
-     * Add unconditionally for root since DSDT expects it.
+     * Add this method for root bus only when hotplug is enabled since DSDT
+     * expects it.
      */
-    method = aml_method("PCNT", 0, AML_NOTSERIALIZED);
-
+    if (bsel || pcihp_bridge_en) {
+        method = aml_method("PCNT", 0, AML_NOTSERIALIZED);
+    }

build_append_pci_bus_devices() is not easy to follow and could certainly benefit from a refactor.

So here, before 'method' was always reinitialized. Now not always, so it can be any value set in the big for() loop before...

Something is definitively wrong.

Quoted 45 lines
hw/i386/acpi-build.c +9 -4
     /* If bus supports hotplug select it and notify about local events */
     if (bsel) {
         uint64_t bsel_val = qnum_get_uint(qobject_to(QNum, bsel));
@@ -485,7 +491,10 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
             aml_append(method, aml_name("^S%.02X.PCNT", devfn));
         }
     }
-    aml_append(parent_scope, method);
+
+    if (bsel || pcihp_bridge_en) {
+        aml_append(parent_scope, method);
+    }
     qobject_unref(bsel);
 }
 
@@ -1510,7 +1519,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
         build_hpet_aml(dsdt);
         build_piix4_isa_bridge(dsdt);
         build_isa_devices_aml(dsdt);
-        build_piix4_pci_hotplug(dsdt);
+        if (pm->pcihp_bridge_en || pm->pcihp_root_en) {
+            build_piix4_pci_hotplug(dsdt);
+        }
         build_piix4_pci0_int(dsdt);
     } else {
         sb_scope = aml_scope("_SB");
@@ -1579,7 +1590,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
     {
         aml_append(scope, aml_name_decl("_HID", aml_string("ACPI0006")));
 
-        if (misc->is_piix4) {
+        if (misc->is_piix4 && (pm->pcihp_bridge_en || pm->pcihp_root_en)) {
             method = aml_method("_E01", 0, AML_NOTSERIALIZED);
             aml_append(method,
                 aml_acquire(aml_name("\\_SB.PCI0.BLCK"), 0xFFFF));
@@ -1731,7 +1742,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
     crs_range_set_free(&crs_range_set);
 
     /* reserve PCIHP resources */
-    if (pm->pcihp_io_len) {
+    if (pm->pcihp_io_len && (pm->pcihp_bridge_en || pm->pcihp_root_en)) {
         dev = aml_device("PHPR");
         aml_append(dev, aml_name_decl("_HID", aml_string("PNP0A06")));
         aml_append(dev,
#30 lore raw

Re: [PULL v4 44/48] piix4: don't reserve hw resources when hotplug is off globally

Quoted 114 lines · Philippe Mathieu-Daudé

Hi,

Quoted 11 lines · Michael S. Tsirkin

From: Ani Sinha <[email protected]>

When acpi hotplug is turned off for both root pci bus as well as for pci bridges, we should not generate the related ACPI code for DSDT table or initialize related hw ports or reserve hw resources. This change makes sure all those operations are turned off in the case ACPI pci hotplug is off globally.

In this change, we also make sure ACPI code for the PCNT method are only added when bsel is enabled for the corresponding pci bus or bridge hotplug is turned on.

I'm trying to understand the following build failure using gcc 9.3.0 on Ubuntu:

[2567/3684] Compiling C object libqemu-x86_64-softmmu.fa.p/hw_i386_acpi-build.c.o
FAILED: libqemu-x86_64-softmmu.fa.p/hw_i386_acpi-build.c.o ../hw/i386/acpi-build.c: In function 'build_append_pci_bus_devices':
../hw/i386/acpi-build.c:496:9: error: 'method' may be used uninitialized in this function [-Werror=maybe-uninitialized]

  496 |         aml_append(parent_scope, method);
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

cc1: all warnings being treated as errors

Quoted 72 lines

As q35 machines do not use bsel for it's pci buses at this point in time, this change affects DSDT acpi table for q35 machines as well. Therefore, we will also need to commit the updated golden master DSDT table acpi binary blobs as well. Following is the list of blobs which needs updating:

tests/data/acpi/q35/DSDT
tests/data/acpi/q35/DSDT.acpihmat
tests/data/acpi/q35/DSDT.bridge
tests/data/acpi/q35/DSDT.cphp
tests/data/acpi/q35/DSDT.dimmpxm
tests/data/acpi/q35/DSDT.ipmibt
tests/data/acpi/q35/DSDT.memhp
tests/data/acpi/q35/DSDT.mmio64
tests/data/acpi/q35/DSDT.numamem
tests/data/acpi/q35/DSDT.tis

These tables are updated in the following commit. Without the updated table blobs, the unit tests would fail with this patch.

Message-Id: <[email protected]>

---
 hw/acpi/piix4.c      |  6 ++++--
 hw/i386/acpi-build.c | 25 ++++++++++++++++++-------
 2 files changed, 22 insertions(+), 9 deletions(-)
hw/acpi/piix4.c +4 -2
index 832f8fba82..894d357f8c 100644
@@ -596,8 +596,10 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent,
                           "acpi-gpe0", GPE_LEN);
     memory_region_add_subregion(parent, GPE_BASE, &s->io_gpe);
 
-    acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent,
-                    s->use_acpi_hotplug_bridge);
+    if (s->use_acpi_hotplug_bridge || s->use_acpi_root_pci_hotplug) {
+        acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent,
+                        s->use_acpi_hotplug_bridge);
+    }
 
     s->cpu_hotplug_legacy = true;
     object_property_add_bool(OBJECT(s), "cpu-hotplug-legacy",
hw/i386/acpi-build.c +4 -0
index 2b17843837..8d14e4667a 100644
@@ -96,6 +96,7 @@ typedef struct AcpiPmInfo {
     bool s4_disabled;
     bool pcihp_bridge_en;
     bool smi_on_cpuhp;
+    bool pcihp_root_en;
     uint8_t s4_val;
     AcpiFadtData fadt;
     uint16_t cpu_hp_io_base;
@@ -251,6 +252,9 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm)
     pm->pcihp_bridge_en =
         object_property_get_bool(obj, "acpi-pci-hotplug-with-bridge-support",
                                  NULL);
+    pm->pcihp_root_en =
+        object_property_get_bool(obj, "acpi-root-pci-hotplug",
+                                 NULL);
 }
 
 static void acpi_get_misc_info(AcpiMiscInfo *info)
@@ -456,10 +460,12 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
     }
 

hw/i386/acpi-build.c static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, · line 468

Quoted 10 lines
hw/i386/acpi-build.c +5 -3
     /* Append PCNT method to notify about events on local and child buses.
-     * Add unconditionally for root since DSDT expects it.
+     * Add this method for root bus only when hotplug is enabled since DSDT
+     * expects it.
      */
-    method = aml_method("PCNT", 0, AML_NOTSERIALIZED);
-
+    if (bsel || pcihp_bridge_en) {
+        method = aml_method("PCNT", 0, AML_NOTSERIALIZED);
+    }

build_append_pci_bus_devices() is not easy to follow and could certainly benefit from a refactor.

Quoted 4 lines

So here, before 'method' was always reinitialized. Now not always, so it can be any value set in the big for() loop before...

Something is definitively wrong.

Suggested fix:
https://lists.gnu.org/archive/html/qemu-devel/2020-11/msg01986.html

#31 lore raw

Re: [PULL v4 44/48] piix4: don't reserve hw resources when hotplug is off globally

In reply to Philippe Mathieu-Daudé
Quoted 101 lines · Philippe Mathieu-Daudé

Hi,

Quoted 11 lines · Michael S. Tsirkin

From: Ani Sinha <[email protected]>

When acpi hotplug is turned off for both root pci bus as well as for pci bridges, we should not generate the related ACPI code for DSDT table or initialize related hw ports or reserve hw resources. This change makes sure all those operations are turned off in the case ACPI pci hotplug is off globally.

In this change, we also make sure ACPI code for the PCNT method are only added when bsel is enabled for the corresponding pci bus or bridge hotplug is turned on.

I'm trying to understand the following build failure using gcc 9.3.0 on Ubuntu:

[2567/3684] Compiling C object libqemu-x86_64-softmmu.fa.p/hw_i386_acpi-build.c.o
FAILED: libqemu-x86_64-softmmu.fa.p/hw_i386_acpi-build.c.o ../hw/i386/acpi-build.c: In function 'build_append_pci_bus_devices':
../hw/i386/acpi-build.c:496:9: error: 'method' may be used uninitialized in this function [-Werror=maybe-uninitialized]

  496 |         aml_append(parent_scope, method);
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

cc1: all warnings being treated as errors

Quoted 72 lines

As q35 machines do not use bsel for it's pci buses at this point in time, this change affects DSDT acpi table for q35 machines as well. Therefore, we will also need to commit the updated golden master DSDT table acpi binary blobs as well. Following is the list of blobs which needs updating:

tests/data/acpi/q35/DSDT
tests/data/acpi/q35/DSDT.acpihmat
tests/data/acpi/q35/DSDT.bridge
tests/data/acpi/q35/DSDT.cphp
tests/data/acpi/q35/DSDT.dimmpxm
tests/data/acpi/q35/DSDT.ipmibt
tests/data/acpi/q35/DSDT.memhp
tests/data/acpi/q35/DSDT.mmio64
tests/data/acpi/q35/DSDT.numamem
tests/data/acpi/q35/DSDT.tis

These tables are updated in the following commit. Without the updated table blobs, the unit tests would fail with this patch.

Message-Id: <[email protected]>

---
 hw/acpi/piix4.c      |  6 ++++--
 hw/i386/acpi-build.c | 25 ++++++++++++++++++-------
 2 files changed, 22 insertions(+), 9 deletions(-)
hw/acpi/piix4.c +4 -2
index 832f8fba82..894d357f8c 100644
@@ -596,8 +596,10 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent,
                           "acpi-gpe0", GPE_LEN);
     memory_region_add_subregion(parent, GPE_BASE, &s->io_gpe);
 
-    acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent,
-                    s->use_acpi_hotplug_bridge);
+    if (s->use_acpi_hotplug_bridge || s->use_acpi_root_pci_hotplug) {
+        acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent,
+                        s->use_acpi_hotplug_bridge);
+    }
 
     s->cpu_hotplug_legacy = true;
     object_property_add_bool(OBJECT(s), "cpu-hotplug-legacy",
hw/i386/acpi-build.c +4 -0
index 2b17843837..8d14e4667a 100644
@@ -96,6 +96,7 @@ typedef struct AcpiPmInfo {
     bool s4_disabled;
     bool pcihp_bridge_en;
     bool smi_on_cpuhp;
+    bool pcihp_root_en;
     uint8_t s4_val;
     AcpiFadtData fadt;
     uint16_t cpu_hp_io_base;
@@ -251,6 +252,9 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm)
     pm->pcihp_bridge_en =
         object_property_get_bool(obj, "acpi-pci-hotplug-with-bridge-support",
                                  NULL);
+    pm->pcihp_root_en =
+        object_property_get_bool(obj, "acpi-root-pci-hotplug",
+                                 NULL);
 }
 
 static void acpi_get_misc_info(AcpiMiscInfo *info)
@@ -456,10 +460,12 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
     }
 
Quoted 13 lines

hw/i386/acpi-build.c static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, · line 468

Quoted 10 lines
hw/i386/acpi-build.c +5 -3
     /* Append PCNT method to notify about events on local and child buses.
-     * Add unconditionally for root since DSDT expects it.
+     * Add this method for root bus only when hotplug is enabled since DSDT
+     * expects it.
      */
-    method = aml_method("PCNT", 0, AML_NOTSERIALIZED);
-
+    if (bsel || pcihp_bridge_en) {
+        method = aml_method("PCNT", 0, AML_NOTSERIALIZED);
+    }

build_append_pci_bus_devices() is not easy to follow and could certainly benefit from a refactor.

Hmm, ok will do that in my spare time.

Quoted 3 lines

So here, before 'method' was always reinitialized. Now not always, so it can be any value set in the big for() loop before...

In line 467 above, method is initialized when bsel is available or pcihp is enabled. In line 496, it is appended to the parent scope only under those conditions as well. Basically, in hunks

+ if (bsel || pcihp_bridge_en) {
+ method = aml_method("PCNT", 0, AML_NOTSERIALIZED);
+ }

and
+
+ if (bsel || pcihp_bridge_en) {
+ aml_append(parent_scope, method);
+ }

the conditions are exactly the same.

Hence, I see no contradiction. To satisfy the compiler, one could do this:

hw/i386/acpi-build.c +0 -0
index 4f66642..79b86d4 100644
@@ -349,7 +349,7 @@ static void build_append_pcihp_notify_entry(Aml

*method, int slot)
static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
bool pcihp_bridge_en)
{
- Aml *dev, *notify_method = NULL, *method;

+    Aml *dev, *notify_method = NULL, *method = NULL;
     QObject *bsel;
     PCIBus *sec;
     int i;
@@ -492,7 +492,7 @@ static void build_append_pci_bus_devices(Aml
*parent_scope, PCIBus *bus,
         }
     }
-    if (bsel || pcihp_bridge_en) {
+    if (method) {
         aml_append(parent_scope, method);
     }
     qobject_unref(bsel);
Quoted 49 lines

Something is definitively wrong.

Quoted 45 lines
hw/i386/acpi-build.c +9 -4
     /* If bus supports hotplug select it and notify about local events */
     if (bsel) {
         uint64_t bsel_val = qnum_get_uint(qobject_to(QNum, bsel));
@@ -485,7 +491,10 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
             aml_append(method, aml_name("^S%.02X.PCNT", devfn));
         }
     }
-    aml_append(parent_scope, method);
+
+    if (bsel || pcihp_bridge_en) {
+        aml_append(parent_scope, method);
+    }
     qobject_unref(bsel);
 }
 
@@ -1510,7 +1519,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
         build_hpet_aml(dsdt);
         build_piix4_isa_bridge(dsdt);
         build_isa_devices_aml(dsdt);
-        build_piix4_pci_hotplug(dsdt);
+        if (pm->pcihp_bridge_en || pm->pcihp_root_en) {
+            build_piix4_pci_hotplug(dsdt);
+        }
         build_piix4_pci0_int(dsdt);
     } else {
         sb_scope = aml_scope("_SB");
@@ -1579,7 +1590,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
     {
         aml_append(scope, aml_name_decl("_HID", aml_string("ACPI0006")));
 
-        if (misc->is_piix4) {
+        if (misc->is_piix4 && (pm->pcihp_bridge_en || pm->pcihp_root_en)) {
             method = aml_method("_E01", 0, AML_NOTSERIALIZED);
             aml_append(method,
                 aml_acquire(aml_name("\\_SB.PCI0.BLCK"), 0xFFFF));
@@ -1731,7 +1742,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
     crs_range_set_free(&crs_range_set);
 
     /* reserve PCIHP resources */
-    if (pm->pcihp_io_len) {
+    if (pm->pcihp_io_len && (pm->pcihp_bridge_en || pm->pcihp_root_en)) {
         dev = aml_device("PHPR");
         aml_append(dev, aml_name_decl("_HID", aml_string("PNP0A06")));
         aml_append(dev,
#32 lore raw

Re: [PULL v4 44/48] piix4: don't reserve hw resources when hotplug is off globally

Quoted 30 lines · Ani Sinha
Quoted 29 lines · Philippe Mathieu-Daudé

Hi,

Quoted 11 lines · Michael S. Tsirkin

From: Ani Sinha <[email protected]>

When acpi hotplug is turned off for both root pci bus as well as for pci bridges, we should not generate the related ACPI code for DSDT table or initialize related hw ports or reserve hw resources. This change makes sure all those operations are turned off in the case ACPI pci hotplug is off globally.

In this change, we also make sure ACPI code for the PCNT method are only added when bsel is enabled for the corresponding pci bus or bridge hotplug is turned on.

I'm trying to understand the following build failure using gcc 9.3.0 on Ubuntu:

[2567/3684] Compiling C object libqemu-x86_64-softmmu.fa.p/hw_i386_acpi-build.c.o
FAILED: libqemu-x86_64-softmmu.fa.p/hw_i386_acpi-build.c.o ../hw/i386/acpi-build.c: In function 'build_append_pci_bus_devices':
../hw/i386/acpi-build.c:496:9: error: 'method' may be used uninitialized in this function [-Werror=maybe-uninitialized]

  496 |         aml_append(parent_scope, method);
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

cc1: all warnings being treated as errors

...

Quoted 38 lines
Quoted 4 lines
Quoted 4 lines

static void acpi_get_misc_info(AcpiMiscInfo *info)

(quoted diff) +0 -0
@@ -456,10 +460,12 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
     }
 
Quoted 13 lines

Review static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, · line 468

Quoted 10 lines
(quoted diff) +5 -3
     /* Append PCNT method to notify about events on local and child buses.
-     * Add unconditionally for root since DSDT expects it.
+     * Add this method for root bus only when hotplug is enabled since DSDT
+     * expects it.
      */
-    method = aml_method("PCNT", 0, AML_NOTSERIALIZED);
-
+    if (bsel || pcihp_bridge_en) {
+        method = aml_method("PCNT", 0, AML_NOTSERIALIZED);
+    }

build_append_pci_bus_devices() is not easy to follow and could certainly benefit from a refactor.

Hmm, ok will do that in my spare time.

Quoted 3 lines

So here, before 'method' was always reinitialized. Now not always, so it can be any value set in the big for() loop before...

In line 467 above, method is initialized when bsel is available or pcihp is enabled. In line 496, it is appended to the parent scope only under those conditions as well. Basically, in hunks

(quoted diff) +3 -0
+    if (bsel || pcihp_bridge_en) {
+        method = aml_method("PCNT", 0, AML_NOTSERIALIZED);
+    }

and

(quoted diff) +4 -0
+
+    if (bsel || pcihp_bridge_en) {
+        aml_append(parent_scope, method);
+    }
Quoted 1 line

the conditions are exactly the same.

The problem is in the (!bsel && !pcihp_bridge_en) case, what 'method' is used there?

#33 lore raw

Re: [PULL v4 44/48] piix4: don't reserve hw resources when hotplug is off globally

Quoted 70 lines · Philippe Mathieu-Daudé
Quoted 30 lines · Ani Sinha
Quoted 29 lines · Philippe Mathieu-Daudé

Hi,

Quoted 11 lines · Michael S. Tsirkin

From: Ani Sinha <[email protected]>

When acpi hotplug is turned off for both root pci bus as well as for pci bridges, we should not generate the related ACPI code for DSDT table or initialize related hw ports or reserve hw resources. This change makes sure all those operations are turned off in the case ACPI pci hotplug is off globally.

In this change, we also make sure ACPI code for the PCNT method are only added when bsel is enabled for the corresponding pci bus or bridge hotplug is turned on.

I'm trying to understand the following build failure using gcc 9.3.0 on Ubuntu:

[2567/3684] Compiling C object libqemu-x86_64-softmmu.fa.p/hw_i386_acpi-build.c.o
FAILED: libqemu-x86_64-softmmu.fa.p/hw_i386_acpi-build.c.o ../hw/i386/acpi-build.c: In function 'build_append_pci_bus_devices':
../hw/i386/acpi-build.c:496:9: error: 'method' may be used uninitialized in this function [-Werror=maybe-uninitialized]

  496 |         aml_append(parent_scope, method);
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

cc1: all warnings being treated as errors

...

Quoted 38 lines
Quoted 4 lines
Quoted 4 lines

static void acpi_get_misc_info(AcpiMiscInfo *info)

(quoted diff) +0 -0
@@ -456,10 +460,12 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
     }
 
Quoted 13 lines

Review static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus, · line 468

Quoted 10 lines
(quoted diff) +5 -3
     /* Append PCNT method to notify about events on local and child buses.
-     * Add unconditionally for root since DSDT expects it.
+     * Add this method for root bus only when hotplug is enabled since DSDT
+     * expects it.
      */
-    method = aml_method("PCNT", 0, AML_NOTSERIALIZED);
-
+    if (bsel || pcihp_bridge_en) {
+        method = aml_method("PCNT", 0, AML_NOTSERIALIZED);
+    }

build_append_pci_bus_devices() is not easy to follow and could certainly benefit from a refactor.

Hmm, ok will do that in my spare time.

Quoted 3 lines

So here, before 'method' was always reinitialized. Now not always, so it can be any value set in the big for() loop before...

In line 467 above, method is initialized when bsel is available or pcihp is enabled. In line 496, it is appended to the parent scope only under those conditions as well. Basically, in hunks

(quoted diff) +3 -0
+    if (bsel || pcihp_bridge_en) {
+        method = aml_method("PCNT", 0, AML_NOTSERIALIZED);
+    }

and

(quoted diff) +4 -0
+
+    if (bsel || pcihp_bridge_en) {
+        aml_append(parent_scope, method);
+    }
Quoted 4 lines
Quoted 1 line

the conditions are exactly the same.

The problem is in the (!bsel && !pcihp_bridge_en) case, what 'method' is used there?

Um ... where exactly?

#34 lore raw

[PULL v4 34/48] vhost-user: save features of multiqueues if chardev is closed

In reply to Michael S. Tsirkin

From: haibinzhang(张海斌) <[email protected]>

Fore-commit(c6beefd674) only saves features of queue0, this makes wrong features of other queues in multiqueues situation.
For examples:
qemu-system-aarch64 ... \
-chardev socket,id=charnet0,path=/var/run/vhost_sock \
-netdev vhost-user,chardev=charnet0,queues=2,id=hostnet0 \
...
There are two queues in nic assocated with one chardev. When chardev is reconnected, it is necessary to save and restore features of all queues.

Message-Id: <[email protected]>

---
 net/vhost-user.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
net/vhost-user.c +7 -3
index 17532daaf3..ffbd94d944 100644
@@ -226,7 +226,7 @@ static void chr_closed_bh(void *opaque)
     NetClientState *ncs[MAX_QUEUE_NUM];
     NetVhostUserState *s;
     Error *err = NULL;
-    int queues;
+    int queues, i;
 
     queues = qemu_find_net_clients_except(name, ncs,
                                           NET_CLIENT_DRIVER_NIC,
@@ -235,8 +235,12 @@ static void chr_closed_bh(void *opaque)
 
     s = DO_UPCAST(NetVhostUserState, nc, ncs[0]);
 
-    if (s->vhost_net) {
-        s->acked_features = vhost_net_get_acked_features(s->vhost_net);
+    for (i = queues -1; i >= 0; i--) {
+        s = DO_UPCAST(NetVhostUserState, nc, ncs[i]);
+
+        if (s->vhost_net) {
+            s->acked_features = vhost_net_get_acked_features(s->vhost_net);
+        }
     }
 
     qmp_set_link(name, false, &err);
Signature · 1 line
MST
#35 lore raw

Re: [PULL v4 34/48] vhost-user: save features of multiqueues if chardev is closed

Quoted 14 lines · Michael S. Tsirkin

From: haibinzhang(张海斌) <[email protected]>

Fore-commit(c6beefd674) only saves features of queue0, this makes wrong features of other queues in multiqueues situation.
For examples:
qemu-system-aarch64 ... \
-chardev socket,id=charnet0,path=/var/run/vhost_sock \
-netdev vhost-user,chardev=charnet0,queues=2,id=hostnet0 \
...
There are two queues in nic assocated with one chardev. When chardev is reconnected, it is necessary to save and restore features of all queues.

Quoted 4 lines

Message-Id: <[email protected]>

Quoted 35 lines
---
 net/vhost-user.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
net/vhost-user.c +7 -3
index 17532daaf3..ffbd94d944 100644
@@ -226,7 +226,7 @@ static void chr_closed_bh(void *opaque)
     NetClientState *ncs[MAX_QUEUE_NUM];
     NetVhostUserState *s;
     Error *err = NULL;
-    int queues;
+    int queues, i;
 
     queues = qemu_find_net_clients_except(name, ncs,
                                           NET_CLIENT_DRIVER_NIC,
@@ -235,8 +235,12 @@ static void chr_closed_bh(void *opaque)
 
     s = DO_UPCAST(NetVhostUserState, nc, ncs[0]);
 
-    if (s->vhost_net) {
-        s->acked_features = vhost_net_get_acked_features(s->vhost_net);
+    for (i = queues -1; i >= 0; i--) {
+        s = DO_UPCAST(NetVhostUserState, nc, ncs[i]);
+
+        if (s->vhost_net) {
+            s->acked_features = vhost_net_get_acked_features(s->vhost_net);
+        }
     }
 
     qmp_set_link(name, false, &err);
Signature · 1 line
MST
#36 lore raw

[PULL v4 27/48] x86: acpi: introduce AcpiPmInfo::smi_on_cpuhp

In reply to Michael S. Tsirkin

From: Igor Mammedov <[email protected]>

Translate the "CPU hotplug with SMI" feature bit, from the property added in the last patch, to a dedicated boolean in AcpiPmInfo.

Message-Id: <[email protected]>

---
 hw/i386/acpi-build.c | 6 ++++++
 1 file changed, 6 insertions(+)
hw/i386/acpi-build.c +6 -0
index 0e0535d2e3..b408d62560 100644
@@ -95,6 +95,7 @@ typedef struct AcpiPmInfo {
     bool s3_disabled;
     bool s4_disabled;
     bool pcihp_bridge_en;
+    bool smi_on_cpuhp;
     uint8_t s4_val;
     AcpiFadtData fadt;
     uint16_t cpu_hp_io_base;
@@ -194,6 +195,7 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm)
     pm->cpu_hp_io_base = 0;
     pm->pcihp_io_base = 0;
     pm->pcihp_io_len = 0;
+    pm->smi_on_cpuhp = false;
 
     assert(obj);
     init_common_fadt_data(machine, obj, &pm->fadt);
@@ -207,12 +209,16 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm)
             object_property_get_uint(obj, ACPI_PCIHP_IO_LEN_PROP, NULL);
     }
     if (lpc) {
+        uint64_t smi_features = object_property_get_uint(lpc,
+            ICH9_LPC_SMI_NEGOTIATED_FEAT_PROP, NULL);
         struct AcpiGenericAddress r = { .space_id = AML_AS_SYSTEM_IO,
             .bit_width = 8, .address = ICH9_RST_CNT_IOPORT };
         pm->fadt.reset_reg = r;
         pm->fadt.reset_val = 0xf;
         pm->fadt.flags |= 1 << ACPI_FADT_F_RESET_REG_SUP;
         pm->cpu_hp_io_base = ICH9_CPU_HOTPLUG_IO_BASE;
+        pm->smi_on_cpuhp =
+            !!(smi_features & BIT_ULL(ICH9_LPC_SMI_F_CPU_HOTPLUG_BIT));
     }
 
     /* The above need not be conditional on machine type because the reset port
Signature · 1 line
MST
#37 lore raw

[PULL v4 29/48] x68: acpi: trigger SMI before sending hotplug Notify event to OSPM

In reply to Michael S. Tsirkin

From: Igor Mammedov <[email protected]>

In case firmware has negotiated CPU hotplug SMI feature, generate AML to describe SMI IO port region and send SMI to firmware on each CPU hotplug SCI in case new CPUs were hotplugged.

Since new CPUs can be hotplugged while CPU_SCAN_METHOD is running we can't send SMI before new CPUs are fetched from QEMU as it could cause sending Notify to a CPU that firmware hasn't seen yet. So fetch new CPUs into local cache first, then send SMI and after that send Notify events to cached CPUs. This should ensure that Notify is sent only to CPUs which were processed by firmware first.
Any CPUs that were hotplugged after caching will be processed by the next CPU_SCAN_METHOD, when pending SCI is handled.

Message-Id: <[email protected]>

---
 hw/acpi/cpu.c | 165 +++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 138 insertions(+), 27 deletions(-)
hw/acpi/cpu.c +138 -27
index 3d6a500fb7..8dd4d8ebbf 100644
@@ -14,6 +14,8 @@
 #define ACPI_CPU_CMD_DATA_OFFSET_RW 8
 #define ACPI_CPU_CMD_DATA2_OFFSET_R 0
 
+#define OVMF_CPUHP_SMI_CMD 4
+
 enum {
     CPHP_GET_NEXT_CPU_WITH_EVENT_CMD = 0,
     CPHP_OST_EVENT_CMD = 1,
@@ -321,6 +323,7 @@ const VMStateDescription vmstate_cpu_hotplug = {
 #define CPU_NOTIFY_METHOD "CTFY"
 #define CPU_EJECT_METHOD  "CEJ0"
 #define CPU_OST_METHOD    "COST"
+#define CPU_ADDED_LIST    "CNEW"
 
 #define CPU_ENABLED       "CPEN"
 #define CPU_SELECTOR      "CSEL"
@@ -465,42 +468,150 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts,
 
         method = aml_method(CPU_SCAN_METHOD, 0, AML_SERIALIZED);
         {
+            const uint8_t max_cpus_per_pass = 255;
             Aml *else_ctx;
-            Aml *while_ctx;
+            Aml *while_ctx, *while_ctx2;
             Aml *has_event = aml_local(0);
             Aml *dev_chk = aml_int(1);
             Aml *eject_req = aml_int(3);
             Aml *next_cpu_cmd = aml_int(CPHP_GET_NEXT_CPU_WITH_EVENT_CMD);
+            Aml *num_added_cpus = aml_local(1);
+            Aml *cpu_idx = aml_local(2);
+            Aml *uid = aml_local(3);
+            Aml *has_job = aml_local(4);
+            Aml *new_cpus = aml_name(CPU_ADDED_LIST);
 
             aml_append(method, aml_acquire(ctrl_lock, 0xFFFF));
-            aml_append(method, aml_store(one, has_event));
-            while_ctx = aml_while(aml_equal(has_event, one));
+
+            /*
+             * Windows versions newer than XP (including Windows 10/Windows
+             * Server 2019), do support* VarPackageOp but, it is cripled to hold
+             * the same elements number as old PackageOp.
+             * For compatibility with Windows XP (so it won't crash) use ACPI1.0
+             * PackageOp which can hold max 255 elements.
+             *
+             * use named package as old Windows don't support it in local var
+             */
+            aml_append(method, aml_name_decl(CPU_ADDED_LIST,
+                                             aml_package(max_cpus_per_pass)));
+
+            aml_append(method, aml_store(zero, uid));
+            aml_append(method, aml_store(one, has_job));
+            /*
+             * CPU_ADDED_LIST can hold limited number of elements, outer loop
+             * allows to process CPUs in batches which let us to handle more
+             * CPUs than CPU_ADDED_LIST can hold.
+             */
+            while_ctx2 = aml_while(aml_equal(has_job, one));
             {
-                 /* clear loop exit condition, ins_evt/rm_evt checks
-                  * will set it to 1 while next_cpu_cmd returns a CPU
-                  * with events */
-                 aml_append(while_ctx, aml_store(zero, has_event));
-                 aml_append(while_ctx, aml_store(next_cpu_cmd, cpu_cmd));
-                 ifctx = aml_if(aml_equal(ins_evt, one));
-                 {
-                     aml_append(ifctx,
-                         aml_call2(CPU_NOTIFY_METHOD, cpu_data, dev_chk));
-                     aml_append(ifctx, aml_store(one, ins_evt));
-                     aml_append(ifctx, aml_store(one, has_event));
-                 }
-                 aml_append(while_ctx, ifctx);
-                 else_ctx = aml_else();
-                 ifctx = aml_if(aml_equal(rm_evt, one));
-                 {
-                     aml_append(ifctx,
-                         aml_call2(CPU_NOTIFY_METHOD, cpu_data, eject_req));
-                     aml_append(ifctx, aml_store(one, rm_evt));
-                     aml_append(ifctx, aml_store(one, has_event));
-                 }
-                 aml_append(else_ctx, ifctx);
-                 aml_append(while_ctx, else_ctx);
+                aml_append(while_ctx2, aml_store(zero, has_job));
+
+                aml_append(while_ctx2, aml_store(one, has_event));
+                aml_append(while_ctx2, aml_store(zero, num_added_cpus));
+
+                /*
+                 * Scan CPUs, till there are CPUs with events or
+                 * CPU_ADDED_LIST capacity is exhausted
+                 */
+                while_ctx = aml_while(aml_land(aml_equal(has_event, one),
+                                      aml_lless(uid, aml_int(arch_ids->len))));
+                {
+                     /*
+                      * clear loop exit condition, ins_evt/rm_evt checks will
+                      * set it to 1 while next_cpu_cmd returns a CPU with events
+                      */
+                     aml_append(while_ctx, aml_store(zero, has_event));
+
+                     aml_append(while_ctx, aml_store(uid, cpu_selector));
+                     aml_append(while_ctx, aml_store(next_cpu_cmd, cpu_cmd));
+
+                     /*
+                      * wrap around case, scan is complete, exit loop.
+                      * It happens since events are not cleared in scan loop,
+                      * so next_cpu_cmd continues to find already processed CPUs
+                      */
+                     ifctx = aml_if(aml_lless(cpu_data, uid));
+                     {
+                         aml_append(ifctx, aml_break());
+                     }
+                     aml_append(while_ctx, ifctx);
+
+                     /*
+                      * if CPU_ADDED_LIST is full, exit inner loop and process
+                      * collected CPUs
+                      */
+                     ifctx = aml_if(
+                         aml_equal(num_added_cpus, aml_int(max_cpus_per_pass)));
+                     {
+                         aml_append(ifctx, aml_store(one, has_job));
+                         aml_append(ifctx, aml_break());
+                     }
+                     aml_append(while_ctx, ifctx);
+
+                     aml_append(while_ctx, aml_store(cpu_data, uid));
+                     ifctx = aml_if(aml_equal(ins_evt, one));
+                     {
+                         /* cache added CPUs to Notify/Wakeup later */
+                         aml_append(ifctx, aml_store(uid,
+                             aml_index(new_cpus, num_added_cpus)));
+                         aml_append(ifctx, aml_increment(num_added_cpus));
+                         aml_append(ifctx, aml_store(one, has_event));
+                     }
+                     aml_append(while_ctx, ifctx);
+                     else_ctx = aml_else();
+                     ifctx = aml_if(aml_equal(rm_evt, one));
+                     {
+                         aml_append(ifctx,
+                             aml_call2(CPU_NOTIFY_METHOD, uid, eject_req));
+                         aml_append(ifctx, aml_store(one, rm_evt));
+                         aml_append(ifctx, aml_store(one, has_event));
+                     }
+                     aml_append(else_ctx, ifctx);
+                     aml_append(while_ctx, else_ctx);
+                     aml_append(while_ctx, aml_increment(uid));
+                }
+                aml_append(while_ctx2, while_ctx);
+
+                /*
+                 * in case FW negotiated ICH9_LPC_SMI_F_CPU_HOTPLUG_BIT,
+                 * make upcall to FW, so it can pull in new CPUs before
+                 * OS is notified and wakes them up
+                 */
+                if (opts.smi_path) {
+                    ifctx = aml_if(aml_lgreater(num_added_cpus, zero));
+                    {
+                        aml_append(ifctx, aml_store(aml_int(OVMF_CPUHP_SMI_CMD),
+                            aml_name("%s", opts.smi_path)));
+                    }
+                    aml_append(while_ctx2, ifctx);
+                }
+
+                /* Notify OSPM about new CPUs and clear insert events */
+                aml_append(while_ctx2, aml_store(zero, cpu_idx));
+                while_ctx = aml_while(aml_lless(cpu_idx, num_added_cpus));
+                {
+                    aml_append(while_ctx,
+                        aml_store(aml_derefof(aml_index(new_cpus, cpu_idx)),
+                                  uid));
+                    aml_append(while_ctx,
+                        aml_call2(CPU_NOTIFY_METHOD, uid, dev_chk));
+                    aml_append(while_ctx, aml_store(uid, aml_debug()));
+                    aml_append(while_ctx, aml_store(uid, cpu_selector));
+                    aml_append(while_ctx, aml_store(one, ins_evt));
+                    aml_append(while_ctx, aml_increment(cpu_idx));
+                }
+                aml_append(while_ctx2, while_ctx);
+                /*
+                 * If another batch is needed, then it will resume scanning
+                 * exactly at -- and not after -- the last CPU that's currently
+                 * in CPU_ADDED_LIST. In other words, the last CPU in
+                 * CPU_ADDED_LIST is going to be re-checked. That's OK: we've
+                 * just cleared the insert event for *all* CPUs in
+                 * CPU_ADDED_LIST, including the last one. So the scan will
+                 * simply seek past it.
+                 */
             }
-            aml_append(method, while_ctx);
+            aml_append(method, while_ctx2);
             aml_append(method, aml_release(ctrl_lock));
         }
         aml_append(cpus_dev, method);
Signature · 1 line
MST
#38 lore raw

[PULL v4 35/48] tests/acpi: mark addition of table DSDT.roothp for unit testing root pci hotplug

In reply to Michael S. Tsirkin

From: Ani Sinha <[email protected]>

A new binary acpi table tests/data/acpi/pc/DSDT.roothp is added in order to unit test the feature flag that can disable/enable root pci bus hotplug on i440fx. This feature was added with the commit:
3d7e78aa7777f0 ("Introduce a new flag for i440fx to disable PCI hotplug on the root bus")

This change documents the fact that this new file addition was made as a part of the unit test change.

Message-Id: <[email protected]>

---
 tests/qtest/bios-tables-test-allowed-diff.h | 1 +
 1 file changed, 1 insertion(+)
tests/qtest/bios-tables-test-allowed-diff.h +1 -0
index dfb8523c8b..ac864fc982 100644
@@ -1 +1,2 @@
 /* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/pc/DSDT.roothp",
Signature · 1 line
MST
#39 lore raw

[PULL v4 40/48] tests/acpi: list added acpi table binary file for pci bridge hotplug test

In reply to Michael S. Tsirkin

From: Ani Sinha <[email protected]>

The file 'tests/data/acpi/pc/DSDT.hpbridge' is a newly added acpi table file for testing the pci bridge option 'acpi-pci-hotplug-with-bridge-support' under i440fx. This change documents this fact.

Message-Id: <[email protected]>

---
 tests/qtest/bios-tables-test-allowed-diff.h | 1 +
 1 file changed, 1 insertion(+)
tests/qtest/bios-tables-test-allowed-diff.h +1 -0
index dfb8523c8b..96a9237355 100644
@@ -1 +1,2 @@
 /* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/pc/DSDT.hpbridge",
Signature · 1 line
MST
#40 lore raw

[PULL v4 36/48] tests/acpi: add new unit test to test hotplug off/on feature on the root pci bus

In reply to Michael S. Tsirkin

From: Ani Sinha <[email protected]>

Ability to turn hotplug off on the pci root bus for i440fx was added in commit:
3d7e78aa7777f0 ("Introduce a new flag for i440fx to disable PCI hotplug on the root bus")

This change adds a unit test in order to test this feature.

Message-Id: <[email protected]>

---
 tests/qtest/bios-tables-test.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
tests/qtest/bios-tables-test.c +16 -0
index a9c8d478ae..bc932d0b9f 100644
@@ -742,6 +742,20 @@ static void test_acpi_piix4_tcg_bridge(void)
     free_test_data(&data);
 }
 
+static void test_acpi_piix4_no_root_hotplug(void)
+{
+    test_data data;
+
+    memset(&data, 0, sizeof(data));
+    data.machine = MACHINE_PC;
+    data.variant = ".roothp";
+    data.required_struct_types = base_required_struct_types;
+    data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types);
+    test_acpi_one("-global PIIX4_PM.acpi-root-pci-hotplug=off "
+                  "-device pci-bridge,chassis_nr=1", &data);
+    free_test_data(&data);
+}
+
 static void test_acpi_q35_tcg(void)
 {
     test_data data;
@@ -1160,6 +1174,8 @@ int main(int argc, char *argv[])
         qtest_add_func("acpi/q35/tpm-tis", test_acpi_q35_tcg_tpm_tis);
         qtest_add_func("acpi/piix4", test_acpi_piix4_tcg);
         qtest_add_func("acpi/piix4/bridge", test_acpi_piix4_tcg_bridge);
+        qtest_add_func("acpi/piix4/pci-hotplug/no_root_hotplug",
+                       test_acpi_piix4_no_root_hotplug);
         qtest_add_func("acpi/q35", test_acpi_q35_tcg);
         qtest_add_func("acpi/q35/bridge", test_acpi_q35_tcg_bridge);
         qtest_add_func("acpi/q35/mmio64", test_acpi_q35_tcg_mmio64);
Signature · 1 line
MST
#41 lore raw

[PULL v4 20/48] virtio: update MemoryRegionCaches when guest set bad features

In reply to Michael S. Tsirkin

From: Li Qiang <[email protected]>

Current the 'virtio_set_features' only update the 'MemorRegionCaches' when the 'virtio_set_features_nocheck' return '0' which means it is not bad features. However the guest can still trigger the access of the used vring after set bad features. In this situation it will cause assert failure in 'ADDRESS_SPACE_ST_CACHED'.

Fixes db812c4073c7 ("virtio: update MemoryRegionCaches when guest negotiates features")

Message-Id: <[email protected]>

---
 hw/virtio/virtio.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)
hw/virtio/virtio.c +8 -9
index a2edb4f386..6f8f865aff 100644
@@ -2963,17 +2963,16 @@ int virtio_set_features(VirtIODevice *vdev, uint64_t val)
         return -EINVAL;
     }
     ret = virtio_set_features_nocheck(vdev, val);
-    if (!ret) {
-        if (virtio_vdev_has_feature(vdev, VIRTIO_RING_F_EVENT_IDX)) {
-            /* VIRTIO_RING_F_EVENT_IDX changes the size of the caches.  */
-            int i;
-            for (i = 0; i < VIRTIO_QUEUE_MAX; i++) {
-                if (vdev->vq[i].vring.num != 0) {
-                    virtio_init_region_cache(vdev, i);
-                }
+    if (virtio_vdev_has_feature(vdev, VIRTIO_RING_F_EVENT_IDX)) {
+        /* VIRTIO_RING_F_EVENT_IDX changes the size of the caches.  */
+        int i;
+        for (i = 0; i < VIRTIO_QUEUE_MAX; i++) {
+            if (vdev->vq[i].vring.num != 0) {
+                virtio_init_region_cache(vdev, i);
             }
         }
-
+    }
+    if (!ret) {
         if (!virtio_device_started(vdev, vdev->status) &&
             !virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) {
             vdev->start_on_kick = true;
Signature · 1 line
MST
#42 lore raw

[PULL v4 39/48] i440fx/acpi: do not add hotplug related amls for cold plugged bridges

In reply to Michael S. Tsirkin

From: Ani Sinha <[email protected]>

Cold plugged bridges are not hot unpluggable, even when their hotplug property (acpi-pci-hotplug-with-bridge-support) is turned off. Please see the function acpi_pcihp_pc_no_hotplug(). However, with
the current implementaton, Windows would try to hot-unplug a pci bridge when it's hotplug switch is off. This is regardless of whether there are devices attached to the bridge. This is because we add ACPI code like _EJ0 etc for the pci slot where the bridge is cold plugged.

In this fix, we identify a cold plugged bridge and for cold plugged bridges, we do not add the appropriate ACPI methods that are used by the OS to identify a hot-pluggable/unpluggable pci device. After this change, Windows does not detect the cold plugged pci bridge as ejectable.

As a result of the patch, the following are the changes to the DSDT ACPI table:

@@ -858,38 +858,33 @@

                     Return (Zero)
                 }

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

                 Method (_S3D, 0, NotSerialized)  // _S3D: S3 Device State
                 {
                     Return (Zero)
                 }
             }

             Device (S18)
             {
-                Name (_SUN, 0x03)  // _SUN: Slot User Number
                 Name (_ADR, 0x00030000)  // _ADR: Address

- Method (_EJ0, 1, NotSerialized) // _EJx: Eject Device
- {
- PCEJ (BSEL, _SUN)
- }

             }

             Device (S20)
             {
                 Name (_SUN, 0x04)  // _SUN: Slot User Number
                 Name (_ADR, 0x00040000)  // _ADR: Address
                 Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
                 {
                     PCEJ (BSEL, _SUN)
                 }
             }

             Device (S28)
             {
                 Name (_SUN, 0x05)  // _SUN: Slot User Number
                 Name (_ADR, 0x00050000)  // _ADR: Address
@@ -1148,37 +1143,32 @@
                     PCEJ (BSEL, _SUN)
                 }
             }

             Device (SF8)
             {
                 Name (_SUN, 0x1F)  // _SUN: Slot User Number
                 Name (_ADR, 0x001F0000)  // _ADR: Address
                 Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
                 {
                     PCEJ (BSEL, _SUN)
                 }
             }

             Method (DVNT, 2, NotSerialized)
             {

- If ((Arg0 & 0x08))
- {
- Notify (S18, Arg1)
- }
-

                 If ((Arg0 & 0x10))
                 {
                     Notify (S20, Arg1)
                 }

                 If ((Arg0 & 0x20))
                 {
                     Notify (S28, Arg1)
                 }

                 If ((Arg0 & 0x40))
                 {
                     Notify (S30, Arg1)
                 }

                 If ((Arg0 & 0x80))

While at it, I have also updated a stale comment.

Message-Id: <[email protected]>

---
 hw/i386/acpi-build.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
hw/i386/acpi-build.c +6 -6
index b49d360ab2..2b17843837 100644
@@ -365,6 +365,7 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
         int slot = PCI_SLOT(i);
         bool hotplug_enabled_dev;
         bool bridge_in_acpi;
+        bool cold_plugged_bridge;
 
         if (!pdev) {
             if (bsel) { /* add hotplug slots for non present devices */
@@ -386,15 +387,14 @@ static void build_append_pci_bus_devices(Aml *parent_scope, PCIBus *bus,
         pc = PCI_DEVICE_GET_CLASS(pdev);
         dc = DEVICE_GET_CLASS(pdev);
 
-        /* When hotplug for bridges is enabled, bridges are
-         * described in ACPI separately (see build_pci_bus_end).
-         * In this case they aren't themselves hot-pluggable.
+        /*
+         * Cold plugged bridges aren't themselves hot-pluggable.
          * Hotplugged bridges *are* hot-pluggable.
          */
-        bridge_in_acpi = pc->is_bridge && pcihp_bridge_en &&
-            !DEVICE(pdev)->hotplugged;
+        cold_plugged_bridge = pc->is_bridge && !DEVICE(pdev)->hotplugged;
+        bridge_in_acpi =  cold_plugged_bridge && pcihp_bridge_en;
 
-        hotplug_enabled_dev = bsel && dc->hotpluggable && !bridge_in_acpi;
+        hotplug_enabled_dev = bsel && dc->hotpluggable && !cold_plugged_bridge;
 
         if (pc->class_id == PCI_CLASS_BRIDGE_ISA) {
             continue;
Signature · 1 line
MST
#43 lore raw

[PULL v4 38/48] Fix a gap where acpi_pcihp_find_hotplug_bus() returns a non-hotpluggable bus

In reply to Michael S. Tsirkin

From: Ani Sinha <[email protected]>

When ACPI hotplug for the root bus is disabled, the bsel property for that bus is not set. Please see the following commit:

3d7e78aa7777f ("Introduce a new flag for i440fx to disable PCI hotplug on the root bus").

As a result, when acpi_pcihp_find_hotplug_bus() is called
with bsel set to 0, it may return the root bus. This can cause devices attached to the root bus to get hot-unplugged if the user issues the following set of commmands:

outl 0xae10 0
outl 0xae08 your_slot

Thanks to Julia for pointing this out here:
https://www.mail-archive.com/[email protected]/msg734548.html

In this patch, we fix the issue in this function by checking if the bus which is returned by the function is actually hotpluggable. If not, we simply return NULL. This avoids the scenario where we were returning a non-hotpluggable bus.

Message-Id: <[email protected]>

---
 hw/acpi/pcihp.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
hw/acpi/pcihp.c +15 -0
index 39b1f74442..32ae8b2c0a 100644
@@ -147,6 +147,21 @@ static PCIBus *acpi_pcihp_find_hotplug_bus(AcpiPciHpState *s, int bsel)
     if (!bsel && !find.bus) {
         find.bus = s->root;
     }
+
+    /*
+     * Check if find.bus is actually hotpluggable. If bsel is set to
+     * NULL for example on the root bus in order to make it
+     * non-hotpluggable, find.bus will match the root bus when bsel
+     * is 0. See acpi_pcihp_test_hotplug_bus() above. Since the
+     * bus is not hotpluggable however, we should not select the bus.
+     * Instead, we should set find.bus to NULL in that case. In the check
+     * below, we generalize this case for all buses, not just the root bus.
+     * The callers of this function check for a null return value and
+     * handle them appropriately.
+     */
+    if (find.bus && !qbus_is_hotpluggable(BUS(find.bus))) {
+        find.bus = NULL;
+    }
     return find.bus;
 }
 
Signature · 1 line
MST
#44 lore raw

[PULL v4 37/48] tests/acpi: add a new ACPI table in order to test root pci hotplug on/off

In reply to Michael S. Tsirkin

From: Ani Sinha <[email protected]>

A new binary ACPI table tests/data/acpi/pc/DSDT.roothp is added in order to unit test hotplug on/off capability on the root pci bus for i440fx. The diff between the table DSDT.bridge and DSDT.roothp is listed below:

@@ -1,30 +1,30 @@
/*
* Intel ACPI Component Architecture
* AML/ASL+ Disassembler version 20180105 (64-bit version)
* Copyright (c) 2000 - 2018 Intel Corporation
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/pc/DSDT.bridge, Fri Sep 11 22:51:04 2020
+ * Disassembly of /tmp/aml-UGIHQ0, Fri Sep 11 22:51:04 2020
*
* Original Table Header:

  *     Signature        "DSDT"
- *     Length           0x00001A89 (6793)
+ *     Length           0x0000140A (5130)
  *     Revision         0x01 **** 32-bit table (V1), no 64-bit math support
- *     Checksum         0x09
+ *     Checksum         0xE6
  *     OEM ID           "BOCHS "
  *     OEM Table ID     "BXPCDSDT"
  *     OEM Revision     0x00000001 (1)
  *     Compiler ID      "BXPC"
  *     Compiler Version 0x00000001 (1)
  */
 DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPCDSDT", 0x00000001)
 {
     Scope (\)
     {
         OperationRegion (DBG, SystemIO, 0x0402, One)
         Field (DBG, ByteAcc, NoLock, Preserve)
         {
             DBGB,   8
         }

@@ -831,61 +831,60 @@

             Name (_CRS, ResourceTemplate ()  // _CRS: Current Resource Settings
             {
                 IO (Decode16,
                     0x0510,             // Range Minimum
                     0x0510,             // Range Maximum
                     0x01,               // Alignment
                     0x0C,               // Length
                     )
             })
         }
     }

     Scope (\_SB)
     {
         Scope (PCI0)
         {
-            Name (BSEL, Zero)
             Device (S00)
             {
                 Name (_ADR, Zero)  // _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
                 {
                     Return (Zero)
                 }
             }

             Device (S18)
             {
                 Name (_ADR, 0x00030000)  // _ADR: Address
-                Name (BSEL, One)
+                Name (BSEL, Zero)
                 Device (S00)
                 {
                     Name (_SUN, Zero)  // _SUN: Slot User Number
                     Name (_ADR, Zero)  // _ADR: Address
                     Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
                     {
                         PCEJ (BSEL, _SUN)
                     }
                 }

                 Device (S08)
                 {
                     Name (_SUN, One)  // _SUN: Slot User Number
                     Name (_ADR, 0x00010000)  // _ADR: Address
                     Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
                     {
@@ -1345,456 +1344,30 @@
                         Notify (SE8, Arg1)
                     }

                     If ((Arg0 & 0x40000000))
                     {
                         Notify (SF0, Arg1)
                     }

                     If ((Arg0 & 0x80000000))
                     {
                         Notify (SF8, Arg1)
                     }
                 }

                 Method (PCNT, 0, NotSerialized)
                 {
-                    BNUM = One
+                    BNUM = Zero
                     DVNT (PCIU, One)
                     DVNT (PCID, 0x03)
                 }
             }

- Device (S20)
- {

-                Name (_SUN, 0x04)  // _SUN: Slot User Number
-                Name (_ADR, 0x00040000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S28)
- {

-                Name (_SUN, 0x05)  // _SUN: Slot User Number
-                Name (_ADR, 0x00050000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S30)
- {

-                Name (_SUN, 0x06)  // _SUN: Slot User Number
-                Name (_ADR, 0x00060000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S38)
- {

-                Name (_SUN, 0x07)  // _SUN: Slot User Number
-                Name (_ADR, 0x00070000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S40)
- {

-                Name (_SUN, 0x08)  // _SUN: Slot User Number
-                Name (_ADR, 0x00080000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S48)
- {

-                Name (_SUN, 0x09)  // _SUN: Slot User Number
-                Name (_ADR, 0x00090000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S50)
- {

-                Name (_SUN, 0x0A)  // _SUN: Slot User Number
-                Name (_ADR, 0x000A0000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S58)
- {

-                Name (_SUN, 0x0B)  // _SUN: Slot User Number
-                Name (_ADR, 0x000B0000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S60)
- {

-                Name (_SUN, 0x0C)  // _SUN: Slot User Number
-                Name (_ADR, 0x000C0000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S68)
- {

-                Name (_SUN, 0x0D)  // _SUN: Slot User Number
-                Name (_ADR, 0x000D0000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S70)
- {

-                Name (_SUN, 0x0E)  // _SUN: Slot User Number
-                Name (_ADR, 0x000E0000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S78)
- {

-                Name (_SUN, 0x0F)  // _SUN: Slot User Number
-                Name (_ADR, 0x000F0000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S80)
- {

-                Name (_SUN, 0x10)  // _SUN: Slot User Number
-                Name (_ADR, 0x00100000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S88)
- {

-                Name (_SUN, 0x11)  // _SUN: Slot User Number
-                Name (_ADR, 0x00110000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S90)
- {

-                Name (_SUN, 0x12)  // _SUN: Slot User Number
-                Name (_ADR, 0x00120000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (S98)
- {

-                Name (_SUN, 0x13)  // _SUN: Slot User Number
-                Name (_ADR, 0x00130000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (SA0)
- {

-                Name (_SUN, 0x14)  // _SUN: Slot User Number
-                Name (_ADR, 0x00140000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (SA8)
- {

-                Name (_SUN, 0x15)  // _SUN: Slot User Number
-                Name (_ADR, 0x00150000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (SB0)
- {

-                Name (_SUN, 0x16)  // _SUN: Slot User Number
-                Name (_ADR, 0x00160000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (SB8)
- {

-                Name (_SUN, 0x17)  // _SUN: Slot User Number
-                Name (_ADR, 0x00170000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (SC0)
- {

-                Name (_SUN, 0x18)  // _SUN: Slot User Number
-                Name (_ADR, 0x00180000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (SC8)
- {

-                Name (_SUN, 0x19)  // _SUN: Slot User Number
-                Name (_ADR, 0x00190000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (SD0)
- {

-                Name (_SUN, 0x1A)  // _SUN: Slot User Number
-                Name (_ADR, 0x001A0000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (SD8)
- {

-                Name (_SUN, 0x1B)  // _SUN: Slot User Number
-                Name (_ADR, 0x001B0000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (SE0)
- {

-                Name (_SUN, 0x1C)  // _SUN: Slot User Number
-                Name (_ADR, 0x001C0000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (SE8)
- {

-                Name (_SUN, 0x1D)  // _SUN: Slot User Number
-                Name (_ADR, 0x001D0000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (SF0)
- {

-                Name (_SUN, 0x1E)  // _SUN: Slot User Number
-                Name (_ADR, 0x001E0000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Device (SF8)
- {

-                Name (_SUN, 0x1F)  // _SUN: Slot User Number
-                Name (_ADR, 0x001F0000)  // _ADR: Address
-                Method (_EJ0, 1, NotSerialized)  // _EJx: Eject Device
-                {

- PCEJ (BSEL, _SUN)
- }
- }
-
- Method (DVNT, 2, NotSerialized)
- {
- If ((Arg0 & 0x10))
- {
- Notify (S20, Arg1)
- }
-
- If ((Arg0 & 0x20))
- {
- Notify (S28, Arg1)
- }
-
- If ((Arg0 & 0x40))
- {
- Notify (S30, Arg1)
- }
-
- If ((Arg0 & 0x80))
- {
- Notify (S38, Arg1)
- }
-
- If ((Arg0 & 0x0100))
- {
- Notify (S40, Arg1)
- }
-
- If ((Arg0 & 0x0200))
- {
- Notify (S48, Arg1)
- }
-
- If ((Arg0 & 0x0400))
- {
- Notify (S50, Arg1)
- }
-
- If ((Arg0 & 0x0800))
- {
- Notify (S58, Arg1)
- }
-
- If ((Arg0 & 0x1000))
- {
- Notify (S60, Arg1)
- }
-
- If ((Arg0 & 0x2000))
- {
- Notify (S68, Arg1)
- }
-
- If ((Arg0 & 0x4000))
- {
- Notify (S70, Arg1)
- }
-
- If ((Arg0 & 0x8000))
- {
- Notify (S78, Arg1)
- }
-
- If ((Arg0 & 0x00010000))
- {
- Notify (S80, Arg1)
- }
-
- If ((Arg0 & 0x00020000))
- {
- Notify (S88, Arg1)
- }
-
- If ((Arg0 & 0x00040000))
- {
- Notify (S90, Arg1)
- }
-
- If ((Arg0 & 0x00080000))
- {
- Notify (S98, Arg1)
- }
-
- If ((Arg0 & 0x00100000))
- {
- Notify (SA0, Arg1)
- }
-
- If ((Arg0 & 0x00200000))
- {
- Notify (SA8, Arg1)
- }
-
- If ((Arg0 & 0x00400000))
- {
- Notify (SB0, Arg1)
- }
-
- If ((Arg0 & 0x00800000))
- {
- Notify (SB8, Arg1)
- }
-
- If ((Arg0 & 0x01000000))
- {
- Notify (SC0, Arg1)
- }
-
- If ((Arg0 & 0x02000000))
- {
- Notify (SC8, Arg1)
- }
-
- If ((Arg0 & 0x04000000))
- {
- Notify (SD0, Arg1)
- }
-
- If ((Arg0 & 0x08000000))
- {
- Notify (SD8, Arg1)
- }
-
- If ((Arg0 & 0x10000000))
- {
- Notify (SE0, Arg1)
- }
-
- If ((Arg0 & 0x20000000))
- {
- Notify (SE8, Arg1)
- }
-
- If ((Arg0 & 0x40000000))
- {
- Notify (SF0, Arg1)
- }
-
- If ((Arg0 & 0x80000000))
- {
- Notify (SF8, Arg1)
- }
- }
-
Method (PCNT, 0, NotSerialized)
{

-                BNUM = Zero
-                DVNT (PCIU, One)
-                DVNT (PCID, 0x03)
                 ^S18.PCNT ()
             }
         }
     }

}

Message-Id: <[email protected]>

---
 tests/qtest/bios-tables-test-allowed-diff.h |   1 -
 tests/data/acpi/pc/DSDT.roothp              | Bin 0 -> 5130 bytes
 2 files changed, 1 deletion(-)
 create mode 100644 tests/data/acpi/pc/DSDT.roothp
tests/qtest/bios-tables-test-allowed-diff.h +0 -1
index ac864fc982..dfb8523c8b 100644
@@ -1,2 +1 @@
 /* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/pc/DSDT.roothp",
tests/data/acpi/pc/DSDT.roothp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..886a5e6952f6f034bdd80d44d43de5975a1a4b0f
GIT binary patch
Signature · 1 line
MST
#45 lore raw

[PULL v4 41/48] tests/acpi: unit test for 'acpi-pci-hotplug-with-bridge-support' bridge flag

In reply to Michael S. Tsirkin

From: Ani Sinha <[email protected]>

This change adds a new unit test for the global flag 'acpi-pci-hotplug-with-bridge-support' which is available for cold plugged pci bridges in i440fx. The flag can be used to turn off ACPI based hotplug support on all pci bridges.

Message-Id: <[email protected]>

---
 tests/qtest/bios-tables-test.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
tests/qtest/bios-tables-test.c +16 -0
index bc932d0b9f..3c09b844f9 100644
@@ -756,6 +756,20 @@ static void test_acpi_piix4_no_root_hotplug(void)
     free_test_data(&data);
 }
 
+static void test_acpi_piix4_no_bridge_hotplug(void)
+{
+    test_data data;
+
+    memset(&data, 0, sizeof(data));
+    data.machine = MACHINE_PC;
+    data.variant = ".hpbridge";
+    data.required_struct_types = base_required_struct_types;
+    data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types);
+    test_acpi_one("-global PIIX4_PM.acpi-pci-hotplug-with-bridge-support=off "
+                  "-device pci-bridge,chassis_nr=1", &data);
+    free_test_data(&data);
+}
+
 static void test_acpi_q35_tcg(void)
 {
     test_data data;
@@ -1176,6 +1190,8 @@ int main(int argc, char *argv[])
         qtest_add_func("acpi/piix4/bridge", test_acpi_piix4_tcg_bridge);
         qtest_add_func("acpi/piix4/pci-hotplug/no_root_hotplug",
                        test_acpi_piix4_no_root_hotplug);
+        qtest_add_func("acpi/piix4/pci-hotplug/no_bridge_hotplug",
+                       test_acpi_piix4_no_bridge_hotplug);
         qtest_add_func("acpi/q35", test_acpi_q35_tcg);
         qtest_add_func("acpi/q35/bridge", test_acpi_q35_tcg_bridge);
         qtest_add_func("acpi/q35/mmio64", test_acpi_q35_tcg_mmio64);
Signature · 1 line
MST
#46 lore raw

[PULL v4 43/48] Add ACPI DSDT tables for q35 that are being updated by the next patch

In reply to Michael S. Tsirkin

From: Ani Sinha <[email protected]>

The following patch ("piix4: don't reserve hw resources when hotplug is off globally") modifies certain ACPI tables for q35 machines. This patch adds those table names to tests/qtest/bios-tables-test-allowed-diff.h so that unit tests continue to pass and bisection is not broken.

Message-Id: <[email protected]>

---
 tests/qtest/bios-tables-test-allowed-diff.h | 10 ++++++++++
 1 file changed, 10 insertions(+)
tests/qtest/bios-tables-test-allowed-diff.h +10 -0
index dfb8523c8b..631703142c 100644
@@ -1 +1,11 @@
 /* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/q35/DSDT",
+"tests/data/acpi/q35/DSDT.acpihmat",
+"tests/data/acpi/q35/DSDT.bridge",
+"tests/data/acpi/q35/DSDT.cphp",
+"tests/data/acpi/q35/DSDT.dimmpxm",
+"tests/data/acpi/q35/DSDT.ipmibt",
+"tests/data/acpi/q35/DSDT.memhp",
+"tests/data/acpi/q35/DSDT.mmio64",
+"tests/data/acpi/q35/DSDT.numamem",
+"tests/data/acpi/q35/DSDT.tis",
Signature · 1 line
MST
#47 lore raw

[PULL v4 02/48] vhost: switch to use IOTLB v2 format

In reply to Michael S. Tsirkin

From: Jason Wang <[email protected]>

This patch tries to switch to use new kernel IOTLB format V2. Previous version may have inconsistent ABI between 32bit and 64bit machines because of the hole after type field. Refer kernel commit ("429711aec282 vhost: switch to use new message format") for more information.

To enable this feature, qemu need to use a new ioctl VHOST_SET_BACKEND_FEATURE with VHOST_BACKEND_F_IOTLB_MSG_V2 bit. A new vhost setting backend features ops was introduced. And when we try to set features for vhost dev, we will examine the support of new IOTLB format and enable it. This process is total transparent to guest, which means we can have different IOTLB message type in src and dst during migration.

The conversion of IOTLB message is straightforward, just check the type and behave accordingly.

Message-Id: <[email protected]>

---
 include/hw/virtio/vhost-backend.h |  2 +
 include/hw/virtio/vhost.h         |  1 +
 hw/virtio/vhost-backend.c         | 88 +++++++++++++++++++++++++------
 hw/virtio/vhost.c                 | 10 ++++
 4 files changed, 84 insertions(+), 17 deletions(-)
include/hw/virtio/vhost-backend.h +2 -0
index 8825bd278f..8a6f8e2a7a 100644
@@ -74,6 +74,7 @@ typedef int (*vhost_set_features_op)(struct vhost_dev *dev,
                                      uint64_t features);
 typedef int (*vhost_get_features_op)(struct vhost_dev *dev,
                                      uint64_t *features);
+typedef int (*vhost_set_backend_cap_op)(struct vhost_dev *dev);
 typedef int (*vhost_set_owner_op)(struct vhost_dev *dev);
 typedef int (*vhost_reset_device_op)(struct vhost_dev *dev);
 typedef int (*vhost_get_vq_index_op)(struct vhost_dev *dev, int idx);
@@ -146,6 +147,7 @@ typedef struct VhostOps {
     vhost_set_vring_busyloop_timeout_op vhost_set_vring_busyloop_timeout;
     vhost_set_features_op vhost_set_features;
     vhost_get_features_op vhost_get_features;
+    vhost_set_backend_cap_op vhost_set_backend_cap;
     vhost_set_owner_op vhost_set_owner;
     vhost_reset_device_op vhost_reset_device;
     vhost_get_vq_index_op vhost_get_vq_index;
include/hw/virtio/vhost.h +1 -0
index 767a95ec0b..94585067f7 100644
@@ -79,6 +79,7 @@ struct vhost_dev {
     uint64_t backend_features;
     uint64_t protocol_features;
     uint64_t max_queues;
+    uint64_t backend_cap;
     bool started;
     bool log_enabled;
     uint64_t log_size;
hw/virtio/vhost-backend.c +71 -17

117 lines not on this page · raw message

hw/virtio/vhost.c +10 -0
index 0119516254..8087f200e9 100644
@@ -818,7 +818,17 @@ static int vhost_dev_set_features(struct vhost_dev *dev,
     r = dev->vhost_ops->vhost_set_features(dev, features);
     if (r < 0) {
         VHOST_OPS_DEBUG("vhost_set_features failed");
+        goto out;
     }
+    if (dev->vhost_ops->vhost_set_backend_cap) {
+        r = dev->vhost_ops->vhost_set_backend_cap(dev);
+        if (r < 0) {
+            VHOST_OPS_DEBUG("vhost_set_backend_cap failed");
+            goto out;
+        }
+    }
+
+out:
     return r < 0 ? -errno : 0;
 }
 
Signature · 1 line
MST
#48 lore raw

[PULL v4 46/48] hw: virtio-pmem: detach the element fromt the virtqueue when error occurs

In reply to Michael S. Tsirkin

From: Li Qiang <[email protected]>

If error occurs while processing the virtio request we should call 'virtqueue_detach_element' to detach the element from the virtqueue before free the elem.

Message-Id: <[email protected]>

Fixes 5f503cd9f3 ("virtio-pmem: add virtio device")
---
 hw/virtio/virtio-pmem.c | 1 +
 1 file changed, 1 insertion(+)
hw/virtio/virtio-pmem.c +1 -0
index 1e0c137497..ddb0125901 100644
@@ -77,6 +77,7 @@ static void virtio_pmem_flush(VirtIODevice *vdev, VirtQueue *vq)
 
     if (req_data->elem.out_num < 1 || req_data->elem.in_num < 1) {
         virtio_error(vdev, "virtio-pmem request not proper");
+        virtqueue_detach_element(vq, (VirtQueueElement *)req_data, 0);
         g_free(req_data);
         return;
     }
Signature · 1 line
MST
#49 lore raw

[PULL v4 45/48] tests/acpi: update golden master DSDT binary table blobs for q35

In reply to Michael S. Tsirkin

From: Ani Sinha <[email protected]>

In the previously applied commit ("piix4: don't reserve hw resources when hotplug is off globally"), we make changes to the ACPI DSDT tables such that some ACPI code are not generated when bsel is absent. Since as of this point in time, in q35 machines, we do not use bsel for pci buses, we need to update the DSDT table blobs.
This patch updates the DSDT golden master tables for q35 machines. At the same time, we clear bios-tables-test-allowed-diff.h for future changes which update tables.

Following is a typical diff between the q35 acpi DSDT table blobs:

@@ -1,30 +1,30 @@
/*
* Intel ACPI Component Architecture
* AML/ASL+ Disassembler version 20180105 (64-bit version)
* Copyright (c) 2000 - 2018 Intel Corporation
*
* Disassembling to symbolic ASL+ operators
*
- * Disassembly of tests/data/acpi/q35/DSDT, Tue Sep 15 18:52:47 2020
+ * Disassembly of /tmp/aml-3O0DR0, Tue Sep 15 18:52:47 2020 *
* Original Table Header:

  *     Signature        "DSDT"
- *     Length           0x00001DFE (7678)
+ *     Length           0x00001DF6 (7670)
  *     Revision         0x01 **** 32-bit table (V1), no 64-bit math support
- *     Checksum         0xAC
+ *     Checksum         0x17
  *     OEM ID           "BOCHS "
  *     OEM Table ID     "BXPCDSDT"
  *     OEM Revision     0x00000001 (1)
  *     Compiler ID      "BXPC"
  *     Compiler Version 0x00000001 (1)
  */
 DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPCDSDT", 0x00000001)
 {
     Scope (\)
     {
         OperationRegion (DBG, SystemIO, 0x0402, One)
         Field (DBG, ByteAcc, NoLock, Preserve)
         {
             DBGB,   8
         }

@@ -3113,24 +3113,20 @@

                 Name (_ADR, 0x00010000)  // _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
                 {
                     Return (Zero)
                 }
             }
-
-            Method (PCNT, 0, NotSerialized)
-            {
-            }
         }
     }

}

Message-Id: <[email protected]>

---
 tests/qtest/bios-tables-test-allowed-diff.h   |   10 -
 tests/test-qapi-event.c                       |  198 +
 tests/test-qmp-introspect.c                   |   58 +
 tests/test-qmp-marshal.c                      |  383 ++
 tests/.vhost-user-test.c.swo                  |  Bin 0 -> 16384 bytes
 tests/Makefile.include.orig                   | 1012 +++++
 tests/Makefile.orig                           |  569 +++
 tests/bios-tables-test.c.orig                 |  925 +++++
 tests/data/acpi/diff-aml.sh                   |    0
 tests/data/acpi/disassemle-aml.py             |   21 +
 tests/data/acpi/microvm/APIC.dsl              |   56 +
 tests/data/acpi/microvm/DSDT.dsl              |  121 +
 tests/data/acpi/microvm/FACP.dsl              |  196 +
 tests/data/acpi/pc/APIC.acpihmat.dsl          |  112 +
 tests/data/acpi/pc/APIC.bridge                |  Bin 0 -> 120 bytes
 tests/data/acpi/pc/APIC.bridge.dsl            |  104 +
 tests/data/acpi/pc/APIC.cphp.dsl              |  146 +
 tests/data/acpi/pc/APIC.dimmpxm.dsl           |  129 +
 tests/data/acpi/pc/APIC.dsl                   |  104 +
 tests/data/acpi/pc/APIC.hpbridge              |  Bin 0 -> 120 bytes
 tests/data/acpi/pc/APIC.ipmikcs               |  Bin 0 -> 120 bytes
 tests/data/acpi/pc/APIC.ipmikcs.dsl           |  104 +
 tests/data/acpi/pc/APIC.memhp                 |  Bin 0 -> 120 bytes
 tests/data/acpi/pc/APIC.memhp.dsl             |  104 +
 tests/data/acpi/pc/APIC.numamem               |  Bin 0 -> 120 bytes
 tests/data/acpi/pc/APIC.numamem.dsl           |  104 +
 tests/data/acpi/pc/APIC.roothp                |  Bin 0 -> 120 bytes
 tests/data/acpi/pc/DSDT.acpihmat.dsl          | 1619 ++++++++
 tests/data/acpi/pc/DSDT.bridge.dsl            | 1800 +++++++++
 tests/data/acpi/pc/DSDT.cphp.dsl              | 1466 +++++++
 tests/data/acpi/pc/DSDT.dimmpxm.dsl           | 1719 ++++++++
 tests/data/acpi/pc/DSDT.dsl                   | 1407 +++++++
 tests/data/acpi/pc/DSDT.hpbridge              |  Bin 4895 -> 5021 bytes
 tests/data/acpi/pc/DSDT.ipmikcs.dsl           | 1337 +++++++
 tests/data/acpi/pc/DSDT.memhp.dsl             | 1625 ++++++++
 tests/data/acpi/pc/DSDT.numamem.dsl           | 1321 ++++++
 tests/data/acpi/pc/DSDT.roothp                |  Bin 5130 -> 5256 bytes
 tests/data/acpi/pc/FACP.acpihmat              |  Bin 0 -> 116 bytes
 tests/data/acpi/pc/FACP.acpihmat.dsl          |   99 +
 tests/data/acpi/pc/FACP.bridge                |  Bin 0 -> 116 bytes
 tests/data/acpi/pc/FACP.bridge.dsl            |   99 +
 tests/data/acpi/pc/FACP.cphp                  |  Bin 0 -> 116 bytes
 tests/data/acpi/pc/FACP.cphp.dsl              |   99 +
 tests/data/acpi/pc/FACP.dimmpxm               |  Bin 0 -> 116 bytes
 tests/data/acpi/pc/FACP.dimmpxm.dsl           |   99 +
 tests/data/acpi/pc/FACP.dsl                   |   99 +
 tests/data/acpi/pc/FACP.hpbridge              |  Bin 0 -> 116 bytes
 tests/data/acpi/pc/FACP.ipmikcs               |  Bin 0 -> 116 bytes
 tests/data/acpi/pc/FACP.ipmikcs.dsl           |   99 +
 tests/data/acpi/pc/FACP.memhp                 |  Bin 0 -> 116 bytes
 tests/data/acpi/pc/FACP.memhp.dsl             |   99 +
 tests/data/acpi/pc/FACP.numamem               |  Bin 0 -> 116 bytes
 tests/data/acpi/pc/FACP.numamem.dsl           |   99 +
 tests/data/acpi/pc/FACP.roothp                |  Bin 0 -> 116 bytes
 tests/data/acpi/pc/FACS.acpihmat              |  Bin 0 -> 64 bytes
 tests/data/acpi/pc/FACS.acpihmat.dsl          |   32 +
 tests/data/acpi/pc/FACS.bridge                |  Bin 0 -> 64 bytes
 tests/data/acpi/pc/FACS.bridge.dsl            |   32 +
 tests/data/acpi/pc/FACS.cphp                  |  Bin 0 -> 64 bytes
 tests/data/acpi/pc/FACS.cphp.dsl              |   32 +
 tests/data/acpi/pc/FACS.dimmpxm               |  Bin 0 -> 64 bytes
 tests/data/acpi/pc/FACS.dimmpxm.dsl           |   32 +
 tests/data/acpi/pc/FACS.dsl                   |   32 +
 tests/data/acpi/pc/FACS.hpbridge              |  Bin 0 -> 64 bytes
 tests/data/acpi/pc/FACS.ipmikcs               |  Bin 0 -> 64 bytes
 tests/data/acpi/pc/FACS.ipmikcs.dsl           |   32 +
 tests/data/acpi/pc/FACS.memhp                 |  Bin 0 -> 64 bytes
 tests/data/acpi/pc/FACS.memhp.dsl             |   32 +
 tests/data/acpi/pc/FACS.numamem               |  Bin 0 -> 64 bytes
 tests/data/acpi/pc/FACS.numamem.dsl           |   32 +
 tests/data/acpi/pc/FACS.roothp                |  Bin 0 -> 64 bytes
 tests/data/acpi/pc/HMAT.acpihmat.dsl          |  132 +
 tests/data/acpi/pc/HMAT.dsl                   |  132 +
 tests/data/acpi/pc/HPET.acpihmat              |  Bin 0 -> 56 bytes
 tests/data/acpi/pc/HPET.acpihmat.dsl          |   43 +
 tests/data/acpi/pc/HPET.bridge                |  Bin 0 -> 56 bytes
 tests/data/acpi/pc/HPET.bridge.dsl            |   43 +
 tests/data/acpi/pc/HPET.cphp                  |  Bin 0 -> 56 bytes
 tests/data/acpi/pc/HPET.cphp.dsl              |   43 +
 tests/data/acpi/pc/HPET.dimmpxm               |  Bin 0 -> 56 bytes
 tests/data/acpi/pc/HPET.dimmpxm.dsl           |   43 +
 tests/data/acpi/pc/HPET.dsl                   |   43 +
 tests/data/acpi/pc/HPET.hpbridge              |  Bin 0 -> 56 bytes
 tests/data/acpi/pc/HPET.ipmikcs               |  Bin 0 -> 56 bytes
 tests/data/acpi/pc/HPET.ipmikcs.dsl           |   43 +
 tests/data/acpi/pc/HPET.memhp                 |  Bin 0 -> 56 bytes
 tests/data/acpi/pc/HPET.memhp.dsl             |   43 +
 tests/data/acpi/pc/HPET.numamem               |  Bin 0 -> 56 bytes
 tests/data/acpi/pc/HPET.numamem.dsl           |   43 +
 tests/data/acpi/pc/HPET.roothp                |  Bin 0 -> 56 bytes
 tests/data/acpi/pc/NFIT.dimmpxm.dsl           |  115 +
 tests/data/acpi/pc/NFIT.dsl                   |  115 +
 tests/data/acpi/pc/SLIT.cphp.dsl              |   31 +
 tests/data/acpi/pc/SLIT.dsl                   |   31 +
 tests/data/acpi/pc/SLIT.memhp.dsl             |   31 +
 tests/data/acpi/pc/SRAT.acpihmat.dsl          |  137 +
 tests/data/acpi/pc/SRAT.cphp.dsl              |  168 +
 tests/data/acpi/pc/SRAT.dimmpxm.dsl           |  194 +
 tests/data/acpi/pc/SRAT.dsl                   |  108 +
 tests/data/acpi/pc/SRAT.memhp.dsl             |  125 +
 tests/data/acpi/pc/SRAT.numamem.dsl           |  108 +
 tests/data/acpi/pc/SSDT.dsl                   |  205 +
 tests/data/acpi/pc/WAET.acpihmat              |  Bin 0 -> 40 bytes
 tests/data/acpi/pc/WAET.acpihmat.dsl          |   31 +
 tests/data/acpi/pc/WAET.bridge                |  Bin 0 -> 40 bytes
 tests/data/acpi/pc/WAET.bridge.dsl            |   31 +
 tests/data/acpi/pc/WAET.cphp                  |  Bin 0 -> 40 bytes
 tests/data/acpi/pc/WAET.cphp.dsl              |   31 +
 tests/data/acpi/pc/WAET.dimmpxm               |  Bin 0 -> 40 bytes
 tests/data/acpi/pc/WAET.dimmpxm.dsl           |   31 +
 tests/data/acpi/pc/WAET.dsl                   |   31 +
 tests/data/acpi/pc/WAET.hpbridge              |  Bin 0 -> 40 bytes
 tests/data/acpi/pc/WAET.ipmikcs               |  Bin 0 -> 40 bytes
 tests/data/acpi/pc/WAET.ipmikcs.dsl           |   31 +
 tests/data/acpi/pc/WAET.memhp                 |  Bin 0 -> 40 bytes
 tests/data/acpi/pc/WAET.memhp.dsl             |   31 +
 tests/data/acpi/pc/WAET.numamem               |  Bin 0 -> 40 bytes
 tests/data/acpi/pc/WAET.numamem.dsl           |   31 +
 tests/data/acpi/pc/WAET.roothp                |  Bin 0 -> 40 bytes
 tests/data/acpi/q35/APIC.acpihmat.dsl         |  112 +
 tests/data/acpi/q35/APIC.bridge               |  Bin 0 -> 120 bytes
 tests/data/acpi/q35/APIC.bridge.dsl           |  104 +
 tests/data/acpi/q35/APIC.cphp.dsl             |  146 +
 tests/data/acpi/q35/APIC.dimmpxm.dsl          |  129 +
 tests/data/acpi/q35/APIC.dsl                  |  104 +
 tests/data/acpi/q35/APIC.ipmibt               |  Bin 0 -> 120 bytes
 tests/data/acpi/q35/APIC.ipmibt.dsl           |  104 +
 tests/data/acpi/q35/APIC.memhp                |  Bin 0 -> 120 bytes
 tests/data/acpi/q35/APIC.memhp.dsl            |  104 +
 tests/data/acpi/q35/APIC.mmio64               |  Bin 0 -> 120 bytes
 tests/data/acpi/q35/APIC.mmio64.dsl           |  104 +
 tests/data/acpi/q35/APIC.numamem              |  Bin 0 -> 120 bytes
 tests/data/acpi/q35/APIC.numamem.dsl          |  104 +
 tests/data/acpi/q35/APIC.tis                  |  Bin 0 -> 120 bytes
 tests/data/acpi/q35/APIC.tis.dsl              |  104 +
 tests/data/acpi/q35/DSDT                      |  Bin 7804 -> 7796 bytes
 tests/data/acpi/q35/DSDT.acpihmat             |  Bin 9129 -> 9121 bytes
 tests/data/acpi/q35/DSDT.acpihmat.dsl         | 3436 ++++++++++++++++
 tests/data/acpi/q35/DSDT.bridge               |  Bin 7821 -> 7814 bytes
 tests/data/acpi/q35/DSDT.bridge.dsl           | 3141 +++++++++++++++
 tests/data/acpi/q35/DSDT.cphp                 |  Bin 8268 -> 8260 bytes
 tests/data/acpi/q35/DSDT.cphp.dsl             | 3283 +++++++++++++++
 tests/data/acpi/q35/DSDT.dimmpxm              |  Bin 9458 -> 9450 bytes
 tests/data/acpi/q35/DSDT.dimmpxm.dsl          | 3535 +++++++++++++++++
 tests/data/acpi/q35/DSDT.dsl                  | 3351 ++++++++++++++++
 tests/data/acpi/q35/DSDT.ipmibt               |  Bin 7879 -> 7871 bytes
 tests/data/acpi/q35/DSDT.ipmibt.dsl           | 3156 +++++++++++++++
 tests/data/acpi/q35/DSDT.memhp                |  Bin 9163 -> 9155 bytes
 tests/data/acpi/q35/DSDT.memhp.dsl            | 3442 ++++++++++++++++
 tests/data/acpi/q35/DSDT.mmio64               |  Bin 8934 -> 8927 bytes
 tests/data/acpi/q35/DSDT.mmio64.dsl           | 3377 ++++++++++++++++
 tests/data/acpi/q35/DSDT.numamem              |  Bin 7810 -> 7802 bytes
 tests/data/acpi/q35/DSDT.numamem.dsl          | 3138 +++++++++++++++
 tests/data/acpi/q35/DSDT.tis                  |  Bin 8409 -> 8402 bytes
 tests/data/acpi/q35/DSDT.tis.dsl              | 3321 ++++++++++++++++
 tests/data/acpi/q35/FACP.acpihmat             |  Bin 0 -> 244 bytes
 tests/data/acpi/q35/FACP.acpihmat.dsl         |  179 +
 tests/data/acpi/q35/FACP.bridge               |  Bin 0 -> 244 bytes
 tests/data/acpi/q35/FACP.bridge.dsl           |  179 +
 tests/data/acpi/q35/FACP.cphp                 |  Bin 0 -> 244 bytes
 tests/data/acpi/q35/FACP.cphp.dsl             |  179 +
 tests/data/acpi/q35/FACP.dimmpxm              |  Bin 0 -> 244 bytes
 tests/data/acpi/q35/FACP.dimmpxm.dsl          |  179 +
 tests/data/acpi/q35/FACP.dsl                  |  179 +
 tests/data/acpi/q35/FACP.ipmibt               |  Bin 0 -> 244 bytes
 tests/data/acpi/q35/FACP.ipmibt.dsl           |  179 +
 tests/data/acpi/q35/FACP.memhp                |  Bin 0 -> 244 bytes
 tests/data/acpi/q35/FACP.memhp.dsl            |  179 +
 tests/data/acpi/q35/FACP.mmio64               |  Bin 0 -> 244 bytes
 tests/data/acpi/q35/FACP.mmio64.dsl           |  179 +
 tests/data/acpi/q35/FACP.numamem              |  Bin 0 -> 244 bytes
 tests/data/acpi/q35/FACP.numamem.dsl          |  179 +
 tests/data/acpi/q35/FACP.tis                  |  Bin 0 -> 244 bytes
 tests/data/acpi/q35/FACP.tis.dsl              |  179 +
 tests/data/acpi/q35/FACS.acpihmat             |  Bin 0 -> 64 bytes
 tests/data/acpi/q35/FACS.acpihmat.dsl         |   32 +
 tests/data/acpi/q35/FACS.bridge               |  Bin 0 -> 64 bytes
 tests/data/acpi/q35/FACS.bridge.dsl           |   32 +
 tests/data/acpi/q35/FACS.cphp                 |  Bin 0 -> 64 bytes
 tests/data/acpi/q35/FACS.cphp.dsl             |   32 +
 tests/data/acpi/q35/FACS.dimmpxm              |  Bin 0 -> 64 bytes
 tests/data/acpi/q35/FACS.dimmpxm.dsl          |   32 +
 tests/data/acpi/q35/FACS.dsl                  |   32 +
 tests/data/acpi/q35/FACS.ipmibt               |  Bin 0 -> 64 bytes
 tests/data/acpi/q35/FACS.ipmibt.dsl           |   32 +
 tests/data/acpi/q35/FACS.memhp                |  Bin 0 -> 64 bytes
 tests/data/acpi/q35/FACS.memhp.dsl            |   32 +
 tests/data/acpi/q35/FACS.mmio64               |  Bin 0 -> 64 bytes
 tests/data/acpi/q35/FACS.mmio64.dsl           |   32 +
 tests/data/acpi/q35/FACS.numamem              |  Bin 0 -> 64 bytes
 tests/data/acpi/q35/FACS.numamem.dsl          |   32 +
 tests/data/acpi/q35/FACS.tis                  |  Bin 0 -> 64 bytes
 tests/data/acpi/q35/FACS.tis.dsl              |   32 +
 tests/data/acpi/q35/HMAT.acpihmat.dsl         |  132 +
 tests/data/acpi/q35/HMAT.dsl                  |  132 +
 tests/data/acpi/q35/HPET.acpihmat             |  Bin 0 -> 56 bytes
 tests/data/acpi/q35/HPET.acpihmat.dsl         |   43 +
 tests/data/acpi/q35/HPET.bridge               |  Bin 0 -> 56 bytes
 tests/data/acpi/q35/HPET.bridge.dsl           |   43 +
 tests/data/acpi/q35/HPET.cphp                 |  Bin 0 -> 56 bytes
 tests/data/acpi/q35/HPET.cphp.dsl             |   43 +
 tests/data/acpi/q35/HPET.dimmpxm              |  Bin 0 -> 56 bytes
 tests/data/acpi/q35/HPET.dimmpxm.dsl          |   43 +
 tests/data/acpi/q35/HPET.dsl                  |   43 +
 tests/data/acpi/q35/HPET.ipmibt               |  Bin 0 -> 56 bytes
 tests/data/acpi/q35/HPET.ipmibt.dsl           |   43 +
 tests/data/acpi/q35/HPET.memhp                |  Bin 0 -> 56 bytes
 tests/data/acpi/q35/HPET.memhp.dsl            |   43 +
 tests/data/acpi/q35/HPET.mmio64               |  Bin 0 -> 56 bytes
 tests/data/acpi/q35/HPET.mmio64.dsl           |   43 +
 tests/data/acpi/q35/HPET.numamem              |  Bin 0 -> 56 bytes
 tests/data/acpi/q35/HPET.numamem.dsl          |   43 +
 tests/data/acpi/q35/HPET.tis                  |  Bin 0 -> 56 bytes
 tests/data/acpi/q35/HPET.tis.dsl              |   43 +
 tests/data/acpi/q35/MCFG.acpihmat             |  Bin 0 -> 60 bytes
 tests/data/acpi/q35/MCFG.acpihmat.dsl         |   36 +
 tests/data/acpi/q35/MCFG.bridge               |  Bin 0 -> 60 bytes
 tests/data/acpi/q35/MCFG.bridge.dsl           |   36 +
 tests/data/acpi/q35/MCFG.cphp                 |  Bin 0 -> 60 bytes
 tests/data/acpi/q35/MCFG.cphp.dsl             |   36 +
 tests/data/acpi/q35/MCFG.dimmpxm              |  Bin 0 -> 60 bytes
 tests/data/acpi/q35/MCFG.dimmpxm.dsl          |   36 +
 tests/data/acpi/q35/MCFG.dsl                  |   36 +
 tests/data/acpi/q35/MCFG.ipmibt               |  Bin 0 -> 60 bytes
 tests/data/acpi/q35/MCFG.ipmibt.dsl           |   36 +
 tests/data/acpi/q35/MCFG.memhp                |  Bin 0 -> 60 bytes
 tests/data/acpi/q35/MCFG.memhp.dsl            |   36 +
 tests/data/acpi/q35/MCFG.mmio64               |  Bin 0 -> 60 bytes
 tests/data/acpi/q35/MCFG.mmio64.dsl           |   36 +
 tests/data/acpi/q35/MCFG.numamem              |  Bin 0 -> 60 bytes
 tests/data/acpi/q35/MCFG.numamem.dsl          |   36 +
 tests/data/acpi/q35/MCFG.tis                  |  Bin 0 -> 60 bytes
 tests/data/acpi/q35/MCFG.tis.dsl              |   36 +
 tests/data/acpi/q35/NFIT.dimmpxm.dsl          |  115 +
 tests/data/acpi/q35/NFIT.dsl                  |  115 +
 tests/data/acpi/q35/SLIT.cphp.dsl             |   31 +
 tests/data/acpi/q35/SLIT.dsl                  |   31 +
 tests/data/acpi/q35/SLIT.memhp.dsl            |   31 +
 tests/data/acpi/q35/SRAT.acpihmat.dsl         |  137 +
 tests/data/acpi/q35/SRAT.cphp.dsl             |  168 +
 tests/data/acpi/q35/SRAT.dimmpxm.dsl          |  194 +
 tests/data/acpi/q35/SRAT.dsl                  |  108 +
 tests/data/acpi/q35/SRAT.memhp.dsl            |  125 +
 tests/data/acpi/q35/SRAT.mmio64.dsl           |  108 +
 tests/data/acpi/q35/SRAT.numamem.dsl          |  108 +
 tests/data/acpi/q35/SSDT.dsl                  |  205 +
 tests/data/acpi/q35/TPM2.dsl                  |   38 +
 tests/data/acpi/q35/TPM2.tis.dsl              |   38 +
 tests/data/acpi/q35/WAET.acpihmat             |  Bin 0 -> 40 bytes
 tests/data/acpi/q35/WAET.acpihmat.dsl         |   31 +
 tests/data/acpi/q35/WAET.bridge               |  Bin 0 -> 40 bytes
 tests/data/acpi/q35/WAET.bridge.dsl           |   31 +
 tests/data/acpi/q35/WAET.cphp                 |  Bin 0 -> 40 bytes
 tests/data/acpi/q35/WAET.cphp.dsl             |   31 +
 tests/data/acpi/q35/WAET.dimmpxm              |  Bin 0 -> 40 bytes
 tests/data/acpi/q35/WAET.dimmpxm.dsl          |   31 +
 tests/data/acpi/q35/WAET.dsl                  |   31 +
 tests/data/acpi/q35/WAET.ipmibt               |  Bin 0 -> 40 bytes
 tests/data/acpi/q35/WAET.ipmibt.dsl           |   31 +
 tests/data/acpi/q35/WAET.memhp                |  Bin 0 -> 40 bytes
 tests/data/acpi/q35/WAET.memhp.dsl            |   31 +
 tests/data/acpi/q35/WAET.mmio64               |  Bin 0 -> 40 bytes
 tests/data/acpi/q35/WAET.mmio64.dsl           |   31 +
 tests/data/acpi/q35/WAET.numamem              |  Bin 0 -> 40 bytes
 tests/data/acpi/q35/WAET.numamem.dsl          |   31 +
 tests/data/acpi/q35/WAET.tis                  |  Bin 0 -> 40 bytes
 tests/data/acpi/q35/WAET.tis.dsl              |   31 +
 tests/data/acpi/virt/APIC.dsl                 |   78 +
 tests/data/acpi/virt/APIC.memhp.dsl           |   78 +
 tests/data/acpi/virt/APIC.numamem.dsl         |   78 +
 tests/data/acpi/virt/DSDT.dsl                 | 1906 +++++++++
 tests/data/acpi/virt/DSDT.memhp.dsl           | 2215 +++++++++++
 tests/data/acpi/virt/DSDT.numamem.dsl         | 1906 +++++++++
 tests/data/acpi/virt/FACP.dsl                 |  196 +
 tests/data/acpi/virt/FACP.memhp.dsl           |  196 +
 tests/data/acpi/virt/FACP.numamem.dsl         |  196 +
 tests/data/acpi/virt/GTDT.dsl                 |   61 +
 tests/data/acpi/virt/GTDT.memhp.dsl           |   61 +
 tests/data/acpi/virt/GTDT.numamem.dsl         |   61 +
 tests/data/acpi/virt/MCFG.dsl                 |   36 +
 tests/data/acpi/virt/MCFG.memhp.dsl           |   36 +
 tests/data/acpi/virt/MCFG.numamem.dsl         |   36 +
 tests/data/acpi/virt/NFIT.dsl                 |  103 +
 tests/data/acpi/virt/NFIT.memhp.dsl           |  103 +
 tests/data/acpi/virt/SLIT.dsl                 |   31 +
 tests/data/acpi/virt/SLIT.memhp.dsl           |   31 +
 tests/data/acpi/virt/SPCR.dsl                 |   57 +
 tests/data/acpi/virt/SPCR.memhp.dsl           |   57 +
 tests/data/acpi/virt/SPCR.numamem.dsl         |   57 +
 tests/data/acpi/virt/SRAT.dsl                 |   57 +
 tests/data/acpi/virt/SRAT.memhp.dsl           |  107 +
 tests/data/acpi/virt/SRAT.numamem.dsl         |   57 +
 tests/data/acpi/virt/SSDT.dsl                 |  205 +
 .../bios-tables-test.x86_64.iso.raw           |  Bin 0 -> 425984 bytes
 tests/libqtest.c.orig                         | 1106 ++++++
 tests/qemu-iotests/core.12067                 |  Bin 0 -> 22716416 bytes
 .../bios-tables-test-allowed-diff.h.orig      |   18 +
 .../qtest/bios-tables-test-allowed-diff.h.rej |    9 +
 tests/qtest/bios-tables-test.c.orig           | 1200 ++++++
 tests/qtest/bios-tables-test.c.rej            |   22 +
 tests/vhost-user-bridge                       |  Bin 0 -> 83120 bytes
 tests/vhost-user-bridge.c.orig                | 1432 +++++++
 tests/vhost-user-test.c.orig                  |  364 ++
 303 files changed, 71489 insertions(+), 10 deletions(-)
 create mode 100644 tests/test-qapi-event.c
 create mode 100644 tests/test-qmp-introspect.c
 create mode 100644 tests/test-qmp-marshal.c
 create mode 100644 tests/.vhost-user-test.c.swo
 create mode 100644 tests/Makefile.include.orig
 create mode 100644 tests/Makefile.orig
 create mode 100644 tests/bios-tables-test.c.orig
 create mode 100644 tests/data/acpi/diff-aml.sh
 create mode 100644 tests/data/acpi/disassemle-aml.py
 create mode 100644 tests/data/acpi/microvm/APIC.dsl
 create mode 100644 tests/data/acpi/microvm/DSDT.dsl
 create mode 100644 tests/data/acpi/microvm/FACP.dsl
 create mode 100644 tests/data/acpi/pc/APIC.acpihmat.dsl
 create mode 100644 tests/data/acpi/pc/APIC.bridge
 create mode 100644 tests/data/acpi/pc/APIC.bridge.dsl
 create mode 100644 tests/data/acpi/pc/APIC.cphp.dsl
 create mode 100644 tests/data/acpi/pc/APIC.dimmpxm.dsl
 create mode 100644 tests/data/acpi/pc/APIC.dsl
 create mode 100644 tests/data/acpi/pc/APIC.hpbridge
 create mode 100644 tests/data/acpi/pc/APIC.ipmikcs
 create mode 100644 tests/data/acpi/pc/APIC.ipmikcs.dsl
 create mode 100644 tests/data/acpi/pc/APIC.memhp
 create mode 100644 tests/data/acpi/pc/APIC.memhp.dsl
 create mode 100644 tests/data/acpi/pc/APIC.numamem
 create mode 100644 tests/data/acpi/pc/APIC.numamem.dsl
 create mode 100644 tests/data/acpi/pc/APIC.roothp
 create mode 100644 tests/data/acpi/pc/DSDT.acpihmat.dsl
 create mode 100644 tests/data/acpi/pc/DSDT.bridge.dsl
 create mode 100644 tests/data/acpi/pc/DSDT.cphp.dsl
 create mode 100644 tests/data/acpi/pc/DSDT.dimmpxm.dsl
 create mode 100644 tests/data/acpi/pc/DSDT.dsl
 create mode 100644 tests/data/acpi/pc/DSDT.ipmikcs.dsl
 create mode 100644 tests/data/acpi/pc/DSDT.memhp.dsl
 create mode 100644 tests/data/acpi/pc/DSDT.numamem.dsl
 create mode 100644 tests/data/acpi/pc/FACP.acpihmat
 create mode 100644 tests/data/acpi/pc/FACP.acpihmat.dsl
 create mode 100644 tests/data/acpi/pc/FACP.bridge
 create mode 100644 tests/data/acpi/pc/FACP.bridge.dsl
 create mode 100644 tests/data/acpi/pc/FACP.cphp
 create mode 100644 tests/data/acpi/pc/FACP.cphp.dsl
 create mode 100644 tests/data/acpi/pc/FACP.dimmpxm
 create mode 100644 tests/data/acpi/pc/FACP.dimmpxm.dsl
 create mode 100644 tests/data/acpi/pc/FACP.dsl
 create mode 100644 tests/data/acpi/pc/FACP.hpbridge
 create mode 100644 tests/data/acpi/pc/FACP.ipmikcs
 create mode 100644 tests/data/acpi/pc/FACP.ipmikcs.dsl
 create mode 100644 tests/data/acpi/pc/FACP.memhp
 create mode 100644 tests/data/acpi/pc/FACP.memhp.dsl
 create mode 100644 tests/data/acpi/pc/FACP.numamem
 create mode 100644 tests/data/acpi/pc/FACP.numamem.dsl
 create mode 100644 tests/data/acpi/pc/FACP.roothp
 create mode 100644 tests/data/acpi/pc/FACS.acpihmat
 create mode 100644 tests/data/acpi/pc/FACS.acpihmat.dsl
 create mode 100644 tests/data/acpi/pc/FACS.bridge
 create mode 100644 tests/data/acpi/pc/FACS.bridge.dsl
 create mode 100644 tests/data/acpi/pc/FACS.cphp
 create mode 100644 tests/data/acpi/pc/FACS.cphp.dsl
 create mode 100644 tests/data/acpi/pc/FACS.dimmpxm
 create mode 100644 tests/data/acpi/pc/FACS.dimmpxm.dsl
 create mode 100644 tests/data/acpi/pc/FACS.dsl
 create mode 100644 tests/data/acpi/pc/FACS.hpbridge
 create mode 100644 tests/data/acpi/pc/FACS.ipmikcs
 create mode 100644 tests/data/acpi/pc/FACS.ipmikcs.dsl
 create mode 100644 tests/data/acpi/pc/FACS.memhp
 create mode 100644 tests/data/acpi/pc/FACS.memhp.dsl
 create mode 100644 tests/data/acpi/pc/FACS.numamem
 create mode 100644 tests/data/acpi/pc/FACS.numamem.dsl
 create mode 100644 tests/data/acpi/pc/FACS.roothp
 create mode 100644 tests/data/acpi/pc/HMAT.acpihmat.dsl
 create mode 100644 tests/data/acpi/pc/HMAT.dsl
 create mode 100644 tests/data/acpi/pc/HPET.acpihmat
 create mode 100644 tests/data/acpi/pc/HPET.acpihmat.dsl
 create mode 100644 tests/data/acpi/pc/HPET.bridge
 create mode 100644 tests/data/acpi/pc/HPET.bridge.dsl
 create mode 100644 tests/data/acpi/pc/HPET.cphp
 create mode 100644 tests/data/acpi/pc/HPET.cphp.dsl
 create mode 100644 tests/data/acpi/pc/HPET.dimmpxm
 create mode 100644 tests/data/acpi/pc/HPET.dimmpxm.dsl
 create mode 100644 tests/data/acpi/pc/HPET.dsl
 create mode 100644 tests/data/acpi/pc/HPET.hpbridge
 create mode 100644 tests/data/acpi/pc/HPET.ipmikcs
 create mode 100644 tests/data/acpi/pc/HPET.ipmikcs.dsl
 create mode 100644 tests/data/acpi/pc/HPET.memhp
 create mode 100644 tests/data/acpi/pc/HPET.memhp.dsl
 create mode 100644 tests/data/acpi/pc/HPET.numamem
 create mode 100644 tests/data/acpi/pc/HPET.numamem.dsl
 create mode 100644 tests/data/acpi/pc/HPET.roothp
 create mode 100644 tests/data/acpi/pc/NFIT.dimmpxm.dsl
 create mode 100644 tests/data/acpi/pc/NFIT.dsl
 create mode 100644 tests/data/acpi/pc/SLIT.cphp.dsl
 create mode 100644 tests/data/acpi/pc/SLIT.dsl
 create mode 100644 tests/data/acpi/pc/SLIT.memhp.dsl
 create mode 100644 tests/data/acpi/pc/SRAT.acpihmat.dsl
 create mode 100644 tests/data/acpi/pc/SRAT.cphp.dsl
 create mode 100644 tests/data/acpi/pc/SRAT.dimmpxm.dsl
 create mode 100644 tests/data/acpi/pc/SRAT.dsl
 create mode 100644 tests/data/acpi/pc/SRAT.memhp.dsl
 create mode 100644 tests/data/acpi/pc/SRAT.numamem.dsl
 create mode 100644 tests/data/acpi/pc/SSDT.dsl
 create mode 100644 tests/data/acpi/pc/WAET.acpihmat
 create mode 100644 tests/data/acpi/pc/WAET.acpihmat.dsl
 create mode 100644 tests/data/acpi/pc/WAET.bridge
 create mode 100644 tests/data/acpi/pc/WAET.bridge.dsl
 create mode 100644 tests/data/acpi/pc/WAET.cphp
 create mode 100644 tests/data/acpi/pc/WAET.cphp.dsl
 create mode 100644 tests/data/acpi/pc/WAET.dimmpxm
 create mode 100644 tests/data/acpi/pc/WAET.dimmpxm.dsl
 create mode 100644 tests/data/acpi/pc/WAET.dsl
 create mode 100644 tests/data/acpi/pc/WAET.hpbridge
 create mode 100644 tests/data/acpi/pc/WAET.ipmikcs
 create mode 100644 tests/data/acpi/pc/WAET.ipmikcs.dsl
 create mode 100644 tests/data/acpi/pc/WAET.memhp
 create mode 100644 tests/data/acpi/pc/WAET.memhp.dsl
 create mode 100644 tests/data/acpi/pc/WAET.numamem
 create mode 100644 tests/data/acpi/pc/WAET.numamem.dsl
 create mode 100644 tests/data/acpi/pc/WAET.roothp
 create mode 100644 tests/data/acpi/q35/APIC.acpihmat.dsl
 create mode 100644 tests/data/acpi/q35/APIC.bridge
 create mode 100644 tests/data/acpi/q35/APIC.bridge.dsl
 create mode 100644 tests/data/acpi/q35/APIC.cphp.dsl
 create mode 100644 tests/data/acpi/q35/APIC.dimmpxm.dsl
 create mode 100644 tests/data/acpi/q35/APIC.dsl
 create mode 100644 tests/data/acpi/q35/APIC.ipmibt
 create mode 100644 tests/data/acpi/q35/APIC.ipmibt.dsl
 create mode 100644 tests/data/acpi/q35/APIC.memhp
 create mode 100644 tests/data/acpi/q35/APIC.memhp.dsl
 create mode 100644 tests/data/acpi/q35/APIC.mmio64
 create mode 100644 tests/data/acpi/q35/APIC.mmio64.dsl
 create mode 100644 tests/data/acpi/q35/APIC.numamem
 create mode 100644 tests/data/acpi/q35/APIC.numamem.dsl
 create mode 100644 tests/data/acpi/q35/APIC.tis
 create mode 100644 tests/data/acpi/q35/APIC.tis.dsl
 create mode 100644 tests/data/acpi/q35/DSDT.acpihmat.dsl
 create mode 100644 tests/data/acpi/q35/DSDT.bridge.dsl
 create mode 100644 tests/data/acpi/q35/DSDT.cphp.dsl
 create mode 100644 tests/data/acpi/q35/DSDT.dimmpxm.dsl
 create mode 100644 tests/data/acpi/q35/DSDT.dsl
 create mode 100644 tests/data/acpi/q35/DSDT.ipmibt.dsl
 create mode 100644 tests/data/acpi/q35/DSDT.memhp.dsl
 create mode 100644 tests/data/acpi/q35/DSDT.mmio64.dsl
 create mode 100644 tests/data/acpi/q35/DSDT.numamem.dsl
 create mode 100644 tests/data/acpi/q35/DSDT.tis.dsl
 create mode 100644 tests/data/acpi/q35/FACP.acpihmat
 create mode 100644 tests/data/acpi/q35/FACP.acpihmat.dsl
 create mode 100644 tests/data/acpi/q35/FACP.bridge
 create mode 100644 tests/data/acpi/q35/FACP.bridge.dsl
 create mode 100644 tests/data/acpi/q35/FACP.cphp
 create mode 100644 tests/data/acpi/q35/FACP.cphp.dsl
 create mode 100644 tests/data/acpi/q35/FACP.dimmpxm
 create mode 100644 tests/data/acpi/q35/FACP.dimmpxm.dsl
 create mode 100644 tests/data/acpi/q35/FACP.dsl
 create mode 100644 tests/data/acpi/q35/FACP.ipmibt
 create mode 100644 tests/data/acpi/q35/FACP.ipmibt.dsl
 create mode 100644 tests/data/acpi/q35/FACP.memhp
 create mode 100644 tests/data/acpi/q35/FACP.memhp.dsl
 create mode 100644 tests/data/acpi/q35/FACP.mmio64
 create mode 100644 tests/data/acpi/q35/FACP.mmio64.dsl
 create mode 100644 tests/data/acpi/q35/FACP.numamem
 create mode 100644 tests/data/acpi/q35/FACP.numamem.dsl
 create mode 100644 tests/data/acpi/q35/FACP.tis
 create mode 100644 tests/data/acpi/q35/FACP.tis.dsl
 create mode 100644 tests/data/acpi/q35/FACS.acpihmat
 create mode 100644 tests/data/acpi/q35/FACS.acpihmat.dsl
 create mode 100644 tests/data/acpi/q35/FACS.bridge
 create mode 100644 tests/data/acpi/q35/FACS.bridge.dsl
 create mode 100644 tests/data/acpi/q35/FACS.cphp
 create mode 100644 tests/data/acpi/q35/FACS.cphp.dsl
 create mode 100644 tests/data/acpi/q35/FACS.dimmpxm
 create mode 100644 tests/data/acpi/q35/FACS.dimmpxm.dsl
 create mode 100644 tests/data/acpi/q35/FACS.dsl
 create mode 100644 tests/data/acpi/q35/FACS.ipmibt
 create mode 100644 tests/data/acpi/q35/FACS.ipmibt.dsl
 create mode 100644 tests/data/acpi/q35/FACS.memhp
 create mode 100644 tests/data/acpi/q35/FACS.memhp.dsl
 create mode 100644 tests/data/acpi/q35/FACS.mmio64
 create mode 100644 tests/data/acpi/q35/FACS.mmio64.dsl
 create mode 100644 tests/data/acpi/q35/FACS.numamem
 create mode 100644 tests/data/acpi/q35/FACS.numamem.dsl
 create mode 100644 tests/data/acpi/q35/FACS.tis
 create mode 100644 tests/data/acpi/q35/FACS.tis.dsl
 create mode 100644 tests/data/acpi/q35/HMAT.acpihmat.dsl
 create mode 100644 tests/data/acpi/q35/HMAT.dsl
 create mode 100644 tests/data/acpi/q35/HPET.acpihmat
 create mode 100644 tests/data/acpi/q35/HPET.acpihmat.dsl
 create mode 100644 tests/data/acpi/q35/HPET.bridge
 create mode 100644 tests/data/acpi/q35/HPET.bridge.dsl
 create mode 100644 tests/data/acpi/q35/HPET.cphp
 create mode 100644 tests/data/acpi/q35/HPET.cphp.dsl
 create mode 100644 tests/data/acpi/q35/HPET.dimmpxm
 create mode 100644 tests/data/acpi/q35/HPET.dimmpxm.dsl
 create mode 100644 tests/data/acpi/q35/HPET.dsl
 create mode 100644 tests/data/acpi/q35/HPET.ipmibt
 create mode 100644 tests/data/acpi/q35/HPET.ipmibt.dsl
 create mode 100644 tests/data/acpi/q35/HPET.memhp
 create mode 100644 tests/data/acpi/q35/HPET.memhp.dsl
 create mode 100644 tests/data/acpi/q35/HPET.mmio64
 create mode 100644 tests/data/acpi/q35/HPET.mmio64.dsl
 create mode 100644 tests/data/acpi/q35/HPET.numamem
 create mode 100644 tests/data/acpi/q35/HPET.numamem.dsl
 create mode 100644 tests/data/acpi/q35/HPET.tis
 create mode 100644 tests/data/acpi/q35/HPET.tis.dsl
 create mode 100644 tests/data/acpi/q35/MCFG.acpihmat
 create mode 100644 tests/data/acpi/q35/MCFG.acpihmat.dsl
 create mode 100644 tests/data/acpi/q35/MCFG.bridge
 create mode 100644 tests/data/acpi/q35/MCFG.bridge.dsl
 create mode 100644 tests/data/acpi/q35/MCFG.cphp
 create mode 100644 tests/data/acpi/q35/MCFG.cphp.dsl
 create mode 100644 tests/data/acpi/q35/MCFG.dimmpxm
 create mode 100644 tests/data/acpi/q35/MCFG.dimmpxm.dsl
 create mode 100644 tests/data/acpi/q35/MCFG.dsl
 create mode 100644 tests/data/acpi/q35/MCFG.ipmibt
 create mode 100644 tests/data/acpi/q35/MCFG.ipmibt.dsl
 create mode 100644 tests/data/acpi/q35/MCFG.memhp
 create mode 100644 tests/data/acpi/q35/MCFG.memhp.dsl
 create mode 100644 tests/data/acpi/q35/MCFG.mmio64
 create mode 100644 tests/data/acpi/q35/MCFG.mmio64.dsl
 create mode 100644 tests/data/acpi/q35/MCFG.numamem
 create mode 100644 tests/data/acpi/q35/MCFG.numamem.dsl
 create mode 100644 tests/data/acpi/q35/MCFG.tis
 create mode 100644 tests/data/acpi/q35/MCFG.tis.dsl
 create mode 100644 tests/data/acpi/q35/NFIT.dimmpxm.dsl
 create mode 100644 tests/data/acpi/q35/NFIT.dsl
 create mode 100644 tests/data/acpi/q35/SLIT.cphp.dsl
 create mode 100644 tests/data/acpi/q35/SLIT.dsl
 create mode 100644 tests/data/acpi/q35/SLIT.memhp.dsl
 create mode 100644 tests/data/acpi/q35/SRAT.acpihmat.dsl
 create mode 100644 tests/data/acpi/q35/SRAT.cphp.dsl
 create mode 100644 tests/data/acpi/q35/SRAT.dimmpxm.dsl
 create mode 100644 tests/data/acpi/q35/SRAT.dsl
 create mode 100644 tests/data/acpi/q35/SRAT.memhp.dsl
 create mode 100644 tests/data/acpi/q35/SRAT.mmio64.dsl
 create mode 100644 tests/data/acpi/q35/SRAT.numamem.dsl
 create mode 100644 tests/data/acpi/q35/SSDT.dsl
 create mode 100644 tests/data/acpi/q35/TPM2.dsl
 create mode 100644 tests/data/acpi/q35/TPM2.tis.dsl
 create mode 100644 tests/data/acpi/q35/WAET.acpihmat
 create mode 100644 tests/data/acpi/q35/WAET.acpihmat.dsl
 create mode 100644 tests/data/acpi/q35/WAET.bridge
 create mode 100644 tests/data/acpi/q35/WAET.bridge.dsl
 create mode 100644 tests/data/acpi/q35/WAET.cphp
 create mode 100644 tests/data/acpi/q35/WAET.cphp.dsl
 create mode 100644 tests/data/acpi/q35/WAET.dimmpxm
 create mode 100644 tests/data/acpi/q35/WAET.dimmpxm.dsl
 create mode 100644 tests/data/acpi/q35/WAET.dsl
 create mode 100644 tests/data/acpi/q35/WAET.ipmibt
 create mode 100644 tests/data/acpi/q35/WAET.ipmibt.dsl
 create mode 100644 tests/data/acpi/q35/WAET.memhp
 create mode 100644 tests/data/acpi/q35/WAET.memhp.dsl
 create mode 100644 tests/data/acpi/q35/WAET.mmio64
 create mode 100644 tests/data/acpi/q35/WAET.mmio64.dsl
 create mode 100644 tests/data/acpi/q35/WAET.numamem
 create mode 100644 tests/data/acpi/q35/WAET.numamem.dsl
 create mode 100644 tests/data/acpi/q35/WAET.tis
 create mode 100644 tests/data/acpi/q35/WAET.tis.dsl
 create mode 100644 tests/data/acpi/virt/APIC.dsl
 create mode 100644 tests/data/acpi/virt/APIC.memhp.dsl
 create mode 100644 tests/data/acpi/virt/APIC.numamem.dsl
 create mode 100644 tests/data/acpi/virt/DSDT.dsl
 create mode 100644 tests/data/acpi/virt/DSDT.memhp.dsl
 create mode 100644 tests/data/acpi/virt/DSDT.numamem.dsl
 create mode 100644 tests/data/acpi/virt/FACP.dsl
 create mode 100644 tests/data/acpi/virt/FACP.memhp.dsl
 create mode 100644 tests/data/acpi/virt/FACP.numamem.dsl
 create mode 100644 tests/data/acpi/virt/GTDT.dsl
 create mode 100644 tests/data/acpi/virt/GTDT.memhp.dsl
 create mode 100644 tests/data/acpi/virt/GTDT.numamem.dsl
 create mode 100644 tests/data/acpi/virt/MCFG.dsl
 create mode 100644 tests/data/acpi/virt/MCFG.memhp.dsl
 create mode 100644 tests/data/acpi/virt/MCFG.numamem.dsl
 create mode 100644 tests/data/acpi/virt/NFIT.dsl
 create mode 100644 tests/data/acpi/virt/NFIT.memhp.dsl
 create mode 100644 tests/data/acpi/virt/SLIT.dsl
 create mode 100644 tests/data/acpi/virt/SLIT.memhp.dsl
 create mode 100644 tests/data/acpi/virt/SPCR.dsl
 create mode 100644 tests/data/acpi/virt/SPCR.memhp.dsl
 create mode 100644 tests/data/acpi/virt/SPCR.numamem.dsl
 create mode 100644 tests/data/acpi/virt/SRAT.dsl
 create mode 100644 tests/data/acpi/virt/SRAT.memhp.dsl
 create mode 100644 tests/data/acpi/virt/SRAT.numamem.dsl
 create mode 100644 tests/data/acpi/virt/SSDT.dsl
 create mode 100644 tests/data/uefi-boot-images/bios-tables-test.x86_64.iso.raw
 create mode 100644 tests/libqtest.c.orig
 create mode 100644 tests/qemu-iotests/core.12067
 create mode 100644 tests/qtest/bios-tables-test-allowed-diff.h.orig
 create mode 100644 tests/qtest/bios-tables-test-allowed-diff.h.rej
 create mode 100644 tests/qtest/bios-tables-test.c.orig
 create mode 100644 tests/qtest/bios-tables-test.c.rej
 create mode 100755 tests/vhost-user-bridge
 create mode 100644 tests/vhost-user-bridge.c.orig
 create mode 100644 tests/vhost-user-test.c.orig
tests/qtest/bios-tables-test-allowed-diff.h +0 -10
index 631703142c..dfb8523c8b 100644
@@ -1,11 +1 @@
 /* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/q35/DSDT",
-"tests/data/acpi/q35/DSDT.acpihmat",
-"tests/data/acpi/q35/DSDT.bridge",
-"tests/data/acpi/q35/DSDT.cphp",
-"tests/data/acpi/q35/DSDT.dimmpxm",
-"tests/data/acpi/q35/DSDT.ipmibt",
-"tests/data/acpi/q35/DSDT.memhp",
-"tests/data/acpi/q35/DSDT.mmio64",
-"tests/data/acpi/q35/DSDT.numamem",
-"tests/data/acpi/q35/DSDT.tis",
tests/test-qapi-event.c new file +198 -0

198 lines not on this page · raw message

tests/test-qmp-introspect.c new file +58 -0

58 lines not on this page · raw message

tests/test-qmp-marshal.c new file +383 -0

383 lines not on this page · raw message

tests/.vhost-user-test.c.swo new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..5545d2bef350c4c4197c70c9789465cfee8f84ce
GIT binary patch
tests/Makefile.include.orig new file +1012 -0

1,012 lines not on this page · raw message

tests/Makefile.orig new file +569 -0

569 lines not on this page · raw message

tests/bios-tables-test.c.orig new file +925 -0

769 lines not on this page · raw message

tests/data/acpi/diff-aml.sh new file +0 -0
new file mode 100644
index 0000000000..e69de29bb2
tests/data/acpi/disassemle-aml.py new file +21 -0
new file mode 100644
index 0000000000..0398fada63

Lines of this file are not shown. View the raw message.

tests/data/acpi/microvm/APIC.dsl new file +56 -0

56 lines not on this page · raw message

tests/data/acpi/microvm/DSDT.dsl new file +121 -0

121 lines not on this page · raw message

tests/data/acpi/microvm/FACP.dsl new file +196 -0

196 lines not on this page · raw message

tests/data/acpi/pc/APIC.acpihmat.dsl new file +112 -0

112 lines not on this page · raw message

tests/data/acpi/pc/APIC.bridge new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..84509e0ae4cabeb5ead3e42a4edfa50abddbc17d
GIT binary patch
tests/data/acpi/pc/APIC.bridge.dsl new file +104 -0

104 lines not on this page · raw message

tests/data/acpi/pc/APIC.cphp.dsl new file +146 -0

146 lines not on this page · raw message

tests/data/acpi/pc/APIC.dimmpxm.dsl new file +129 -0

129 lines not on this page · raw message

tests/data/acpi/pc/APIC.dsl new file +104 -0

104 lines not on this page · raw message

tests/data/acpi/pc/APIC.hpbridge new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..84509e0ae4cabeb5ead3e42a4edfa50abddbc17d
GIT binary patch
tests/data/acpi/pc/APIC.ipmikcs new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..84509e0ae4cabeb5ead3e42a4edfa50abddbc17d
GIT binary patch
tests/data/acpi/pc/APIC.ipmikcs.dsl new file +104 -0

104 lines not on this page · raw message

tests/data/acpi/pc/APIC.memhp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..84509e0ae4cabeb5ead3e42a4edfa50abddbc17d
GIT binary patch
tests/data/acpi/pc/APIC.memhp.dsl new file +104 -0

104 lines not on this page · raw message

tests/data/acpi/pc/APIC.numamem new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..84509e0ae4cabeb5ead3e42a4edfa50abddbc17d
GIT binary patch
tests/data/acpi/pc/APIC.numamem.dsl new file +104 -0

104 lines not on this page · raw message

tests/data/acpi/pc/APIC.roothp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..84509e0ae4cabeb5ead3e42a4edfa50abddbc17d
GIT binary patch
tests/data/acpi/pc/DSDT.acpihmat.dsl new file +1619 -0

1,619 lines not on this page · raw message

tests/data/acpi/pc/DSDT.bridge.dsl new file +1800 -0

1,800 lines not on this page · raw message

tests/data/acpi/pc/DSDT.cphp.dsl new file +1466 -0

1,466 lines not on this page · raw message

tests/data/acpi/pc/DSDT.dimmpxm.dsl new file +1719 -0

1,719 lines not on this page · raw message

tests/data/acpi/pc/DSDT.dsl new file +1407 -0

1,407 lines not on this page · raw message

tests/data/acpi/pc/DSDT.hpbridge binary +0 -0
index b0751398541bdf88ce405be9742aeba0b375dbc3..56032bcf1ba4e251f16c9028429826090531efdd 100644
GIT binary patch
tests/data/acpi/pc/DSDT.ipmikcs.dsl new file +1337 -0

1,337 lines not on this page · raw message

tests/data/acpi/pc/DSDT.memhp.dsl new file +1625 -0

1,625 lines not on this page · raw message

tests/data/acpi/pc/DSDT.numamem.dsl new file +1321 -0

1,321 lines not on this page · raw message

tests/data/acpi/pc/DSDT.roothp binary +0 -0
index 886a5e6952f6f034bdd80d44d43de5975a1a4b0f..18caa0765fc10adb29e01717390ead6c63cd0f3c 100644
GIT binary patch
tests/data/acpi/pc/FACP.acpihmat new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..261ebdc5d1c3bdf18fb7935314a04fd7f6f92a7a
GIT binary patch
tests/data/acpi/pc/FACP.acpihmat.dsl new file +99 -0

99 lines not on this page · raw message

tests/data/acpi/pc/FACP.bridge new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..261ebdc5d1c3bdf18fb7935314a04fd7f6f92a7a
GIT binary patch
tests/data/acpi/pc/FACP.bridge.dsl new file +99 -0

99 lines not on this page · raw message

tests/data/acpi/pc/FACP.cphp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..261ebdc5d1c3bdf18fb7935314a04fd7f6f92a7a
GIT binary patch
tests/data/acpi/pc/FACP.cphp.dsl new file +99 -0

99 lines not on this page · raw message

tests/data/acpi/pc/FACP.dimmpxm new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..261ebdc5d1c3bdf18fb7935314a04fd7f6f92a7a
GIT binary patch
tests/data/acpi/pc/FACP.dimmpxm.dsl new file +99 -0

99 lines not on this page · raw message

tests/data/acpi/pc/FACP.dsl new file +99 -0

99 lines not on this page · raw message

tests/data/acpi/pc/FACP.hpbridge new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..261ebdc5d1c3bdf18fb7935314a04fd7f6f92a7a
GIT binary patch
tests/data/acpi/pc/FACP.ipmikcs new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..261ebdc5d1c3bdf18fb7935314a04fd7f6f92a7a
GIT binary patch
tests/data/acpi/pc/FACP.ipmikcs.dsl new file +99 -0

99 lines not on this page · raw message

tests/data/acpi/pc/FACP.memhp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..261ebdc5d1c3bdf18fb7935314a04fd7f6f92a7a
GIT binary patch
tests/data/acpi/pc/FACP.memhp.dsl new file +99 -0

99 lines not on this page · raw message

tests/data/acpi/pc/FACP.numamem new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..261ebdc5d1c3bdf18fb7935314a04fd7f6f92a7a
GIT binary patch
tests/data/acpi/pc/FACP.numamem.dsl new file +99 -0

99 lines not on this page · raw message

tests/data/acpi/pc/FACP.roothp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..261ebdc5d1c3bdf18fb7935314a04fd7f6f92a7a
GIT binary patch
tests/data/acpi/pc/FACS.acpihmat new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..fc67ecc40782bd7fe8921e430d7de67f0bfaad93
GIT binary patch
tests/data/acpi/pc/FACS.acpihmat.dsl new file +32 -0
new file mode 100644
index 0000000000..bff165ba4e

Lines of this file are not shown. View the raw message.

tests/data/acpi/pc/FACS.bridge new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..fc67ecc40782bd7fe8921e430d7de67f0bfaad93
GIT binary patch
tests/data/acpi/pc/FACS.bridge.dsl new file +32 -0
new file mode 100644
index 0000000000..981354f0f3

Lines of this file are not shown. View the raw message.

tests/data/acpi/pc/FACS.cphp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..fc67ecc40782bd7fe8921e430d7de67f0bfaad93
GIT binary patch
tests/data/acpi/pc/FACS.cphp.dsl new file +32 -0
new file mode 100644
index 0000000000..bb44e525b9

Lines of this file are not shown. View the raw message.

tests/data/acpi/pc/FACS.dimmpxm new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..fc67ecc40782bd7fe8921e430d7de67f0bfaad93
GIT binary patch
tests/data/acpi/pc/FACS.dimmpxm.dsl new file +32 -0
new file mode 100644
index 0000000000..e7586d3236

Lines of this file are not shown. View the raw message.

tests/data/acpi/pc/FACS.dsl new file +32 -0
new file mode 100644
index 0000000000..11d622cdf7

Lines of this file are not shown. View the raw message.

tests/data/acpi/pc/FACS.hpbridge new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..fc67ecc40782bd7fe8921e430d7de67f0bfaad93
GIT binary patch
tests/data/acpi/pc/FACS.ipmikcs new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..fc67ecc40782bd7fe8921e430d7de67f0bfaad93
GIT binary patch
tests/data/acpi/pc/FACS.ipmikcs.dsl new file +32 -0
new file mode 100644
index 0000000000..f4b7c9718c

Lines of this file are not shown. View the raw message.

tests/data/acpi/pc/FACS.memhp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..fc67ecc40782bd7fe8921e430d7de67f0bfaad93
GIT binary patch
tests/data/acpi/pc/FACS.memhp.dsl new file +32 -0
new file mode 100644
index 0000000000..da2e230a62

Lines of this file are not shown. View the raw message.

tests/data/acpi/pc/FACS.numamem new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..fc67ecc40782bd7fe8921e430d7de67f0bfaad93
GIT binary patch
tests/data/acpi/pc/FACS.numamem.dsl new file +32 -0
new file mode 100644
index 0000000000..c856f8b230

Lines of this file are not shown. View the raw message.

tests/data/acpi/pc/FACS.roothp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..fc67ecc40782bd7fe8921e430d7de67f0bfaad93
GIT binary patch
tests/data/acpi/pc/HMAT.acpihmat.dsl new file +132 -0

132 lines not on this page · raw message

tests/data/acpi/pc/HMAT.dsl new file +132 -0

132 lines not on this page · raw message

tests/data/acpi/pc/HPET.acpihmat new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..df689b8f99c1c43cfd7d63bdede3bcdfd23b7de1
GIT binary patch
tests/data/acpi/pc/HPET.acpihmat.dsl new file +43 -0

43 lines not on this page · raw message

tests/data/acpi/pc/HPET.bridge new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..df689b8f99c1c43cfd7d63bdede3bcdfd23b7de1
GIT binary patch
tests/data/acpi/pc/HPET.bridge.dsl new file +43 -0

43 lines not on this page · raw message

tests/data/acpi/pc/HPET.cphp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..df689b8f99c1c43cfd7d63bdede3bcdfd23b7de1
GIT binary patch
tests/data/acpi/pc/HPET.cphp.dsl new file +43 -0

43 lines not on this page · raw message

tests/data/acpi/pc/HPET.dimmpxm new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..df689b8f99c1c43cfd7d63bdede3bcdfd23b7de1
GIT binary patch
tests/data/acpi/pc/HPET.dimmpxm.dsl new file +43 -0

43 lines not on this page · raw message

tests/data/acpi/pc/HPET.dsl new file +43 -0

43 lines not on this page · raw message

tests/data/acpi/pc/HPET.hpbridge new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..df689b8f99c1c43cfd7d63bdede3bcdfd23b7de1
GIT binary patch
tests/data/acpi/pc/HPET.ipmikcs new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..df689b8f99c1c43cfd7d63bdede3bcdfd23b7de1
GIT binary patch
tests/data/acpi/pc/HPET.ipmikcs.dsl new file +43 -0

43 lines not on this page · raw message

tests/data/acpi/pc/HPET.memhp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..df689b8f99c1c43cfd7d63bdede3bcdfd23b7de1
GIT binary patch
tests/data/acpi/pc/HPET.memhp.dsl new file +43 -0

43 lines not on this page · raw message

tests/data/acpi/pc/HPET.numamem new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..df689b8f99c1c43cfd7d63bdede3bcdfd23b7de1
GIT binary patch
tests/data/acpi/pc/HPET.numamem.dsl new file +43 -0

43 lines not on this page · raw message

tests/data/acpi/pc/HPET.roothp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..df689b8f99c1c43cfd7d63bdede3bcdfd23b7de1
GIT binary patch
tests/data/acpi/pc/NFIT.dimmpxm.dsl new file +115 -0

115 lines not on this page · raw message

tests/data/acpi/pc/NFIT.dsl new file +115 -0

115 lines not on this page · raw message

tests/data/acpi/pc/SLIT.cphp.dsl new file +31 -0
new file mode 100644
index 0000000000..20289608db

Lines of this file are not shown. View the raw message.

tests/data/acpi/pc/SLIT.dsl new file +31 -0
new file mode 100644
index 0000000000..8b923249af

Lines of this file are not shown. View the raw message.

tests/data/acpi/pc/SLIT.memhp.dsl new file +31 -0
new file mode 100644
index 0000000000..b3a0170144

Lines of this file are not shown. View the raw message.

tests/data/acpi/pc/SRAT.acpihmat.dsl new file +137 -0

137 lines not on this page · raw message

tests/data/acpi/pc/SRAT.cphp.dsl new file +168 -0

168 lines not on this page · raw message

tests/data/acpi/pc/SRAT.dimmpxm.dsl new file +194 -0

194 lines not on this page · raw message

tests/data/acpi/pc/SRAT.dsl new file +108 -0

108 lines not on this page · raw message

tests/data/acpi/pc/SRAT.memhp.dsl new file +125 -0

125 lines not on this page · raw message

tests/data/acpi/pc/SRAT.numamem.dsl new file +108 -0

108 lines not on this page · raw message

tests/data/acpi/pc/SSDT.dsl new file +205 -0

205 lines not on this page · raw message

tests/data/acpi/pc/WAET.acpihmat new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..c2240f58dff6b2f765386b5a2e506fda4800be3e
GIT binary patch
tests/data/acpi/pc/WAET.acpihmat.dsl new file +31 -0
new file mode 100644
index 0000000000..991c8773b8

Lines of this file are not shown. View the raw message.

tests/data/acpi/pc/WAET.bridge new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..c2240f58dff6b2f765386b5a2e506fda4800be3e
GIT binary patch
tests/data/acpi/pc/WAET.bridge.dsl new file +31 -0
new file mode 100644
index 0000000000..f47dbb17a7

Lines of this file are not shown. View the raw message.

tests/data/acpi/pc/WAET.cphp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..c2240f58dff6b2f765386b5a2e506fda4800be3e
GIT binary patch
tests/data/acpi/pc/WAET.cphp.dsl new file +31 -0
new file mode 100644
index 0000000000..ff077a14eb

Lines of this file are not shown. View the raw message.

tests/data/acpi/pc/WAET.dimmpxm new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..c2240f58dff6b2f765386b5a2e506fda4800be3e
GIT binary patch
tests/data/acpi/pc/WAET.dimmpxm.dsl new file +31 -0
new file mode 100644
index 0000000000..b8192c8601

Lines of this file are not shown. View the raw message.

tests/data/acpi/pc/WAET.dsl new file +31 -0
new file mode 100644
index 0000000000..53b6c1dc42

Lines of this file are not shown. View the raw message.

tests/data/acpi/pc/WAET.hpbridge new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..c2240f58dff6b2f765386b5a2e506fda4800be3e
GIT binary patch
tests/data/acpi/pc/WAET.ipmikcs new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..c2240f58dff6b2f765386b5a2e506fda4800be3e
GIT binary patch
tests/data/acpi/pc/WAET.ipmikcs.dsl new file +31 -0
new file mode 100644
index 0000000000..5144bada0f

Lines of this file are not shown. View the raw message.

tests/data/acpi/pc/WAET.memhp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..c2240f58dff6b2f765386b5a2e506fda4800be3e
GIT binary patch
tests/data/acpi/pc/WAET.memhp.dsl new file +31 -0
new file mode 100644
index 0000000000..bfe3a036d7

Lines of this file are not shown. View the raw message.

tests/data/acpi/pc/WAET.numamem new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..c2240f58dff6b2f765386b5a2e506fda4800be3e
GIT binary patch
tests/data/acpi/pc/WAET.numamem.dsl new file +31 -0
new file mode 100644
index 0000000000..e4c6cf4bf8

Lines of this file are not shown. View the raw message.

tests/data/acpi/pc/WAET.roothp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..c2240f58dff6b2f765386b5a2e506fda4800be3e
GIT binary patch
tests/data/acpi/q35/APIC.acpihmat.dsl new file +112 -0

112 lines not on this page · raw message

tests/data/acpi/q35/APIC.bridge new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..84509e0ae4cabeb5ead3e42a4edfa50abddbc17d
GIT binary patch
tests/data/acpi/q35/APIC.bridge.dsl new file +104 -0

104 lines not on this page · raw message

tests/data/acpi/q35/APIC.cphp.dsl new file +146 -0

146 lines not on this page · raw message

tests/data/acpi/q35/APIC.dimmpxm.dsl new file +129 -0

129 lines not on this page · raw message

tests/data/acpi/q35/APIC.dsl new file +104 -0

104 lines not on this page · raw message

tests/data/acpi/q35/APIC.ipmibt new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..84509e0ae4cabeb5ead3e42a4edfa50abddbc17d
GIT binary patch
tests/data/acpi/q35/APIC.ipmibt.dsl new file +104 -0

104 lines not on this page · raw message

tests/data/acpi/q35/APIC.memhp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..84509e0ae4cabeb5ead3e42a4edfa50abddbc17d
GIT binary patch
tests/data/acpi/q35/APIC.memhp.dsl new file +104 -0

104 lines not on this page · raw message

tests/data/acpi/q35/APIC.mmio64 new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..84509e0ae4cabeb5ead3e42a4edfa50abddbc17d
GIT binary patch
tests/data/acpi/q35/APIC.mmio64.dsl new file +104 -0

104 lines not on this page · raw message

tests/data/acpi/q35/APIC.numamem new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..84509e0ae4cabeb5ead3e42a4edfa50abddbc17d
GIT binary patch
tests/data/acpi/q35/APIC.numamem.dsl new file +104 -0

104 lines not on this page · raw message

tests/data/acpi/q35/APIC.tis new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..84509e0ae4cabeb5ead3e42a4edfa50abddbc17d
GIT binary patch
tests/data/acpi/q35/APIC.tis.dsl new file +104 -0

104 lines not on this page · raw message

tests/data/acpi/q35/DSDT binary +0 -0
index d6c26940b1a68d4184f6f2335924099aa28b130a..e7414e78563372fca4d2aab9d16c58c0ff8468f4 100644
GIT binary patch
tests/data/acpi/q35/DSDT.acpihmat binary +0 -0
index 2b67045d6add69574499b97d938cca01949231b4..88434da261212b15264c892976775acd5c954aea 100644
GIT binary patch
tests/data/acpi/q35/DSDT.acpihmat.dsl new file +3436 -0

3,436 lines not on this page · raw message

tests/data/acpi/q35/DSDT.bridge binary +0 -0
index 0f6c9c68c81cddd2126eea8a7c336b8667202223..118476ff6101e11d6b1f2d3399241d7fd1a6f634 100644
GIT binary patch
tests/data/acpi/q35/DSDT.bridge.dsl new file +3141 -0

3,141 lines not on this page · raw message

tests/data/acpi/q35/DSDT.cphp binary +0 -0
index d7bedee7ff638f11b3bb84ef960364b409a49cce..69c5edf620529e995461ccba63b76a083f25b2b6 100644
GIT binary patch
tests/data/acpi/q35/DSDT.cphp.dsl new file +3283 -0

3,283 lines not on this page · raw message

tests/data/acpi/q35/DSDT.dimmpxm binary +0 -0
index 13e80ae2e5c7606a7260d4cb3ab776488d0697d6..af41acba6e0117191ad8495a30ded7b0acc4d2ca 100644
GIT binary patch
tests/data/acpi/q35/DSDT.dimmpxm.dsl new file +3535 -0

3,535 lines not on this page · raw message

tests/data/acpi/q35/DSDT.dsl new file +3351 -0

3,351 lines not on this page · raw message

tests/data/acpi/q35/DSDT.ipmibt binary +0 -0
index 9a1b635dab776fb25e378a00e6ca0cadf9902c25..a650c3041ab9d6688eda843a6a2ab418e1a7ce9b 100644
GIT binary patch
tests/data/acpi/q35/DSDT.ipmibt.dsl new file +3156 -0

3,156 lines not on this page · raw message

tests/data/acpi/q35/DSDT.memhp binary +0 -0
index 55ce4e2293624c2c0725c3bbaaa7ec29acfccfc9..85598ca3f68f437e8d5048e2cb9815f20b332152 100644
GIT binary patch
tests/data/acpi/q35/DSDT.memhp.dsl new file +3442 -0

3,442 lines not on this page · raw message

tests/data/acpi/q35/DSDT.mmio64 binary +0 -0
index 99b7b2ae4ba36b8ca7901626c1561d29100087d2..092fdc32628f5a145b510c2a46de8b02222b1951 100644
GIT binary patch
tests/data/acpi/q35/DSDT.mmio64.dsl new file +3377 -0

3,377 lines not on this page · raw message

tests/data/acpi/q35/DSDT.numamem binary +0 -0
index 2b2433cc13ec3110abbc8440a0b1ad8c487edb6c..899946255b9111e077e06c5f78be860e863911b9 100644
GIT binary patch
tests/data/acpi/q35/DSDT.numamem.dsl new file +3138 -0

3,138 lines not on this page · raw message

tests/data/acpi/q35/DSDT.tis binary +0 -0
index dd06ee4c348930b0684827ca05747b4f65dbd6b2..08802fbd12eae6ad99f03a8db9a0bc7f95e77cb4 100644
GIT binary patch
tests/data/acpi/q35/DSDT.tis.dsl new file +3321 -0

3,321 lines not on this page · raw message

tests/data/acpi/q35/FACP.acpihmat new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..72c9d97902a4bbf14896023d9ba78e0899d6517b
GIT binary patch
tests/data/acpi/q35/FACP.acpihmat.dsl new file +179 -0

179 lines not on this page · raw message

tests/data/acpi/q35/FACP.bridge new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..72c9d97902a4bbf14896023d9ba78e0899d6517b
GIT binary patch
tests/data/acpi/q35/FACP.bridge.dsl new file +179 -0

179 lines not on this page · raw message

tests/data/acpi/q35/FACP.cphp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..72c9d97902a4bbf14896023d9ba78e0899d6517b
GIT binary patch
tests/data/acpi/q35/FACP.cphp.dsl new file +179 -0

179 lines not on this page · raw message

tests/data/acpi/q35/FACP.dimmpxm new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..72c9d97902a4bbf14896023d9ba78e0899d6517b
GIT binary patch
tests/data/acpi/q35/FACP.dimmpxm.dsl new file +179 -0

179 lines not on this page · raw message

tests/data/acpi/q35/FACP.dsl new file +179 -0

179 lines not on this page · raw message

tests/data/acpi/q35/FACP.ipmibt new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..72c9d97902a4bbf14896023d9ba78e0899d6517b
GIT binary patch
tests/data/acpi/q35/FACP.ipmibt.dsl new file +179 -0

179 lines not on this page · raw message

tests/data/acpi/q35/FACP.memhp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..72c9d97902a4bbf14896023d9ba78e0899d6517b
GIT binary patch
tests/data/acpi/q35/FACP.memhp.dsl new file +179 -0

179 lines not on this page · raw message

tests/data/acpi/q35/FACP.mmio64 new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..72c9d97902a4bbf14896023d9ba78e0899d6517b
GIT binary patch
tests/data/acpi/q35/FACP.mmio64.dsl new file +179 -0

179 lines not on this page · raw message

tests/data/acpi/q35/FACP.numamem new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..72c9d97902a4bbf14896023d9ba78e0899d6517b
GIT binary patch
tests/data/acpi/q35/FACP.numamem.dsl new file +179 -0

179 lines not on this page · raw message

tests/data/acpi/q35/FACP.tis new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..72c9d97902a4bbf14896023d9ba78e0899d6517b
GIT binary patch
tests/data/acpi/q35/FACP.tis.dsl new file +179 -0

179 lines not on this page · raw message

tests/data/acpi/q35/FACS.acpihmat new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..fc67ecc40782bd7fe8921e430d7de67f0bfaad93
GIT binary patch
tests/data/acpi/q35/FACS.acpihmat.dsl new file +32 -0
new file mode 100644
index 0000000000..0bd98653ce

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/FACS.bridge new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..fc67ecc40782bd7fe8921e430d7de67f0bfaad93
GIT binary patch
tests/data/acpi/q35/FACS.bridge.dsl new file +32 -0
new file mode 100644
index 0000000000..116dce1f2d

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/FACS.cphp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..fc67ecc40782bd7fe8921e430d7de67f0bfaad93
GIT binary patch
tests/data/acpi/q35/FACS.cphp.dsl new file +32 -0
new file mode 100644
index 0000000000..580d502491

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/FACS.dimmpxm new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..fc67ecc40782bd7fe8921e430d7de67f0bfaad93
GIT binary patch
tests/data/acpi/q35/FACS.dimmpxm.dsl new file +32 -0
new file mode 100644
index 0000000000..4106387866

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/FACS.dsl new file +32 -0
new file mode 100644
index 0000000000..0595b4ddb9

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/FACS.ipmibt new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..fc67ecc40782bd7fe8921e430d7de67f0bfaad93
GIT binary patch
tests/data/acpi/q35/FACS.ipmibt.dsl new file +32 -0
new file mode 100644
index 0000000000..8c019f3475

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/FACS.memhp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..fc67ecc40782bd7fe8921e430d7de67f0bfaad93
GIT binary patch
tests/data/acpi/q35/FACS.memhp.dsl new file +32 -0
new file mode 100644
index 0000000000..fb6d84c152

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/FACS.mmio64 new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..fc67ecc40782bd7fe8921e430d7de67f0bfaad93
GIT binary patch
tests/data/acpi/q35/FACS.mmio64.dsl new file +32 -0
new file mode 100644
index 0000000000..1a20060749

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/FACS.numamem new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..fc67ecc40782bd7fe8921e430d7de67f0bfaad93
GIT binary patch
tests/data/acpi/q35/FACS.numamem.dsl new file +32 -0
new file mode 100644
index 0000000000..740e0bca9a

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/FACS.tis new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..fc67ecc40782bd7fe8921e430d7de67f0bfaad93
GIT binary patch
tests/data/acpi/q35/FACS.tis.dsl new file +32 -0
new file mode 100644
index 0000000000..cb35bde06c

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/HMAT.acpihmat.dsl new file +132 -0

132 lines not on this page · raw message

tests/data/acpi/q35/HMAT.dsl new file +132 -0

132 lines not on this page · raw message

tests/data/acpi/q35/HPET.acpihmat new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..df689b8f99c1c43cfd7d63bdede3bcdfd23b7de1
GIT binary patch
tests/data/acpi/q35/HPET.acpihmat.dsl new file +43 -0

43 lines not on this page · raw message

tests/data/acpi/q35/HPET.bridge new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..df689b8f99c1c43cfd7d63bdede3bcdfd23b7de1
GIT binary patch
tests/data/acpi/q35/HPET.bridge.dsl new file +43 -0

43 lines not on this page · raw message

tests/data/acpi/q35/HPET.cphp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..df689b8f99c1c43cfd7d63bdede3bcdfd23b7de1
GIT binary patch
tests/data/acpi/q35/HPET.cphp.dsl new file +43 -0

43 lines not on this page · raw message

tests/data/acpi/q35/HPET.dimmpxm new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..df689b8f99c1c43cfd7d63bdede3bcdfd23b7de1
GIT binary patch
tests/data/acpi/q35/HPET.dimmpxm.dsl new file +43 -0

43 lines not on this page · raw message

tests/data/acpi/q35/HPET.dsl new file +43 -0

43 lines not on this page · raw message

tests/data/acpi/q35/HPET.ipmibt new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..df689b8f99c1c43cfd7d63bdede3bcdfd23b7de1
GIT binary patch
tests/data/acpi/q35/HPET.ipmibt.dsl new file +43 -0

43 lines not on this page · raw message

tests/data/acpi/q35/HPET.memhp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..df689b8f99c1c43cfd7d63bdede3bcdfd23b7de1
GIT binary patch
tests/data/acpi/q35/HPET.memhp.dsl new file +43 -0

43 lines not on this page · raw message

tests/data/acpi/q35/HPET.mmio64 new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..df689b8f99c1c43cfd7d63bdede3bcdfd23b7de1
GIT binary patch
tests/data/acpi/q35/HPET.mmio64.dsl new file +43 -0

43 lines not on this page · raw message

tests/data/acpi/q35/HPET.numamem new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..df689b8f99c1c43cfd7d63bdede3bcdfd23b7de1
GIT binary patch
tests/data/acpi/q35/HPET.numamem.dsl new file +43 -0

43 lines not on this page · raw message

tests/data/acpi/q35/HPET.tis new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..df689b8f99c1c43cfd7d63bdede3bcdfd23b7de1
GIT binary patch
tests/data/acpi/q35/HPET.tis.dsl new file +43 -0

43 lines not on this page · raw message

tests/data/acpi/q35/MCFG.acpihmat new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..79ceb27a038c6e29d098b98dda2e229495f96b7c
GIT binary patch
tests/data/acpi/q35/MCFG.acpihmat.dsl new file +36 -0
new file mode 100644
index 0000000000..8d07f64e9d

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/MCFG.bridge new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..79ceb27a038c6e29d098b98dda2e229495f96b7c
GIT binary patch
tests/data/acpi/q35/MCFG.bridge.dsl new file +36 -0
new file mode 100644
index 0000000000..6ce54d7228

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/MCFG.cphp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..79ceb27a038c6e29d098b98dda2e229495f96b7c
GIT binary patch
tests/data/acpi/q35/MCFG.cphp.dsl new file +36 -0
new file mode 100644
index 0000000000..7ffd7f30db

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/MCFG.dimmpxm new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..79ceb27a038c6e29d098b98dda2e229495f96b7c
GIT binary patch
tests/data/acpi/q35/MCFG.dimmpxm.dsl new file +36 -0
new file mode 100644
index 0000000000..dd7373b692

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/MCFG.dsl new file +36 -0
new file mode 100644
index 0000000000..5179d6d707

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/MCFG.ipmibt new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..79ceb27a038c6e29d098b98dda2e229495f96b7c
GIT binary patch
tests/data/acpi/q35/MCFG.ipmibt.dsl new file +36 -0
new file mode 100644
index 0000000000..80c372162c

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/MCFG.memhp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..79ceb27a038c6e29d098b98dda2e229495f96b7c
GIT binary patch
tests/data/acpi/q35/MCFG.memhp.dsl new file +36 -0
new file mode 100644
index 0000000000..1b1f666833

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/MCFG.mmio64 new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..79ceb27a038c6e29d098b98dda2e229495f96b7c
GIT binary patch
tests/data/acpi/q35/MCFG.mmio64.dsl new file +36 -0
new file mode 100644
index 0000000000..79be440f72

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/MCFG.numamem new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..79ceb27a038c6e29d098b98dda2e229495f96b7c
GIT binary patch
tests/data/acpi/q35/MCFG.numamem.dsl new file +36 -0
new file mode 100644
index 0000000000..30b37074d3

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/MCFG.tis new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..79ceb27a038c6e29d098b98dda2e229495f96b7c
GIT binary patch
tests/data/acpi/q35/MCFG.tis.dsl new file +36 -0
new file mode 100644
index 0000000000..0a92d698e9

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/NFIT.dimmpxm.dsl new file +115 -0

115 lines not on this page · raw message

tests/data/acpi/q35/NFIT.dsl new file +115 -0

115 lines not on this page · raw message

tests/data/acpi/q35/SLIT.cphp.dsl new file +31 -0
new file mode 100644
index 0000000000..cb7347fbd4

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/SLIT.dsl new file +31 -0
new file mode 100644
index 0000000000..89c381bdd0

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/SLIT.memhp.dsl new file +31 -0
new file mode 100644
index 0000000000..70b233c0e6

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/SRAT.acpihmat.dsl new file +137 -0

137 lines not on this page · raw message

tests/data/acpi/q35/SRAT.cphp.dsl new file +168 -0

168 lines not on this page · raw message

tests/data/acpi/q35/SRAT.dimmpxm.dsl new file +194 -0

194 lines not on this page · raw message

tests/data/acpi/q35/SRAT.dsl new file +108 -0

108 lines not on this page · raw message

tests/data/acpi/q35/SRAT.memhp.dsl new file +125 -0

125 lines not on this page · raw message

tests/data/acpi/q35/SRAT.mmio64.dsl new file +108 -0

108 lines not on this page · raw message

tests/data/acpi/q35/SRAT.numamem.dsl new file +108 -0

108 lines not on this page · raw message

tests/data/acpi/q35/SSDT.dsl new file +205 -0

205 lines not on this page · raw message

tests/data/acpi/q35/TPM2.dsl new file +38 -0
new file mode 100644
index 0000000000..8568152ccf

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/TPM2.tis.dsl new file +38 -0
new file mode 100644
index 0000000000..420643ab2b

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/WAET.acpihmat new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..c2240f58dff6b2f765386b5a2e506fda4800be3e
GIT binary patch
tests/data/acpi/q35/WAET.acpihmat.dsl new file +31 -0
new file mode 100644
index 0000000000..12a4fced5c

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/WAET.bridge new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..c2240f58dff6b2f765386b5a2e506fda4800be3e
GIT binary patch
tests/data/acpi/q35/WAET.bridge.dsl new file +31 -0
new file mode 100644
index 0000000000..48effe4c6e

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/WAET.cphp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..c2240f58dff6b2f765386b5a2e506fda4800be3e
GIT binary patch
tests/data/acpi/q35/WAET.cphp.dsl new file +31 -0
new file mode 100644
index 0000000000..aadebd53e8

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/WAET.dimmpxm new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..c2240f58dff6b2f765386b5a2e506fda4800be3e
GIT binary patch
tests/data/acpi/q35/WAET.dimmpxm.dsl new file +31 -0
new file mode 100644
index 0000000000..7ad316b118

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/WAET.dsl new file +31 -0
new file mode 100644
index 0000000000..b48db4efca

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/WAET.ipmibt new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..c2240f58dff6b2f765386b5a2e506fda4800be3e
GIT binary patch
tests/data/acpi/q35/WAET.ipmibt.dsl new file +31 -0
new file mode 100644
index 0000000000..40cb1d5649

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/WAET.memhp new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..c2240f58dff6b2f765386b5a2e506fda4800be3e
GIT binary patch
tests/data/acpi/q35/WAET.memhp.dsl new file +31 -0
new file mode 100644
index 0000000000..e27f54d4dd

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/WAET.mmio64 new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..c2240f58dff6b2f765386b5a2e506fda4800be3e
GIT binary patch
tests/data/acpi/q35/WAET.mmio64.dsl new file +31 -0
new file mode 100644
index 0000000000..98f3aaf569

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/WAET.numamem new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..c2240f58dff6b2f765386b5a2e506fda4800be3e
GIT binary patch
tests/data/acpi/q35/WAET.numamem.dsl new file +31 -0
new file mode 100644
index 0000000000..738c75ca6c

Lines of this file are not shown. View the raw message.

tests/data/acpi/q35/WAET.tis new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..c2240f58dff6b2f765386b5a2e506fda4800be3e
GIT binary patch
tests/data/acpi/q35/WAET.tis.dsl new file +31 -0
new file mode 100644
index 0000000000..869ebe2b4a

Lines of this file are not shown. View the raw message.

tests/data/acpi/virt/APIC.dsl new file +78 -0

78 lines not on this page · raw message

tests/data/acpi/virt/APIC.memhp.dsl new file +78 -0

78 lines not on this page · raw message

tests/data/acpi/virt/APIC.numamem.dsl new file +78 -0

78 lines not on this page · raw message

tests/data/acpi/virt/DSDT.dsl new file +1906 -0

1,906 lines not on this page · raw message

tests/data/acpi/virt/DSDT.memhp.dsl new file +2215 -0

2,215 lines not on this page · raw message

tests/data/acpi/virt/DSDT.numamem.dsl new file +1906 -0

1,906 lines not on this page · raw message

tests/data/acpi/virt/FACP.dsl new file +196 -0

196 lines not on this page · raw message

tests/data/acpi/virt/FACP.memhp.dsl new file +196 -0

196 lines not on this page · raw message

tests/data/acpi/virt/FACP.numamem.dsl new file +196 -0

196 lines not on this page · raw message

tests/data/acpi/virt/GTDT.dsl new file +61 -0

61 lines not on this page · raw message

tests/data/acpi/virt/GTDT.memhp.dsl new file +61 -0

61 lines not on this page · raw message

tests/data/acpi/virt/GTDT.numamem.dsl new file +61 -0

61 lines not on this page · raw message

tests/data/acpi/virt/MCFG.dsl new file +36 -0
new file mode 100644
index 0000000000..f09c86f487

Lines of this file are not shown. View the raw message.

tests/data/acpi/virt/MCFG.memhp.dsl new file +36 -0
new file mode 100644
index 0000000000..b03a6384e8

Lines of this file are not shown. View the raw message.

tests/data/acpi/virt/MCFG.numamem.dsl new file +36 -0
new file mode 100644
index 0000000000..303df803f5

Lines of this file are not shown. View the raw message.

tests/data/acpi/virt/NFIT.dsl new file +103 -0

103 lines not on this page · raw message

tests/data/acpi/virt/NFIT.memhp.dsl new file +103 -0

103 lines not on this page · raw message

tests/data/acpi/virt/SLIT.dsl new file +31 -0
new file mode 100644
index 0000000000..34276fca96

Lines of this file are not shown. View the raw message.

tests/data/acpi/virt/SLIT.memhp.dsl new file +31 -0
new file mode 100644
index 0000000000..a17f948af2

Lines of this file are not shown. View the raw message.

tests/data/acpi/virt/SPCR.dsl new file +57 -0

57 lines not on this page · raw message

tests/data/acpi/virt/SPCR.memhp.dsl new file +57 -0

57 lines not on this page · raw message

tests/data/acpi/virt/SPCR.numamem.dsl new file +57 -0

57 lines not on this page · raw message

tests/data/acpi/virt/SRAT.dsl new file +57 -0

57 lines not on this page · raw message

tests/data/acpi/virt/SRAT.memhp.dsl new file +107 -0

107 lines not on this page · raw message

tests/data/acpi/virt/SRAT.numamem.dsl new file +57 -0

57 lines not on this page · raw message

tests/data/acpi/virt/SSDT.dsl new file +205 -0

205 lines not on this page · raw message

tests/data/uefi-boot-images/bios-tables-test.x86_64.iso.raw new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..bd43ba50a3b25bdf4108cf920a26acc93cc45555
GIT binary patch
tests/libqtest.c.orig new file +1106 -0

1,106 lines not on this page · raw message

tests/qemu-iotests/core.12067 new file binary +0 -0
new file mode 100644
index 0000000000000000000000000000000000000000..0ddb68f76aacbf14f48ba13b2ce9d4d52fab0ebf
GIT binary patch
tests/qtest/bios-tables-test-allowed-diff.h.orig new file +18 -0
new file mode 100644
index 0000000000..6a052c5044

Lines of this file are not shown. View the raw message.

tests/qtest/bios-tables-test-allowed-diff.h.rej new file +9 -0
new file mode 100644
index 0000000000..31b3352111

Lines of this file are not shown. View the raw message.

tests/qtest/bios-tables-test.c.orig new file +1200 -0

1,200 lines not on this page · raw message

tests/qtest/bios-tables-test.c.rej new file +22 -0
new file mode 100644
index 0000000000..aacd6ae220

Lines of this file are not shown. View the raw message.

tests/vhost-user-bridge new file binary +0 -0
new file mode 100755
index 0000000000000000000000000000000000000000..36d1ece0dc8a198846c3a8bf277c1f7d093736f5
GIT binary patch
tests/vhost-user-bridge.c.orig new file +1432 -0

1,432 lines not on this page · raw message

tests/vhost-user-test.c.orig new file +364 -0

364 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
MST

Part of the diff is not shown here. View the raw message.

#50 lore raw

[PULL v4 47/48] libvhost-user: return early on virtqueue errors

In reply to Michael S. Tsirkin

From: Stefan Hajnoczi <[email protected]>

vu_panic() is not guaranteed to exit the program. Return early when errors are encountered.

Note that libvhost-user does not have an "unmap" operation for mapped descriptors. Therefore it is correct to return without explicit cleanup.

Message-Id: <[email protected]>

---
 contrib/libvhost-user/libvhost-user.c | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)
contrib/libvhost-user/libvhost-user.c +17 -8
index 70055c98b7..4ebfa4cc40 100644
@@ -2416,7 +2416,7 @@ vu_queue_set_notification(VuDev *dev, VuVirtq *vq, int enable)
     }
 }
 
-static void
+static bool
 virtqueue_map_desc(VuDev *dev,
                    unsigned int *p_num_sg, struct iovec *iov,
                    unsigned int max_num_sg, bool is_write,
@@ -2428,7 +2428,7 @@ virtqueue_map_desc(VuDev *dev,
 
     if (!sz) {
         vu_panic(dev, "virtio: zero sized buffers are not allowed");
-        return;
+        return false;
     }
 
     while (sz) {
@@ -2436,13 +2436,13 @@ virtqueue_map_desc(VuDev *dev,
 
         if (num_sg == max_num_sg) {
             vu_panic(dev, "virtio: too many descriptors in indirect table");
-            return;
+            return false;
         }
 
         iov[num_sg].iov_base = vu_gpa_to_va(dev, &len, pa);
         if (iov[num_sg].iov_base == NULL) {
             vu_panic(dev, "virtio: invalid address for buffers");
-            return;
+            return false;
         }
         iov[num_sg].iov_len = len;
         num_sg++;
@@ -2451,6 +2451,7 @@ virtqueue_map_desc(VuDev *dev,
     }
 
     *p_num_sg = num_sg;
+    return true;
 }
 
 static void *
@@ -2488,6 +2489,7 @@ vu_queue_map_desc(VuDev *dev, VuVirtq *vq, unsigned int idx, size_t sz)
     if (lduw_le_p(&desc[i].flags) & VRING_DESC_F_INDIRECT) {
         if (ldl_le_p(&desc[i].len) % sizeof(struct vring_desc)) {
             vu_panic(dev, "Invalid size for indirect buffer table");
+            return NULL;
         }
 
         /* loop over the indirect descriptor table */
@@ -2515,22 +2517,29 @@ vu_queue_map_desc(VuDev *dev, VuVirtq *vq, unsigned int idx, size_t sz)
     /* Collect all the descriptors */
     do {
         if (lduw_le_p(&desc[i].flags) & VRING_DESC_F_WRITE) {
-            virtqueue_map_desc(dev, &in_num, iov + out_num,
+            if (!virtqueue_map_desc(dev, &in_num, iov + out_num,
                                VIRTQUEUE_MAX_SIZE - out_num, true,
-                               ldq_le_p(&desc[i].addr), ldl_le_p(&desc[i].len));
+                               ldq_le_p(&desc[i].addr),
+                               ldl_le_p(&desc[i].len))) {
+                return NULL;
+            }
         } else {
             if (in_num) {
                 vu_panic(dev, "Incorrect order for descriptors");
                 return NULL;
             }
-            virtqueue_map_desc(dev, &out_num, iov,
+            if (!virtqueue_map_desc(dev, &out_num, iov,
                                VIRTQUEUE_MAX_SIZE, false,
-                               ldq_le_p(&desc[i].addr), ldl_le_p(&desc[i].len));
+                               ldq_le_p(&desc[i].addr),
+                               ldl_le_p(&desc[i].len))) {
+                return NULL;
+            }
         }
 
         /* If we've got too many, that implies a descriptor loop. */
         if ((in_num + out_num) > max) {
             vu_panic(dev, "Looped descriptor");
+            return NULL;
         }
         rc = virtqueue_read_next_desc(dev, desc, i, max, &i);
     } while (rc == VIRTQUEUE_READ_DESC_MORE);
Signature · 1 line
MST
#51 lore raw

[PULL v4 48/48] libvhost-user: return on error in vu_log_queue_fill()

In reply to Michael S. Tsirkin

From: Stefan Hajnoczi <[email protected]>

vu_panic() is not guaranteed to exit the program. Return early when errors are encountered.

Message-Id: <[email protected]>

---
 contrib/libvhost-user/libvhost-user.c | 1 +
 1 file changed, 1 insertion(+)
contrib/libvhost-user/libvhost-user.c +1 -0
index 4ebfa4cc40..9f1285b8a1 100644
@@ -2733,6 +2733,7 @@ vu_log_queue_fill(VuDev *dev, VuVirtq *vq,
     if (lduw_le_p(&desc[i].flags) & VRING_DESC_F_INDIRECT) {
         if (ldl_le_p(&desc[i].len) % sizeof(struct vring_desc)) {
             vu_panic(dev, "Invalid size for indirect buffer table");
+            return;
         }
 
         /* loop over the indirect descriptor table */
Signature · 1 line
MST
#52 lore raw

[PULL v4 12/48] virtio-pmem-pci: force virtio version 1

In reply to Michael S. Tsirkin

From: Pankaj Gupta <[email protected]>

Qemu fails with below error when trying to run with virtio pmem:

(qemu) qemu-system-x86_64: -device virtio-pmem-pci,memdev=mem1,id=nv1:
device is modern-only, use disable-legacy=on

This patch fixes this by forcing virtio 1 with virtio-pmem.

Fixes adf0748a49 ("virtio-pci: Proxy for virtio-pmem")

Message-Id: <[email protected]>

---
 hw/virtio/virtio-pmem-pci.c | 1 +
 1 file changed, 1 insertion(+)
hw/virtio/virtio-pmem-pci.c +1 -0
index 21a457d151..2b2a0b1eae 100644
@@ -22,6 +22,7 @@ static void virtio_pmem_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
     VirtIOPMEMPCI *pmem_pci = VIRTIO_PMEM_PCI(vpci_dev);
     DeviceState *vdev = DEVICE(&pmem_pci->vdev);
 
+    virtio_pci_force_virtio_1(vpci_dev);
     qdev_realize(vdev, BUS(&vpci_dev->bus), errp);
 }
 
Signature · 1 line
MST
#53 lore raw

[PULL v4 23/48] x86: cpuhp: refuse cpu hot-unplug request earlier if not supported

In reply to Michael S. Tsirkin

From: Igor Mammedov <[email protected]>

CPU hot-unplug with SMM requires firmware participation to prevent guest crash (i.e. CPU can be removed only after OS _and_ firmware were prepared for the action).
Previous patches introduced ICH9_LPC_SMI_F_CPU_HOT_UNPLUG_BIT feature bit, which is advertised by firmware when it has support for CPU hot-unplug. Use it to check if guest is able to handle unplug and make device_del fail gracefully if hot-unplug feature hasn't been negotiated.

Message-Id: <[email protected]>

---
 hw/acpi/ich9.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)
hw/acpi/ich9.c +12 -0
index 0acc9a3107..95cb0f935b 100644
@@ -460,6 +460,18 @@ void ich9_pm_device_unplug_request_cb(HotplugHandler *hotplug_dev,
                                       errp);
     } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU) &&
                !lpc->pm.cpu_hotplug_legacy) {
+        uint64_t negotiated = lpc->smi_negotiated_features;
+
+        if (negotiated & BIT_ULL(ICH9_LPC_SMI_F_BROADCAST_BIT) &&
+            !(negotiated & BIT_ULL(ICH9_LPC_SMI_F_CPU_HOT_UNPLUG_BIT))) {
+            error_setg(errp, "cpu hot-unplug with SMI wasn't enabled "
+                             "by firmware");
+            error_append_hint(errp, "update machine type to a version having "
+                                    "x-smi-cpu-hotunplug=on and firmware that "
+                                    "supports CPU hot-unplug with SMM");
+            return;
+        }
+
         acpi_cpu_unplug_request_cb(hotplug_dev, &lpc->pm.cpuhp_state,
                                    dev, errp);
     } else {
Signature · 1 line
MST
#54 lore raw

[PULL v4 30/48] tests: acpi: update acpi blobs with new AML

In reply to Michael S. Tsirkin

From: Igor Mammedov <[email protected]>

here is diff against tests/data/acpi/q35/DSDT
for currently shipped ovmf binary.
(once firmware blob is updated, it will negotiate CPU hotplug feature which will ad extra hunk sending SMI and Q35 tests will need to be updated), but otherwise diff shows new CPU hotplug AML that is shared between q35 and pc machines.

             Method (CSCN, 0, Serialized)
             {
                 Acquire (\_SB.PCI0.PRES.CPLK, 0xFFFF)
-                Local0 = One
-                While ((Local0 == One))
-                {
-                    Local0 = Zero
-                    \_SB.PCI0.PRES.CCMD = Zero
-                    If ((\_SB.PCI0.PRES.CINS == One))
+                Name (CNEW, Package (0xFF){})
+                Local3 = Zero
+                Local4 = One
+                While ((Local4 == One))
+                {
+                    Local4 = Zero
+                    Local0 = One
+                    Local1 = Zero
+                    While (((Local0 == One) && (Local3 < One)))
                     {
-                        CTFY (\_SB.PCI0.PRES.CDAT, One)
-                        \_SB.PCI0.PRES.CINS = One
-                        Local0 = One
+                        Local0 = Zero
+                        \_SB.PCI0.PRES.CSEL = Local3
+                        \_SB.PCI0.PRES.CCMD = Zero
+                        If ((\_SB.PCI0.PRES.CDAT < Local3))
+                        {

+ Break
+ }
+
+ If ((Local1 == 0xFF))
+ {
+ Local4 = One
+ Break
+ }
+

+                        Local3 = \_SB.PCI0.PRES.CDAT
+                        If ((\_SB.PCI0.PRES.CINS == One))
+                        {
+                            CNEW [Local1] = Local3
+                            Local1++
+                            Local0 = One
+                        }
+                        ElseIf ((\_SB.PCI0.PRES.CRMV == One))
+                        {
+                            CTFY (Local3, 0x03)
+                            \_SB.PCI0.PRES.CRMV = One
+                            Local0 = One
+                        }
+
+                        Local3++
                     }

- ElseIf ((\_SB.PCI0.PRES.CRMV == One))
+
+ Local2 = Zero
+ While ((Local2 < Local1))

                     {
-                        CTFY (\_SB.PCI0.PRES.CDAT, 0x03)
-                        \_SB.PCI0.PRES.CRMV = One
-                        Local0 = One
+                        Local3 = DerefOf (CNEW [Local2])
+                        CTFY (Local3, One)
+                        Debug = Local3
+                        \_SB.PCI0.PRES.CSEL = Local3
+                        \_SB.PCI0.PRES.CINS = One
+                        Local2++
                     }
                 }

Message-Id: <[email protected]>

---
 tests/qtest/bios-tables-test-allowed-diff.h |  19 -------------------
 tests/data/acpi/pc/DSDT                     | Bin 4934 -> 5060 bytes
 tests/data/acpi/pc/DSDT.acpihmat            | Bin 6258 -> 6385 bytes
 tests/data/acpi/pc/DSDT.bridge              | Bin 6793 -> 6919 bytes
 tests/data/acpi/pc/DSDT.cphp                | Bin 5397 -> 5524 bytes
 tests/data/acpi/pc/DSDT.dimmpxm             | Bin 6587 -> 6714 bytes
 tests/data/acpi/pc/DSDT.ipmikcs             | Bin 5006 -> 5132 bytes
 tests/data/acpi/pc/DSDT.memhp               | Bin 6293 -> 6419 bytes
 tests/data/acpi/pc/DSDT.numamem             | Bin 4940 -> 5066 bytes
 tests/data/acpi/q35/DSDT                    | Bin 7678 -> 7804 bytes
 tests/data/acpi/q35/DSDT.acpihmat           | Bin 9002 -> 9129 bytes
 tests/data/acpi/q35/DSDT.bridge             | Bin 7695 -> 7821 bytes
 tests/data/acpi/q35/DSDT.cphp               | Bin 8141 -> 8268 bytes
 tests/data/acpi/q35/DSDT.dimmpxm            | Bin 9331 -> 9458 bytes
 tests/data/acpi/q35/DSDT.ipmibt             | Bin 7753 -> 7879 bytes
 tests/data/acpi/q35/DSDT.memhp              | Bin 9037 -> 9163 bytes
 tests/data/acpi/q35/DSDT.mmio64             | Bin 8808 -> 8934 bytes
 tests/data/acpi/q35/DSDT.numamem            | Bin 7684 -> 7810 bytes
 tests/data/acpi/q35/DSDT.tis                | Bin 8283 -> 8409 bytes
 19 files changed, 19 deletions(-)
tests/qtest/bios-tables-test-allowed-diff.h +0 -19
index dba32d5613..dfb8523c8b 100644
@@ -1,20 +1 @@
 /* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/pc/DSDT",
-"tests/data/acpi/q35/DSDT",
-"tests/data/acpi/q35/DSDT.tis",
-"tests/data/acpi/q35/DSDT.bridge",
-"tests/data/acpi/q35/DSDT.mmio64",
-"tests/data/acpi/q35/DSDT.ipmibt",
-"tests/data/acpi/q35/DSDT.cphp",
-"tests/data/acpi/q35/DSDT.memhp",
-"tests/data/acpi/q35/DSDT.numamem",
-"tests/data/acpi/q35/DSDT.dimmpxm",
-"tests/data/acpi/q35/DSDT.acpihmat",
-"tests/data/acpi/pc/DSDT.bridge",
-"tests/data/acpi/pc/DSDT.ipmikcs",
-"tests/data/acpi/pc/DSDT.cphp",
-"tests/data/acpi/pc/DSDT.memhp",
-"tests/data/acpi/pc/DSDT.numamem",
-"tests/data/acpi/pc/DSDT.dimmpxm",
-"tests/data/acpi/pc/DSDT.acpihmat",
-"tests/data/acpi/pc/DSDT.acpihmat",
tests/data/acpi/pc/DSDT binary +0 -0
index b121bb5bc124be522e233516efb17cdc94de5a75..4ca46e5a2bdb1dfab79dd8630aeeb9a386d8b30e 100644
GIT binary patch
tests/data/acpi/pc/DSDT.acpihmat binary +0 -0
index b0dbb943f4cea83a5adde23aefa54f1678c560a1..35a74bce8cc152ecb615cb38c4b7f63c7c7d3ab3 100644
GIT binary patch
tests/data/acpi/pc/DSDT.bridge binary +0 -0
index 7b6c7a47875fc73b03fbe88807890f3867ddba1a..803d7a8e839ea8b7ac33c4490459ddaede584269 100644
GIT binary patch
tests/data/acpi/pc/DSDT.cphp binary +0 -0
index c0e8aa5b32d84f39e5d6c9a5024505f818707c12..8bab2f506409f2b025a63d8b91c7bfdaa931e626 100644
GIT binary patch
tests/data/acpi/pc/DSDT.dimmpxm binary +0 -0
index 1649953b6cccb933e4a440dc56507dc9197c4a8a..e015b4594c96a6e0f34c0668e3383b9a91dff38e 100644
GIT binary patch
tests/data/acpi/pc/DSDT.ipmikcs binary +0 -0
index 92748d49dcd418e4a734da47e8d5c0268aedfc29..ca6630e39f60ebd5c056f57c4c03fdb9d5467577 100644
GIT binary patch
tests/data/acpi/pc/DSDT.memhp binary +0 -0
index 4026772906e910af514beb76de6e4cca0bc2171b..43f4e114e2cc48c68c35af47303fa87c9255db40 100644
GIT binary patch
tests/data/acpi/pc/DSDT.numamem binary +0 -0
index 4d9ba337a82954af094e739b8a83467f89a37cc0..ba8f7e6c33f9eb0f7a080144fcb4a27d36aa04ae 100644
GIT binary patch
tests/data/acpi/q35/DSDT binary +0 -0
index bba8884073a27427b88ac0d733c9c87330a59366..d6c26940b1a68d4184f6f2335924099aa28b130a 100644
GIT binary patch
tests/data/acpi/q35/DSDT.acpihmat binary +0 -0
index 9cac92418b5fcc2767dc74603d599642b59623fe..2b67045d6add69574499b97d938cca01949231b4 100644
GIT binary patch
tests/data/acpi/q35/DSDT.bridge binary +0 -0
index f08b7245f59aad491fcaa60e2bab1085c369ea1c..0f6c9c68c81cddd2126eea8a7c336b8667202223 100644
GIT binary patch
tests/data/acpi/q35/DSDT.cphp binary +0 -0
index 57d859cef9fa16a8f125c4b338611c8472699f38..d7bedee7ff638f11b3bb84ef960364b409a49cce 100644
GIT binary patch
tests/data/acpi/q35/DSDT.dimmpxm binary +0 -0
index 9d5bd5744e2ba2e0f6126c3aba0bb36af865e499..13e80ae2e5c7606a7260d4cb3ab776488d0697d6 100644
GIT binary patch
tests/data/acpi/q35/DSDT.ipmibt binary +0 -0
index 5cd11de6a8fe47324e5f922823a22746882f19f5..9a1b635dab776fb25e378a00e6ca0cadf9902c25 100644
GIT binary patch
tests/data/acpi/q35/DSDT.memhp binary +0 -0
index 05a7a73ec43130d5c3018bb462fd84981bfb151c..55ce4e2293624c2c0725c3bbaaa7ec29acfccfc9 100644
GIT binary patch
tests/data/acpi/q35/DSDT.mmio64 binary +0 -0
index efd3f1188f2b55da1514212d4be081a61c2a96e9..99b7b2ae4ba36b8ca7901626c1561d29100087d2 100644
GIT binary patch
tests/data/acpi/q35/DSDT.numamem binary +0 -0
index 1978b55f1255402bf9bade0b91150b5cb49789a4..2b2433cc13ec3110abbc8440a0b1ad8c487edb6c 100644
GIT binary patch
tests/data/acpi/q35/DSDT.tis binary +0 -0
index 638de3872673d17b1958497d0e62c83653de1602..dd06ee4c348930b0684827ca05747b4f65dbd6b2 100644
GIT binary patch
Signature · 1 line
MST
#55 lore raw
In reply to Michael S. Tsirkin
Patchew URL: https://patchew.org/QEMU/[email protected]/

Patchew URL: https://patchew.org/QEMU/[email protected]/

Hi,

This series seems to have some coding style problems. See output below for more information:

Type: series
Message-id: [email protected]
Subject: [PULL v4 00/48] virtio,pc,acpi: fixes, tests

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

From https://github.com/patchew-project/qemu
* [new tag] patchew/[email protected] -> patchew/[email protected]
Switched to a new branch 'test'
8faf4c1 libvhost-user: return on error in vu_log_queue_fill()
7755613 libvhost-user: return early on virtqueue errors
213edc5 hw: virtio-pmem: detach the element fromt the virtqueue when error occurs cda2006 tests/acpi: update golden master DSDT binary table blobs for q35 e6d3dfc piix4: don't reserve hw resources when hotplug is off globally 1063408 Add ACPI DSDT tables for q35 that are being updated by the next patch 3fbd4aa tests/acpi: add newly added acpi DSDT table blob for pci bridge hotplug flag 9abab80 tests/acpi: unit test for 'acpi-pci-hotplug-with-bridge-support' bridge flag 74bfb00 tests/acpi: list added acpi table binary file for pci bridge hotplug test 629eb05 i440fx/acpi: do not add hotplug related amls for cold plugged bridges 4eb9af4 Fix a gap where acpi_pcihp_find_hotplug_bus() returns a non-hotpluggable bus 0d18f5f tests/acpi: add a new ACPI table in order to test root pci hotplug on/off b60dbf6 tests/acpi: add new unit test to test hotplug off/on feature on the root pci bus 03f41c1 tests/acpi: mark addition of table DSDT.roothp for unit testing root pci hotplug 22d490b vhost-user: save features of multiqueues if chardev is closed
dd6397f qemu-options: document SMBIOS type 11 settings
be08877 hw/smbios: report error if table size is too large
9356e5c hw/smbios: support loading OEM strings values from a file
0cab92d tests: acpi: update acpi blobs with new AML
80a8f41 x68: acpi: trigger SMI before sending hotplug Notify event to OSPM fdb1c57 x86: acpi: introduce the PCI0.SMI0 ACPI device
289214b x86: acpi: introduce AcpiPmInfo::smi_on_cpuhp
0aa4ef3 x86: ich9: expose "smi_negotiated_features" as a QOM property
396eade tests: acpi: mark to be changed tables in bios-tables-test-allowed-diff c3ad1d9 acpi: add aml_land() and aml_break() primitives
1a4174c x86: cpuhp: refuse cpu hot-unplug request earlier if not supported d3430c3 x86: cpuhp: prevent guest crash on CPU hotplug when broadcast SMI is in use ef6eae6 x86: lpc9: let firmware negotiate 'CPU hotplug with SMI' features 0dc5e2f virtio: update MemoryRegionCaches when guest set bad features
2eb7962 vhost-vsock-ccw: force virtio version 1
8a17dc6 vhost-user-vsock-pci: force virtio version 1
9cce71d vhost-vsock-pci: force virtio version 1
2f9be81 virtio: skip legacy support check on machine types less than 5.1 b6724f6 configure: Fix build dependencies with vhost-vdpa.
6009552 vhost-vdpa: add trace-events
88de0b1 util/hexdump: introduce qemu_hexdump_line()
3e5338d virtio-pmem-pci: force virtio version 1
45b3828 virtio-iommu-pci: force virtio version 1
d6c4ca5 virtio-iommu: Check gtrees are non null before destroying them 592378f cphp: remove deprecated cpu-add command(s)
71ca9ef tests/qtest/vhost-user-test: prepare the tests for adding new dev class 369b395 vhost: check queue state in the vhost_dev_set_log routine
1efaa40 vhost: recheck dev state in the vhost_migration_log routine
a84d978 pc: fix auto_enable_numa_with_memhp/auto_enable_numa_with_memdev for the 5.0 machine 7c21a29 virtio-mem: detach the element from the virtqueue when error occurs 634b24d vhost-vdpa: batch updating IOTLB mappings
c9626c9 vhost: switch to use IOTLB v2 format
95ec3ff linux headers: sync to 5.9-rc4

=== OUTPUT BEGIN ===
1/48 Checking commit 95ec3ff3afd6 (linux headers: sync to 5.9-rc4)
2/48 Checking commit c9626c9533ef (vhost: switch to use IOTLB v2 format)
3/48 Checking commit 634b24dca28e (vhost-vdpa: batch updating IOTLB mappings)
4/48 Checking commit 7c21a29dabdd (virtio-mem: detach the element from the virtqueue when error occurs) 5/48 Checking commit a84d978e98c9 (pc: fix auto_enable_numa_with_memhp/auto_enable_numa_with_memdev for the 5.0 machine) 6/48 Checking commit 1efaa40a5425 (vhost: recheck dev state in the vhost_migration_log routine)
7/48 Checking commit 369b39525b1b (vhost: check queue state in the vhost_dev_set_log routine)
8/48 Checking commit 71ca9efda220 (tests/qtest/vhost-user-test: prepare the tests for adding new dev class) 9/48 Checking commit 592378f85dbb (cphp: remove deprecated cpu-add command(s))
10/48 Checking commit d6c4ca523e90 (virtio-iommu: Check gtrees are non null before destroying them) 11/48 Checking commit 45b382853635 (virtio-iommu-pci: force virtio version 1)
12/48 Checking commit 3e5338d41957 (virtio-pmem-pci: force virtio version 1)
13/48 Checking commit 88de0b1a3204 (util/hexdump: introduce qemu_hexdump_line())
14/48 Checking commit 600955249473 (vhost-vdpa: add trace-events)
15/48 Checking commit b6724f619409 (configure: Fix build dependencies with vhost-vdpa.)
16/48 Checking commit 2f9be819901a (virtio: skip legacy support check on machine types less than 5.1) 17/48 Checking commit 9cce71d9be4f (vhost-vsock-pci: force virtio version 1)
18/48 Checking commit 8a17dc630f04 (vhost-user-vsock-pci: force virtio version 1)
19/48 Checking commit 2eb7962be08e (vhost-vsock-ccw: force virtio version 1)
20/48 Checking commit 0dc5e2f7d63b (virtio: update MemoryRegionCaches when guest set bad features) 21/48 Checking commit ef6eae68bd24 (x86: lpc9: let firmware negotiate 'CPU hotplug with SMI' features) 22/48 Checking commit d3430c31fa92 (x86: cpuhp: prevent guest crash on CPU hotplug when broadcast SMI is in use) 23/48 Checking commit 1a4174c05a04 (x86: cpuhp: refuse cpu hot-unplug request earlier if not supported) 24/48 Checking commit c3ad1d9c627f (acpi: add aml_land() and aml_break() primitives)
WARNING: Block comments use a leading /* on a separate line
#27: FILE: hw/acpi/aml-build.c:562:
+ Aml *var = aml_opcode(0x90 /* LAndOp */);

WARNING: Block comments use a leading /* on a separate line #43: FILE: hw/acpi/aml-build.c:644:
+ Aml *var = aml_opcode(0xa5 /* BreakOp */);

total: 0 errors, 2 warnings, 42 lines checked

Patch 24/48 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
25/48 Checking commit 396eade8a620 (tests: acpi: mark to be changed tables in bios-tables-test-allowed-diff) 26/48 Checking commit 0aa4ef3f3dc1 (x86: ich9: expose "smi_negotiated_features" as a QOM property) 27/48 Checking commit 289214bd8c4f (x86: acpi: introduce AcpiPmInfo::smi_on_cpuhp)
28/48 Checking commit fdb1c57bd2c7 (x86: acpi: introduce the PCI0.SMI0 ACPI device)
29/48 Checking commit 80a8f41d5cbd (x68: acpi: trigger SMI before sending hotplug Notify event to OSPM) 30/48 Checking commit 0cab92dce2d1 (tests: acpi: update acpi blobs with new AML)
31/48 Checking commit 9356e5c6fd0b (hw/smbios: support loading OEM strings values from a file) 32/48 Checking commit be08877a8d28 (hw/smbios: report error if table size is too large) 33/48 Checking commit dd6397f4c9dd (qemu-options: document SMBIOS type 11 settings)
34/48 Checking commit 22d490b7bc7c (vhost-user: save features of multiqueues if chardev is closed)
ERROR: spaces required around that '-' (ctx:WxV)
#44: FILE: net/vhost-user.c:238:

+    for (i = queues -1; i >= 0; i--) {
                     ^

total: 1 errors, 0 warnings, 22 lines checked

Patch 34/48 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.

35/48 Checking commit 03f41c150f3c (tests/acpi: mark addition of table DSDT.roothp for unit testing root pci hotplug) 36/48 Checking commit b60dbf6dfe1d (tests/acpi: add new unit test to test hotplug off/on feature on the root pci bus) 37/48 Checking commit 0d18f5f38d10 (tests/acpi: add a new ACPI table in order to test root pci hotplug on/off)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#574:
new file mode 100644

total: 0 errors, 1 warnings, 1 lines checked

Patch 37/48 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
38/48 Checking commit 4eb9af406754 (Fix a gap where acpi_pcihp_find_hotplug_bus() returns a non-hotpluggable bus) 39/48 Checking commit 629eb0561c20 (i440fx/acpi: do not add hotplug related amls for cold plugged bridges) 40/48 Checking commit 74bfb0010fc3 (tests/acpi: list added acpi table binary file for pci bridge hotplug test) 41/48 Checking commit 9abab8098143 (tests/acpi: unit test for 'acpi-pci-hotplug-with-bridge-support' bridge flag) 42/48 Checking commit 3fbd4aabe5f1 (tests/acpi: add newly added acpi DSDT table blob for pci bridge hotplug flag)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#605:
new file mode 100644

total: 0 errors, 1 warnings, 1 lines checked

Patch 42/48 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
43/48 Checking commit 10634089cc39 (Add ACPI DSDT tables for q35 that are being updated by the next patch) 44/48 Checking commit e6d3dfcfbd81 (piix4: don't reserve hw resources when hotplug is off globally) 45/48 Checking commit cda2006eded0 (tests/acpi: update golden master DSDT binary table blobs for q35)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#85:
new file mode 100644

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/diff-aml.sh and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/disassemle-aml.py and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/disassemle-aml.py and tests/bios-tables-test.c.orig found

ERROR: please use python3 interpreter
#2621: FILE: tests/data/acpi/disassemle-aml.py:1:
+#!/usr/bin/python

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/microvm/APIC.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/microvm/APIC.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#2652: FILE: tests/data/acpi/microvm/APIC.dsl:5:
+ * $

ERROR: trailing whitespace
#2699: FILE: tests/data/acpi/microvm/APIC.dsl:52:
+ 0000: 41 50 49 43 46 00 00 00 01 D7 42 4F 43 48 53 20 // APICF.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/microvm/DSDT.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/microvm/DSDT.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#2714: FILE: tests/data/acpi/microvm/DSDT.dsl:5:
+ * $

ERROR: trailing whitespace
#2823: FILE: tests/data/acpi/microvm/DSDT.dsl:114:
+ 0x05, $

ERROR: trailing whitespace
#2824: FILE: tests/data/acpi/microvm/DSDT.dsl:115:
+ Zero, $

ERROR: trailing whitespace
#2825: FILE: tests/data/acpi/microvm/DSDT.dsl:116:
+ Zero, $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/microvm/FACP.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/microvm/FACP.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#2841: FILE: tests/data/acpi/microvm/FACP.dsl:5:
+ * $

ERROR: trailing whitespace
#3016: FILE: tests/data/acpi/microvm/FACP.dsl:180:
+ 0000: 46 41 43 50 0C 01 00 00 05 7E 42 4F 43 48 53 20 // FACP.....~BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/APIC.acpihmat.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/APIC.acpihmat.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#3043: FILE: tests/data/acpi/pc/APIC.acpihmat.dsl:5:
+ * $

ERROR: trailing whitespace
#3143: FILE: tests/data/acpi/pc/APIC.acpihmat.dsl:105:
+ 0000: 41 50 49 43 80 00 00 00 01 DA 42 4F 43 48 53 20 // APIC......BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/APIC.bridge and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/APIC.bridge.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/APIC.bridge.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#3165: FILE: tests/data/acpi/pc/APIC.bridge.dsl:5:
+ * $

ERROR: trailing whitespace
#3257: FILE: tests/data/acpi/pc/APIC.bridge.dsl:97:
+ 0000: 41 50 49 43 78 00 00 00 01 ED 42 4F 43 48 53 20 // APICx.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/APIC.cphp.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/APIC.cphp.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#3275: FILE: tests/data/acpi/pc/APIC.cphp.dsl:5:
+ * $

ERROR: trailing whitespace
#3407: FILE: tests/data/acpi/pc/APIC.cphp.dsl:137:
+ 0000: 41 50 49 43 A0 00 00 00 01 7B 42 4F 43 48 53 20 // APIC.....{BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/APIC.dimmpxm.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/APIC.dimmpxm.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#3427: FILE: tests/data/acpi/pc/APIC.dimmpxm.dsl:5:
+ * $

ERROR: trailing whitespace
#3543: FILE: tests/data/acpi/pc/APIC.dimmpxm.dsl:121:
+ 0000: 41 50 49 43 90 00 00 00 01 AE 42 4F 43 48 53 20 // APIC......BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/APIC.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/APIC.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#3562: FILE: tests/data/acpi/pc/APIC.dsl:5:
+ * $

ERROR: trailing whitespace
#3654: FILE: tests/data/acpi/pc/APIC.dsl:97:
+ 0000: 41 50 49 43 78 00 00 00 01 ED 42 4F 43 48 53 20 // APICx.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/APIC.hpbridge and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/APIC.ipmikcs and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/APIC.ipmikcs.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/APIC.ipmikcs.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#3680: FILE: tests/data/acpi/pc/APIC.ipmikcs.dsl:5:
+ * $

ERROR: trailing whitespace
#3772: FILE: tests/data/acpi/pc/APIC.ipmikcs.dsl:97:
+ 0000: 41 50 49 43 78 00 00 00 01 ED 42 4F 43 48 53 20 // APICx.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/APIC.memhp and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/APIC.memhp.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/APIC.memhp.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#3794: FILE: tests/data/acpi/pc/APIC.memhp.dsl:5:
+ * $

ERROR: trailing whitespace
#3886: FILE: tests/data/acpi/pc/APIC.memhp.dsl:97:
+ 0000: 41 50 49 43 78 00 00 00 01 ED 42 4F 43 48 53 20 // APICx.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/APIC.numamem and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/APIC.numamem.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/APIC.numamem.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#3908: FILE: tests/data/acpi/pc/APIC.numamem.dsl:5:
+ * $

ERROR: trailing whitespace
#4000: FILE: tests/data/acpi/pc/APIC.numamem.dsl:97:
+ 0000: 41 50 49 43 78 00 00 00 01 ED 42 4F 43 48 53 20 // APICx.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/APIC.roothp and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.acpihmat.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.acpihmat.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#4022: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:5:
+ * $

ERROR: trailing whitespace
#4083: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:66:
+ VEND, 32, $

ERROR: trailing whitespace
#4187: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:170:
+ Zero, $

ERROR: trailing whitespace
#4188: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:171:
+ 0x05, $

ERROR: trailing whitespace
#4189: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:172:
+ 0x4F, $

ERROR: trailing whitespace
#4190: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:173:
+ 0x30, $

ERROR: trailing whitespace
#4191: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:174:
+ One, $

ERROR: trailing whitespace
#4192: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:175:
+ 0xAF, $

ERROR: trailing whitespace
#4193: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:176:
+ 0x02, $

ERROR: trailing whitespace
#4194: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:177:
+ 0x25, $

ERROR: trailing whitespace
#4195: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:178:
+ 0x02, $

ERROR: trailing whitespace
#4196: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:179:
+ 0x12, $

ERROR: trailing whitespace
#4197: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:180:
+ 0x1B, $

ERROR: trailing whitespace
#4198: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:181:
+ 0xFF, $

ERROR: trailing whitespace
#4199: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:182:
+ 0x6C, $

ERROR: trailing whitespace
#4200: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:183:
+ 0xF6, $

ERROR: trailing whitespace
#4201: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:184:
+ 0x0F, $

ERROR: trailing whitespace
#4272: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:255:
+ PCIU, 32, $

ERROR: trailing whitespace
#4315: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:298:
+ Zero, $

ERROR: trailing whitespace
#4316: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:299:
+ Zero, $

ERROR: trailing whitespace
#4317: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:300:
+ LNKD, $

ERROR: trailing whitespace
#4328: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:311:
+ Zero, $

ERROR: trailing whitespace
#4329: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:312:
+ Zero, $

ERROR: trailing whitespace
#4330: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:313:
+ LNKS, $

ERROR: trailing whitespace
#4338: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:321:
+ Zero, $

ERROR: trailing whitespace
#4339: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:322:
+ Zero, $

ERROR: trailing whitespace
#4340: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:323:
+ LNKA, $

ERROR: trailing whitespace
#4350: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:333:
+ Zero, $

ERROR: trailing whitespace
#4351: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:334:
+ Zero, $

ERROR: trailing whitespace
#4352: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:335:
+ LNKB, $

ERROR: trailing whitespace
#4361: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:344:
+ Zero, $

ERROR: trailing whitespace
#4362: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:345:
+ Zero, $

ERROR: trailing whitespace
#4363: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:346:
+ LNKC, $

ERROR: trailing whitespace
#4380: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:363:
+ PRQ0, 8, $

ERROR: trailing whitespace
#4381: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:364:
+ PRQ1, 8, $

ERROR: trailing whitespace
#4382: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:365:
+ PRQ2, 8, $

ERROR: trailing whitespace
#4604: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:587:
+ Offset (0x04), $

ERROR: trailing whitespace
#4605: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:588:
+ CPEN, 1, $

ERROR: trailing whitespace
#4606: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:589:
+ CINS, 1, $

ERROR: trailing whitespace
#4607: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:590:
+ CRMV, 1, $

ERROR: trailing whitespace
#4608: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:591:
+ CEJ0, 1, $

ERROR: trailing whitespace
#4609: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:592:
+ Offset (0x05), $

ERROR: trailing whitespace
#4615: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:598:
+ CSEL, 32, $

ERROR: trailing whitespace
#4616: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:599:
+ Offset (0x08), $

ERROR: trailing whitespace
#4774: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:757:
+ MRBL, 32, $

ERROR: trailing whitespace
#4775: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:758:
+ MRBH, 32, $

ERROR: trailing whitespace
#4776: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:759:
+ MRLL, 32, $

ERROR: trailing whitespace
#4777: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:760:
+ MRLH, 32, $

ERROR: trailing whitespace
#4783: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:766:
+ Offset (0x14), $

ERROR: trailing whitespace
#4784: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:767:
+ MES, 1, $

ERROR: trailing whitespace
#4785: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:768:
+ MINS, 1, $

ERROR: trailing whitespace
#4786: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:769:
+ MRMV, 1, $

ERROR: trailing whitespace
#4792: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:775:
+ MSEL, 32, $

ERROR: trailing whitespace
#4793: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:776:
+ MOEV, 32, $

ERROR: trailing whitespace
#5121: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:1104:
+ One, $

ERROR: trailing whitespace
#5122: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:1105:
+ One, $

ERROR: trailing whitespace
#5123: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:1106:
+ Zero, $

ERROR: trailing whitespace
#5128: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:1111:
+ 0x02, $

ERROR: trailing whitespace
#5129: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:1112:
+ 0x02, $

ERROR: trailing whitespace
#5130: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:1113:
+ Zero, $

ERROR: trailing whitespace
#5135: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:1118:
+ Zero, $

ERROR: trailing whitespace
#5136: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:1119:
+ Zero, $

ERROR: trailing whitespace
#5137: FILE: tests/data/acpi/pc/DSDT.acpihmat.dsl:1120:
+ Zero, $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.bridge.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.bridge.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#5647: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:5:
+ * $

ERROR: trailing whitespace
#5708: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:66:
+ VEND, 32, $

ERROR: trailing whitespace
#5812: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:170:
+ Zero, $

ERROR: trailing whitespace
#5813: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:171:
+ 0x05, $

ERROR: trailing whitespace
#5814: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:172:
+ 0x4F, $

ERROR: trailing whitespace
#5815: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:173:
+ 0x30, $

ERROR: trailing whitespace
#5816: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:174:
+ One, $

ERROR: trailing whitespace
#5817: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:175:
+ 0xAF, $

ERROR: trailing whitespace
#5818: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:176:
+ 0x02, $

ERROR: trailing whitespace
#5819: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:177:
+ 0x25, $

ERROR: trailing whitespace
#5820: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:178:
+ 0x02, $

ERROR: trailing whitespace
#5821: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:179:
+ 0x12, $

ERROR: trailing whitespace
#5822: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:180:
+ 0x1B, $

ERROR: trailing whitespace
#5823: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:181:
+ 0xFF, $

ERROR: trailing whitespace
#5824: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:182:
+ 0x6C, $

ERROR: trailing whitespace
#5825: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:183:
+ 0xF6, $

ERROR: trailing whitespace
#5826: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:184:
+ 0x0F, $

ERROR: trailing whitespace
#5897: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:255:
+ PCIU, 32, $

ERROR: trailing whitespace
#5940: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:298:
+ Zero, $

ERROR: trailing whitespace
#5941: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:299:
+ Zero, $

ERROR: trailing whitespace
#5942: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:300:
+ LNKD, $

ERROR: trailing whitespace
#5953: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:311:
+ Zero, $

ERROR: trailing whitespace
#5954: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:312:
+ Zero, $

ERROR: trailing whitespace
#5955: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:313:
+ LNKS, $

ERROR: trailing whitespace
#5963: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:321:
+ Zero, $

ERROR: trailing whitespace
#5964: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:322:
+ Zero, $

ERROR: trailing whitespace
#5965: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:323:
+ LNKA, $

ERROR: trailing whitespace
#5975: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:333:
+ Zero, $

ERROR: trailing whitespace
#5976: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:334:
+ Zero, $

ERROR: trailing whitespace
#5977: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:335:
+ LNKB, $

ERROR: trailing whitespace
#5986: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:344:
+ Zero, $

ERROR: trailing whitespace
#5987: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:345:
+ Zero, $

ERROR: trailing whitespace
#5988: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:346:
+ LNKC, $

ERROR: trailing whitespace
#6005: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:363:
+ PRQ0, 8, $

ERROR: trailing whitespace
#6006: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:364:
+ PRQ1, 8, $

ERROR: trailing whitespace
#6007: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:365:
+ PRQ2, 8, $

ERROR: trailing whitespace
#6229: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:587:
+ Offset (0x04), $

ERROR: trailing whitespace
#6230: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:588:
+ CPEN, 1, $

ERROR: trailing whitespace
#6231: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:589:
+ CINS, 1, $

ERROR: trailing whitespace
#6232: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:590:
+ CRMV, 1, $

ERROR: trailing whitespace
#6233: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:591:
+ CEJ0, 1, $

ERROR: trailing whitespace
#6234: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:592:
+ Offset (0x05), $

ERROR: trailing whitespace
#6240: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:598:
+ CSEL, 32, $

ERROR: trailing whitespace
#6241: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:599:
+ Offset (0x08), $

ERROR: trailing whitespace
#6446: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:804:
+ One, $

ERROR: trailing whitespace
#6447: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:805:
+ One, $

ERROR: trailing whitespace
#6448: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:806:
+ Zero, $

ERROR: trailing whitespace
#6453: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:811:
+ 0x02, $

ERROR: trailing whitespace
#6454: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:812:
+ 0x02, $

ERROR: trailing whitespace
#6455: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:813:
+ Zero, $

ERROR: trailing whitespace
#6460: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:818:
+ Zero, $

ERROR: trailing whitespace
#6461: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:819:
+ Zero, $

ERROR: trailing whitespace
#6462: FILE: tests/data/acpi/pc/DSDT.bridge.dsl:820:
+ Zero, $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.cphp.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.cphp.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#7453: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:5:
+ * $

ERROR: trailing whitespace
#7514: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:66:
+ VEND, 32, $

ERROR: trailing whitespace
#7618: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:170:
+ Zero, $

ERROR: trailing whitespace
#7619: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:171:
+ 0x05, $

ERROR: trailing whitespace
#7620: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:172:
+ 0x4F, $

ERROR: trailing whitespace
#7621: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:173:
+ 0x30, $

ERROR: trailing whitespace
#7622: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:174:
+ One, $

ERROR: trailing whitespace
#7623: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:175:
+ 0xAF, $

ERROR: trailing whitespace
#7624: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:176:
+ 0x02, $

ERROR: trailing whitespace
#7625: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:177:
+ 0x25, $

ERROR: trailing whitespace
#7626: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:178:
+ 0x02, $

ERROR: trailing whitespace
#7627: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:179:
+ 0x12, $

ERROR: trailing whitespace
#7628: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:180:
+ 0x1B, $

ERROR: trailing whitespace
#7629: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:181:
+ 0xFF, $

ERROR: trailing whitespace
#7630: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:182:
+ 0x6C, $

ERROR: trailing whitespace
#7631: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:183:
+ 0xF6, $

ERROR: trailing whitespace
#7632: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:184:
+ 0x0F, $

ERROR: trailing whitespace
#7703: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:255:
+ PCIU, 32, $

ERROR: trailing whitespace
#7746: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:298:
+ Zero, $

ERROR: trailing whitespace
#7747: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:299:
+ Zero, $

ERROR: trailing whitespace
#7748: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:300:
+ LNKD, $

ERROR: trailing whitespace
#7759: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:311:
+ Zero, $

ERROR: trailing whitespace
#7760: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:312:
+ Zero, $

ERROR: trailing whitespace
#7761: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:313:
+ LNKS, $

ERROR: trailing whitespace
#7769: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:321:
+ Zero, $

ERROR: trailing whitespace
#7770: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:322:
+ Zero, $

ERROR: trailing whitespace
#7771: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:323:
+ LNKA, $

ERROR: trailing whitespace
#7781: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:333:
+ Zero, $

ERROR: trailing whitespace
#7782: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:334:
+ Zero, $

ERROR: trailing whitespace
#7783: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:335:
+ LNKB, $

ERROR: trailing whitespace
#7792: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:344:
+ Zero, $

ERROR: trailing whitespace
#7793: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:345:
+ Zero, $

ERROR: trailing whitespace
#7794: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:346:
+ LNKC, $

ERROR: trailing whitespace
#7811: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:363:
+ PRQ0, 8, $

ERROR: trailing whitespace
#7812: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:364:
+ PRQ1, 8, $

ERROR: trailing whitespace
#7813: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:365:
+ PRQ2, 8, $

ERROR: trailing whitespace
#8035: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:587:
+ Offset (0x04), $

ERROR: trailing whitespace
#8036: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:588:
+ CPEN, 1, $

ERROR: trailing whitespace
#8037: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:589:
+ CINS, 1, $

ERROR: trailing whitespace
#8038: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:590:
+ CRMV, 1, $

ERROR: trailing whitespace
#8039: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:591:
+ CEJ0, 1, $

ERROR: trailing whitespace
#8040: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:592:
+ Offset (0x05), $

ERROR: trailing whitespace
#8046: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:598:
+ CSEL, 32, $

ERROR: trailing whitespace
#8047: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:599:
+ Offset (0x08), $

ERROR: trailing whitespace
#8399: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:951:
+ One, $

ERROR: trailing whitespace
#8400: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:952:
+ One, $

ERROR: trailing whitespace
#8401: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:953:
+ Zero, $

ERROR: trailing whitespace
#8406: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:958:
+ 0x02, $

ERROR: trailing whitespace
#8407: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:959:
+ 0x02, $

ERROR: trailing whitespace
#8408: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:960:
+ Zero, $

ERROR: trailing whitespace
#8413: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:965:
+ Zero, $

ERROR: trailing whitespace
#8414: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:966:
+ Zero, $

ERROR: trailing whitespace
#8415: FILE: tests/data/acpi/pc/DSDT.cphp.dsl:967:
+ Zero, $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.dimmpxm.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.dimmpxm.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#8925: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:5:
+ * $

ERROR: trailing whitespace
#8988: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:68:
+ VEND, 32, $

ERROR: trailing whitespace
#9092: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:172:
+ Zero, $

ERROR: trailing whitespace
#9093: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:173:
+ 0x05, $

ERROR: trailing whitespace
#9094: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:174:
+ 0x4F, $

ERROR: trailing whitespace
#9095: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:175:
+ 0x30, $

ERROR: trailing whitespace
#9096: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:176:
+ One, $

ERROR: trailing whitespace
#9097: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:177:
+ 0xAF, $

ERROR: trailing whitespace
#9098: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:178:
+ 0x02, $

ERROR: trailing whitespace
#9099: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:179:
+ 0x25, $

ERROR: trailing whitespace
#9100: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:180:
+ 0x02, $

ERROR: trailing whitespace
#9101: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:181:
+ 0x12, $

ERROR: trailing whitespace
#9102: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:182:
+ 0x1B, $

ERROR: trailing whitespace
#9103: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:183:
+ 0xFF, $

ERROR: trailing whitespace
#9104: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:184:
+ 0x6C, $

ERROR: trailing whitespace
#9105: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:185:
+ 0xF6, $

ERROR: trailing whitespace
#9106: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:186:
+ 0x0F, $

ERROR: trailing whitespace
#9177: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:257:
+ PCIU, 32, $

ERROR: trailing whitespace
#9220: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:300:
+ Zero, $

ERROR: trailing whitespace
#9221: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:301:
+ Zero, $

ERROR: trailing whitespace
#9222: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:302:
+ LNKD, $

ERROR: trailing whitespace
#9233: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:313:
+ Zero, $

ERROR: trailing whitespace
#9234: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:314:
+ Zero, $

ERROR: trailing whitespace
#9235: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:315:
+ LNKS, $

ERROR: trailing whitespace
#9243: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:323:
+ Zero, $

ERROR: trailing whitespace
#9244: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:324:
+ Zero, $

ERROR: trailing whitespace
#9245: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:325:
+ LNKA, $

ERROR: trailing whitespace
#9255: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:335:
+ Zero, $

ERROR: trailing whitespace
#9256: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:336:
+ Zero, $

ERROR: trailing whitespace
#9257: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:337:
+ LNKB, $

ERROR: trailing whitespace
#9266: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:346:
+ Zero, $

ERROR: trailing whitespace
#9267: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:347:
+ Zero, $

ERROR: trailing whitespace
#9268: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:348:
+ LNKC, $

ERROR: trailing whitespace
#9285: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:365:
+ PRQ0, 8, $

ERROR: trailing whitespace
#9286: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:366:
+ PRQ1, 8, $

ERROR: trailing whitespace
#9287: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:367:
+ PRQ2, 8, $

ERROR: trailing whitespace
#9509: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:589:
+ Offset (0x04), $

ERROR: trailing whitespace
#9510: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:590:
+ CPEN, 1, $

ERROR: trailing whitespace
#9511: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:591:
+ CINS, 1, $

ERROR: trailing whitespace
#9512: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:592:
+ CRMV, 1, $

ERROR: trailing whitespace
#9513: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:593:
+ CEJ0, 1, $

ERROR: trailing whitespace
#9514: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:594:
+ Offset (0x05), $

ERROR: trailing whitespace
#9520: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:600:
+ CSEL, 32, $

ERROR: trailing whitespace
#9521: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:601:
+ Offset (0x08), $

ERROR: trailing whitespace
#9737: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:817:
+ MRBL, 32, $

ERROR: trailing whitespace
#9738: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:818:
+ MRBH, 32, $

ERROR: trailing whitespace
#9739: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:819:
+ MRLL, 32, $

ERROR: trailing whitespace
#9740: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:820:
+ MRLH, 32, $

ERROR: trailing whitespace
#9746: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:826:
+ Offset (0x14), $

ERROR: trailing whitespace
#9747: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:827:
+ MES, 1, $

ERROR: trailing whitespace
#9748: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:828:
+ MINS, 1, $

ERROR: trailing whitespace
#9749: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:829:
+ MRMV, 1, $

ERROR: trailing whitespace
#9755: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:835:
+ MSEL, 32, $

ERROR: trailing whitespace
#9756: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:836:
+ MOEV, 32, $

ERROR: trailing whitespace
#10124: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:1204:
+ One, $

ERROR: trailing whitespace
#10125: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:1205:
+ One, $

ERROR: trailing whitespace
#10126: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:1206:
+ Zero, $

ERROR: trailing whitespace
#10131: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:1211:
+ 0x02, $

ERROR: trailing whitespace
#10132: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:1212:
+ 0x02, $

ERROR: trailing whitespace
#10133: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:1213:
+ Zero, $

ERROR: trailing whitespace
#10138: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:1218:
+ Zero, $

ERROR: trailing whitespace
#10139: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:1219:
+ Zero, $

ERROR: trailing whitespace
#10140: FILE: tests/data/acpi/pc/DSDT.dimmpxm.dsl:1220:
+ Zero, $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#10650: FILE: tests/data/acpi/pc/DSDT.dsl:5:
+ * $

ERROR: trailing whitespace
#10711: FILE: tests/data/acpi/pc/DSDT.dsl:66:
+ VEND, 32, $

ERROR: trailing whitespace
#10815: FILE: tests/data/acpi/pc/DSDT.dsl:170:
+ Zero, $

ERROR: trailing whitespace
#10816: FILE: tests/data/acpi/pc/DSDT.dsl:171:
+ 0x05, $

ERROR: trailing whitespace
#10817: FILE: tests/data/acpi/pc/DSDT.dsl:172:
+ 0x4F, $

ERROR: trailing whitespace
#10818: FILE: tests/data/acpi/pc/DSDT.dsl:173:
+ 0x30, $

ERROR: trailing whitespace
#10819: FILE: tests/data/acpi/pc/DSDT.dsl:174:
+ One, $

ERROR: trailing whitespace
#10820: FILE: tests/data/acpi/pc/DSDT.dsl:175:
+ 0xAF, $

ERROR: trailing whitespace
#10821: FILE: tests/data/acpi/pc/DSDT.dsl:176:
+ 0x02, $

ERROR: trailing whitespace
#10822: FILE: tests/data/acpi/pc/DSDT.dsl:177:
+ 0x25, $

ERROR: trailing whitespace
#10823: FILE: tests/data/acpi/pc/DSDT.dsl:178:
+ 0x02, $

ERROR: trailing whitespace
#10824: FILE: tests/data/acpi/pc/DSDT.dsl:179:
+ 0x12, $

ERROR: trailing whitespace
#10825: FILE: tests/data/acpi/pc/DSDT.dsl:180:
+ 0x1B, $

ERROR: trailing whitespace
#10826: FILE: tests/data/acpi/pc/DSDT.dsl:181:
+ 0xFF, $

ERROR: trailing whitespace
#10827: FILE: tests/data/acpi/pc/DSDT.dsl:182:
+ 0x6C, $

ERROR: trailing whitespace
#10828: FILE: tests/data/acpi/pc/DSDT.dsl:183:
+ 0xF6, $

ERROR: trailing whitespace
#10829: FILE: tests/data/acpi/pc/DSDT.dsl:184:
+ 0x0F, $

ERROR: trailing whitespace
#10900: FILE: tests/data/acpi/pc/DSDT.dsl:255:
+ PCIU, 32, $

ERROR: trailing whitespace
#10943: FILE: tests/data/acpi/pc/DSDT.dsl:298:
+ Zero, $

ERROR: trailing whitespace
#10944: FILE: tests/data/acpi/pc/DSDT.dsl:299:
+ Zero, $

ERROR: trailing whitespace
#10945: FILE: tests/data/acpi/pc/DSDT.dsl:300:
+ LNKD, $

ERROR: trailing whitespace
#10956: FILE: tests/data/acpi/pc/DSDT.dsl:311:
+ Zero, $

ERROR: trailing whitespace
#10957: FILE: tests/data/acpi/pc/DSDT.dsl:312:
+ Zero, $

ERROR: trailing whitespace
#10958: FILE: tests/data/acpi/pc/DSDT.dsl:313:
+ LNKS, $

ERROR: trailing whitespace
#10966: FILE: tests/data/acpi/pc/DSDT.dsl:321:
+ Zero, $

ERROR: trailing whitespace
#10967: FILE: tests/data/acpi/pc/DSDT.dsl:322:
+ Zero, $

ERROR: trailing whitespace
#10968: FILE: tests/data/acpi/pc/DSDT.dsl:323:
+ LNKA, $

ERROR: trailing whitespace
#10978: FILE: tests/data/acpi/pc/DSDT.dsl:333:
+ Zero, $

ERROR: trailing whitespace
#10979: FILE: tests/data/acpi/pc/DSDT.dsl:334:
+ Zero, $

ERROR: trailing whitespace
#10980: FILE: tests/data/acpi/pc/DSDT.dsl:335:
+ LNKB, $

ERROR: trailing whitespace
#10989: FILE: tests/data/acpi/pc/DSDT.dsl:344:
+ Zero, $

ERROR: trailing whitespace
#10990: FILE: tests/data/acpi/pc/DSDT.dsl:345:
+ Zero, $

ERROR: trailing whitespace
#10991: FILE: tests/data/acpi/pc/DSDT.dsl:346:
+ LNKC, $

ERROR: trailing whitespace
#11008: FILE: tests/data/acpi/pc/DSDT.dsl:363:
+ PRQ0, 8, $

ERROR: trailing whitespace
#11009: FILE: tests/data/acpi/pc/DSDT.dsl:364:
+ PRQ1, 8, $

ERROR: trailing whitespace
#11010: FILE: tests/data/acpi/pc/DSDT.dsl:365:
+ PRQ2, 8, $

ERROR: trailing whitespace
#11232: FILE: tests/data/acpi/pc/DSDT.dsl:587:
+ Offset (0x04), $

ERROR: trailing whitespace
#11233: FILE: tests/data/acpi/pc/DSDT.dsl:588:
+ CPEN, 1, $

ERROR: trailing whitespace
#11234: FILE: tests/data/acpi/pc/DSDT.dsl:589:
+ CINS, 1, $

ERROR: trailing whitespace
#11235: FILE: tests/data/acpi/pc/DSDT.dsl:590:
+ CRMV, 1, $

ERROR: trailing whitespace
#11236: FILE: tests/data/acpi/pc/DSDT.dsl:591:
+ CEJ0, 1, $

ERROR: trailing whitespace
#11237: FILE: tests/data/acpi/pc/DSDT.dsl:592:
+ Offset (0x05), $

ERROR: trailing whitespace
#11243: FILE: tests/data/acpi/pc/DSDT.dsl:598:
+ CSEL, 32, $

ERROR: trailing whitespace
#11244: FILE: tests/data/acpi/pc/DSDT.dsl:599:
+ Offset (0x08), $

ERROR: trailing whitespace
#11483: FILE: tests/data/acpi/pc/DSDT.dsl:838:
+ One, $

ERROR: trailing whitespace
#11484: FILE: tests/data/acpi/pc/DSDT.dsl:839:
+ One, $

ERROR: trailing whitespace
#11485: FILE: tests/data/acpi/pc/DSDT.dsl:840:
+ Zero, $

ERROR: trailing whitespace
#11490: FILE: tests/data/acpi/pc/DSDT.dsl:845:
+ 0x02, $

ERROR: trailing whitespace
#11491: FILE: tests/data/acpi/pc/DSDT.dsl:846:
+ 0x02, $

ERROR: trailing whitespace
#11492: FILE: tests/data/acpi/pc/DSDT.dsl:847:
+ Zero, $

ERROR: trailing whitespace
#11497: FILE: tests/data/acpi/pc/DSDT.dsl:852:
+ Zero, $

ERROR: trailing whitespace
#11498: FILE: tests/data/acpi/pc/DSDT.dsl:853:
+ Zero, $

ERROR: trailing whitespace
#11499: FILE: tests/data/acpi/pc/DSDT.dsl:854:
+ Zero, $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.hpbridge and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.ipmikcs.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.ipmikcs.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#12066: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:5:
+ * $

ERROR: trailing whitespace
#12127: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:66:
+ VEND, 32, $

ERROR: trailing whitespace
#12249: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:188:
+ Zero, $

ERROR: trailing whitespace
#12250: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:189:
+ 0x05, $

ERROR: trailing whitespace
#12251: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:190:
+ 0x4F, $

ERROR: trailing whitespace
#12252: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:191:
+ 0x30, $

ERROR: trailing whitespace
#12253: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:192:
+ One, $

ERROR: trailing whitespace
#12254: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:193:
+ 0xAF, $

ERROR: trailing whitespace
#12255: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:194:
+ 0x02, $

ERROR: trailing whitespace
#12256: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:195:
+ 0x25, $

ERROR: trailing whitespace
#12257: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:196:
+ 0x02, $

ERROR: trailing whitespace
#12258: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:197:
+ 0x12, $

ERROR: trailing whitespace
#12259: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:198:
+ 0x1B, $

ERROR: trailing whitespace
#12260: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:199:
+ 0xFF, $

ERROR: trailing whitespace
#12261: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:200:
+ 0x6C, $

ERROR: trailing whitespace
#12262: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:201:
+ 0xF6, $

ERROR: trailing whitespace
#12263: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:202:
+ 0x0F, $

ERROR: trailing whitespace
#12334: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:273:
+ PCIU, 32, $

ERROR: trailing whitespace
#12377: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:316:
+ Zero, $

ERROR: trailing whitespace
#12378: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:317:
+ Zero, $

ERROR: trailing whitespace
#12379: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:318:
+ LNKD, $

ERROR: trailing whitespace
#12390: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:329:
+ Zero, $

ERROR: trailing whitespace
#12391: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:330:
+ Zero, $

ERROR: trailing whitespace
#12392: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:331:
+ LNKS, $

ERROR: trailing whitespace
#12400: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:339:
+ Zero, $

ERROR: trailing whitespace
#12401: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:340:
+ Zero, $

ERROR: trailing whitespace
#12402: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:341:
+ LNKA, $

ERROR: trailing whitespace
#12412: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:351:
+ Zero, $

ERROR: trailing whitespace
#12413: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:352:
+ Zero, $

ERROR: trailing whitespace
#12414: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:353:
+ LNKB, $

ERROR: trailing whitespace
#12423: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:362:
+ Zero, $

ERROR: trailing whitespace
#12424: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:363:
+ Zero, $

ERROR: trailing whitespace
#12425: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:364:
+ LNKC, $

ERROR: trailing whitespace
#12442: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:381:
+ PRQ0, 8, $

ERROR: trailing whitespace
#12443: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:382:
+ PRQ1, 8, $

ERROR: trailing whitespace
#12444: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:383:
+ PRQ2, 8, $

ERROR: trailing whitespace
#12666: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:605:
+ Offset (0x04), $

ERROR: trailing whitespace
#12667: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:606:
+ CPEN, 1, $

ERROR: trailing whitespace
#12668: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:607:
+ CINS, 1, $

ERROR: trailing whitespace
#12669: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:608:
+ CRMV, 1, $

ERROR: trailing whitespace
#12670: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:609:
+ CEJ0, 1, $

ERROR: trailing whitespace
#12671: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:610:
+ Offset (0x05), $

ERROR: trailing whitespace
#12677: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:616:
+ CSEL, 32, $

ERROR: trailing whitespace
#12678: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:617:
+ Offset (0x08), $

ERROR: trailing whitespace
#12883: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:822:
+ One, $

ERROR: trailing whitespace
#12884: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:823:
+ One, $

ERROR: trailing whitespace
#12885: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:824:
+ Zero, $

ERROR: trailing whitespace
#12890: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:829:
+ 0x02, $

ERROR: trailing whitespace
#12891: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:830:
+ 0x02, $

ERROR: trailing whitespace
#12892: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:831:
+ Zero, $

ERROR: trailing whitespace
#12897: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:836:
+ Zero, $

ERROR: trailing whitespace
#12898: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:837:
+ Zero, $

ERROR: trailing whitespace
#12899: FILE: tests/data/acpi/pc/DSDT.ipmikcs.dsl:838:
+ Zero, $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.memhp.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.memhp.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#13409: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:5:
+ * $

ERROR: trailing whitespace
#13470: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:66:
+ VEND, 32, $

ERROR: trailing whitespace
#13574: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:170:
+ Zero, $

ERROR: trailing whitespace
#13575: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:171:
+ 0x05, $

ERROR: trailing whitespace
#13576: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:172:
+ 0x4F, $

ERROR: trailing whitespace
#13577: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:173:
+ 0x30, $

ERROR: trailing whitespace
#13578: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:174:
+ One, $

ERROR: trailing whitespace
#13579: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:175:
+ 0xAF, $

ERROR: trailing whitespace
#13580: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:176:
+ 0x02, $

ERROR: trailing whitespace
#13581: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:177:
+ 0x25, $

ERROR: trailing whitespace
#13582: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:178:
+ 0x02, $

ERROR: trailing whitespace
#13583: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:179:
+ 0x12, $

ERROR: trailing whitespace
#13584: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:180:
+ 0x1B, $

ERROR: trailing whitespace
#13585: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:181:
+ 0xFF, $

ERROR: trailing whitespace
#13586: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:182:
+ 0x6C, $

ERROR: trailing whitespace
#13587: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:183:
+ 0xF6, $

ERROR: trailing whitespace
#13588: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:184:
+ 0x0F, $

ERROR: trailing whitespace
#13659: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:255:
+ PCIU, 32, $

ERROR: trailing whitespace
#13702: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:298:
+ Zero, $

ERROR: trailing whitespace
#13703: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:299:
+ Zero, $

ERROR: trailing whitespace
#13704: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:300:
+ LNKD, $

ERROR: trailing whitespace
#13715: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:311:
+ Zero, $

ERROR: trailing whitespace
#13716: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:312:
+ Zero, $

ERROR: trailing whitespace
#13717: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:313:
+ LNKS, $

ERROR: trailing whitespace
#13725: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:321:
+ Zero, $

ERROR: trailing whitespace
#13726: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:322:
+ Zero, $

ERROR: trailing whitespace
#13727: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:323:
+ LNKA, $

ERROR: trailing whitespace
#13737: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:333:
+ Zero, $

ERROR: trailing whitespace
#13738: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:334:
+ Zero, $

ERROR: trailing whitespace
#13739: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:335:
+ LNKB, $

ERROR: trailing whitespace
#13748: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:344:
+ Zero, $

ERROR: trailing whitespace
#13749: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:345:
+ Zero, $

ERROR: trailing whitespace
#13750: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:346:
+ LNKC, $

ERROR: trailing whitespace
#13767: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:363:
+ PRQ0, 8, $

ERROR: trailing whitespace
#13768: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:364:
+ PRQ1, 8, $

ERROR: trailing whitespace
#13769: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:365:
+ PRQ2, 8, $

ERROR: trailing whitespace
#13991: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:587:
+ Offset (0x04), $

ERROR: trailing whitespace
#13992: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:588:
+ CPEN, 1, $

ERROR: trailing whitespace
#13993: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:589:
+ CINS, 1, $

ERROR: trailing whitespace
#13994: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:590:
+ CRMV, 1, $

ERROR: trailing whitespace
#13995: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:591:
+ CEJ0, 1, $

ERROR: trailing whitespace
#13996: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:592:
+ Offset (0x05), $

ERROR: trailing whitespace
#14002: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:598:
+ CSEL, 32, $

ERROR: trailing whitespace
#14003: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:599:
+ Offset (0x08), $

ERROR: trailing whitespace
#14132: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:728:
+ MRBL, 32, $

ERROR: trailing whitespace
#14133: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:729:
+ MRBH, 32, $

ERROR: trailing whitespace
#14134: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:730:
+ MRLL, 32, $

ERROR: trailing whitespace
#14135: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:731:
+ MRLH, 32, $

ERROR: trailing whitespace
#14141: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:737:
+ Offset (0x14), $

ERROR: trailing whitespace
#14142: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:738:
+ MES, 1, $

ERROR: trailing whitespace
#14143: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:739:
+ MINS, 1, $

ERROR: trailing whitespace
#14144: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:740:
+ MRMV, 1, $

ERROR: trailing whitespace
#14150: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:746:
+ MSEL, 32, $

ERROR: trailing whitespace
#14151: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:747:
+ MOEV, 32, $

ERROR: trailing whitespace
#14514: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:1110:
+ One, $

ERROR: trailing whitespace
#14515: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:1111:
+ One, $

ERROR: trailing whitespace
#14516: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:1112:
+ Zero, $

ERROR: trailing whitespace
#14521: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:1117:
+ 0x02, $

ERROR: trailing whitespace
#14522: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:1118:
+ 0x02, $

ERROR: trailing whitespace
#14523: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:1119:
+ Zero, $

ERROR: trailing whitespace
#14528: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:1124:
+ Zero, $

ERROR: trailing whitespace
#14529: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:1125:
+ Zero, $

ERROR: trailing whitespace
#14530: FILE: tests/data/acpi/pc/DSDT.memhp.dsl:1126:
+ Zero, $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.numamem.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.numamem.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#15040: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:5:
+ * $

ERROR: trailing whitespace
#15101: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:66:
+ VEND, 32, $

ERROR: trailing whitespace
#15205: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:170:
+ Zero, $

ERROR: trailing whitespace
#15206: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:171:
+ 0x05, $

ERROR: trailing whitespace
#15207: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:172:
+ 0x4F, $

ERROR: trailing whitespace
#15208: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:173:
+ 0x30, $

ERROR: trailing whitespace
#15209: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:174:
+ One, $

ERROR: trailing whitespace
#15210: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:175:
+ 0xAF, $

ERROR: trailing whitespace
#15211: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:176:
+ 0x02, $

ERROR: trailing whitespace
#15212: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:177:
+ 0x25, $

ERROR: trailing whitespace
#15213: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:178:
+ 0x02, $

ERROR: trailing whitespace
#15214: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:179:
+ 0x12, $

ERROR: trailing whitespace
#15215: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:180:
+ 0x1B, $

ERROR: trailing whitespace
#15216: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:181:
+ 0xFF, $

ERROR: trailing whitespace
#15217: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:182:
+ 0x6C, $

ERROR: trailing whitespace
#15218: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:183:
+ 0xF6, $

ERROR: trailing whitespace
#15219: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:184:
+ 0x0F, $

ERROR: trailing whitespace
#15290: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:255:
+ PCIU, 32, $

ERROR: trailing whitespace
#15333: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:298:
+ Zero, $

ERROR: trailing whitespace
#15334: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:299:
+ Zero, $

ERROR: trailing whitespace
#15335: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:300:
+ LNKD, $

ERROR: trailing whitespace
#15346: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:311:
+ Zero, $

ERROR: trailing whitespace
#15347: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:312:
+ Zero, $

ERROR: trailing whitespace
#15348: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:313:
+ LNKS, $

ERROR: trailing whitespace
#15356: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:321:
+ Zero, $

ERROR: trailing whitespace
#15357: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:322:
+ Zero, $

ERROR: trailing whitespace
#15358: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:323:
+ LNKA, $

ERROR: trailing whitespace
#15368: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:333:
+ Zero, $

ERROR: trailing whitespace
#15369: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:334:
+ Zero, $

ERROR: trailing whitespace
#15370: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:335:
+ LNKB, $

ERROR: trailing whitespace
#15379: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:344:
+ Zero, $

ERROR: trailing whitespace
#15380: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:345:
+ Zero, $

ERROR: trailing whitespace
#15381: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:346:
+ LNKC, $

ERROR: trailing whitespace
#15398: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:363:
+ PRQ0, 8, $

ERROR: trailing whitespace
#15399: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:364:
+ PRQ1, 8, $

ERROR: trailing whitespace
#15400: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:365:
+ PRQ2, 8, $

ERROR: trailing whitespace
#15622: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:587:
+ Offset (0x04), $

ERROR: trailing whitespace
#15623: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:588:
+ CPEN, 1, $

ERROR: trailing whitespace
#15624: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:589:
+ CINS, 1, $

ERROR: trailing whitespace
#15625: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:590:
+ CRMV, 1, $

ERROR: trailing whitespace
#15626: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:591:
+ CEJ0, 1, $

ERROR: trailing whitespace
#15627: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:592:
+ Offset (0x05), $

ERROR: trailing whitespace
#15633: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:598:
+ CSEL, 32, $

ERROR: trailing whitespace
#15634: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:599:
+ Offset (0x08), $

ERROR: trailing whitespace
#15841: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:806:
+ One, $

ERROR: trailing whitespace
#15842: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:807:
+ One, $

ERROR: trailing whitespace
#15843: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:808:
+ Zero, $

ERROR: trailing whitespace
#15848: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:813:
+ 0x02, $

ERROR: trailing whitespace
#15849: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:814:
+ 0x02, $

ERROR: trailing whitespace
#15850: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:815:
+ Zero, $

ERROR: trailing whitespace
#15855: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:820:
+ Zero, $

ERROR: trailing whitespace
#15856: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:821:
+ Zero, $

ERROR: trailing whitespace
#15857: FILE: tests/data/acpi/pc/DSDT.numamem.dsl:822:
+ Zero, $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/DSDT.roothp and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACP.acpihmat and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACP.acpihmat.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACP.acpihmat.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#16374: FILE: tests/data/acpi/pc/FACP.acpihmat.dsl:5:
+ * $

ERROR: trailing whitespace
#16461: FILE: tests/data/acpi/pc/FACP.acpihmat.dsl:92:
+ 0000: 46 41 43 50 74 00 00 00 01 A1 42 4F 43 48 53 20 // FACPt.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACP.bridge and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACP.bridge.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACP.bridge.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#16483: FILE: tests/data/acpi/pc/FACP.bridge.dsl:5:
+ * $

ERROR: trailing whitespace
#16570: FILE: tests/data/acpi/pc/FACP.bridge.dsl:92:
+ 0000: 46 41 43 50 74 00 00 00 01 A1 42 4F 43 48 53 20 // FACPt.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACP.cphp and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACP.cphp.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACP.cphp.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#16592: FILE: tests/data/acpi/pc/FACP.cphp.dsl:5:
+ * $

ERROR: trailing whitespace
#16679: FILE: tests/data/acpi/pc/FACP.cphp.dsl:92:
+ 0000: 46 41 43 50 74 00 00 00 01 A1 42 4F 43 48 53 20 // FACPt.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACP.dimmpxm and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACP.dimmpxm.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACP.dimmpxm.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#16701: FILE: tests/data/acpi/pc/FACP.dimmpxm.dsl:5:
+ * $

ERROR: trailing whitespace
#16788: FILE: tests/data/acpi/pc/FACP.dimmpxm.dsl:92:
+ 0000: 46 41 43 50 74 00 00 00 01 A1 42 4F 43 48 53 20 // FACPt.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACP.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACP.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#16806: FILE: tests/data/acpi/pc/FACP.dsl:5:
+ * $

ERROR: trailing whitespace
#16893: FILE: tests/data/acpi/pc/FACP.dsl:92:
+ 0000: 46 41 43 50 74 00 00 00 01 A1 42 4F 43 48 53 20 // FACPt.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACP.hpbridge and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACP.ipmikcs and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACP.ipmikcs.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACP.ipmikcs.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#16919: FILE: tests/data/acpi/pc/FACP.ipmikcs.dsl:5:
+ * $

ERROR: trailing whitespace
#17006: FILE: tests/data/acpi/pc/FACP.ipmikcs.dsl:92:
+ 0000: 46 41 43 50 74 00 00 00 01 A1 42 4F 43 48 53 20 // FACPt.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACP.memhp and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACP.memhp.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACP.memhp.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#17028: FILE: tests/data/acpi/pc/FACP.memhp.dsl:5:
+ * $

ERROR: trailing whitespace
#17115: FILE: tests/data/acpi/pc/FACP.memhp.dsl:92:
+ 0000: 46 41 43 50 74 00 00 00 01 A1 42 4F 43 48 53 20 // FACPt.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACP.numamem and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACP.numamem.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACP.numamem.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#17137: FILE: tests/data/acpi/pc/FACP.numamem.dsl:5:
+ * $

ERROR: trailing whitespace
#17224: FILE: tests/data/acpi/pc/FACP.numamem.dsl:92:
+ 0000: 46 41 43 50 74 00 00 00 01 A1 42 4F 43 48 53 20 // FACPt.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACP.roothp and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACS.acpihmat and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACS.acpihmat.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACS.acpihmat.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#17250: FILE: tests/data/acpi/pc/FACS.acpihmat.dsl:5:
+ * $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACS.bridge and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACS.bridge.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACS.bridge.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#17292: FILE: tests/data/acpi/pc/FACS.bridge.dsl:5:
+ * $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACS.cphp and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACS.cphp.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACS.cphp.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#17334: FILE: tests/data/acpi/pc/FACS.cphp.dsl:5:
+ * $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACS.dimmpxm and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACS.dimmpxm.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACS.dimmpxm.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#17376: FILE: tests/data/acpi/pc/FACS.dimmpxm.dsl:5:
+ * $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACS.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACS.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#17414: FILE: tests/data/acpi/pc/FACS.dsl:5:
+ * $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACS.hpbridge and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACS.ipmikcs and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACS.ipmikcs.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACS.ipmikcs.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#17460: FILE: tests/data/acpi/pc/FACS.ipmikcs.dsl:5:
+ * $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACS.memhp and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACS.memhp.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACS.memhp.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#17502: FILE: tests/data/acpi/pc/FACS.memhp.dsl:5:
+ * $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACS.numamem and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACS.numamem.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACS.numamem.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#17544: FILE: tests/data/acpi/pc/FACS.numamem.dsl:5:
+ * $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/FACS.roothp and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HMAT.acpihmat.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HMAT.acpihmat.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#17586: FILE: tests/data/acpi/pc/HMAT.acpihmat.dsl:5:
+ * $

ERROR: trailing whitespace
#17696: FILE: tests/data/acpi/pc/HMAT.acpihmat.dsl:115:
+ 0000: 48 4D 41 54 18 01 00 00 02 98 42 4F 43 48 53 20 // HMAT......BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HMAT.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HMAT.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#17724: FILE: tests/data/acpi/pc/HMAT.dsl:5:
+ * $

ERROR: trailing whitespace
#17834: FILE: tests/data/acpi/pc/HMAT.dsl:115:
+ 0000: 48 4D 41 54 18 01 00 00 02 98 42 4F 43 48 53 20 // HMAT......BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HPET.acpihmat and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HPET.acpihmat.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HPET.acpihmat.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#17866: FILE: tests/data/acpi/pc/HPET.acpihmat.dsl:5:
+ * $

ERROR: trailing whitespace
#17901: FILE: tests/data/acpi/pc/HPET.acpihmat.dsl:40:
+ 0000: 48 50 45 54 38 00 00 00 01 03 42 4F 43 48 53 20 // HPET8.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HPET.bridge and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HPET.bridge.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HPET.bridge.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#17919: FILE: tests/data/acpi/pc/HPET.bridge.dsl:5:
+ * $

ERROR: trailing whitespace
#17954: FILE: tests/data/acpi/pc/HPET.bridge.dsl:40:
+ 0000: 48 50 45 54 38 00 00 00 01 03 42 4F 43 48 53 20 // HPET8.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HPET.cphp and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HPET.cphp.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HPET.cphp.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#17972: FILE: tests/data/acpi/pc/HPET.cphp.dsl:5:
+ * $

ERROR: trailing whitespace
#18007: FILE: tests/data/acpi/pc/HPET.cphp.dsl:40:
+ 0000: 48 50 45 54 38 00 00 00 01 03 42 4F 43 48 53 20 // HPET8.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HPET.dimmpxm and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HPET.dimmpxm.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HPET.dimmpxm.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#18025: FILE: tests/data/acpi/pc/HPET.dimmpxm.dsl:5:
+ * $

ERROR: trailing whitespace
#18060: FILE: tests/data/acpi/pc/HPET.dimmpxm.dsl:40:
+ 0000: 48 50 45 54 38 00 00 00 01 03 42 4F 43 48 53 20 // HPET8.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HPET.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HPET.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#18074: FILE: tests/data/acpi/pc/HPET.dsl:5:
+ * $

ERROR: trailing whitespace
#18109: FILE: tests/data/acpi/pc/HPET.dsl:40:
+ 0000: 48 50 45 54 38 00 00 00 01 03 42 4F 43 48 53 20 // HPET8.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HPET.hpbridge and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HPET.ipmikcs and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HPET.ipmikcs.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HPET.ipmikcs.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#18131: FILE: tests/data/acpi/pc/HPET.ipmikcs.dsl:5:
+ * $

ERROR: trailing whitespace
#18166: FILE: tests/data/acpi/pc/HPET.ipmikcs.dsl:40:
+ 0000: 48 50 45 54 38 00 00 00 01 03 42 4F 43 48 53 20 // HPET8.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HPET.memhp and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HPET.memhp.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HPET.memhp.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#18184: FILE: tests/data/acpi/pc/HPET.memhp.dsl:5:
+ * $

ERROR: trailing whitespace
#18219: FILE: tests/data/acpi/pc/HPET.memhp.dsl:40:
+ 0000: 48 50 45 54 38 00 00 00 01 03 42 4F 43 48 53 20 // HPET8.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HPET.numamem and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HPET.numamem.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HPET.numamem.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#18237: FILE: tests/data/acpi/pc/HPET.numamem.dsl:5:
+ * $

ERROR: trailing whitespace
#18272: FILE: tests/data/acpi/pc/HPET.numamem.dsl:40:
+ 0000: 48 50 45 54 38 00 00 00 01 03 42 4F 43 48 53 20 // HPET8.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/HPET.roothp and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/NFIT.dimmpxm.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/NFIT.dimmpxm.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#18290: FILE: tests/data/acpi/pc/NFIT.dimmpxm.dsl:5:
+ * $

ERROR: trailing whitespace
#18386: FILE: tests/data/acpi/pc/NFIT.dimmpxm.dsl:101:
+ 0000: 4E 46 49 54 F0 00 00 00 01 24 42 4F 43 48 53 20 // NFIT.....$BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/NFIT.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/NFIT.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#18411: FILE: tests/data/acpi/pc/NFIT.dsl:5:
+ * $

ERROR: trailing whitespace
#18507: FILE: tests/data/acpi/pc/NFIT.dsl:101:
+ 0000: 4E 46 49 54 F0 00 00 00 01 24 42 4F 43 48 53 20 // NFIT.....$BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/SLIT.cphp.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/SLIT.cphp.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#18532: FILE: tests/data/acpi/pc/SLIT.cphp.dsl:5:
+ * $

ERROR: trailing whitespace
#18556: FILE: tests/data/acpi/pc/SLIT.cphp.dsl:29:
+ 0000: 53 4C 49 54 30 00 00 00 01 2C 42 4F 43 48 53 20 // SLIT0....,BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/SLIT.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/SLIT.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#18569: FILE: tests/data/acpi/pc/SLIT.dsl:5:
+ * $

ERROR: trailing whitespace
#18593: FILE: tests/data/acpi/pc/SLIT.dsl:29:
+ 0000: 53 4C 49 54 30 00 00 00 01 2C 42 4F 43 48 53 20 // SLIT0....,BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/SLIT.memhp.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/SLIT.memhp.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#18606: FILE: tests/data/acpi/pc/SLIT.memhp.dsl:5:
+ * $

ERROR: trailing whitespace
#18630: FILE: tests/data/acpi/pc/SLIT.memhp.dsl:29:
+ 0000: 53 4C 49 54 30 00 00 00 01 2C 42 4F 43 48 53 20 // SLIT0....,BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/SRAT.acpihmat.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/SRAT.acpihmat.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#18643: FILE: tests/data/acpi/pc/SRAT.acpihmat.dsl:5:
+ * $

ERROR: trailing whitespace
#18758: FILE: tests/data/acpi/pc/SRAT.acpihmat.dsl:120:
+ 0000: 53 52 41 54 18 01 00 00 01 C0 42 4F 43 48 53 20 // SRAT......BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/SRAT.cphp.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/SRAT.cphp.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#18786: FILE: tests/data/acpi/pc/SRAT.cphp.dsl:5:
+ * $

ERROR: trailing whitespace
#18931: FILE: tests/data/acpi/pc/SRAT.cphp.dsl:150:
+ 0000: 53 52 41 54 30 01 00 00 01 36 42 4F 43 48 53 20 // SRAT0....6BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/SRAT.dimmpxm.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/SRAT.dimmpxm.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#18960: FILE: tests/data/acpi/pc/SRAT.dimmpxm.dsl:5:
+ * $

ERROR: trailing whitespace
#19125: FILE: tests/data/acpi/pc/SRAT.dimmpxm.dsl:170:
+ 0000: 53 52 41 54 88 01 00 00 01 68 42 4F 43 48 53 20 // SRAT.....hBOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/SRAT.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/SRAT.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#19160: FILE: tests/data/acpi/pc/SRAT.dsl:5:
+ * $

ERROR: trailing whitespace
#19250: FILE: tests/data/acpi/pc/SRAT.dsl:95:
+ 0000: 53 52 41 54 E0 00 00 00 01 F5 42 4F 43 48 53 20 // SRAT......BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/SRAT.memhp.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/SRAT.memhp.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#19274: FILE: tests/data/acpi/pc/SRAT.memhp.dsl:5:
+ * $

ERROR: trailing whitespace
#19378: FILE: tests/data/acpi/pc/SRAT.memhp.dsl:109:
+ 0000: 53 52 41 54 08 01 00 00 01 A2 42 4F 43 48 53 20 // SRAT......BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/SRAT.numamem.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/SRAT.numamem.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#19405: FILE: tests/data/acpi/pc/SRAT.numamem.dsl:5:
+ * $

ERROR: trailing whitespace
#19495: FILE: tests/data/acpi/pc/SRAT.numamem.dsl:95:
+ 0000: 53 52 41 54 E0 00 00 00 01 F5 42 4F 43 48 53 20 // SRAT......BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/SSDT.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/SSDT.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#19519: FILE: tests/data/acpi/pc/SSDT.dsl:5:
+ * $

ERROR: trailing whitespace
#19554: FILE: tests/data/acpi/pc/SSDT.dsl:40:
+ HDLE, 32, $

ERROR: trailing whitespace
#19555: FILE: tests/data/acpi/pc/SSDT.dsl:41:
+ REVS, 32, $

ERROR: trailing whitespace
#19556: FILE: tests/data/acpi/pc/SSDT.dsl:42:
+ FUNC, 32, $

ERROR: trailing whitespace
#19562: FILE: tests/data/acpi/pc/SSDT.dsl:48:
+ RLEN, 32, $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/WAET.acpihmat and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/WAET.acpihmat.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/WAET.acpihmat.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#19734: FILE: tests/data/acpi/pc/WAET.acpihmat.dsl:5:
+ * $

ERROR: trailing whitespace
#19758: FILE: tests/data/acpi/pc/WAET.acpihmat.dsl:29:
+ 0000: 57 41 45 54 28 00 00 00 01 88 42 4F 43 48 53 20 // WAET(.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/WAET.bridge and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/WAET.bridge.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/WAET.bridge.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#19775: FILE: tests/data/acpi/pc/WAET.bridge.dsl:5:
+ * $

ERROR: trailing whitespace
#19799: FILE: tests/data/acpi/pc/WAET.bridge.dsl:29:
+ 0000: 57 41 45 54 28 00 00 00 01 88 42 4F 43 48 53 20 // WAET(.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/WAET.cphp and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/WAET.cphp.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/WAET.cphp.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#19816: FILE: tests/data/acpi/pc/WAET.cphp.dsl:5:
+ * $

ERROR: trailing whitespace
#19840: FILE: tests/data/acpi/pc/WAET.cphp.dsl:29:
+ 0000: 57 41 45 54 28 00 00 00 01 88 42 4F 43 48 53 20 // WAET(.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/WAET.dimmpxm and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/WAET.dimmpxm.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/WAET.dimmpxm.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#19857: FILE: tests/data/acpi/pc/WAET.dimmpxm.dsl:5:
+ * $

ERROR: trailing whitespace
#19881: FILE: tests/data/acpi/pc/WAET.dimmpxm.dsl:29:
+ 0000: 57 41 45 54 28 00 00 00 01 88 42 4F 43 48 53 20 // WAET(.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/WAET.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/WAET.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#19894: FILE: tests/data/acpi/pc/WAET.dsl:5:
+ * $

ERROR: trailing whitespace
#19918: FILE: tests/data/acpi/pc/WAET.dsl:29:
+ 0000: 57 41 45 54 28 00 00 00 01 88 42 4F 43 48 53 20 // WAET(.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/WAET.hpbridge and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/WAET.ipmikcs and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/WAET.ipmikcs.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/WAET.ipmikcs.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#19939: FILE: tests/data/acpi/pc/WAET.ipmikcs.dsl:5:
+ * $

ERROR: trailing whitespace
#19963: FILE: tests/data/acpi/pc/WAET.ipmikcs.dsl:29:
+ 0000: 57 41 45 54 28 00 00 00 01 88 42 4F 43 48 53 20 // WAET(.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/WAET.memhp and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/WAET.memhp.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/WAET.memhp.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#19980: FILE: tests/data/acpi/pc/WAET.memhp.dsl:5:
+ * $

ERROR: trailing whitespace
#20004: FILE: tests/data/acpi/pc/WAET.memhp.dsl:29:
+ 0000: 57 41 45 54 28 00 00 00 01 88 42 4F 43 48 53 20 // WAET(.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/WAET.numamem and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/WAET.numamem.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/WAET.numamem.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#20021: FILE: tests/data/acpi/pc/WAET.numamem.dsl:5:
+ * $

ERROR: trailing whitespace
#20045: FILE: tests/data/acpi/pc/WAET.numamem.dsl:29:
+ 0000: 57 41 45 54 28 00 00 00 01 88 42 4F 43 48 53 20 // WAET(.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/pc/WAET.roothp and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.acpihmat.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.acpihmat.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#20062: FILE: tests/data/acpi/q35/APIC.acpihmat.dsl:5:
+ * $

ERROR: trailing whitespace
#20162: FILE: tests/data/acpi/q35/APIC.acpihmat.dsl:105:
+ 0000: 41 50 49 43 80 00 00 00 01 DA 42 4F 43 48 53 20 // APIC......BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.bridge and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.bridge.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.bridge.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#20184: FILE: tests/data/acpi/q35/APIC.bridge.dsl:5:
+ * $

ERROR: trailing whitespace
#20276: FILE: tests/data/acpi/q35/APIC.bridge.dsl:97:
+ 0000: 41 50 49 43 78 00 00 00 01 ED 42 4F 43 48 53 20 // APICx.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.cphp.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.cphp.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#20294: FILE: tests/data/acpi/q35/APIC.cphp.dsl:5:
+ * $

ERROR: trailing whitespace
#20426: FILE: tests/data/acpi/q35/APIC.cphp.dsl:137:
+ 0000: 41 50 49 43 A0 00 00 00 01 7B 42 4F 43 48 53 20 // APIC.....{BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.dimmpxm.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.dimmpxm.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#20446: FILE: tests/data/acpi/q35/APIC.dimmpxm.dsl:5:
+ * $

ERROR: trailing whitespace
#20562: FILE: tests/data/acpi/q35/APIC.dimmpxm.dsl:121:
+ 0000: 41 50 49 43 90 00 00 00 01 AE 42 4F 43 48 53 20 // APIC......BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#20581: FILE: tests/data/acpi/q35/APIC.dsl:5:
+ * $

ERROR: trailing whitespace
#20673: FILE: tests/data/acpi/q35/APIC.dsl:97:
+ 0000: 41 50 49 43 78 00 00 00 01 ED 42 4F 43 48 53 20 // APICx.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.ipmibt and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.ipmibt.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.ipmibt.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#20695: FILE: tests/data/acpi/q35/APIC.ipmibt.dsl:5:
+ * $

ERROR: trailing whitespace
#20787: FILE: tests/data/acpi/q35/APIC.ipmibt.dsl:97:
+ 0000: 41 50 49 43 78 00 00 00 01 ED 42 4F 43 48 53 20 // APICx.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.memhp and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.memhp.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.memhp.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#20809: FILE: tests/data/acpi/q35/APIC.memhp.dsl:5:
+ * $

ERROR: trailing whitespace
#20901: FILE: tests/data/acpi/q35/APIC.memhp.dsl:97:
+ 0000: 41 50 49 43 78 00 00 00 01 ED 42 4F 43 48 53 20 // APICx.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.mmio64 and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.mmio64.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.mmio64.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#20923: FILE: tests/data/acpi/q35/APIC.mmio64.dsl:5:
+ * $

ERROR: trailing whitespace
#21015: FILE: tests/data/acpi/q35/APIC.mmio64.dsl:97:
+ 0000: 41 50 49 43 78 00 00 00 01 ED 42 4F 43 48 53 20 // APICx.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.numamem and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.numamem.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.numamem.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#21037: FILE: tests/data/acpi/q35/APIC.numamem.dsl:5:
+ * $

ERROR: trailing whitespace
#21129: FILE: tests/data/acpi/q35/APIC.numamem.dsl:97:
+ 0000: 41 50 49 43 78 00 00 00 01 ED 42 4F 43 48 53 20 // APICx.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.tis and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.tis.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/APIC.tis.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#21151: FILE: tests/data/acpi/q35/APIC.tis.dsl:5:
+ * $

ERROR: trailing whitespace
#21243: FILE: tests/data/acpi/q35/APIC.tis.dsl:97:
+ 0000: 41 50 49 43 78 00 00 00 01 ED 42 4F 43 48 53 20 // APICx.....BOCHS $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/DSDT and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/DSDT.acpihmat and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/DSDT.acpihmat.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/DSDT.acpihmat.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#21267: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:5:
+ * $

ERROR: trailing whitespace
#21357: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:95:
+ VEND, 32, $

ERROR: trailing whitespace
#21501: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:239:
+ 0xFFFF, $

ERROR: trailing whitespace
#21502: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:240:
+ Zero, $

ERROR: trailing whitespace
#21503: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:241:
+ LNKE, $

ERROR: trailing whitespace
#21505: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:243:
+ }, $

ERROR: trailing whitespace
#21509: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:247:
+ 0xFFFF, $

ERROR: trailing whitespace
#21510: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:248:
+ One, $

ERROR: trailing whitespace
#21511: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:249:
+ LNKF, $

ERROR: trailing whitespace
#21513: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:251:
+ }, $

ERROR: trailing whitespace
#21517: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:255:
+ 0xFFFF, $

ERROR: trailing whitespace
#21518: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:256:
+ 0x02, $

ERROR: trailing whitespace
#21519: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:257:
+ LNKG, $

ERROR: trailing whitespace
#21521: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:259:
+ }, $

ERROR: trailing whitespace
#21525: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:263:
+ 0xFFFF, $

ERROR: trailing whitespace
#21526: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:264:
+ 0x03, $

ERROR: trailing whitespace
#21527: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:265:
+ LNKH, $

ERROR: trailing whitespace
#21529: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:267:
+ }, $

ERROR: trailing whitespace
#21533: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:271:
+ 0x0001FFFF, $

ERROR: trailing whitespace
#21534: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:272:
+ Zero, $

ERROR: trailing whitespace
#21535: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:273:
+ LNKF, $

ERROR: trailing whitespace
#21537: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:275:
+ }, $

ERROR: trailing whitespace
#21541: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:279:
+ 0x0001FFFF, $

ERROR: trailing whitespace
#21542: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:280:
+ One, $

ERROR: trailing whitespace
#21543: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:281:
+ LNKG, $

ERROR: trailing whitespace
#21545: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:283:
+ }, $

ERROR: trailing whitespace
#21549: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:287:
+ 0x0001FFFF, $

ERROR: trailing whitespace
#21550: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:288:
+ 0x02, $

ERROR: trailing whitespace
#21551: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:289:
+ LNKH, $

ERROR: trailing whitespace
#21553: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:291:
+ }, $

ERROR: trailing whitespace
#21557: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:295:
+ 0x0001FFFF, $

ERROR: trailing whitespace
#21558: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:296:
+ 0x03, $

ERROR: trailing whitespace
#21559: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:297:
+ LNKE, $

ERROR: trailing whitespace
#21561: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:299:
+ }, $

ERROR: trailing whitespace
#21565: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:303:
+ 0x0002FFFF, $

ERROR: trailing whitespace
#21566: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:304:
+ Zero, $

ERROR: trailing whitespace
#21567: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:305:
+ LNKG, $

ERROR: trailing whitespace
#21569: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:307:
+ }, $

ERROR: trailing whitespace
#21573: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:311:
+ 0x0002FFFF, $

ERROR: trailing whitespace
#21574: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:312:
+ One, $

ERROR: trailing whitespace
#21575: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:313:
+ LNKH, $

ERROR: trailing whitespace
#21577: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:315:
+ }, $

ERROR: trailing whitespace
#21581: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:319:
+ 0x0002FFFF, $

ERROR: trailing whitespace
#21582: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:320:
+ 0x02, $

ERROR: trailing whitespace
#21583: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:321:
+ LNKE, $

ERROR: trailing whitespace
#21585: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:323:
+ }, $

ERROR: trailing whitespace
#21589: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:327:
+ 0x0002FFFF, $

ERROR: trailing whitespace
#21590: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:328:
+ 0x03, $

ERROR: trailing whitespace
#21591: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:329:
+ LNKF, $

ERROR: trailing whitespace
#21593: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:331:
+ }, $

ERROR: trailing whitespace
#21597: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:335:
+ 0x0003FFFF, $

ERROR: trailing whitespace
#21598: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:336:
+ Zero, $

ERROR: trailing whitespace
#21599: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:337:
+ LNKH, $

ERROR: trailing whitespace
#21601: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:339:
+ }, $

ERROR: trailing whitespace
#21605: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:343:
+ 0x0003FFFF, $

ERROR: trailing whitespace
#21606: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:344:
+ One, $

ERROR: trailing whitespace
#21607: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:345:
+ LNKE, $

ERROR: trailing whitespace
#21609: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:347:
+ }, $

ERROR: trailing whitespace
#21613: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:351:
+ 0x0003FFFF, $

ERROR: trailing whitespace
#21614: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:352:
+ 0x02, $

ERROR: trailing whitespace
#21615: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:353:
+ LNKF, $

ERROR: trailing whitespace
#21617: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:355:
+ }, $

ERROR: trailing whitespace
#21621: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:359:
+ 0x0003FFFF, $

ERROR: trailing whitespace
#21622: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:360:
+ 0x03, $

ERROR: trailing whitespace
#21623: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:361:
+ LNKG, $

ERROR: trailing whitespace
#21625: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:363:
+ }, $

ERROR: trailing whitespace
#21629: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:367:
+ 0x0004FFFF, $

ERROR: trailing whitespace
#21630: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:368:
+ Zero, $

ERROR: trailing whitespace
#21631: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:369:
+ LNKE, $

ERROR: trailing whitespace
#21633: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:371:
+ }, $

ERROR: trailing whitespace
#21637: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:375:
+ 0x0004FFFF, $

ERROR: trailing whitespace
#21638: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:376:
+ One, $

ERROR: trailing whitespace
#21639: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:377:
+ LNKF, $

ERROR: trailing whitespace
#21641: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:379:
+ }, $

ERROR: trailing whitespace
#21645: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:383:
+ 0x0004FFFF, $

ERROR: trailing whitespace
#21646: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:384:
+ 0x02, $

ERROR: trailing whitespace
#21647: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:385:
+ LNKG, $

ERROR: trailing whitespace
#21649: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:387:
+ }, $

ERROR: trailing whitespace
#21653: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:391:
+ 0x0004FFFF, $

ERROR: trailing whitespace
#21654: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:392:
+ 0x03, $

ERROR: trailing whitespace
#21655: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:393:
+ LNKH, $

ERROR: trailing whitespace
#21657: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:395:
+ }, $

ERROR: trailing whitespace
#21661: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:399:
+ 0x0005FFFF, $

ERROR: trailing whitespace
#21662: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:400:
+ Zero, $

ERROR: trailing whitespace
#21663: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:401:
+ LNKF, $

ERROR: trailing whitespace
#21665: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:403:
+ }, $

ERROR: trailing whitespace
#21669: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:407:
+ 0x0005FFFF, $

ERROR: trailing whitespace
#21670: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:408:
+ One, $

ERROR: trailing whitespace
#21671: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:409:
+ LNKG, $

ERROR: trailing whitespace
#21673: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:411:
+ }, $

ERROR: trailing whitespace
#21677: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:415:
+ 0x0005FFFF, $

ERROR: trailing whitespace
#21678: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:416:
+ 0x02, $

ERROR: trailing whitespace
#21679: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:417:
+ LNKH, $

ERROR: trailing whitespace
#21681: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:419:
+ }, $

ERROR: trailing whitespace
#21685: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:423:
+ 0x0005FFFF, $

ERROR: trailing whitespace
#21686: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:424:
+ 0x03, $

ERROR: trailing whitespace
#21687: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:425:
+ LNKE, $

ERROR: trailing whitespace
#21689: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:427:
+ }, $

ERROR: trailing whitespace
#21693: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:431:
+ 0x0006FFFF, $

ERROR: trailing whitespace
#21694: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:432:
+ Zero, $

ERROR: trailing whitespace
#21695: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:433:
+ LNKG, $

ERROR: trailing whitespace
#21697: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:435:
+ }, $

ERROR: trailing whitespace
#21701: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:439:
+ 0x0006FFFF, $

ERROR: trailing whitespace
#21702: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:440:
+ One, $

ERROR: trailing whitespace
#21703: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:441:
+ LNKH, $

ERROR: trailing whitespace
#21705: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:443:
+ }, $

ERROR: trailing whitespace
#21709: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:447:
+ 0x0006FFFF, $

ERROR: trailing whitespace
#21710: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:448:
+ 0x02, $

ERROR: trailing whitespace
#21711: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:449:
+ LNKE, $

ERROR: trailing whitespace
#21713: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:451:
+ }, $

ERROR: trailing whitespace
#21717: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:455:
+ 0x0006FFFF, $

ERROR: trailing whitespace
#21718: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:456:
+ 0x03, $

ERROR: trailing whitespace
#21719: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:457:
+ LNKF, $

ERROR: trailing whitespace
#21721: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:459:
+ }, $

ERROR: trailing whitespace
#21725: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:463:
+ 0x0007FFFF, $

ERROR: trailing whitespace
#21726: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:464:
+ Zero, $

ERROR: trailing whitespace
#21727: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:465:
+ LNKH, $

ERROR: trailing whitespace
#21729: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:467:
+ }, $

ERROR: trailing whitespace
#21733: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:471:
+ 0x0007FFFF, $

ERROR: trailing whitespace
#21734: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:472:
+ One, $

ERROR: trailing whitespace
#21735: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:473:
+ LNKE, $

ERROR: trailing whitespace
#21737: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:475:
+ }, $

ERROR: trailing whitespace
#21741: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:479:
+ 0x0007FFFF, $

ERROR: trailing whitespace
#21742: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:480:
+ 0x02, $

ERROR: trailing whitespace
#21743: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:481:
+ LNKF, $

ERROR: trailing whitespace
#21745: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:483:
+ }, $

ERROR: trailing whitespace
#21749: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:487:
+ 0x0007FFFF, $

ERROR: trailing whitespace
#21750: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:488:
+ 0x03, $

ERROR: trailing whitespace
#21751: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:489:
+ LNKG, $

ERROR: trailing whitespace
#21753: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:491:
+ }, $

ERROR: trailing whitespace
#21757: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:495:
+ 0x0008FFFF, $

ERROR: trailing whitespace
#21758: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:496:
+ Zero, $

ERROR: trailing whitespace
#21759: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:497:
+ LNKE, $

ERROR: trailing whitespace
#21761: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:499:
+ }, $

ERROR: trailing whitespace
#21765: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:503:
+ 0x0008FFFF, $

ERROR: trailing whitespace
#21766: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:504:
+ One, $

ERROR: trailing whitespace
#21767: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:505:
+ LNKF, $

ERROR: trailing whitespace
#21769: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:507:
+ }, $

ERROR: trailing whitespace
#21773: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:511:
+ 0x0008FFFF, $

ERROR: trailing whitespace
#21774: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:512:
+ 0x02, $

ERROR: trailing whitespace
#21775: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:513:
+ LNKG, $

ERROR: trailing whitespace
#21777: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:515:
+ }, $

ERROR: trailing whitespace
#21781: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:519:
+ 0x0008FFFF, $

ERROR: trailing whitespace
#21782: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:520:
+ 0x03, $

ERROR: trailing whitespace
#21783: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:521:
+ LNKH, $

ERROR: trailing whitespace
#21785: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:523:
+ }, $

ERROR: trailing whitespace
#21789: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:527:
+ 0x0009FFFF, $

ERROR: trailing whitespace
#21790: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:528:
+ Zero, $

ERROR: trailing whitespace
#21791: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:529:
+ LNKF, $

ERROR: trailing whitespace
#21793: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:531:
+ }, $

ERROR: trailing whitespace
#21797: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:535:
+ 0x0009FFFF, $

ERROR: trailing whitespace
#21798: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:536:
+ One, $

ERROR: trailing whitespace
#21799: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:537:
+ LNKG, $

ERROR: trailing whitespace
#21801: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:539:
+ }, $

ERROR: trailing whitespace
#21805: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:543:
+ 0x0009FFFF, $

ERROR: trailing whitespace
#21806: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:544:
+ 0x02, $

ERROR: trailing whitespace
#21807: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:545:
+ LNKH, $

ERROR: trailing whitespace
#21809: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:547:
+ }, $

ERROR: trailing whitespace
#21813: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:551:
+ 0x0009FFFF, $

ERROR: trailing whitespace
#21814: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:552:
+ 0x03, $

ERROR: trailing whitespace
#21815: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:553:
+ LNKE, $

ERROR: trailing whitespace
#21817: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:555:
+ }, $

ERROR: trailing whitespace
#21821: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:559:
+ 0x000AFFFF, $

ERROR: trailing whitespace
#21822: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:560:
+ Zero, $

ERROR: trailing whitespace
#21823: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:561:
+ LNKG, $

ERROR: trailing whitespace
#21825: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:563:
+ }, $

ERROR: trailing whitespace
#21829: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:567:
+ 0x000AFFFF, $

ERROR: trailing whitespace
#21830: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:568:
+ One, $

ERROR: trailing whitespace
#21831: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:569:
+ LNKH, $

ERROR: trailing whitespace
#21833: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:571:
+ }, $

ERROR: trailing whitespace
#21837: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:575:
+ 0x000AFFFF, $

ERROR: trailing whitespace
#21838: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:576:
+ 0x02, $

ERROR: trailing whitespace
#21839: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:577:
+ LNKE, $

ERROR: trailing whitespace
#21841: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:579:
+ }, $

ERROR: trailing whitespace
#21845: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:583:
+ 0x000AFFFF, $

ERROR: trailing whitespace
#21846: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:584:
+ 0x03, $

ERROR: trailing whitespace
#21847: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:585:
+ LNKF, $

ERROR: trailing whitespace
#21849: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:587:
+ }, $

ERROR: trailing whitespace
#21853: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:591:
+ 0x000BFFFF, $

ERROR: trailing whitespace
#21854: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:592:
+ Zero, $

ERROR: trailing whitespace
#21855: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:593:
+ LNKH, $

ERROR: trailing whitespace
#21857: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:595:
+ }, $

ERROR: trailing whitespace
#21861: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:599:
+ 0x000BFFFF, $

ERROR: trailing whitespace
#21862: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:600:
+ One, $

ERROR: trailing whitespace
#21863: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:601:
+ LNKE, $

ERROR: trailing whitespace
#21865: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:603:
+ }, $

ERROR: trailing whitespace
#21869: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:607:
+ 0x000BFFFF, $

ERROR: trailing whitespace
#21870: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:608:
+ 0x02, $

ERROR: trailing whitespace
#21871: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:609:
+ LNKF, $

ERROR: trailing whitespace
#21873: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:611:
+ }, $

ERROR: trailing whitespace
#21877: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:615:
+ 0x000BFFFF, $

ERROR: trailing whitespace
#21878: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:616:
+ 0x03, $

ERROR: trailing whitespace
#21879: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:617:
+ LNKG, $

ERROR: trailing whitespace
#21881: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:619:
+ }, $

ERROR: trailing whitespace
#21885: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:623:
+ 0x000CFFFF, $

ERROR: trailing whitespace
#21886: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:624:
+ Zero, $

ERROR: trailing whitespace
#21887: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:625:
+ LNKE, $

ERROR: trailing whitespace
#21889: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:627:
+ }, $

ERROR: trailing whitespace
#21893: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:631:
+ 0x000CFFFF, $

ERROR: trailing whitespace
#21894: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:632:
+ One, $

ERROR: trailing whitespace
#21895: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:633:
+ LNKF, $

ERROR: trailing whitespace
#21897: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:635:
+ }, $

ERROR: trailing whitespace
#21901: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:639:
+ 0x000CFFFF, $

ERROR: trailing whitespace
#21902: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:640:
+ 0x02, $

ERROR: trailing whitespace
#21903: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:641:
+ LNKG, $

ERROR: trailing whitespace
#21905: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:643:
+ }, $

ERROR: trailing whitespace
#21909: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:647:
+ 0x000CFFFF, $

ERROR: trailing whitespace
#21910: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:648:
+ 0x03, $

ERROR: trailing whitespace
#21911: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:649:
+ LNKH, $

ERROR: trailing whitespace
#21913: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:651:
+ }, $

ERROR: trailing whitespace
#21917: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:655:
+ 0x000DFFFF, $

ERROR: trailing whitespace
#21918: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:656:
+ Zero, $

ERROR: trailing whitespace
#21919: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:657:
+ LNKF, $

ERROR: trailing whitespace
#21921: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:659:
+ }, $

ERROR: trailing whitespace
#21925: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:663:
+ 0x000DFFFF, $

ERROR: trailing whitespace
#21926: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:664:
+ One, $

ERROR: trailing whitespace
#21927: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:665:
+ LNKG, $

ERROR: trailing whitespace
#21929: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:667:
+ }, $

ERROR: trailing whitespace
#21933: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:671:
+ 0x000DFFFF, $

ERROR: trailing whitespace
#21934: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:672:
+ 0x02, $

ERROR: trailing whitespace
#21935: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:673:
+ LNKH, $

ERROR: trailing whitespace
#21937: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:675:
+ }, $

ERROR: trailing whitespace
#21941: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:679:
+ 0x000DFFFF, $

ERROR: trailing whitespace
#21942: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:680:
+ 0x03, $

ERROR: trailing whitespace
#21943: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:681:
+ LNKE, $

ERROR: trailing whitespace
#21945: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:683:
+ }, $

ERROR: trailing whitespace
#21949: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:687:
+ 0x000EFFFF, $

ERROR: trailing whitespace
#21950: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:688:
+ Zero, $

ERROR: trailing whitespace
#21951: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:689:
+ LNKG, $

ERROR: trailing whitespace
#21953: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:691:
+ }, $

ERROR: trailing whitespace
#21957: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:695:
+ 0x000EFFFF, $

ERROR: trailing whitespace
#21958: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:696:
+ One, $

ERROR: trailing whitespace
#21959: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:697:
+ LNKH, $

ERROR: trailing whitespace
#21961: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:699:
+ }, $

ERROR: trailing whitespace
#21965: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:703:
+ 0x000EFFFF, $

ERROR: trailing whitespace
#21966: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:704:
+ 0x02, $

ERROR: trailing whitespace
#21967: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:705:
+ LNKE, $

ERROR: trailing whitespace
#21969: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:707:
+ }, $

ERROR: trailing whitespace
#21973: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:711:
+ 0x000EFFFF, $

ERROR: trailing whitespace
#21974: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:712:
+ 0x03, $

ERROR: trailing whitespace
#21975: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:713:
+ LNKF, $

ERROR: trailing whitespace
#21977: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:715:
+ }, $

ERROR: trailing whitespace
#21981: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:719:
+ 0x000FFFFF, $

ERROR: trailing whitespace
#21982: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:720:
+ Zero, $

ERROR: trailing whitespace
#21983: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:721:
+ LNKH, $

ERROR: trailing whitespace
#21985: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:723:
+ }, $

ERROR: trailing whitespace
#21989: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:727:
+ 0x000FFFFF, $

ERROR: trailing whitespace
#21990: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:728:
+ One, $

ERROR: trailing whitespace
#21991: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:729:
+ LNKE, $

ERROR: trailing whitespace
#21993: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:731:
+ }, $

ERROR: trailing whitespace
#21997: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:735:
+ 0x000FFFFF, $

ERROR: trailing whitespace
#21998: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:736:
+ 0x02, $

ERROR: trailing whitespace
#21999: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:737:
+ LNKF, $

ERROR: trailing whitespace
#22001: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:739:
+ }, $

ERROR: trailing whitespace
#22005: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:743:
+ 0x000FFFFF, $

ERROR: trailing whitespace
#22006: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:744:
+ 0x03, $

ERROR: trailing whitespace
#22007: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:745:
+ LNKG, $

ERROR: trailing whitespace
#22009: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:747:
+ }, $

ERROR: trailing whitespace
#22013: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:751:
+ 0x0010FFFF, $

ERROR: trailing whitespace
#22014: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:752:
+ Zero, $

ERROR: trailing whitespace
#22015: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:753:
+ LNKE, $

ERROR: trailing whitespace
#22017: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:755:
+ }, $

ERROR: trailing whitespace
#22021: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:759:
+ 0x0010FFFF, $

ERROR: trailing whitespace
#22022: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:760:
+ One, $

ERROR: trailing whitespace
#22023: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:761:
+ LNKF, $

ERROR: trailing whitespace
#22025: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:763:
+ }, $

ERROR: trailing whitespace
#22029: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:767:
+ 0x0010FFFF, $

ERROR: trailing whitespace
#22030: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:768:
+ 0x02, $

ERROR: trailing whitespace
#22031: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:769:
+ LNKG, $

ERROR: trailing whitespace
#22033: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:771:
+ }, $

ERROR: trailing whitespace
#22037: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:775:
+ 0x0010FFFF, $

ERROR: trailing whitespace
#22038: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:776:
+ 0x03, $

ERROR: trailing whitespace
#22039: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:777:
+ LNKH, $

ERROR: trailing whitespace
#22041: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:779:
+ }, $

ERROR: trailing whitespace
#22045: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:783:
+ 0x0011FFFF, $

ERROR: trailing whitespace
#22046: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:784:
+ Zero, $

ERROR: trailing whitespace
#22047: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:785:
+ LNKF, $

ERROR: trailing whitespace
#22049: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:787:
+ }, $

ERROR: trailing whitespace
#22053: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:791:
+ 0x0011FFFF, $

ERROR: trailing whitespace
#22054: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:792:
+ One, $

ERROR: trailing whitespace
#22055: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:793:
+ LNKG, $

ERROR: trailing whitespace
#22057: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:795:
+ }, $

ERROR: trailing whitespace
#22061: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:799:
+ 0x0011FFFF, $

ERROR: trailing whitespace
#22062: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:800:
+ 0x02, $

ERROR: trailing whitespace
#22063: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:801:
+ LNKH, $

ERROR: trailing whitespace
#22065: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:803:
+ }, $

ERROR: trailing whitespace
#22069: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:807:
+ 0x0011FFFF, $

ERROR: trailing whitespace
#22070: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:808:
+ 0x03, $

ERROR: trailing whitespace
#22071: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:809:
+ LNKE, $

ERROR: trailing whitespace
#22073: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:811:
+ }, $

ERROR: trailing whitespace
#22077: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:815:
+ 0x0012FFFF, $

ERROR: trailing whitespace
#22078: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:816:
+ Zero, $

ERROR: trailing whitespace
#22079: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:817:
+ LNKG, $

ERROR: trailing whitespace
#22081: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:819:
+ }, $

ERROR: trailing whitespace
#22085: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:823:
+ 0x0012FFFF, $

ERROR: trailing whitespace
#22086: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:824:
+ One, $

ERROR: trailing whitespace
#22087: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:825:
+ LNKH, $

ERROR: trailing whitespace
#22089: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:827:
+ }, $

ERROR: trailing whitespace
#22093: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:831:
+ 0x0012FFFF, $

ERROR: trailing whitespace
#22094: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:832:
+ 0x02, $

ERROR: trailing whitespace
#22095: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:833:
+ LNKE, $

ERROR: trailing whitespace
#22097: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:835:
+ }, $

ERROR: trailing whitespace
#22101: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:839:
+ 0x0012FFFF, $

ERROR: trailing whitespace
#22102: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:840:
+ 0x03, $

ERROR: trailing whitespace
#22103: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:841:
+ LNKF, $

ERROR: trailing whitespace
#22105: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:843:
+ }, $

ERROR: trailing whitespace
#22109: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:847:
+ 0x0013FFFF, $

ERROR: trailing whitespace
#22110: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:848:
+ Zero, $

ERROR: trailing whitespace
#22111: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:849:
+ LNKH, $

ERROR: trailing whitespace
#22113: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:851:
+ }, $

ERROR: trailing whitespace
#22117: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:855:
+ 0x0013FFFF, $

ERROR: trailing whitespace
#22118: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:856:
+ One, $

ERROR: trailing whitespace
#22119: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:857:
+ LNKE, $

ERROR: trailing whitespace
#22121: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:859:
+ }, $

ERROR: trailing whitespace
#22125: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:863:
+ 0x0013FFFF, $

ERROR: trailing whitespace
#22126: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:864:
+ 0x02, $

ERROR: trailing whitespace
#22127: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:865:
+ LNKF, $

ERROR: trailing whitespace
#22129: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:867:
+ }, $

ERROR: trailing whitespace
#22133: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:871:
+ 0x0013FFFF, $

ERROR: trailing whitespace
#22134: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:872:
+ 0x03, $

ERROR: trailing whitespace
#22135: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:873:
+ LNKG, $

ERROR: trailing whitespace
#22137: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:875:
+ }, $

ERROR: trailing whitespace
#22141: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:879:
+ 0x0014FFFF, $

ERROR: trailing whitespace
#22142: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:880:
+ Zero, $

ERROR: trailing whitespace
#22143: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:881:
+ LNKE, $

ERROR: trailing whitespace
#22145: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:883:
+ }, $

ERROR: trailing whitespace
#22149: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:887:
+ 0x0014FFFF, $

ERROR: trailing whitespace
#22150: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:888:
+ One, $

ERROR: trailing whitespace
#22151: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:889:
+ LNKF, $

ERROR: trailing whitespace
#22153: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:891:
+ }, $

ERROR: trailing whitespace
#22157: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:895:
+ 0x0014FFFF, $

ERROR: trailing whitespace
#22158: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:896:
+ 0x02, $

ERROR: trailing whitespace
#22159: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:897:
+ LNKG, $

ERROR: trailing whitespace
#22161: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:899:
+ }, $

ERROR: trailing whitespace
#22165: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:903:
+ 0x0014FFFF, $

ERROR: trailing whitespace
#22166: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:904:
+ 0x03, $

ERROR: trailing whitespace
#22167: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:905:
+ LNKH, $

ERROR: trailing whitespace
#22169: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:907:
+ }, $

ERROR: trailing whitespace
#22173: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:911:
+ 0x0015FFFF, $

ERROR: trailing whitespace
#22174: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:912:
+ Zero, $

ERROR: trailing whitespace
#22175: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:913:
+ LNKF, $

ERROR: trailing whitespace
#22177: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:915:
+ }, $

ERROR: trailing whitespace
#22181: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:919:
+ 0x0015FFFF, $

ERROR: trailing whitespace
#22182: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:920:
+ One, $

ERROR: trailing whitespace
#22183: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:921:
+ LNKG, $

ERROR: trailing whitespace
#22185: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:923:
+ }, $

ERROR: trailing whitespace
#22189: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:927:
+ 0x0015FFFF, $

ERROR: trailing whitespace
#22190: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:928:
+ 0x02, $

ERROR: trailing whitespace
#22191: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:929:
+ LNKH, $

ERROR: trailing whitespace
#22193: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:931:
+ }, $

ERROR: trailing whitespace
#22197: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:935:
+ 0x0015FFFF, $

ERROR: trailing whitespace
#22198: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:936:
+ 0x03, $

ERROR: trailing whitespace
#22199: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:937:
+ LNKE, $

ERROR: trailing whitespace
#22201: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:939:
+ }, $

ERROR: trailing whitespace
#22205: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:943:
+ 0x0016FFFF, $

ERROR: trailing whitespace
#22206: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:944:
+ Zero, $

ERROR: trailing whitespace
#22207: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:945:
+ LNKG, $

ERROR: trailing whitespace
#22209: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:947:
+ }, $

ERROR: trailing whitespace
#22213: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:951:
+ 0x0016FFFF, $

ERROR: trailing whitespace
#22214: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:952:
+ One, $

ERROR: trailing whitespace
#22215: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:953:
+ LNKH, $

ERROR: trailing whitespace
#22217: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:955:
+ }, $

ERROR: trailing whitespace
#22221: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:959:
+ 0x0016FFFF, $

ERROR: trailing whitespace
#22222: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:960:
+ 0x02, $

ERROR: trailing whitespace
#22223: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:961:
+ LNKE, $

ERROR: trailing whitespace
#22225: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:963:
+ }, $

ERROR: trailing whitespace
#22229: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:967:
+ 0x0016FFFF, $

ERROR: trailing whitespace
#22230: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:968:
+ 0x03, $

ERROR: trailing whitespace
#22231: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:969:
+ LNKF, $

ERROR: trailing whitespace
#22233: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:971:
+ }, $

ERROR: trailing whitespace
#22237: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:975:
+ 0x0017FFFF, $

ERROR: trailing whitespace
#22238: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:976:
+ Zero, $

ERROR: trailing whitespace
#22239: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:977:
+ LNKH, $

ERROR: trailing whitespace
#22241: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:979:
+ }, $

ERROR: trailing whitespace
#22245: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:983:
+ 0x0017FFFF, $

ERROR: trailing whitespace
#22246: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:984:
+ One, $

ERROR: trailing whitespace
#22247: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:985:
+ LNKE, $

ERROR: trailing whitespace
#22249: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:987:
+ }, $

ERROR: trailing whitespace
#22253: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:991:
+ 0x0017FFFF, $

ERROR: trailing whitespace
#22254: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:992:
+ 0x02, $

ERROR: trailing whitespace
#22255: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:993:
+ LNKF, $

ERROR: trailing whitespace
#22257: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:995:
+ }, $

ERROR: trailing whitespace
#22261: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:999:
+ 0x0017FFFF, $

ERROR: trailing whitespace
#22262: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1000:
+ 0x03, $

ERROR: trailing whitespace
#22263: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1001:
+ LNKG, $

ERROR: trailing whitespace
#22265: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1003:
+ }, $

ERROR: trailing whitespace
#22269: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1007:
+ 0x0018FFFF, $

ERROR: trailing whitespace
#22270: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1008:
+ Zero, $

ERROR: trailing whitespace
#22271: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1009:
+ LNKE, $

ERROR: trailing whitespace
#22273: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1011:
+ }, $

ERROR: trailing whitespace
#22277: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1015:
+ 0x0018FFFF, $

ERROR: trailing whitespace
#22278: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1016:
+ One, $

ERROR: trailing whitespace
#22279: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1017:
+ LNKF, $

ERROR: trailing whitespace
#22281: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1019:
+ }, $

ERROR: trailing whitespace
#22285: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1023:
+ 0x0018FFFF, $

ERROR: trailing whitespace
#22286: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1024:
+ 0x02, $

ERROR: trailing whitespace
#22287: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1025:
+ LNKG, $

ERROR: trailing whitespace
#22289: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1027:
+ }, $

ERROR: trailing whitespace
#22293: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1031:
+ 0x0018FFFF, $

ERROR: trailing whitespace
#22294: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1032:
+ 0x03, $

ERROR: trailing whitespace
#22295: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1033:
+ LNKH, $

ERROR: trailing whitespace
#22297: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1035:
+ }, $

ERROR: trailing whitespace
#22301: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1039:
+ 0x0019FFFF, $

ERROR: trailing whitespace
#22302: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1040:
+ Zero, $

ERROR: trailing whitespace
#22303: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1041:
+ LNKA, $

ERROR: trailing whitespace
#22305: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1043:
+ }, $

ERROR: trailing whitespace
#22309: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1047:
+ 0x0019FFFF, $

ERROR: trailing whitespace
#22310: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1048:
+ One, $

ERROR: trailing whitespace
#22311: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1049:
+ LNKB, $

ERROR: trailing whitespace
#22313: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1051:
+ }, $

ERROR: trailing whitespace
#22317: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1055:
+ 0x0019FFFF, $

ERROR: trailing whitespace
#22318: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1056:
+ 0x02, $

ERROR: trailing whitespace
#22319: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1057:
+ LNKC, $

ERROR: trailing whitespace
#22321: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1059:
+ }, $

ERROR: trailing whitespace
#22325: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1063:
+ 0x0019FFFF, $

ERROR: trailing whitespace
#22326: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1064:
+ 0x03, $

ERROR: trailing whitespace
#22327: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1065:
+ LNKD, $

ERROR: trailing whitespace
#22329: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1067:
+ }, $

ERROR: trailing whitespace
#22333: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1071:
+ 0x001AFFFF, $

ERROR: trailing whitespace
#22334: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1072:
+ Zero, $

ERROR: trailing whitespace
#22335: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1073:
+ LNKA, $

ERROR: trailing whitespace
#22337: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1075:
+ }, $

ERROR: trailing whitespace
#22341: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1079:
+ 0x001AFFFF, $

ERROR: trailing whitespace
#22342: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1080:
+ One, $

ERROR: trailing whitespace
#22343: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1081:
+ LNKB, $

ERROR: trailing whitespace
#22345: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1083:
+ }, $

ERROR: trailing whitespace
#22349: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1087:
+ 0x001AFFFF, $

ERROR: trailing whitespace
#22350: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1088:
+ 0x02, $

ERROR: trailing whitespace
#22351: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1089:
+ LNKC, $

ERROR: trailing whitespace
#22353: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1091:
+ }, $

ERROR: trailing whitespace
#22357: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1095:
+ 0x001AFFFF, $

ERROR: trailing whitespace
#22358: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1096:
+ 0x03, $

ERROR: trailing whitespace
#22359: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1097:
+ LNKD, $

ERROR: trailing whitespace
#22361: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1099:
+ }, $

ERROR: trailing whitespace
#22365: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1103:
+ 0x001BFFFF, $

ERROR: trailing whitespace
#22366: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1104:
+ Zero, $

ERROR: trailing whitespace
#22367: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1105:
+ LNKA, $

ERROR: trailing whitespace
#22369: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1107:
+ }, $

ERROR: trailing whitespace
#22373: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1111:
+ 0x001BFFFF, $

ERROR: trailing whitespace
#22374: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1112:
+ One, $

ERROR: trailing whitespace
#22375: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1113:
+ LNKB, $

ERROR: trailing whitespace
#22377: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1115:
+ }, $

ERROR: trailing whitespace
#22381: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1119:
+ 0x001BFFFF, $

ERROR: trailing whitespace
#22382: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1120:
+ 0x02, $

ERROR: trailing whitespace
#22383: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1121:
+ LNKC, $

ERROR: trailing whitespace
#22385: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1123:
+ }, $

ERROR: trailing whitespace
#22389: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1127:
+ 0x001BFFFF, $

ERROR: trailing whitespace
#22390: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1128:
+ 0x03, $

ERROR: trailing whitespace
#22391: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1129:
+ LNKD, $

ERROR: trailing whitespace
#22393: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1131:
+ }, $

ERROR: trailing whitespace
#22397: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1135:
+ 0x001CFFFF, $

ERROR: trailing whitespace
#22398: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1136:
+ Zero, $

ERROR: trailing whitespace
#22399: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1137:
+ LNKA, $

ERROR: trailing whitespace
#22401: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1139:
+ }, $

ERROR: trailing whitespace
#22405: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1143:
+ 0x001CFFFF, $

ERROR: trailing whitespace
#22406: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1144:
+ One, $

ERROR: trailing whitespace
#22407: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1145:
+ LNKB, $

ERROR: trailing whitespace
#22409: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1147:
+ }, $

ERROR: trailing whitespace
#22413: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1151:
+ 0x001CFFFF, $

ERROR: trailing whitespace
#22414: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1152:
+ 0x02, $

ERROR: trailing whitespace
#22415: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1153:
+ LNKC, $

ERROR: trailing whitespace
#22417: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1155:
+ }, $

ERROR: trailing whitespace
#22421: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1159:
+ 0x001CFFFF, $

ERROR: trailing whitespace
#22422: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1160:
+ 0x03, $

ERROR: trailing whitespace
#22423: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1161:
+ LNKD, $

ERROR: trailing whitespace
#22425: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1163:
+ }, $

ERROR: trailing whitespace
#22429: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1167:
+ 0x001DFFFF, $

ERROR: trailing whitespace
#22430: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1168:
+ Zero, $

ERROR: trailing whitespace
#22431: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1169:
+ LNKA, $

ERROR: trailing whitespace
#22433: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1171:
+ }, $

ERROR: trailing whitespace
#22437: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1175:
+ 0x001DFFFF, $

ERROR: trailing whitespace
#22438: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1176:
+ One, $

ERROR: trailing whitespace
#22439: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1177:
+ LNKB, $

ERROR: trailing whitespace
#22441: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1179:
+ }, $

ERROR: trailing whitespace
#22445: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1183:
+ 0x001DFFFF, $

ERROR: trailing whitespace
#22446: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1184:
+ 0x02, $

ERROR: trailing whitespace
#22447: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1185:
+ LNKC, $

ERROR: trailing whitespace
#22449: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1187:
+ }, $

ERROR: trailing whitespace
#22453: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1191:
+ 0x001DFFFF, $

ERROR: trailing whitespace
#22454: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1192:
+ 0x03, $

ERROR: trailing whitespace
#22455: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1193:
+ LNKD, $

ERROR: trailing whitespace
#22457: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1195:
+ }, $

ERROR: trailing whitespace
#22461: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1199:
+ 0x001EFFFF, $

ERROR: trailing whitespace
#22462: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1200:
+ Zero, $

ERROR: trailing whitespace
#22463: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1201:
+ LNKE, $

ERROR: trailing whitespace
#22465: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1203:
+ }, $

ERROR: trailing whitespace
#22469: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1207:
+ 0x001EFFFF, $

ERROR: trailing whitespace
#22470: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1208:
+ One, $

ERROR: trailing whitespace
#22471: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1209:
+ LNKF, $

ERROR: trailing whitespace
#22473: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1211:
+ }, $

ERROR: trailing whitespace
#22477: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1215:
+ 0x001EFFFF, $

ERROR: trailing whitespace
#22478: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1216:
+ 0x02, $

ERROR: trailing whitespace
#22479: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1217:
+ LNKG, $

ERROR: trailing whitespace
#22481: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1219:
+ }, $

ERROR: trailing whitespace
#22485: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1223:
+ 0x001EFFFF, $

ERROR: trailing whitespace
#22486: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1224:
+ 0x03, $

ERROR: trailing whitespace
#22487: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1225:
+ LNKH, $

ERROR: trailing whitespace
#22489: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1227:
+ }, $

ERROR: trailing whitespace
#22493: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1231:
+ 0x001FFFFF, $

ERROR: trailing whitespace
#22494: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1232:
+ Zero, $

ERROR: trailing whitespace
#22495: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1233:
+ LNKA, $

ERROR: trailing whitespace
#22497: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1235:
+ }, $

ERROR: trailing whitespace
#22501: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1239:
+ 0x001FFFFF, $

ERROR: trailing whitespace
#22502: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1240:
+ One, $

ERROR: trailing whitespace
#22503: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1241:
+ LNKB, $

ERROR: trailing whitespace
#22505: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1243:
+ }, $

ERROR: trailing whitespace
#22509: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1247:
+ 0x001FFFFF, $

ERROR: trailing whitespace
#22510: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1248:
+ 0x02, $

ERROR: trailing whitespace
#22511: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1249:
+ LNKC, $

ERROR: trailing whitespace
#22513: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1251:
+ }, $

ERROR: trailing whitespace
#22517: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1255:
+ 0x001FFFFF, $

ERROR: trailing whitespace
#22518: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1256:
+ 0x03, $

ERROR: trailing whitespace
#22519: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1257:
+ LNKD, $

ERROR: trailing whitespace
#22527: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1265:
+ 0xFFFF, $

ERROR: trailing whitespace
#22528: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1266:
+ Zero, $

ERROR: trailing whitespace
#22529: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1267:
+ GSIE, $

ERROR: trailing whitespace
#22531: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1269:
+ }, $

ERROR: trailing whitespace
#22535: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1273:
+ 0xFFFF, $

ERROR: trailing whitespace
#22536: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1274:
+ One, $

ERROR: trailing whitespace
#22537: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1275:
+ GSIF, $

ERROR: trailing whitespace
#22539: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1277:
+ }, $

ERROR: trailing whitespace
#22543: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1281:
+ 0xFFFF, $

ERROR: trailing whitespace
#22544: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1282:
+ 0x02, $

ERROR: trailing whitespace
#22545: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1283:
+ GSIG, $

ERROR: trailing whitespace
#22547: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1285:
+ }, $

ERROR: trailing whitespace
#22551: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1289:
+ 0xFFFF, $

ERROR: trailing whitespace
#22552: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1290:
+ 0x03, $

ERROR: trailing whitespace
#22553: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1291:
+ GSIH, $

ERROR: trailing whitespace
#22555: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1293:
+ }, $

ERROR: trailing whitespace
#22559: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1297:
+ 0x0001FFFF, $

ERROR: trailing whitespace
#22560: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1298:
+ Zero, $

ERROR: trailing whitespace
#22561: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1299:
+ GSIF, $

ERROR: trailing whitespace
#22563: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1301:
+ }, $

ERROR: trailing whitespace
#22567: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1305:
+ 0x0001FFFF, $

ERROR: trailing whitespace
#22568: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1306:
+ One, $

ERROR: trailing whitespace
#22569: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1307:
+ GSIG, $

ERROR: trailing whitespace
#22571: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1309:
+ }, $

ERROR: trailing whitespace
#22575: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1313:
+ 0x0001FFFF, $

ERROR: trailing whitespace
#22576: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1314:
+ 0x02, $

ERROR: trailing whitespace
#22577: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1315:
+ GSIH, $

ERROR: trailing whitespace
#22579: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1317:
+ }, $

ERROR: trailing whitespace
#22583: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1321:
+ 0x0001FFFF, $

ERROR: trailing whitespace
#22584: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1322:
+ 0x03, $

ERROR: trailing whitespace
#22585: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1323:
+ GSIE, $

ERROR: trailing whitespace
#22587: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1325:
+ }, $

ERROR: trailing whitespace
#22591: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1329:
+ 0x0002FFFF, $

ERROR: trailing whitespace
#22592: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1330:
+ Zero, $

ERROR: trailing whitespace
#22593: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1331:
+ GSIG, $

ERROR: trailing whitespace
#22595: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1333:
+ }, $

ERROR: trailing whitespace
#22599: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1337:
+ 0x0002FFFF, $

ERROR: trailing whitespace
#22600: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1338:
+ One, $

ERROR: trailing whitespace
#22601: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1339:
+ GSIH, $

ERROR: trailing whitespace
#22603: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1341:
+ }, $

ERROR: trailing whitespace
#22607: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1345:
+ 0x0002FFFF, $

ERROR: trailing whitespace
#22608: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1346:
+ 0x02, $

ERROR: trailing whitespace
#22609: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1347:
+ GSIE, $

ERROR: trailing whitespace
#22611: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1349:
+ }, $

ERROR: trailing whitespace
#22615: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1353:
+ 0x0002FFFF, $

ERROR: trailing whitespace
#22616: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1354:
+ 0x03, $

ERROR: trailing whitespace
#22617: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1355:
+ GSIF, $

ERROR: trailing whitespace
#22619: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1357:
+ }, $

ERROR: trailing whitespace
#22623: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1361:
+ 0x0003FFFF, $

ERROR: trailing whitespace
#22624: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1362:
+ Zero, $

ERROR: trailing whitespace
#22625: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1363:
+ GSIH, $

ERROR: trailing whitespace
#22627: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1365:
+ }, $

ERROR: trailing whitespace
#22631: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1369:
+ 0x0003FFFF, $

ERROR: trailing whitespace
#22632: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1370:
+ One, $

ERROR: trailing whitespace
#22633: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1371:
+ GSIE, $

ERROR: trailing whitespace
#22635: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1373:
+ }, $

ERROR: trailing whitespace
#22639: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1377:
+ 0x0003FFFF, $

ERROR: trailing whitespace
#22640: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1378:
+ 0x02, $

ERROR: trailing whitespace
#22641: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1379:
+ GSIF, $

ERROR: trailing whitespace
#22643: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1381:
+ }, $

ERROR: trailing whitespace
#22647: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1385:
+ 0x0003FFFF, $

ERROR: trailing whitespace
#22648: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1386:
+ 0x03, $

ERROR: trailing whitespace
#22649: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1387:
+ GSIG, $

ERROR: trailing whitespace
#22651: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1389:
+ }, $

ERROR: trailing whitespace
#22655: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1393:
+ 0x0004FFFF, $

ERROR: trailing whitespace
#22656: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1394:
+ Zero, $

ERROR: trailing whitespace
#22657: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1395:
+ GSIE, $

ERROR: trailing whitespace
#22659: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1397:
+ }, $

ERROR: trailing whitespace
#22663: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1401:
+ 0x0004FFFF, $

ERROR: trailing whitespace
#22664: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1402:
+ One, $

ERROR: trailing whitespace
#22665: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1403:
+ GSIF, $

ERROR: trailing whitespace
#22667: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1405:
+ }, $

ERROR: trailing whitespace
#22671: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1409:
+ 0x0004FFFF, $

ERROR: trailing whitespace
#22672: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1410:
+ 0x02, $

ERROR: trailing whitespace
#22673: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1411:
+ GSIG, $

ERROR: trailing whitespace
#22675: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1413:
+ }, $

ERROR: trailing whitespace
#22679: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1417:
+ 0x0004FFFF, $

ERROR: trailing whitespace
#22680: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1418:
+ 0x03, $

ERROR: trailing whitespace
#22681: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1419:
+ GSIH, $

ERROR: trailing whitespace
#22683: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1421:
+ }, $

ERROR: trailing whitespace
#22687: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1425:
+ 0x0005FFFF, $

ERROR: trailing whitespace
#22688: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1426:
+ Zero, $

ERROR: trailing whitespace
#22689: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1427:
+ GSIF, $

ERROR: trailing whitespace
#22691: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1429:
+ }, $

ERROR: trailing whitespace
#22695: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1433:
+ 0x0005FFFF, $

ERROR: trailing whitespace
#22696: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1434:
+ One, $

ERROR: trailing whitespace
#22697: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1435:
+ GSIG, $

ERROR: trailing whitespace
#22699: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1437:
+ }, $

ERROR: trailing whitespace
#22703: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1441:
+ 0x0005FFFF, $

ERROR: trailing whitespace
#22704: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1442:
+ 0x02, $

ERROR: trailing whitespace
#22705: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1443:
+ GSIH, $

ERROR: trailing whitespace
#22707: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1445:
+ }, $

ERROR: trailing whitespace
#22711: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1449:
+ 0x0005FFFF, $

ERROR: trailing whitespace
#22712: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1450:
+ 0x03, $

ERROR: trailing whitespace
#22713: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1451:
+ GSIE, $

ERROR: trailing whitespace
#22715: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1453:
+ }, $

ERROR: trailing whitespace
#22719: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1457:
+ 0x0006FFFF, $

ERROR: trailing whitespace
#22720: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1458:
+ Zero, $

ERROR: trailing whitespace
#22721: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1459:
+ GSIG, $

ERROR: trailing whitespace
#22723: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1461:
+ }, $

ERROR: trailing whitespace
#22727: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1465:
+ 0x0006FFFF, $

ERROR: trailing whitespace
#22728: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1466:
+ One, $

ERROR: trailing whitespace
#22729: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1467:
+ GSIH, $

ERROR: trailing whitespace
#22731: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1469:
+ }, $

ERROR: trailing whitespace
#22735: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1473:
+ 0x0006FFFF, $

ERROR: trailing whitespace
#22736: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1474:
+ 0x02, $

ERROR: trailing whitespace
#22737: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1475:
+ GSIE, $

ERROR: trailing whitespace
#22739: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1477:
+ }, $

ERROR: trailing whitespace
#22743: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1481:
+ 0x0006FFFF, $

ERROR: trailing whitespace
#22744: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1482:
+ 0x03, $

ERROR: trailing whitespace
#22745: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1483:
+ GSIF, $

ERROR: trailing whitespace
#22747: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1485:
+ }, $

ERROR: trailing whitespace
#22751: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1489:
+ 0x0007FFFF, $

ERROR: trailing whitespace
#22752: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1490:
+ Zero, $

ERROR: trailing whitespace
#22753: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1491:
+ GSIH, $

ERROR: trailing whitespace
#22755: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1493:
+ }, $

ERROR: trailing whitespace
#22759: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1497:
+ 0x0007FFFF, $

ERROR: trailing whitespace
#22760: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1498:
+ One, $

ERROR: trailing whitespace
#22761: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1499:
+ GSIE, $

ERROR: trailing whitespace
#22763: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1501:
+ }, $

ERROR: trailing whitespace
#22767: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1505:
+ 0x0007FFFF, $

ERROR: trailing whitespace
#22768: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1506:
+ 0x02, $

ERROR: trailing whitespace
#22769: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1507:
+ GSIF, $

ERROR: trailing whitespace
#22771: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1509:
+ }, $

ERROR: trailing whitespace
#22775: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1513:
+ 0x0007FFFF, $

ERROR: trailing whitespace
#22776: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1514:
+ 0x03, $

ERROR: trailing whitespace
#22777: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1515:
+ GSIG, $

ERROR: trailing whitespace
#22779: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1517:
+ }, $

ERROR: trailing whitespace
#22783: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1521:
+ 0x0008FFFF, $

ERROR: trailing whitespace
#22784: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1522:
+ Zero, $

ERROR: trailing whitespace
#22785: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1523:
+ GSIE, $

ERROR: trailing whitespace
#22787: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1525:
+ }, $

ERROR: trailing whitespace
#22791: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1529:
+ 0x0008FFFF, $

ERROR: trailing whitespace
#22792: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1530:
+ One, $

ERROR: trailing whitespace
#22793: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1531:
+ GSIF, $

ERROR: trailing whitespace
#22795: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1533:
+ }, $

ERROR: trailing whitespace
#22799: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1537:
+ 0x0008FFFF, $

ERROR: trailing whitespace
#22800: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1538:
+ 0x02, $

ERROR: trailing whitespace
#22801: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1539:
+ GSIG, $

ERROR: trailing whitespace
#22803: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1541:
+ }, $

ERROR: trailing whitespace
#22807: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1545:
+ 0x0008FFFF, $

ERROR: trailing whitespace
#22808: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1546:
+ 0x03, $

ERROR: trailing whitespace
#22809: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1547:
+ GSIH, $

ERROR: trailing whitespace
#22811: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1549:
+ }, $

ERROR: trailing whitespace
#22815: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1553:
+ 0x0009FFFF, $

ERROR: trailing whitespace
#22816: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1554:
+ Zero, $

ERROR: trailing whitespace
#22817: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1555:
+ GSIF, $

ERROR: trailing whitespace
#22819: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1557:
+ }, $

ERROR: trailing whitespace
#22823: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1561:
+ 0x0009FFFF, $

ERROR: trailing whitespace
#22824: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1562:
+ One, $

ERROR: trailing whitespace
#22825: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1563:
+ GSIG, $

ERROR: trailing whitespace
#22827: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1565:
+ }, $

ERROR: trailing whitespace
#22831: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1569:
+ 0x0009FFFF, $

ERROR: trailing whitespace
#22832: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1570:
+ 0x02, $

ERROR: trailing whitespace
#22833: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1571:
+ GSIH, $

ERROR: trailing whitespace
#22835: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1573:
+ }, $

ERROR: trailing whitespace
#22839: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1577:
+ 0x0009FFFF, $

ERROR: trailing whitespace
#22840: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1578:
+ 0x03, $

ERROR: trailing whitespace
#22841: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1579:
+ GSIE, $

ERROR: trailing whitespace
#22843: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1581:
+ }, $

ERROR: trailing whitespace
#22847: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1585:
+ 0x000AFFFF, $

ERROR: trailing whitespace
#22848: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1586:
+ Zero, $

ERROR: trailing whitespace
#22849: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1587:
+ GSIG, $

ERROR: trailing whitespace
#22851: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1589:
+ }, $

ERROR: trailing whitespace
#22855: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1593:
+ 0x000AFFFF, $

ERROR: trailing whitespace
#22856: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1594:
+ One, $

ERROR: trailing whitespace
#22857: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1595:
+ GSIH, $

ERROR: trailing whitespace
#22859: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1597:
+ }, $

ERROR: trailing whitespace
#22863: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1601:
+ 0x000AFFFF, $

ERROR: trailing whitespace
#22864: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1602:
+ 0x02, $

ERROR: trailing whitespace
#22865: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1603:
+ GSIE, $

ERROR: trailing whitespace
#22867: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1605:
+ }, $

ERROR: trailing whitespace
#22871: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1609:
+ 0x000AFFFF, $

ERROR: trailing whitespace
#22872: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1610:
+ 0x03, $

ERROR: trailing whitespace
#22873: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1611:
+ GSIF, $

ERROR: trailing whitespace
#22875: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1613:
+ }, $

ERROR: trailing whitespace
#22879: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1617:
+ 0x000BFFFF, $

ERROR: trailing whitespace
#22880: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1618:
+ Zero, $

ERROR: trailing whitespace
#22881: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1619:
+ GSIH, $

ERROR: trailing whitespace
#22883: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1621:
+ }, $

ERROR: trailing whitespace
#22887: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1625:
+ 0x000BFFFF, $

ERROR: trailing whitespace
#22888: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1626:
+ One, $

ERROR: trailing whitespace
#22889: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1627:
+ GSIE, $

ERROR: trailing whitespace
#22891: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1629:
+ }, $

ERROR: trailing whitespace
#22895: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1633:
+ 0x000BFFFF, $

ERROR: trailing whitespace
#22896: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1634:
+ 0x02, $

ERROR: trailing whitespace
#22897: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1635:
+ GSIF, $

ERROR: trailing whitespace
#22899: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1637:
+ }, $

ERROR: trailing whitespace
#22903: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1641:
+ 0x000BFFFF, $

ERROR: trailing whitespace
#22904: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1642:
+ 0x03, $

ERROR: trailing whitespace
#22905: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1643:
+ GSIG, $

ERROR: trailing whitespace
#22907: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1645:
+ }, $

ERROR: trailing whitespace
#22911: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1649:
+ 0x000CFFFF, $

ERROR: trailing whitespace
#22912: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1650:
+ Zero, $

ERROR: trailing whitespace
#22913: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1651:
+ GSIE, $

ERROR: trailing whitespace
#22915: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1653:
+ }, $

ERROR: trailing whitespace
#22919: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1657:
+ 0x000CFFFF, $

ERROR: trailing whitespace
#22920: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1658:
+ One, $

ERROR: trailing whitespace
#22921: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1659:
+ GSIF, $

ERROR: trailing whitespace
#22923: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1661:
+ }, $

ERROR: trailing whitespace
#22927: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1665:
+ 0x000CFFFF, $

ERROR: trailing whitespace
#22928: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1666:
+ 0x02, $

ERROR: trailing whitespace
#22929: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1667:
+ GSIG, $

ERROR: trailing whitespace
#22931: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1669:
+ }, $

ERROR: trailing whitespace
#22935: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1673:
+ 0x000CFFFF, $

ERROR: trailing whitespace
#22936: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1674:
+ 0x03, $

ERROR: trailing whitespace
#22937: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1675:
+ GSIH, $

ERROR: trailing whitespace
#22939: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1677:
+ }, $

ERROR: trailing whitespace
#22943: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1681:
+ 0x000DFFFF, $

ERROR: trailing whitespace
#22944: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1682:
+ Zero, $

ERROR: trailing whitespace
#22945: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1683:
+ GSIF, $

ERROR: trailing whitespace
#22947: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1685:
+ }, $

ERROR: trailing whitespace
#22951: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1689:
+ 0x000DFFFF, $

ERROR: trailing whitespace
#22952: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1690:
+ One, $

ERROR: trailing whitespace
#22953: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1691:
+ GSIG, $

ERROR: trailing whitespace
#22955: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1693:
+ }, $

ERROR: trailing whitespace
#22959: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1697:
+ 0x000DFFFF, $

ERROR: trailing whitespace
#22960: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1698:
+ 0x02, $

ERROR: trailing whitespace
#22961: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1699:
+ GSIH, $

ERROR: trailing whitespace
#22963: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1701:
+ }, $

ERROR: trailing whitespace
#22967: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1705:
+ 0x000DFFFF, $

ERROR: trailing whitespace
#22968: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1706:
+ 0x03, $

ERROR: trailing whitespace
#22969: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1707:
+ GSIE, $

ERROR: trailing whitespace
#22971: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1709:
+ }, $

ERROR: trailing whitespace
#22975: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1713:
+ 0x000EFFFF, $

ERROR: trailing whitespace
#22976: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1714:
+ Zero, $

ERROR: trailing whitespace
#22977: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1715:
+ GSIG, $

ERROR: trailing whitespace
#22979: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1717:
+ }, $

ERROR: trailing whitespace
#22983: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1721:
+ 0x000EFFFF, $

ERROR: trailing whitespace
#22984: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1722:
+ One, $

ERROR: trailing whitespace
#22985: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1723:
+ GSIH, $

ERROR: trailing whitespace
#22987: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1725:
+ }, $

ERROR: trailing whitespace
#22991: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1729:
+ 0x000EFFFF, $

ERROR: trailing whitespace
#22992: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1730:
+ 0x02, $

ERROR: trailing whitespace
#22993: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1731:
+ GSIE, $

ERROR: trailing whitespace
#22995: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1733:
+ }, $

ERROR: trailing whitespace
#22999: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1737:
+ 0x000EFFFF, $

ERROR: trailing whitespace
#23000: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1738:
+ 0x03, $

ERROR: trailing whitespace
#23001: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1739:
+ GSIF, $

ERROR: trailing whitespace
#23003: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1741:
+ }, $

ERROR: trailing whitespace
#23007: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1745:
+ 0x000FFFFF, $

ERROR: trailing whitespace
#23008: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1746:
+ Zero, $

ERROR: trailing whitespace
#23009: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1747:
+ GSIH, $

ERROR: trailing whitespace
#23011: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1749:
+ }, $

ERROR: trailing whitespace
#23015: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1753:
+ 0x000FFFFF, $

ERROR: trailing whitespace
#23016: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1754:
+ One, $

ERROR: trailing whitespace
#23017: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1755:
+ GSIE, $

ERROR: trailing whitespace
#23019: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1757:
+ }, $

ERROR: trailing whitespace
#23023: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1761:
+ 0x000FFFFF, $

ERROR: trailing whitespace
#23024: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1762:
+ 0x02, $

ERROR: trailing whitespace
#23025: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1763:
+ GSIF, $

ERROR: trailing whitespace
#23027: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1765:
+ }, $

ERROR: trailing whitespace
#23031: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1769:
+ 0x000FFFFF, $

ERROR: trailing whitespace
#23032: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1770:
+ 0x03, $

ERROR: trailing whitespace
#23033: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1771:
+ GSIG, $

ERROR: trailing whitespace
#23035: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1773:
+ }, $

ERROR: trailing whitespace
#23039: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1777:
+ 0x0010FFFF, $

ERROR: trailing whitespace
#23040: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1778:
+ Zero, $

ERROR: trailing whitespace
#23041: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1779:
+ GSIE, $

ERROR: trailing whitespace
#23043: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1781:
+ }, $

ERROR: trailing whitespace
#23047: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1785:
+ 0x0010FFFF, $

ERROR: trailing whitespace
#23048: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1786:
+ One, $

ERROR: trailing whitespace
#23049: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1787:
+ GSIF, $

ERROR: trailing whitespace
#23051: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1789:
+ }, $

ERROR: trailing whitespace
#23055: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1793:
+ 0x0010FFFF, $

ERROR: trailing whitespace
#23056: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1794:
+ 0x02, $

ERROR: trailing whitespace
#23057: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1795:
+ GSIG, $

ERROR: trailing whitespace
#23059: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1797:
+ }, $

ERROR: trailing whitespace
#23063: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1801:
+ 0x0010FFFF, $

ERROR: trailing whitespace
#23064: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1802:
+ 0x03, $

ERROR: trailing whitespace
#23065: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1803:
+ GSIH, $

ERROR: trailing whitespace
#23067: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1805:
+ }, $

ERROR: trailing whitespace
#23071: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1809:
+ 0x0011FFFF, $

ERROR: trailing whitespace
#23072: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1810:
+ Zero, $

ERROR: trailing whitespace
#23073: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1811:
+ GSIF, $

ERROR: trailing whitespace
#23075: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1813:
+ }, $

ERROR: trailing whitespace
#23079: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1817:
+ 0x0011FFFF, $

ERROR: trailing whitespace
#23080: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1818:
+ One, $

ERROR: trailing whitespace
#23081: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1819:
+ GSIG, $

ERROR: trailing whitespace
#23083: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1821:
+ }, $

ERROR: trailing whitespace
#23087: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1825:
+ 0x0011FFFF, $

ERROR: trailing whitespace
#23088: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1826:
+ 0x02, $

ERROR: trailing whitespace
#23089: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1827:
+ GSIH, $

ERROR: trailing whitespace
#23091: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1829:
+ }, $

ERROR: trailing whitespace
#23095: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1833:
+ 0x0011FFFF, $

ERROR: trailing whitespace
#23096: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1834:
+ 0x03, $

ERROR: trailing whitespace
#23097: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1835:
+ GSIE, $

ERROR: trailing whitespace
#23099: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1837:
+ }, $

ERROR: trailing whitespace
#23103: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1841:
+ 0x0012FFFF, $

ERROR: trailing whitespace
#23104: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1842:
+ Zero, $

ERROR: trailing whitespace
#23105: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1843:
+ GSIG, $

ERROR: trailing whitespace
#23107: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1845:
+ }, $

ERROR: trailing whitespace
#23111: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1849:
+ 0x0012FFFF, $

ERROR: trailing whitespace
#23112: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1850:
+ One, $

ERROR: trailing whitespace
#23113: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1851:
+ GSIH, $

ERROR: trailing whitespace
#23115: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1853:
+ }, $

ERROR: trailing whitespace
#23119: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1857:
+ 0x0012FFFF, $

ERROR: trailing whitespace
#23120: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1858:
+ 0x02, $

ERROR: trailing whitespace
#23121: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1859:
+ GSIE, $

ERROR: trailing whitespace
#23123: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1861:
+ }, $

ERROR: trailing whitespace
#23127: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1865:
+ 0x0012FFFF, $

ERROR: trailing whitespace
#23128: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1866:
+ 0x03, $

ERROR: trailing whitespace
#23129: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1867:
+ GSIF, $

ERROR: trailing whitespace
#23131: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1869:
+ }, $

ERROR: trailing whitespace
#23135: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1873:
+ 0x0013FFFF, $

ERROR: trailing whitespace
#23136: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1874:
+ Zero, $

ERROR: trailing whitespace
#23137: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1875:
+ GSIH, $

ERROR: trailing whitespace
#23139: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1877:
+ }, $

ERROR: trailing whitespace
#23143: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1881:
+ 0x0013FFFF, $

ERROR: trailing whitespace
#23144: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1882:
+ One, $

ERROR: trailing whitespace
#23145: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1883:
+ GSIE, $

ERROR: trailing whitespace
#23147: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1885:
+ }, $

ERROR: trailing whitespace
#23151: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1889:
+ 0x0013FFFF, $

ERROR: trailing whitespace
#23152: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1890:
+ 0x02, $

ERROR: trailing whitespace
#23153: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1891:
+ GSIF, $

ERROR: trailing whitespace
#23155: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1893:
+ }, $

ERROR: trailing whitespace
#23159: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1897:
+ 0x0013FFFF, $

ERROR: trailing whitespace
#23160: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1898:
+ 0x03, $

ERROR: trailing whitespace
#23161: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1899:
+ GSIG, $

ERROR: trailing whitespace
#23163: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1901:
+ }, $

ERROR: trailing whitespace
#23167: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1905:
+ 0x0014FFFF, $

ERROR: trailing whitespace
#23168: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1906:
+ Zero, $

ERROR: trailing whitespace
#23169: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1907:
+ GSIE, $

ERROR: trailing whitespace
#23171: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1909:
+ }, $

ERROR: trailing whitespace
#23175: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1913:
+ 0x0014FFFF, $

ERROR: trailing whitespace
#23176: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1914:
+ One, $

ERROR: trailing whitespace
#23177: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1915:
+ GSIF, $

ERROR: trailing whitespace
#23179: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1917:
+ }, $

ERROR: trailing whitespace
#23183: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1921:
+ 0x0014FFFF, $

ERROR: trailing whitespace
#23184: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1922:
+ 0x02, $

ERROR: trailing whitespace
#23185: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1923:
+ GSIG, $

ERROR: trailing whitespace
#23187: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1925:
+ }, $

ERROR: trailing whitespace
#23191: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1929:
+ 0x0014FFFF, $

ERROR: trailing whitespace
#23192: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1930:
+ 0x03, $

ERROR: trailing whitespace
#23193: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1931:
+ GSIH, $

ERROR: trailing whitespace
#23195: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1933:
+ }, $

ERROR: trailing whitespace
#23199: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1937:
+ 0x0015FFFF, $

ERROR: trailing whitespace
#23200: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1938:
+ Zero, $

ERROR: trailing whitespace
#23201: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1939:
+ GSIF, $

ERROR: trailing whitespace
#23203: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1941:
+ }, $

ERROR: trailing whitespace
#23207: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1945:
+ 0x0015FFFF, $

ERROR: trailing whitespace
#23208: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1946:
+ One, $

ERROR: trailing whitespace
#23209: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1947:
+ GSIG, $

ERROR: trailing whitespace
#23211: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1949:
+ }, $

ERROR: trailing whitespace
#23215: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1953:
+ 0x0015FFFF, $

ERROR: trailing whitespace
#23216: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1954:
+ 0x02, $

ERROR: trailing whitespace
#23217: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1955:
+ GSIH, $

ERROR: trailing whitespace
#23219: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1957:
+ }, $

ERROR: trailing whitespace
#23223: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1961:
+ 0x0015FFFF, $

ERROR: trailing whitespace
#23224: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1962:
+ 0x03, $

ERROR: trailing whitespace
#23225: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1963:
+ GSIE, $

ERROR: trailing whitespace
#23227: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1965:
+ }, $

ERROR: trailing whitespace
#23231: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1969:
+ 0x0016FFFF, $

ERROR: trailing whitespace
#23232: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1970:
+ Zero, $

ERROR: trailing whitespace
#23233: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1971:
+ GSIG, $

ERROR: trailing whitespace
#23235: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1973:
+ }, $

ERROR: trailing whitespace
#23239: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1977:
+ 0x0016FFFF, $

ERROR: trailing whitespace
#23240: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1978:
+ One, $

ERROR: trailing whitespace
#23241: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1979:
+ GSIH, $

ERROR: trailing whitespace
#23243: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1981:
+ }, $

ERROR: trailing whitespace
#23247: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1985:
+ 0x0016FFFF, $

ERROR: trailing whitespace
#23248: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1986:
+ 0x02, $

ERROR: trailing whitespace
#23249: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1987:
+ GSIE, $

ERROR: trailing whitespace
#23251: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1989:
+ }, $

ERROR: trailing whitespace
#23255: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1993:
+ 0x0016FFFF, $

ERROR: trailing whitespace
#23256: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1994:
+ 0x03, $

ERROR: trailing whitespace
#23257: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1995:
+ GSIF, $

ERROR: trailing whitespace
#23259: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:1997:
+ }, $

ERROR: trailing whitespace
#23263: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2001:
+ 0x0017FFFF, $

ERROR: trailing whitespace
#23264: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2002:
+ Zero, $

ERROR: trailing whitespace
#23265: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2003:
+ GSIH, $

ERROR: trailing whitespace
#23267: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2005:
+ }, $

ERROR: trailing whitespace
#23271: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2009:
+ 0x0017FFFF, $

ERROR: trailing whitespace
#23272: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2010:
+ One, $

ERROR: trailing whitespace
#23273: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2011:
+ GSIE, $

ERROR: trailing whitespace
#23275: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2013:
+ }, $

ERROR: trailing whitespace
#23279: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2017:
+ 0x0017FFFF, $

ERROR: trailing whitespace
#23280: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2018:
+ 0x02, $

ERROR: trailing whitespace
#23281: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2019:
+ GSIF, $

ERROR: trailing whitespace
#23283: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2021:
+ }, $

ERROR: trailing whitespace
#23287: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2025:
+ 0x0017FFFF, $

ERROR: trailing whitespace
#23288: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2026:
+ 0x03, $

ERROR: trailing whitespace
#23289: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2027:
+ GSIG, $

ERROR: trailing whitespace
#23291: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2029:
+ }, $

ERROR: trailing whitespace
#23295: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2033:
+ 0x0018FFFF, $

ERROR: trailing whitespace
#23296: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2034:
+ Zero, $

ERROR: trailing whitespace
#23297: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2035:
+ GSIE, $

ERROR: trailing whitespace
#23299: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2037:
+ }, $

ERROR: trailing whitespace
#23303: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2041:
+ 0x0018FFFF, $

ERROR: trailing whitespace
#23304: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2042:
+ One, $

ERROR: trailing whitespace
#23305: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2043:
+ GSIF, $

ERROR: trailing whitespace
#23307: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2045:
+ }, $

ERROR: trailing whitespace
#23311: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2049:
+ 0x0018FFFF, $

ERROR: trailing whitespace
#23312: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2050:
+ 0x02, $

ERROR: trailing whitespace
#23313: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2051:
+ GSIG, $

ERROR: trailing whitespace
#23315: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2053:
+ }, $

ERROR: trailing whitespace
#23319: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2057:
+ 0x0018FFFF, $

ERROR: trailing whitespace
#23320: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2058:
+ 0x03, $

ERROR: trailing whitespace
#23321: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2059:
+ GSIH, $

ERROR: trailing whitespace
#23323: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2061:
+ }, $

ERROR: trailing whitespace
#23327: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2065:
+ 0x0019FFFF, $

ERROR: trailing whitespace
#23328: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2066:
+ Zero, $

ERROR: trailing whitespace
#23329: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2067:
+ GSIA, $

ERROR: trailing whitespace
#23331: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2069:
+ }, $

ERROR: trailing whitespace
#23335: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2073:
+ 0x0019FFFF, $

ERROR: trailing whitespace
#23336: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2074:
+ One, $

ERROR: trailing whitespace
#23337: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2075:
+ GSIB, $

ERROR: trailing whitespace
#23339: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2077:
+ }, $

ERROR: trailing whitespace
#23343: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2081:
+ 0x0019FFFF, $

ERROR: trailing whitespace
#23344: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2082:
+ 0x02, $

ERROR: trailing whitespace
#23345: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2083:
+ GSIC, $

ERROR: trailing whitespace
#23347: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2085:
+ }, $

ERROR: trailing whitespace
#23351: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2089:
+ 0x0019FFFF, $

ERROR: trailing whitespace
#23352: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2090:
+ 0x03, $

ERROR: trailing whitespace
#23353: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2091:
+ GSID, $

ERROR: trailing whitespace
#23355: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2093:
+ }, $

ERROR: trailing whitespace
#23359: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2097:
+ 0x001AFFFF, $

ERROR: trailing whitespace
#23360: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2098:
+ Zero, $

ERROR: trailing whitespace
#23361: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2099:
+ GSIA, $

ERROR: trailing whitespace
#23363: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2101:
+ }, $

ERROR: trailing whitespace
#23367: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2105:
+ 0x001AFFFF, $

ERROR: trailing whitespace
#23368: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2106:
+ One, $

ERROR: trailing whitespace
#23369: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2107:
+ GSIB, $

ERROR: trailing whitespace
#23371: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2109:
+ }, $

ERROR: trailing whitespace
#23375: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2113:
+ 0x001AFFFF, $

ERROR: trailing whitespace
#23376: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2114:
+ 0x02, $

ERROR: trailing whitespace
#23377: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2115:
+ GSIC, $

ERROR: trailing whitespace
#23379: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2117:
+ }, $

ERROR: trailing whitespace
#23383: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2121:
+ 0x001AFFFF, $

ERROR: trailing whitespace
#23384: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2122:
+ 0x03, $

ERROR: trailing whitespace
#23385: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2123:
+ GSID, $

ERROR: trailing whitespace
#23387: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2125:
+ }, $

ERROR: trailing whitespace
#23391: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2129:
+ 0x001BFFFF, $

ERROR: trailing whitespace
#23392: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2130:
+ Zero, $

ERROR: trailing whitespace
#23393: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2131:
+ GSIA, $

ERROR: trailing whitespace
#23395: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2133:
+ }, $

ERROR: trailing whitespace
#23399: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2137:
+ 0x001BFFFF, $

ERROR: trailing whitespace
#23400: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2138:
+ One, $

ERROR: trailing whitespace
#23401: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2139:
+ GSIB, $

ERROR: trailing whitespace
#23403: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2141:
+ }, $

ERROR: trailing whitespace
#23407: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2145:
+ 0x001BFFFF, $

ERROR: trailing whitespace
#23408: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2146:
+ 0x02, $

ERROR: trailing whitespace
#23409: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2147:
+ GSIC, $

ERROR: trailing whitespace
#23411: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2149:
+ }, $

ERROR: trailing whitespace
#23415: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2153:
+ 0x001BFFFF, $

ERROR: trailing whitespace
#23416: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2154:
+ 0x03, $

ERROR: trailing whitespace
#23417: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2155:
+ GSID, $

ERROR: trailing whitespace
#23419: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2157:
+ }, $

ERROR: trailing whitespace
#23423: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2161:
+ 0x001CFFFF, $

ERROR: trailing whitespace
#23424: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2162:
+ Zero, $

ERROR: trailing whitespace
#23425: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2163:
+ GSIA, $

ERROR: trailing whitespace
#23427: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2165:
+ }, $

ERROR: trailing whitespace
#23431: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2169:
+ 0x001CFFFF, $

ERROR: trailing whitespace
#23432: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2170:
+ One, $

ERROR: trailing whitespace
#23433: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2171:
+ GSIB, $

ERROR: trailing whitespace
#23435: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2173:
+ }, $

ERROR: trailing whitespace
#23439: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2177:
+ 0x001CFFFF, $

ERROR: trailing whitespace
#23440: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2178:
+ 0x02, $

ERROR: trailing whitespace
#23441: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2179:
+ GSIC, $

ERROR: trailing whitespace
#23443: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2181:
+ }, $

ERROR: trailing whitespace
#23447: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2185:
+ 0x001CFFFF, $

ERROR: trailing whitespace
#23448: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2186:
+ 0x03, $

ERROR: trailing whitespace
#23449: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2187:
+ GSID, $

ERROR: trailing whitespace
#23451: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2189:
+ }, $

ERROR: trailing whitespace
#23455: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2193:
+ 0x001DFFFF, $

ERROR: trailing whitespace
#23456: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2194:
+ Zero, $

ERROR: trailing whitespace
#23457: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2195:
+ GSIA, $

ERROR: trailing whitespace
#23459: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2197:
+ }, $

ERROR: trailing whitespace
#23463: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2201:
+ 0x001DFFFF, $

ERROR: trailing whitespace
#23464: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2202:
+ One, $

ERROR: trailing whitespace
#23465: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2203:
+ GSIB, $

ERROR: trailing whitespace
#23467: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2205:
+ }, $

ERROR: trailing whitespace
#23471: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2209:
+ 0x001DFFFF, $

ERROR: trailing whitespace
#23472: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2210:
+ 0x02, $

ERROR: trailing whitespace
#23473: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2211:
+ GSIC, $

ERROR: trailing whitespace
#23475: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2213:
+ }, $

ERROR: trailing whitespace
#23479: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2217:
+ 0x001DFFFF, $

ERROR: trailing whitespace
#23480: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2218:
+ 0x03, $

ERROR: trailing whitespace
#23481: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2219:
+ GSID, $

ERROR: trailing whitespace
#23483: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2221:
+ }, $

ERROR: trailing whitespace
#23487: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2225:
+ 0x001EFFFF, $

ERROR: trailing whitespace
#23488: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2226:
+ Zero, $

ERROR: trailing whitespace
#23489: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2227:
+ GSIE, $

ERROR: trailing whitespace
#23491: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2229:
+ }, $

ERROR: trailing whitespace
#23495: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2233:
+ 0x001EFFFF, $

ERROR: trailing whitespace
#23496: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2234:
+ One, $

ERROR: trailing whitespace
#23497: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2235:
+ GSIF, $

ERROR: trailing whitespace
#23499: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2237:
+ }, $

ERROR: trailing whitespace
#23503: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2241:
+ 0x001EFFFF, $

ERROR: trailing whitespace
#23504: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2242:
+ 0x02, $

ERROR: trailing whitespace
#23505: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2243:
+ GSIG, $

ERROR: trailing whitespace
#23507: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2245:
+ }, $

ERROR: trailing whitespace
#23511: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2249:
+ 0x001EFFFF, $

ERROR: trailing whitespace
#23512: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2250:
+ 0x03, $

ERROR: trailing whitespace
#23513: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2251:
+ GSIH, $

ERROR: trailing whitespace
#23515: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2253:
+ }, $

ERROR: trailing whitespace
#23519: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2257:
+ 0x001FFFFF, $

ERROR: trailing whitespace
#23520: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2258:
+ Zero, $

ERROR: trailing whitespace
#23521: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2259:
+ GSIA, $

ERROR: trailing whitespace
#23523: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2261:
+ }, $

ERROR: trailing whitespace
#23527: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2265:
+ 0x001FFFFF, $

ERROR: trailing whitespace
#23528: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2266:
+ One, $

ERROR: trailing whitespace
#23529: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2267:
+ GSIB, $

ERROR: trailing whitespace
#23531: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2269:
+ }, $

ERROR: trailing whitespace
#23535: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2273:
+ 0x001FFFFF, $

ERROR: trailing whitespace
#23536: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2274:
+ 0x02, $

ERROR: trailing whitespace
#23537: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2275:
+ GSIC, $

ERROR: trailing whitespace
#23539: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2277:
+ }, $

ERROR: trailing whitespace
#23543: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2281:
+ 0x001FFFFF, $

ERROR: trailing whitespace
#23544: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2282:
+ 0x03, $

ERROR: trailing whitespace
#23545: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2283:
+ GSID, $

ERROR: trailing whitespace
#23564: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2302:
+ PRQA, 8, $

ERROR: trailing whitespace
#23565: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2303:
+ PRQB, 8, $

ERROR: trailing whitespace
#23566: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2304:
+ PRQC, 8, $

ERROR: trailing whitespace
#23567: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2305:
+ PRQD, 8, $

ERROR: trailing whitespace
#23568: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2306:
+ Offset (0x08), $

ERROR: trailing whitespace
#23569: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2307:
+ PRQE, 8, $

ERROR: trailing whitespace
#23570: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2308:
+ PRQF, 8, $

ERROR: trailing whitespace
#23571: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2309:
+ PRQG, 8, $

ERROR: trailing whitespace
#24123: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2861:
+ Offset (0x04), $

ERROR: trailing whitespace
#24124: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2862:
+ CPEN, 1, $

ERROR: trailing whitespace
#24125: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2863:
+ CINS, 1, $

ERROR: trailing whitespace
#24126: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2864:
+ CRMV, 1, $

ERROR: trailing whitespace
#24127: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2865:
+ CEJ0, 1, $

ERROR: trailing whitespace
#24128: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2866:
+ Offset (0x05), $

ERROR: trailing whitespace
#24134: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2872:
+ CSEL, 32, $

ERROR: trailing whitespace
#24135: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:2873:
+ Offset (0x08), $

ERROR: trailing whitespace
#24293: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:3031:
+ MRBL, 32, $

ERROR: trailing whitespace
#24294: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:3032:
+ MRBH, 32, $

ERROR: trailing whitespace
#24295: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:3033:
+ MRLL, 32, $

ERROR: trailing whitespace
#24296: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:3034:
+ MRLH, 32, $

ERROR: trailing whitespace
#24302: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:3040:
+ Offset (0x14), $

ERROR: trailing whitespace
#24303: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:3041:
+ MES, 1, $

ERROR: trailing whitespace
#24304: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:3042:
+ MINS, 1, $

ERROR: trailing whitespace
#24305: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:3043:
+ MRMV, 1, $

ERROR: trailing whitespace
#24311: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:3049:
+ MSEL, 32, $

ERROR: trailing whitespace
#24312: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:3050:
+ MOEV, 32, $

ERROR: trailing whitespace
#24625: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:3363:
+ One, $

ERROR: trailing whitespace
#24626: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:3364:
+ One, $

ERROR: trailing whitespace
#24627: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:3365:
+ Zero, $

ERROR: trailing whitespace
#24632: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:3370:
+ 0x02, $

ERROR: trailing whitespace
#24633: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:3371:
+ 0x02, $

ERROR: trailing whitespace
#24634: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:3372:
+ Zero, $

ERROR: trailing whitespace
#24639: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:3377:
+ Zero, $

ERROR: trailing whitespace
#24640: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:3378:
+ Zero, $

ERROR: trailing whitespace
#24641: FILE: tests/data/acpi/q35/DSDT.acpihmat.dsl:3379:
+ Zero, $

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/DSDT.bridge and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/DSDT.bridge.dsl and tests/bios-tables-test.c.orig found

ERROR: Do not add expected files together with tests, follow instructions in tests/qtest/bios-tables-test.c: both tests/data/acpi/q35/DSDT.bridge.dsl and tests/bios-tables-test.c.orig found

ERROR: trailing whitespace
#24712: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:5:
+ * $

ERROR: trailing whitespace
#24802: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:95:
+ VEND, 32, $

ERROR: trailing whitespace
#24946: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:239:
+ 0xFFFF, $

ERROR: trailing whitespace
#24947: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:240:
+ Zero, $

ERROR: trailing whitespace
#24948: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:241:
+ LNKE, $

ERROR: trailing whitespace
#24950: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:243:
+ }, $

ERROR: trailing whitespace
#24954: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:247:
+ 0xFFFF, $

ERROR: trailing whitespace
#24955: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:248:
+ One, $

ERROR: trailing whitespace
#24956: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:249:
+ LNKF, $

ERROR: trailing whitespace
#24958: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:251:
+ }, $

ERROR: trailing whitespace
#24962: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:255:
+ 0xFFFF, $

ERROR: trailing whitespace
#24963: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:256:
+ 0x02, $

ERROR: trailing whitespace
#24964: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:257:
+ LNKG, $

ERROR: trailing whitespace
#24966: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:259:
+ }, $

ERROR: trailing whitespace
#24970: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:263:
+ 0xFFFF, $

ERROR: trailing whitespace
#24971: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:264:
+ 0x03, $

ERROR: trailing whitespace
#24972: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:265:
+ LNKH, $

ERROR: trailing whitespace
#24974: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:267:
+ }, $

ERROR: trailing whitespace
#24978: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:271:
+ 0x0001FFFF, $

ERROR: trailing whitespace
#24979: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:272:
+ Zero, $

ERROR: trailing whitespace
#24980: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:273:
+ LNKF, $

ERROR: trailing whitespace
#24982: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:275:
+ }, $

ERROR: trailing whitespace
#24986: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:279:
+ 0x0001FFFF, $

ERROR: trailing whitespace
#24987: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:280:
+ One, $

ERROR: trailing whitespace
#24988: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:281:
+ LNKG, $

ERROR: trailing whitespace
#24990: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:283:
+ }, $

ERROR: trailing whitespace
#24994: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:287:
+ 0x0001FFFF, $

ERROR: trailing whitespace
#24995: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:288:
+ 0x02, $

ERROR: trailing whitespace
#24996: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:289:
+ LNKH, $

ERROR: trailing whitespace
#24998: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:291:
+ }, $

ERROR: trailing whitespace
#25002: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:295:
+ 0x0001FFFF, $

ERROR: trailing whitespace
#25003: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:296:
+ 0x03, $

ERROR: trailing whitespace
#25004: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:297:
+ LNKE, $

ERROR: trailing whitespace
#25006: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:299:
+ }, $

ERROR: trailing whitespace
#25010: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:303:
+ 0x0002FFFF, $

ERROR: trailing whitespace
#25011: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:304:
+ Zero, $

ERROR: trailing whitespace
#25012: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:305:
+ LNKG, $

ERROR: trailing whitespace
#25014: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:307:
+ }, $

ERROR: trailing whitespace
#25018: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:311:
+ 0x0002FFFF, $

ERROR: trailing whitespace
#25019: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:312:
+ One, $

ERROR: trailing whitespace
#25020: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:313:
+ LNKH, $

ERROR: trailing whitespace
#25022: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:315:
+ }, $

ERROR: trailing whitespace
#25026: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:319:
+ 0x0002FFFF, $

ERROR: trailing whitespace
#25027: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:320:
+ 0x02, $

ERROR: trailing whitespace
#25028: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:321:
+ LNKE, $

ERROR: trailing whitespace
#25030: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:323:
+ }, $

ERROR: trailing whitespace
#25034: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:327:
+ 0x0002FFFF, $

ERROR: trailing whitespace
#25035: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:328:
+ 0x03, $

ERROR: trailing whitespace
#25036: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:329:
+ LNKF, $

ERROR: trailing whitespace
#25038: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:331:
+ }, $

ERROR: trailing whitespace
#25042: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:335:
+ 0x0003FFFF, $

ERROR: trailing whitespace
#25043: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:336:
+ Zero, $

ERROR: trailing whitespace
#25044: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:337:
+ LNKH, $

ERROR: trailing whitespace
#25046: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:339:
+ }, $

ERROR: trailing whitespace
#25050: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:343:
+ 0x0003FFFF, $

ERROR: trailing whitespace
#25051: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:344:
+ One, $

ERROR: trailing whitespace
#25052: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:345:
+ LNKE, $

ERROR: trailing whitespace
#25054: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:347:
+ }, $

ERROR: trailing whitespace
#25058: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:351:
+ 0x0003FFFF, $

ERROR: trailing whitespace
#25059: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:352:
+ 0x02, $

ERROR: trailing whitespace
#25060: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:353:
+ LNKF, $

ERROR: trailing whitespace
#25062: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:355:
+ }, $

ERROR: trailing whitespace
#25066: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:359:
+ 0x0003FFFF, $

ERROR: trailing whitespace
#25067: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:360:
+ 0x03, $

ERROR: trailing whitespace
#25068: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:361:
+ LNKG, $

ERROR: trailing whitespace
#25070: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:363:
+ }, $

ERROR: trailing whitespace
#25074: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:367:
+ 0x0004FFFF, $

ERROR: trailing whitespace
#25075: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:368:
+ Zero, $

ERROR: trailing whitespace
#25076: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:369:
+ LNKE, $

ERROR: trailing whitespace
#25078: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:371:
+ }, $

ERROR: trailing whitespace
#25082: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:375:
+ 0x0004FFFF, $

ERROR: trailing whitespace
#25083: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:376:
+ One, $

ERROR: trailing whitespace
#25084: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:377:
+ LNKF, $

ERROR: trailing whitespace
#25086: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:379:
+ }, $

ERROR: trailing whitespace
#25090: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:383:
+ 0x0004FFFF, $

ERROR: trailing whitespace
#25091: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:384:
+ 0x02, $

ERROR: trailing whitespace
#25092: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:385:
+ LNKG, $

ERROR: trailing whitespace
#25094: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:387:
+ }, $

ERROR: trailing whitespace
#25098: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:391:
+ 0x0004FFFF, $

ERROR: trailing whitespace
#25099: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:392:
+ 0x03, $

ERROR: trailing whitespace
#25100: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:393:
+ LNKH, $

ERROR: trailing whitespace
#25102: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:395:
+ }, $

ERROR: trailing whitespace
#25106: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:399:
+ 0x0005FFFF, $

ERROR: trailing whitespace
#25107: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:400:
+ Zero, $

ERROR: trailing whitespace
#25108: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:401:
+ LNKF, $

ERROR: trailing whitespace
#25110: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:403:
+ }, $

ERROR: trailing whitespace
#25114: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:407:
+ 0x0005FFFF, $

ERROR: trailing whitespace
#25115: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:408:
+ One, $

ERROR: trailing whitespace
#25116: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:409:
+ LNKG, $

ERROR: trailing whitespace
#25118: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:411:
+ }, $

ERROR: trailing whitespace
#25122: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:415:
+ 0x0005FFFF, $

ERROR: trailing whitespace
#25123: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:416:
+ 0x02, $

ERROR: trailing whitespace
#25124: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:417:
+ LNKH, $

ERROR: trailing whitespace
#25126: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:419:
+ }, $

ERROR: trailing whitespace
#25130: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:423:
+ 0x0005FFFF, $

ERROR: trailing whitespace
#25131: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:424:
+ 0x03, $

ERROR: trailing whitespace
#25132: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:425:
+ LNKE, $

ERROR: trailing whitespace
#25134: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:427:
+ }, $

ERROR: trailing whitespace
#25138: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:431:
+ 0x0006FFFF, $

ERROR: trailing whitespace
#25139: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:432:
+ Zero, $

ERROR: trailing whitespace
#25140: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:433:
+ LNKG, $

ERROR: trailing whitespace
#25142: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:435:
+ }, $

ERROR: trailing whitespace
#25146: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:439:
+ 0x0006FFFF, $

ERROR: trailing whitespace
#25147: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:440:
+ One, $

ERROR: trailing whitespace
#25148: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:441:
+ LNKH, $

ERROR: trailing whitespace
#25150: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:443:
+ }, $

ERROR: trailing whitespace
#25154: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:447:
+ 0x0006FFFF, $

ERROR: trailing whitespace
#25155: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:448:
+ 0x02, $

ERROR: trailing whitespace
#25156: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:449:
+ LNKE, $

ERROR: trailing whitespace
#25158: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:451:
+ }, $

ERROR: trailing whitespace
#25162: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:455:
+ 0x0006FFFF, $

ERROR: trailing whitespace
#25163: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:456:
+ 0x03, $

ERROR: trailing whitespace
#25164: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:457:
+ LNKF, $

ERROR: trailing whitespace
#25166: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:459:
+ }, $

ERROR: trailing whitespace
#25170: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:463:
+ 0x0007FFFF, $

ERROR: trailing whitespace
#25171: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:464:
+ Zero, $

ERROR: trailing whitespace
#25172: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:465:
+ LNKH, $

ERROR: trailing whitespace
#25174: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:467:
+ }, $

ERROR: trailing whitespace
#25178: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:471:
+ 0x0007FFFF, $

ERROR: trailing whitespace
#25179: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:472:
+ One, $

ERROR: trailing whitespace
#25180: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:473:
+ LNKE, $

ERROR: trailing whitespace
#25182: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:475:
+ }, $

ERROR: trailing whitespace
#25186: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:479:
+ 0x0007FFFF, $

ERROR: trailing whitespace
#25187: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:480:
+ 0x02, $

ERROR: trailing whitespace
#25188: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:481:
+ LNKF, $

ERROR: trailing whitespace
#25190: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:483:
+ }, $

ERROR: trailing whitespace
#25194: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:487:
+ 0x0007FFFF, $

ERROR: trailing whitespace
#25195: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:488:
+ 0x03, $

ERROR: trailing whitespace
#25196: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:489:
+ LNKG, $

ERROR: trailing whitespace
#25198: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:491:
+ }, $

ERROR: trailing whitespace
#25202: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:495:
+ 0x0008FFFF, $

ERROR: trailing whitespace
#25203: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:496:
+ Zero, $

ERROR: trailing whitespace
#25204: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:497:
+ LNKE, $

ERROR: trailing whitespace
#25206: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:499:
+ }, $

ERROR: trailing whitespace
#25210: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:503:
+ 0x0008FFFF, $

ERROR: trailing whitespace
#25211: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:504:
+ One, $

ERROR: trailing whitespace
#25212: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:505:
+ LNKF, $

ERROR: trailing whitespace
#25214: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:507:
+ }, $

ERROR: trailing whitespace
#25218: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:511:
+ 0x0008FFFF, $

ERROR: trailing whitespace
#25219: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:512:
+ 0x02, $

ERROR: trailing whitespace
#25220: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:513:
+ LNKG, $

ERROR: trailing whitespace
#25222: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:515:
+ }, $

ERROR: trailing whitespace
#25226: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:519:
+ 0x0008FFFF, $

ERROR: trailing whitespace
#25227: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:520:
+ 0x03, $

ERROR: trailing whitespace
#25228: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:521:
+ LNKH, $

ERROR: trailing whitespace
#25230: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:523:
+ }, $

ERROR: trailing whitespace
#25234: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:527:
+ 0x0009FFFF, $

ERROR: trailing whitespace
#25235: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:528:
+ Zero, $

ERROR: trailing whitespace
#25236: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:529:
+ LNKF, $

ERROR: trailing whitespace
#25238: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:531:
+ }, $

ERROR: trailing whitespace
#25242: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:535:
+ 0x0009FFFF, $

ERROR: trailing whitespace
#25243: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:536:
+ One, $

ERROR: trailing whitespace
#25244: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:537:
+ LNKG, $

ERROR: trailing whitespace
#25246: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:539:
+ }, $

ERROR: trailing whitespace
#25250: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:543:
+ 0x0009FFFF, $

ERROR: trailing whitespace
#25251: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:544:
+ 0x02, $

ERROR: trailing whitespace
#25252: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:545:
+ LNKH, $

ERROR: trailing whitespace
#25254: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:547:
+ }, $

ERROR: trailing whitespace
#25258: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:551:
+ 0x0009FFFF, $

ERROR: trailing whitespace
#25259: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:552:
+ 0x03, $

ERROR: trailing whitespace
#25260: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:553:
+ LNKE, $

ERROR: trailing whitespace
#25262: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:555:
+ }, $

ERROR: trailing whitespace
#25266: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:559:
+ 0x000AFFFF, $

ERROR: trailing whitespace
#25267: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:560:
+ Zero, $

ERROR: trailing whitespace
#25268: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:561:
+ LNKG, $

ERROR: trailing whitespace
#25270: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:563:
+ }, $

ERROR: trailing whitespace
#25274: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:567:
+ 0x000AFFFF, $

ERROR: trailing whitespace
#25275: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:568:
+ One, $

ERROR: trailing whitespace
#25276: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:569:
+ LNKH, $

ERROR: trailing whitespace
#25278: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:571:
+ }, $

ERROR: trailing whitespace
#25282: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:575:
+ 0x000AFFFF, $

ERROR: trailing whitespace
#25283: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:576:
+ 0x02, $

ERROR: trailing whitespace
#25284: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:577:
+ LNKE, $

ERROR: trailing whitespace
#25286: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:579:
+ }, $

ERROR: trailing whitespace
#25290: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:583:
+ 0x000AFFFF, $

ERROR: trailing whitespace
#25291: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:584:
+ 0x03, $

ERROR: trailing whitespace
#25292: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:585:
+ LNKF, $

ERROR: trailing whitespace
#25294: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:587:
+ }, $

ERROR: trailing whitespace
#25298: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:591:
+ 0x000BFFFF, $

ERROR: trailing whitespace
#25299: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:592:
+ Zero, $

ERROR: trailing whitespace
#25300: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:593:
+ LNKH, $

ERROR: trailing whitespace
#25302: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:595:
+ }, $

ERROR: trailing whitespace
#25306: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:599:
+ 0x000BFFFF, $

ERROR: trailing whitespace
#25307: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:600:
+ One, $

ERROR: trailing whitespace
#25308: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:601:
+ LNKE, $

ERROR: trailing whitespace
#25310: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:603:
+ }, $

ERROR: trailing whitespace
#25314: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:607:
+ 0x000BFFFF, $

ERROR: trailing whitespace
#25315: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:608:
+ 0x02, $

ERROR: trailing whitespace
#25316: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:609:
+ LNKF, $

ERROR: trailing whitespace
#25318: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:611:
+ }, $

ERROR: trailing whitespace
#25322: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:615:
+ 0x000BFFFF, $

ERROR: trailing whitespace
#25323: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:616:
+ 0x03, $

ERROR: trailing whitespace
#25324: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:617:
+ LNKG, $

ERROR: trailing whitespace
#25326: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:619:
+ }, $

ERROR: trailing whitespace
#25330: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:623:
+ 0x000CFFFF, $

ERROR: trailing whitespace
#25331: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:624:
+ Zero, $

ERROR: trailing whitespace
#25332: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:625:
+ LNKE, $

ERROR: trailing whitespace
#25334: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:627:
+ }, $

ERROR: trailing whitespace
#25338: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:631:
+ 0x000CFFFF, $

ERROR: trailing whitespace
#25339: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:632:
+ One, $

ERROR: trailing whitespace
#25340: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:633:
+ LNKF, $

ERROR: trailing whitespace
#25342: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:635:
+ }, $

ERROR: trailing whitespace
#25346: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:639:
+ 0x000CFFFF, $

ERROR: trailing whitespace
#25347: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:640:
+ 0x02, $

ERROR: trailing whitespace
#25348: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:641:
+ LNKG, $

ERROR: trailing whitespace
#25350: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:643:
+ }, $

ERROR: trailing whitespace
#25354: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:647:
+ 0x000CFFFF, $

ERROR: trailing whitespace
#25355: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:648:
+ 0x03, $

ERROR: trailing whitespace
#25356: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:649:
+ LNKH, $

ERROR: trailing whitespace
#25358: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:651:
+ }, $

ERROR: trailing whitespace
#25362: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:655:
+ 0x000DFFFF, $

ERROR: trailing whitespace
#25363: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:656:
+ Zero, $

ERROR: trailing whitespace
#25364: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:657:
+ LNKF, $

ERROR: trailing whitespace
#25366: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:659:
+ }, $

ERROR: trailing whitespace
#25370: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:663:
+ 0x000DFFFF, $

ERROR: trailing whitespace
#25371: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:664:
+ One, $

ERROR: trailing whitespace
#25372: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:665:
+ LNKG, $

ERROR: trailing whitespace
#25374: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:667:
+ }, $

ERROR: trailing whitespace
#25378: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:671:
+ 0x000DFFFF, $

ERROR: trailing whitespace
#25379: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:672:
+ 0x02, $

ERROR: trailing whitespace
#25380: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:673:
+ LNKH, $

ERROR: trailing whitespace
#25382: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:675:
+ }, $

ERROR: trailing whitespace
#25386: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:679:
+ 0x000DFFFF, $

ERROR: trailing whitespace
#25387: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:680:
+ 0x03, $

ERROR: trailing whitespace
#25388: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:681:
+ LNKE, $

ERROR: trailing whitespace
#25390: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:683:
+ }, $

ERROR: trailing whitespace
#25394: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:687:
+ 0x000EFFFF, $

ERROR: trailing whitespace
#25395: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:688:
+ Zero, $

ERROR: trailing whitespace
#25396: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:689:
+ LNKG, $

ERROR: trailing whitespace
#25398: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:691:
+ }, $

ERROR: trailing whitespace
#25402: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:695:
+ 0x000EFFFF, $

ERROR: trailing whitespace
#25403: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:696:
+ One, $

ERROR: trailing whitespace
#25404: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:697:
+ LNKH, $

ERROR: trailing whitespace
#25406: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:699:
+ }, $

ERROR: trailing whitespace
#25410: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:703:
+ 0x000EFFFF, $

ERROR: trailing whitespace
#25411: FILE: tests/data/acpi/q35/DSDT.bridge.dsl:704:
+ 0x02, $

33,260 lines not shown · raw message

Part of this message is not shown here. View the raw message.

#56 lore raw
In reply to Michael S. Tsirkin
Patchew URL: https://patchew.org/QEMU/[email protected]/

Patchew URL: https://patchew.org/QEMU/[email protected]/

Hi,

This series failed the docker-quick@centos7 build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.

=== TEST SCRIPT BEGIN ===
#!/bin/bash
make docker-image-centos7 V=1 NETWORK=1
time make docker-test-quick@centos7 SHOW_ENV=1 J=14 NETWORK=1 === TEST SCRIPT END ===

C linker for the host machine: cc ld.bfd 2.27-43
Host machine cpu family: x86_64
Host machine cpu: x86_64
../src/meson.build:10: WARNING: Module unstable-keyval has no backwards or forwards compatibility and might not exist in future releases.
Program sh found: YES
Program python3 found: YES (/usr/bin/python3)
Configuring ninjatool using configuration
---
Could not allocate dynamic translator buffer
Running test qtest-aarch64: numa-test
**
ERROR:../src/tests/qtest/tpm-emu.c:97:tpm_emu_ctrl_thread: assertion failed (cmd == CMD_SET_DATAFD): (0 == 16)
ERROR qtest-aarch64: tpm-tis-device-test - Bail out! ERROR:../src/tests/qtest/tpm-emu.c:97:tpm_emu_ctrl_thread: assertion failed (cmd == CMD_SET_DATAFD): (0 == 16)
../src/tests/qtest/libqtest.c:166: kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0)
make: *** [run-test-160] Error 1
make: *** Waiting for unfinished jobs....
Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: -accel kvm: failed to initialize kvm: No such file or directory
---
Using expected file 'tests/data/acpi/virt/DSDT.numamem'
socket_accept failed: Resource temporarily unavailable
**
ERROR:../src/tests/qtest/libqtest.c:301:qtest_init_without_qmp_handshake: assertion failed: (s->fd >= 0 && s->qmp_fd >= 0)
../src/tests/qtest/libqtest.c:166: kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0)
ERROR qtest-x86_64: bios-tables-test - Bail out! ERROR:../src/tests/qtest/libqtest.c:301:qtest_init_without_qmp_handshake: assertion failed: (s->fd >= 0 && s->qmp_fd >= 0)
make: *** [run-test-138] Error 1
Could not access KVM kernel module: No such file or directory
qemu-system-x86_64: -accel kvm: failed to initialize kvm: No such file or directory
qemu-system-x86_64: falling back to tcg
---
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['sudo', '-n', 'docker', 'run', '--rm', '--label', 'com.qemu.instance.uuid=3fe38e7b6fa6409cb97ac61c748d7472', '-u', '1003', '--security-opt', 'seccomp=unconfined', '-e', 'TARGET_LIST=', '-e', 'EXTRA_CONFIGURE_OPTS=', '-e', 'V=', '-e', 'J=14', '-e', 'DEBUG=', '-e', 'SHOW_ENV=1', '-e', 'CCACHE_DIR=/var/tmp/ccache', '-v', '/home/patchew2/.cache/qemu-docker-ccache:/var/tmp/ccache:z', '-v', '/var/tmp/patchew-tester-tmp-8ifvwte0/src/docker-src.2020-09-29-04.36.49.20090:/var/tmp/qemu:z,ro', 'qemu/centos7', '/var/tmp/qemu/run', 'test-quick']' returned non-zero exit status 2. filter=--filter=label=com.qemu.instance.uuid=3fe38e7b6fa6409cb97ac61c748d7472
make[1]: *** [docker-run] Error 1
make[1]: Leaving directory `/var/tmp/patchew-tester-tmp-8ifvwte0/src'
make: *** [docker-run-test-quick@centos7] Error 2

real 13m24.716s
user 0m15.509s

The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-quick@centos7/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]