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 <m...@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
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!<1dKp25F13p0FMNW#lQh$F##Fe0Wcl|15CX*
gLI}uWgsNwO(#&xED9WH5UbsC>V09of9T)-_08#k}0RR91
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!<1dKp25F13p0FMNW#lQh$F##Fe0Wcl|15CX*
gLI}uWgsNwO(#&xED9WH5UbsC>V09of9T)-_08#k}0RR91
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
zcmZvg%WoT16o>EFlh__VVmr>uc{qhq@vO#n^Jr;H?6H%$#EJ2w4N@w(5&}`OsYHcT
zDx{D_3)#^~Yza~%{tYBn?AWnj&4zz~9p>D*Gs*8LXQYhh%-r+M{l>@f@oo97-K~;R
zv7eed-lo6U{J7^W(q<{8^s#=;zie6$2Yz#~e^mBd*G&#KJFRTP>vbqtQOUvmPD||{
z-ST$2(Y1be({-!W@LF=<_5DKGnR<~@8kkafrM@3kmUV@qXOz3TzUQqQ?nmwJed5+A
z*WYb8X-f7QmO&JpoI%7=(_v=Ae$bDmw6)#eq12^|+n#4$+}u&I@a8Tes^;z-p>KN$
z5mOh4YKUm+S=1zi6O$M=FlxxCi;TF$7zIWh88<|REisb7xPgo%kuf4M9AGRVV_9U3
zN{kFJmXWa{G7=Ia2aFYDtcr}J#K;3<6&W{0MoMB7fpHTU)$qf?OU!X3MhO_VkRg^S
z|BytbJ_(HXks;S<Mw-VoFm5A5uG6f<C<EgTGUPhVNsKvQ+(m|5r(+Uh0T>@3L$1@j
z#8?Ez8ZzWMEl7;lfYCsPT&G2eaTOR%WXN?oE-|hF!vjW5uG5mlcoP^cWXN?oAu-+t
zMjIJ&olZ)OcY(2v47pCHB*t}MY#>9f(`kv}0%H>ya-Ggdj2bXH$dK!_EHQ2X;~p~P
zI-Qjm%fR>$8FHP@NsLusY#~Fg(|L(;3m9Es)a5!|kQldtv5gG5PAd}QE--dN#`Z5g
zuM^Irx7~9a?kY7O9<@g%s_QPMy+QkCbNjq4@pt=$iZj<!p6aMi)uM9guSG{+smJOQ
zdQ}<{G#<VF?)cW1&S5car-wte;dfkRjx9Q_s$xc;cVZOOq99H|T@|x-W;nEz&Y^K(
zq_b#X&Rh%fXlNAbOyUP)sY^0r!$@aFL#YMQcch^~CWSgPx=TFBjAjs5Ix`v?H<>gv
z$fQtb(u{(;*g<AA13So!hEmHES_YXEqUQ+n90@Wb&k>UuO`byZ9A%!=l+t{nq10lb
zCxz&lV4ex)nc$ujqGytMCYdL-WavpDdZw5swbSP51&<`fJt;&_hj}{8lUg|Rq!2yR
z%rnhA)7+Cn^vp2N4D+Ox4?QVF&n)xIGS4jcq!2xG%rnP4sYOIj3ej_nd5$s9G44qr
zdeYAsQ{zDu=b0z9l;}wzdKQ>xfq53VCxz%)WS&LlNi8UPQiz`8%yXQ1j&n~6(UX2C
zf@g_&Qp<{-6r$$@^PFIw6Wo(R^qgd#lgyJ^T=b+6J*SxG6!V<oo)n@d{kR0rY34~S
zF?v#no-@pIhI!6#PYThq%sk7?lUiu>q!2x4nddC?oaLSrqURj*oMWEUa-%1O=sC|k
z=b7g`_oNU#7ntV)^Q0CXJt;)b3iGTm&kFaX(0J}2b!`1snxAj_OWAYR&%cO!v@DTx
z(!o;1>%mt#eeYg6R~jAoecuXEVaLEwv`&Dis{+cLJ4fBqvkDtrhSKW=$a+IynRA>K
zHoBZe>jucWCa}!8kX6bLyk<k4(f?4DU!$FQ9GeN}>33NbqkreL4fW1?NuRC^br->w
z9}fT1Kg(zvUZ*QohI#<AQPV=(kgi(l_#MazE+6V^dJCe9oj(6eCH?!oo=SSV{Vi2m
zPYrf_&ptj-UTd#<x|ulnyfE(M_q%`9|E<ie{kZqE@#~#GKRZ5fY#LCb*Cf5xpXfky
z^g&&tp6i`c(fiZ<tCPppH*}>MjIN$ezB-A<nbUcF@rfR+&z~LqoHOV3O{!-HrS}Fc
zziXdfF|+w&<@dk+rLVg`O#RcH`OWK|rcS<4XN9<B=^ZU}b?tuJXVs_|x^&Ie9rx1n
z3El&GI+eAHN28DE`^K!BH4_i7>y^2Uc57ft+$_sgb>m6Pa#^|%@=cw`t+!0-VY^R#
zDZQh~lw<FIo7SP%_S;*FrTIbo!EWk_4j!H6Po6(=bienax7Tkvhx<n}`T##qp1GI$
EABWcyJpcdz
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<<WME(ub@F%i2v%^42yj*a0-z8Bhz+8t3j|P&V@Bl;Brnj_Hxy()0OQ~X
A0RR91
diff --git a/tests/data/acpi/virt/FACP.numamem
b/tests/data/acpi/virt/FACP.numamem
deleted file mode 100644
index
ac05c35a69451519bd1152c54d1e741af36390f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 276
zcmZ>BbPf<<WME(ub@F%i2v%^42yj*a0-z8Bhz+8t3j|P&V@Bl;Brnj_Hxy()0OQ~X
A0RR91
diff --git a/tests/data/acpi/virt/GTDT.memhp b/tests/data/acpi/virt/GTDT.memhp
deleted file mode 100644
index
6f8cb9b8f30b55f4c93fe515982621e3db50feb2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 96
zcmZ<{aS2IaU|?XH<K*w`5v<@85#X!<1dKp25F14QhXNpzK^8;+fgBLC0I@WP0|ZhK
J3PmkQ2mn(n7XbhO
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<K*w`5v<@85#X!<1dKp25F14QhXNpzK^8;+fgBLC0I@WP0|ZhK
J3PmkQ2mn(n7XbhO
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!<1dKp25F11@0kHuPgMkDCNC*yK93~3}W)K^M
VRiHGGVg_O`aDdYP|3ers^8jQz3IPBB
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!<1dKp25F11@0kHuPgMkDCNC*yK93~3}W)K^M
VRiHGGVg_O`aDdYP|3ers^8jQz3IPBB
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!<1dKp25F11@0kHuPgMkDCNC*yK93~3}W)K^M
VRiHGGVg_O`aDdYP|3ers^8jQz3IPBB
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
scmeZuc5}C3U|?W;<K*w`5v<@85#X!<1dKp25F11z0RaaH=Rb%706Iko0RR91
diff --git a/tests/data/acpi/virt/MCFG.numamem
b/tests/data/acpi/virt/MCFG.numamem
deleted file mode 100644
index
f4ae3203a4e9258a397c9912332178640209637b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 60
scmeZuc5}C3U|?W;<K*w`5v<@85#X!<1dKp25F11z0RaaH=Rb%706Iko0RR91
diff --git a/tests/data/acpi/virt/SPCR.memhp b/tests/data/acpi/virt/SPCR.memhp
deleted file mode 100644
index
24e0a579e7d73f432a614380e29aa95113344186..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 80
zcmWFza1IJ!U|?W6?d0$55v<@85#X!<1dKp25F11@12F>!1Bl59VJZSCW(Gzk28RDY
I01|@%0RBM>0RR91
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!<1dKp25F11@12F>!1Bl59VJZSCW(Gzk28RDY
I01|@%0RBM>0RR91
--
MST
