From ee92a56b08d0b59016a4a9bc1bf3a3de1fbe3956 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Thu, 2 Mar 2023 01:45:28 -0500 Subject: [PATCH] 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 --- 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 diff --git a/tests/data/acpi/virt/APIC.memhp b/tests/data/acpi/virt/APIC.memhp deleted file mode 100644 index 179d274770a23209b949c90a929525e22368568b..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc-jL100001 literal 172 zc-nIe@N{0oz`(%b?&R<65v<@85#X!<1dKp25F13p0FMNm$pK?90Wo&~LJds4I0G_Z ZgsNwO(##wTcmOZl9wrW$nGOsA3;f#7UbBO&j8LijWiXA%^tl97nup`_XC+YdYu@w6r`<&1IoRj#{K-mkuc&O!WYhsE35j$?&Om854wl4bp7VE)5@EZ8^Sj}xkV9W4xw=fA3>DI zh?+uFIE3Nj7&>88D8ptMevT0!44X36Scc9qLWHqK8S5-#hGQ6nu}&EqEF-`%qJ*(Q z8JjF4$T8xCu}K+QEF;7*Ov2crj5{nN%rTOLafdL#Hf6AFia(MGBSRSP zPzK+pQI3%#jJuS<_i2n{6bR!UW$=9(=NLu8xK9~;pU!fOMZ$QOGWb3`(^Z zrwNYn3Sm?!gYVNM$5XgCv=^V#+gD@JD!S`u~ zW4uKeyOhEAX_jNG62=~7@O_%&7#3kPDTD9RJjbXIMvF4|J}q#JHNtp68GN74bBqnb zc#kspJ}q*LEyCER48BhnIL0<%vh0$a70UdB>z+_`Kim%=i-U@P;SL^?$YV@ zQv077XUT{j84kss+p>f=*5tS>l2J7_d@`s^0>2Dwk&Nk4nI(jmH;yzfG44g9I{PN{ zd;C$ZZ&X>CMjA==d6m{p=qG3Kk1FkHq>)s=S6RLZ{p2jV5abGUp^;QwOe`lM^_&6E z8StDz&l&U#fM)LEMp#_qY)mJ<^%TE$1!|b>Ju>UR-c{$1RcAIK_s$#YO`sByBw_ly4e0`FBdr)`V`qeG( zYJS`N^-p*G%l3EKzuNg6l0@N1e{$!=`x-G&R@SQ+1B+pzw3e@5SdygQ{G zygjCv%wdC%R@Ixiy+(aNU(1zkuLEN80DR$o?RBs8tkIS8Qu&RB!iL`eI-)|S;WqY{ n(hGye!(RAQ1&^=H%V&=bHQ#&QIquesv;KKr4XA-L{yqH*hu0H5 diff --git a/tests/data/acpi/virt/FACP.memhp b/tests/data/acpi/virt/FACP.memhp deleted file mode 100644 index ac05c35a69451519bd1152c54d1e741af36390f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc-jL100001 literal 276 yc-nJwbPf<OItl>* diff --git a/tests/data/acpi/virt/IORT.numamem b/tests/data/acpi/virt/IORT.numamem deleted file mode 100644 index 7efd0ce8a6b3928efa7e1373f688ab4c5f50543b..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc-jL100001 literal 128 zc-r&y4+?2uU|?Y0?Bwt45v<@85#X!<1dKp25F11@0kHuC6i6^IG9UpMhslD0nGwoY SL5MTM)Hy)u|NkL0%sc>OItl>* diff --git a/tests/data/acpi/virt/IORT.pxb b/tests/data/acpi/virt/IORT.pxb deleted file mode 100644 index 7efd0ce8a6b3928efa7e1373f688ab4c5f50543b..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc-jL100001 literal 128 zc-r&y4+?2uU|?Y0?Bwt45v<@85#X!<1dKp25F11@0kHuC6i6^IG9UpMhslD0nGwoY SL5MTM)Hy)u|NkL0%sc>OItl>* diff --git a/tests/data/acpi/virt/MCFG.memhp b/tests/data/acpi/virt/MCFG.memhp deleted file mode 100644 index f4ae3203a4e9258a397c9912332178640209637b..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc-jL100001 literal 60 sc-r%Ic5}C3U|?W;!1Bl59VJd<}8JQRu{sRF6 G5&!`HK??x@ diff --git a/tests/data/acpi/virt/SPCR.numamem b/tests/data/acpi/virt/SPCR.numamem deleted file mode 100644 index 24e0a579e7d73f432a614380e29aa95113344186..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc-jL100001 literal 80 zc-jjNa1IJ!U|?W6?d0$55v<@85#X!<1dKp25F11@12F>!1Bl59VJd<}8JQRu{sRF6 G5&!`HK??x@ -- 2.39.5