From 4a42dda7c13498dfdc3e34575606e35109f22300 Mon Sep 17 00:00:00 2001
From: Stefan Berger <stefanb@linux.ibm.com>
Date: Mon, 2 Aug 2021 17:52:41 -0400
Subject: [PATCH] tests: acpi: tpm2: Add the renamed ACPI files and drop old
 ones

Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Acked-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20210802215246.1433175-6-stefanb@linux.ibm.com
---
 tests/data/acpi/q35/DSDT.tis                | Bin 8894 -> 0 bytes
 tests/data/acpi/q35/DSDT.tis.tpm2           | Bin 0 -> 8894 bytes
 tests/data/acpi/q35/TPM2.tis                | Bin 76 -> 0 bytes
 tests/data/acpi/q35/TPM2.tis.tpm2           | Bin 0 -> 76 bytes
 tests/qtest/bios-tables-test-allowed-diff.h |   2 --
 5 files changed, 2 deletions(-)
 delete mode 100644 tests/data/acpi/q35/DSDT.tis
 delete mode 100644 tests/data/acpi/q35/TPM2.tis

diff --git a/tests/data/acpi/q35/DSDT.tis b/tests/data/acpi/q35/DSDT.tis
deleted file mode 100644
index d1433e3c14570bbd17b029a9aec6bc53134c3b7d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc-jL100001

literal 8894
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
REWDir8^nRX#UExD{s+GWX?Xwu

diff --git a/tests/data/acpi/q35/DSDT.tis.tpm2 b/tests/data/acpi/q35/DSDT.tis.tpm2
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d1433e3c14570bbd17b029a9aec6bc53134c3b7d 100644
GIT binary patch
literal 8894
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
REWDir8^nRX#UExD{s+GWX?Xwu

literal 0
Hc-jL100001

diff --git a/tests/data/acpi/q35/TPM2.tis b/tests/data/acpi/q35/TPM2.tis
deleted file mode 100644
index fe0f05987be40f1c1742ae189df7821adc522fc0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc-jL100001

literal 76
vc-jjI@HO&bU|?Vob@F%i2v%^42yj*a0!E-1hz+8V0UHB40IB%T4q^cSa$E-i

diff --git a/tests/data/acpi/q35/TPM2.tis.tpm2 b/tests/data/acpi/q35/TPM2.tis.tpm2
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..fe0f05987be40f1c1742ae189df7821adc522fc0 100644
GIT binary patch
literal 76
vc-jjI@HO&bU|?Vob@F%i2v%^42yj*a0!E-1hz+8V0UHB40IB%T4q^cSa$E-i

literal 0
Hc-jL100001

diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index b301b8fa066..dfb8523c8bf 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,3 +1 @@
 /* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/q35/DSDT.tis.tpm2",
-"tests/data/acpi/q35/TPM2.tis.tpm2",
-- 
2.39.5