qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH] tests/data/acpi/virt: drop (most) duplicate files.


From: Philippe Mathieu-Daudé
Subject: Re: [PATCH] tests/data/acpi/virt: drop (most) duplicate files.
Date: Thu, 2 Mar 2023 11:15:49 +0100
User-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.8.0

On 2/3/23 08:22, Michael S. Tsirkin wrote:
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 <mst@redhat.com>
---
  tests/data/acpi/virt/APIC.memhp   | Bin 172 -> 0 bytes
  tests/data/acpi/virt/APIC.numamem | Bin 172 -> 0 bytes
  tests/data/acpi/virt/DSDT.numamem | Bin 5196 -> 0 bytes
  tests/data/acpi/virt/FACP.memhp   | Bin 276 -> 0 bytes
  tests/data/acpi/virt/FACP.numamem | Bin 276 -> 0 bytes
  tests/data/acpi/virt/GTDT.memhp   | Bin 96 -> 0 bytes
  tests/data/acpi/virt/GTDT.numamem | Bin 96 -> 0 bytes
  tests/data/acpi/virt/IORT.memhp   | Bin 128 -> 0 bytes
  tests/data/acpi/virt/IORT.numamem | Bin 128 -> 0 bytes
  tests/data/acpi/virt/IORT.pxb     | Bin 128 -> 0 bytes
  tests/data/acpi/virt/MCFG.memhp   | Bin 60 -> 0 bytes
  tests/data/acpi/virt/MCFG.numamem | Bin 60 -> 0 bytes
  tests/data/acpi/virt/SPCR.memhp   | Bin 80 -> 0 bytes
  tests/data/acpi/virt/SPCR.numamem | Bin 80 -> 0 bytes
  14 files changed, 0 insertions(+), 0 deletions(-)
  delete mode 100644 tests/data/acpi/virt/APIC.memhp
  delete mode 100644 tests/data/acpi/virt/APIC.numamem
  delete mode 100644 tests/data/acpi/virt/DSDT.numamem
  delete mode 100644 tests/data/acpi/virt/FACP.memhp
  delete mode 100644 tests/data/acpi/virt/FACP.numamem
  delete mode 100644 tests/data/acpi/virt/GTDT.memhp
  delete mode 100644 tests/data/acpi/virt/GTDT.numamem
  delete mode 100644 tests/data/acpi/virt/IORT.memhp
  delete mode 100644 tests/data/acpi/virt/IORT.numamem
  delete mode 100644 tests/data/acpi/virt/IORT.pxb
  delete mode 100644 tests/data/acpi/virt/MCFG.memhp
  delete mode 100644 tests/data/acpi/virt/MCFG.numamem
  delete mode 100644 tests/data/acpi/virt/SPCR.memhp
  delete mode 100644 tests/data/acpi/virt/SPCR.numamem

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]