summary refs log tree commit diff stats
path: root/tests/qtest/bios-tables-test-allowed-diff.h.orig
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-09-29 13:18:54 +0100
committerPeter Maydell <peter.maydell@linaro.org>2020-09-29 13:18:54 +0100
commitb150cb8f67bf491a49a1cb1c7da151eeacbdbcc9 (patch)
tree0cee7cdb374d62a5716e841c60d3e377a535cada /tests/qtest/bios-tables-test-allowed-diff.h.orig
parent5663ac2aa0eafb40411ac4dff85e6ab529c4d199 (diff)
parentf142e4ede72853aaa7d306bc79b099caed45769b (diff)
downloadfocaccia-qemu-b150cb8f67bf491a49a1cb1c7da151eeacbdbcc9.tar.gz
focaccia-qemu-b150cb8f67bf491a49a1cb1c7da151eeacbdbcc9.zip
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
acpi: fixup

My last pull included a ton of useless files by mistake.
Drop them all.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Tue 29 Sep 2020 12:12:20 BST
# gpg:                using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
# gpg:                issuer "mst@redhat.com"
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
# gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>" [full]
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream:
  tests/acpi: drop unnecessary files

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/qtest/bios-tables-test-allowed-diff.h.orig')
-rw-r--r--tests/qtest/bios-tables-test-allowed-diff.h.orig18
1 files changed, 0 insertions, 18 deletions
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h.orig b/tests/qtest/bios-tables-test-allowed-diff.h.orig
deleted file mode 100644
index 6a052c5044..0000000000
--- a/tests/qtest/bios-tables-test-allowed-diff.h.orig
+++ /dev/null
@@ -1,18 +0,0 @@
-/* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/pc/DSDT",
-"tests/data/acpi/pc/DSDT.acpihmat",
-"tests/data/acpi/pc/DSDT.bridge",
-"tests/data/acpi/pc/DSDT.cphp",
-"tests/data/acpi/pc/DSDT.dimmpxm",
-"tests/data/acpi/pc/DSDT.ipmikcs",
-"tests/data/acpi/pc/DSDT.memhp",
-"tests/data/acpi/pc/DSDT.numamem",
-"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",