From: Michael S. Tsirkin Date: Thu, 2 Mar 2023 06:45:28 +0000 (-0500) Subject: tests/data/acpi/virt: drop (most) duplicate files. X-Git-Tag: qemu-xen-4.18.0-rc5~295^2 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ee92a56b08d0b59016a4a9bc1bf3a3de1fbe3956;p=qemu-xen.git tests/data/acpi/virt: drop (most) duplicate files. When virt ACPI files were added, lots of duplicates were created because we forgot that there's a no-prefix fallback: e.g. if tests/data/acpi/virt/APIC.memhp is not there then test will use tests/data/acpi/virt/APIC. Drop these. These were found with $find tests/data/acpi/ -type f -exec sha256sum '{}' ';'|sort -d|uniq -w 64 --all-repeated=separate (trick: -d does a dictionary sort so a no-suffix file ends up first). Note: there are still a bunch of issues with duplicates left even after this. First pc and q35 are often identical. Second, sometimes files are identical but not identical to the default fallback, e.g. tests/data/acpi/pc/SLIT.cphp and tests/data/acpi/pc/SLIT.memhp or tests/data/acpi/q35/HMAT.acpihmat-noinitiator and tests/data/acpi/virt/HMAT.acpihmatvirt Finding a way to deduplicate these is still a TODO item - softlinks maybe? We also need to make rebuild-expected-aml.sh smarter about not creating these duplicates in the 1st place. And maybe we should use softlinks instead of relying on a fallback to make it explicit what version does each test expect? Signed-off-by: Michael S. Tsirkin --- diff --git a/tests/data/acpi/virt/APIC.memhp b/tests/data/acpi/virt/APIC.memhp deleted file mode 100644 index 179d274770..0000000000 Binary files a/tests/data/acpi/virt/APIC.memhp and /dev/null differ diff --git a/tests/data/acpi/virt/APIC.numamem b/tests/data/acpi/virt/APIC.numamem deleted file mode 100644 index 179d274770..0000000000 Binary files a/tests/data/acpi/virt/APIC.numamem and /dev/null differ diff --git a/tests/data/acpi/virt/DSDT.numamem b/tests/data/acpi/virt/DSDT.numamem deleted file mode 100644 index c475039907..0000000000 Binary files a/tests/data/acpi/virt/DSDT.numamem and /dev/null differ diff --git a/tests/data/acpi/virt/FACP.memhp b/tests/data/acpi/virt/FACP.memhp deleted file mode 100644 index ac05c35a69..0000000000 Binary files a/tests/data/acpi/virt/FACP.memhp and /dev/null differ diff --git a/tests/data/acpi/virt/FACP.numamem b/tests/data/acpi/virt/FACP.numamem deleted file mode 100644 index ac05c35a69..0000000000 Binary files a/tests/data/acpi/virt/FACP.numamem and /dev/null differ diff --git a/tests/data/acpi/virt/GTDT.memhp b/tests/data/acpi/virt/GTDT.memhp deleted file mode 100644 index 6f8cb9b8f3..0000000000 Binary files a/tests/data/acpi/virt/GTDT.memhp and /dev/null differ diff --git a/tests/data/acpi/virt/GTDT.numamem b/tests/data/acpi/virt/GTDT.numamem deleted file mode 100644 index 6f8cb9b8f3..0000000000 Binary files a/tests/data/acpi/virt/GTDT.numamem and /dev/null differ diff --git a/tests/data/acpi/virt/IORT.memhp b/tests/data/acpi/virt/IORT.memhp deleted file mode 100644 index 7efd0ce8a6..0000000000 Binary files a/tests/data/acpi/virt/IORT.memhp and /dev/null differ diff --git a/tests/data/acpi/virt/IORT.numamem b/tests/data/acpi/virt/IORT.numamem deleted file mode 100644 index 7efd0ce8a6..0000000000 Binary files a/tests/data/acpi/virt/IORT.numamem and /dev/null differ diff --git a/tests/data/acpi/virt/IORT.pxb b/tests/data/acpi/virt/IORT.pxb deleted file mode 100644 index 7efd0ce8a6..0000000000 Binary files a/tests/data/acpi/virt/IORT.pxb and /dev/null differ diff --git a/tests/data/acpi/virt/MCFG.memhp b/tests/data/acpi/virt/MCFG.memhp deleted file mode 100644 index f4ae3203a4..0000000000 Binary files a/tests/data/acpi/virt/MCFG.memhp and /dev/null differ diff --git a/tests/data/acpi/virt/MCFG.numamem b/tests/data/acpi/virt/MCFG.numamem deleted file mode 100644 index f4ae3203a4..0000000000 Binary files a/tests/data/acpi/virt/MCFG.numamem and /dev/null differ diff --git a/tests/data/acpi/virt/SPCR.memhp b/tests/data/acpi/virt/SPCR.memhp deleted file mode 100644 index 24e0a579e7..0000000000 Binary files a/tests/data/acpi/virt/SPCR.memhp and /dev/null differ diff --git a/tests/data/acpi/virt/SPCR.numamem b/tests/data/acpi/virt/SPCR.numamem deleted file mode 100644 index 24e0a579e7..0000000000 Binary files a/tests/data/acpi/virt/SPCR.numamem and /dev/null differ