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 HcmV?d00001 literal 172 zcmZ<^@N{0oz`(%b?&R<65v<@85#X$#prF9Wz`y`vgJ=dQ;E{kb7#KKUEG7m92JQeD nkAVTEUK}CBz`(!=RnG#YnV~d_A~=T^ZVwY!9mq@vh5!ZtQTYe~ diff --git a/tests/data/acpi/virt/APIC.numamem b/tests/data/acpi/virt/APIC.numamem deleted file mode 100644 index 179d274770a23209b949c90a929525e22368568b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmZ<^@N{0oz`(%b?&R<65v<@85#X$#prF9Wz`y`vgJ=dQ;E{kb7#KKUEG7m92JQeD nkAVTEUK}CBz`(!=RnG#YnV~d_A~=T^ZVwY!9mq@vh5!ZtQTYe~ diff --git a/tests/data/acpi/virt/DSDT.numamem b/tests/data/acpi/virt/DSDT.numamem deleted file mode 100644 index c47503990715d389914fdf9c8bccb510761741ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5196 zcmZ<>b_wwjVPIgI@8s|75v<@85#X$#prF9Wz`y`vgJ^+vC&rlgV5j)#CMjnF0|SnD z4^J0fN9O=f0|Ntd29EepPZx&hCM#!uUzl8wuZMwwp&?X`Bi=bESWt>fyp59qWFRMl z00ToO8v`SwA_D_MB|~(Rg zAXgY+GlGi=*#j_VuppUXglvW}Rx_BfnZbr+hB2}kCRoj2!Da>rk{Kq*W|(3%gB6<@ zTu5e^BAa1`)eJUlX7C`HVTNpmIaV{+v6;b#WQIAi85UU0;J{{v0FoIN$Yxk#HG>nI z8A3>ASR$EW2+bU*NsNmNn;9ZVW>_Jcfi;<;W)fH$6GJk?8rcl&>68bXJ0y_Iut7Eh zdphOCW`-1!8Meq~U{9xf*vybYGQ$qp4D9KYADbC+NM_h0n}I!@3Scus0m%#pWHYd* zQ$cKIC?T2Qh-?P-bSi|+3>73ZoRH1Ho=%0anW2VchBJ~GM%dG-2sSe`kj!vFHUoP) z6~$(T7LpmR$Yx+qr()R5&_Oc84cQFr=~Nt>8G1-&xFef^J)KHmGs6JM3=d>8u%}Z= zY-SiCnc<0S2KIC+h0P2TBs08_&A^^crLmb|hGd2}vKiRZsSGwVERf9bK{f+>I+ev{ zh82<-zDQ;mV^61Y*vzm&GQ$tq4D9Jt9-A3}kv( z#LL3-|34!GNRJ_$2hwH4AjAie1M4$Ja6vi^plX@GI*s5wkWQFVCI+xh1E@|W1}>0J zm@Uj;oiGqRtP`e`2ci?^cpivO zm@T|uoiG>hf_1`_@x3y4g6M=fUI?NSW{WUbC(H%HV4X0f!VsM>#|uMr!fX)%>x8*L1gsOL zR0N_E=6Df^PM9sCV4W}*h=O&(l!`)h!W=IO(FwCf46GC80x_^om{Ku_PMG7xAUa{T zh=X;)Tp$kC2~#Q#(Ft?BI7BDR774IUmuAcC=7oPmJ{G?)Y83H<;657aGVU|{&K*DlV$$ioa02I2o;<^Sy%7#JD4w2}0H zBpDh&I{yEMC<2Q>2#|Os14nRZKmY@Wb4ZX6gNPevynnDWOIJ37vrD+)0uT1d8G^!G z0@1#=jlavwI7|yKaXesqJ*_L7i^bU`+^8#?i^JI^+_(V50ht407=w(e1`%BHAaa4g zq{*3#wIBn*stp&2O_~hS1(Jja3xFgGKzxw+lI(?i5OI(thD)+VbmLuueOVSLLR@pf z{N&SM(<gKLnhI|B~`0|zG;OLQYQi0kYc?CPT+A{*}-7Q$Ho;v_5(m|UH}1#0iL1%wAV TaWzCYNrD&<%OI)E8JeE}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 HcmV?d00001 literal 276 zcmZ>BbPf<BbPf< S7#O6Xd?_dmRr(*wWdHzED;EI( diff --git a/tests/data/acpi/virt/GTDT.numamem b/tests/data/acpi/virt/GTDT.numamem deleted file mode 100644 index 6f8cb9b8f30b55f4c93fe515982621e3db50feb2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 96 zcmZ<{aS2IaU|?XH S7#O6Xd?_dmRr(*wWdHzED;EI( diff --git a/tests/data/acpi/virt/IORT.memhp b/tests/data/acpi/virt/IORT.memhp deleted file mode 100644 index 7efd0ce8a6b3928efa7e1373f688ab4c5f50543b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmebD4+?2uU|?Y0?Bwt45v<@85#X$#prF9Wz`y`vgJ>oO1_lELD3D+P2|+mwa1N6N Z12aehgjE>e;><9G4p7Gb{}2YuJOE@m3IPBB 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 HcmV?d00001 literal 128 zcmebD4+?2uU|?Y0?Bwt45v<@85#X$#prF9Wz`y`vgJ>oO1_lELD3D+P2|+mwa1N6N Z12aehgjE>e;><9G4p7Gb{}2YuJOE@m3IPBB 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 HcmV?d00001 literal 128 zcmebD4+?2uU|?Y0?Bwt45v<@85#X$#prF9Wz`y`vgJ>oO1_lELD3D+P2|+mwa1N6N Z12aehgjE>e;><9G4p7Gb{}2YuJOE@m3IPBB 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 HcmV?d00001 literal 60 vcmeZuc5}C3U|?W;5O9F7|AQz1Iz5O9F7|AQz1Iz0RR91 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 HcmV?d00001 literal 80 zcmWFza1IJ!U|?W6?d0$55v<@85#X$#prF9Wz`y`vgJ@<31_lNW1`v}I!c=5nU|?oo QWMW|W|NsAgkQfXD0RBM>0RR91