From 01766490708273b66e7175c1ff5921edd934348e Mon Sep 17 00:00:00 2001 From: Igor Mammedov Date: Fri, 1 Jul 2022 09:35:08 -0400 Subject: [PATCH] tests: acpi: update expected blobs It's expected that hotpluggable slots will, get ASUN variable and use that instead of _SUN with its _DSM method. For example: @@ -979,8 +979,9 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001) Device (S18) { - Name (_SUN, 0x03) // _SUN: Slot User Number + Name (ASUN, 0x03) Name (_ADR, 0x00030000) // _ADR: Address + Name (_SUN, 0x03) // _SUN: Slot User Number Method (_EJ0, 1, NotSerialized) // _EJx: Eject Device { PCEJ (BSEL, _SUN) @@ -991,7 +992,7 @@ DefinitionBlock ("", "DSDT", 1, "BOCHS ", "BXPC ", 0x00000001) Local0 = Package (0x02) { BSEL, - _SUN + ASUN } Return (PDSM (Arg0, Arg1, Arg2, Arg3, Local0)) } Signed-off-by: Igor Mammedov Message-Id: <20220701133515.137890-11-imammedo@redhat.com> --- tests/data/acpi/pc/DSDT | Bin 6219 -> 6422 bytes tests/data/acpi/pc/DSDT.acpierst | Bin 6186 -> 6382 bytes tests/data/acpi/pc/DSDT.acpihmat | Bin 7544 -> 7747 bytes tests/data/acpi/pc/DSDT.bridge | Bin 9078 -> 9496 bytes tests/data/acpi/pc/DSDT.cphp | Bin 6683 -> 6886 bytes tests/data/acpi/pc/DSDT.dimmpxm | Bin 7873 -> 8076 bytes tests/data/acpi/pc/DSDT.hpbridge | Bin 6186 -> 6382 bytes tests/data/acpi/pc/DSDT.ipmikcs | Bin 6291 -> 6494 bytes tests/data/acpi/pc/DSDT.memhp | Bin 7578 -> 7781 bytes tests/data/acpi/pc/DSDT.nohpet | Bin 6077 -> 6280 bytes tests/data/acpi/pc/DSDT.numamem | Bin 6225 -> 6428 bytes tests/data/acpi/pc/DSDT.roothp | Bin 6434 -> 6656 bytes tests/data/acpi/q35/DSDT.bridge | Bin 11227 -> 11449 bytes tests/data/acpi/q35/DSDT.multi-bridge | Bin 8628 -> 8640 bytes tests/qtest/bios-tables-test-allowed-diff.h | 14 -------------- 15 files changed, 14 deletions(-) diff --git a/tests/data/acpi/pc/DSDT b/tests/data/acpi/pc/DSDT index cb718f1a8a591b27ca841f70f40762562c15c837..8282d449ceaefd914b419f507a13f3fb7b318aaf 100644 GIT binary patch delta 1170 zcmX?YFwKa|CDMGE10gLNH}QP-Q|W%3!7m!;}d_ zl?fv&bA*{D0#haeRVIR>3}%`rOqnQDnJBU{CzxqsFlAy;Wnw7GV5W(~l!-%?i6bj> zhM6V-QzijbCV`?1W||~SnIu%1B(gFWm}yclWl~UOQYgw`rb)w;Nkf%MBP(--nI;2M zCIeL_gQ5&(nk-D2EL52+vNAWAX>u@Sa!_S*D9T`_$-|V%LzT%xmGN&b61&L=0L_H@ AjsO4v delta 1329 zcmbPcblQN+CDp+|Ibn)9aVs{3nal-K%!NlW%w%quVs6}u z&0r?;z!dY~Q4BMg7p9mOw_>B)Fq0)=iY0L?c7d5J1yd}AM={J~X_#VZ+=^XcCdc_>x z5%1^{#KXYA!oU#^7MOgIUup7sUO})j3#c+ym@-zVGFD_|#xT>^V9MB_%Ggkp!AxU^ zDPxB!V@FnI0yB*Rri=rsi~~g(%rs7zGES&6PGn`KFw?kT%DAA)xKNbAOyh-9%A}ymq)?Q>Op}HwlZGmjMpotuGff7jOa`h<21OanG+CH3 oS*S8uWMytJ)8t^vX`Uor+5L+Rg;@}kBWP+1REK|bHoRS`f;&v z#5=kK@h~v3Fid_ZsH6cBOjr`&66~9inU$Ro-2_r>0aeTjQ_PB6u`$eKHke{IJc?l^ zv%?g#<5p|}GnoUXm;;Yun8}CD@o=93d{>oiXvjPVoY+J11`t>X-9p2{yEd=Wq-T_2XjZ zh<9`e;$dK5X5fei3rt=htTg$KkRV8zkpWa03rracR2d73GMH(sFlDSzWvs}`jA5p+ z!IZHoDoXE;dVWx4xlyO0o zaiJ)KnZ^xM#tl`*jjYTJW*QGn84pw$4~jCFX}mCHyijGl$jZ!Nrt!g)@j;dGp(uly z#t&1*4^_sGtjq#tngC3h092U(iZYmKf-q%*P-TM1$}C}~3Bi;JL6r%iD1(_M3{xfy zRVIwA%n@dq2uzs>RGA2hGMH(iFlC}pWunN+oM5Jj!IX(Xm5HG!gPA4{Qzi~oCXTGk z8D^RUOqm2!nFNY5m}!zQWs*>3lE}(jV5UjIlu1FANuel%nI;WWCJj|4jjYTSW||C4 znG95!42m+CX|gb7vQTBR$jaPcrpdvS$w8ILp(ulyCJ$344^<`)RmQ)0zVuB-0Qt=d Ap#T5? delta 1329 zcmX?X^TUeECDc_>* z5%1^{#KXYA%rJSOh>`|KFkwl6OR#T7W>$7Wbdv{5u#o{&F$+vF3m(NVlUZSkS#c{i zhMCL;Q_O}(G0bFkm|}L^icMf9bHEgH;86@SnG>d%6Srbhn8{o)#awt4!%XIeDdxtl z*bHVe4@@x+9>p+|d0~oqaVs{5nal@M%!fxY%w&F;Vt(9;Enp@Kz!VGMQ4BL#5T;lV zw_;0}$wDy2LUDX0i-Su?!x?Fq36r hie+&tc7vHL2U9GEM={J~d6;5(uwuse%`r0183EJ=Yia-h diff --git a/tests/data/acpi/pc/DSDT.bridge b/tests/data/acpi/pc/DSDT.bridge index e04b5b2035fb665b1e75075d4c47776a51fa77e2..407066e1ac46922751969b823000e4fdfa542662 100644 GIT binary patch delta 2499 zcmez7Hp7d{CDX;zvxR}rsLe1l1hACu*Dr81gXaqBn1*VV%s*nXuA`a zFcZ083b~*PxzH5COyq_sc3dPVA!b}v0 zDHMk)6h~F)3^P#zrceT^Py$UM%tT3;LP@AXNmPX{FcYO<3ZUaVs{0nal!H%z{TT%w$%WVpiOWjbSFU!4$LMQ4BMg z9j2Haw_+2R$s91n9C#GNOy-0s=ESYo6lO9POfeT8#W0h(VT!qND>j3f%mY)*gGVvU zWL}tJUfhb!VJ7pz6!YOx3^SP@rkEeMVhfnb0x-n_cof4-7KAAl#I4v8X0i}Wu@D}` zFq4I0iiL42c7&NM0#hu4M={J~QJ7*;+=`uGCX2xoi{ViWGg%y_SRA)vXPC(nFvSvh z6vIrGgejK9t=I)-vJ_0Q6duJelciybrEx2Eg_$e^Q!Il=G0bFHm||Jnirru)%fS@O z;ZY1TSstcX9;}!#esiP*Ka;ozOYmq32d{NJSb|4OIONb6E#Z(uW3+@r4voQI!kH*P GVFUm?M&9WF diff --git a/tests/data/acpi/pc/DSDT.cphp b/tests/data/acpi/pc/DSDT.cphp index 3e8a202b0f32d585b38d4f8c85247124de5ec73d..013de154913063ed1ce3f154444b9e11f4608eac 100644 GIT binary patch delta 1170 zcmbPj^30UWCDM;j1^g#G0ZeJ zm@+n~GBy-tFw@v!%GjaG*pZc)z)a(SDdT`D<3LdcGmR6bj1#Ji6Iq!l%rq{TGA^hx zE)-=j)3{;ExS`6pk(HUjOyhwmp~~c;%J?@sN!(-v05%=( A^#A|> delta 1329 zcmaE6I@^THCDzaneREdwwpbwK4I*PVoX>YbFQt_ltY51RGk!bHoRS`f)LH z#5=kK@h~tjGfWN?P|^SiCM*eX3HHs%%*sxPZt`FWHZp)JW`QYY!J`;vGAm3mD{jTc zFq7F}irMfehMCL`Q_PNAu?fs%4wzyNJc?l^bHWsJ;#O=5GnosfmllfqZ`S2))namGU%#T~K1;f}c3Z_^Jk7Ag~(lEu+xD~s?OqPKumcgSKX0j|y hu`F)IZZMPOV2b7ND2ACV4^u1;R?HZ``M<<-MgS0WV8s9c diff --git a/tests/data/acpi/pc/DSDT.dimmpxm b/tests/data/acpi/pc/DSDT.dimmpxm index f7d6ca1448cf0ae3c609fc1e1391cccc2d7221fc..289ec07c07734f6fb10e1f1f3de7b3de2a4642fd 100644 GIT binary patch delta 1226 zcmX?T+hfn=66_MvBhSFV_-iBAQ(-ROoiXvjPVoY+J174X?w9jt2{yEd=Wq-T_2XjZ zh<9`e;$dK5X5fei3rrRiQ<@wj!mkkBA}>rKFH|8fszP&^iF`1Hd{Bja zXbNE_^1~GJLlyF)Dzt!^C;(F^097b}rVwVLAWWekRG}cMLQ9y5LNJ9wP=!Kh3SlM+ z!xRcb6$+y&bcC5G0#hggRVad{5N4t%Ora=Lp(v_CCzy$1Foj}Jg<@z5VJ3>h6pBL? zilZuYhM6bqAX0IEL5Q^szNuIiE=Q7a!`eGXbNE_%EJ`OLlw$H6$)&ADRYAn E0CAZG{Qv*} delta 1329 zcmeCNKWNM466_LkP>z9tv1TLJQ(-QrwK4I*PVoX>YbO5`?icr92{yEd=ZFsu_2XjZ zh<9`e;$dK5W|*ufp`-y4Ojr`&66~9inU$Ro-Q>X%Y-9jc%mP!)f=4mTWLB7BR@{n> zVJ5S|6tm$`3^SP>rkEYKViTCj95BTkcof4-=7cHc#I4vAW-=E{F&7@iFq64qin(zs zHiMbW15?a{M={J~UYKHD+=|U%CiB4*^WjkpGnpTzm>;)d3z*3QFvS9R6vIpwgeexp zt=JM~vJgzM5FW)alZ9c5g>fr(gqbV?Q!Ii?6il%c9>p+|rD2MtaVvI(nJfcSEQ3ce%w$=Z hVp-gZ-C!om!4%8kQ4BL#9;R3xte7!=^HSO8i~!F1U9SKD diff --git a/tests/data/acpi/pc/DSDT.hpbridge b/tests/data/acpi/pc/DSDT.hpbridge index aebb29c2a4ae67b732bef3eb8e72c5665bb3a7b3..9520f3b7303a43091e8c77b64d1f76407e85f1f4 100644 GIT binary patch delta 1131 zcmZ2w@XnCSCDc_>x z5%1^{#KXYA!oU#^7MOgIUup7sUO})j3#c+ym@-zVGFD_|#xT>^V9MB_%Ggkp!AxU^ zDPxB!V@FnI0yB*Rri=rsi~~g(%rs7zGES&6PGn`KFw?kT%DAA)xKNbAOyh-9%A}ymq)?Q>Op}HwlZGmjMpotuGff7jOa`h<21OanG+CH3 oS*S8uWMytJ)8t^vX`Uor+5L+Rg;@}kBWP+1REK|bHoRS`f;&v z#5=kK@h~v3Fid_ZsH6cBOjr`&66~9inU$Ro-2_r>0aeTjQ_PB6u`$eKHke{IJc?l^ zv%?g#<5p|}GnoUXm;;Yun8}A}>rKFH|8fszP&^iF`1Hd{Bja zXbNE_^1~GJLlyF)Dzt!^C;(F^097b}rVwVLAWWekRG}cMLQ9y5LNJ9wP=!Kh3SlM+ z!xRcb6$+y&bcC5G0#hggRVad{5N4t%Ora=Lp(v_CCzy$1Foj}Jg<@z5VJ3>h6pBL? zilZuYhM6bqAX0IEL5Q^szNuIiE=Q7a!`eGXbNE_%EJ`OLlw$H6$)(LEp~$u E0E$7Wbdv{5u#o{&F$+vF3m(NVlUZSkS#c{i zhMCL;Q_O}(G0bFkm|}L^icMf9bHEgH;86@SnG>d%6Srbhn8{o)#awt4!%XIeDdxtl z*bHVe4@@x+9>p+|d0~oqaVs{5nal@M%!fxY%w&F;Vt(9;Enp@Kz!VGMQ4BL#5T;lV zw_;0}$wDy2LUDX0i-Su?!x?Fq36r hie+&tc7vHL2U9GEM={J~d6;5(uwuse&E?|H83D0zVaWgh diff --git a/tests/data/acpi/pc/DSDT.memhp b/tests/data/acpi/pc/DSDT.memhp index 63fdfe8c025f8b2f19411792817cd21b506fa984..47d63dec8f997417d7512a694a4825fee874d995 100644 GIT binary patch delta 1170 zcmbPb{nUobCDc_>* z5%1^{#KXYA%)k*37MQ$1L}~IrAwiHbBLk>17ML;?s4^B5WiZoNVaiyc%2<(=8N*Ct zgDGQ!Dq}-Y1~ZKvri>k`j2&5-3CuJOm@*EiG7c1FFw;0;$~d9QIFXf^!c60WDdU1F z<3dpeGmRUjj2o(q8(End%rqXDG9IWh9u#FT(|BRZc%jO8k(HUlOyh$oc_>* z5%1^{#KXYA%rIF|L`efAn6MiCeKL%w#T@VlF(2VJ36K6m#QN zYz8x#2d0<@k7Ag~yfDSQxD}hjOy+|r=EI{HW->oaF+Xm_7BG_qV2TCsD2ACV2vaPG zTd^g~WFeShAv}s~+yTMGBgDIB7qZnqgJWR1XSTSS#<~o_@i~v{WTxA}>rKFH|8fszP&^iF`1Hd{Bja zXbNE_^1~GJLlyF)Dzt!^C;(F^097b}rVwVLAWWekRG}cMLQ9y5LNJ9wP=!Kh3SlM+ z!xRcb6$+y&bcC5G0#hggRVad{5N4t%Ora=Lp(v_CCzy$1Foj}Jg<@z5VJ3>h6pBL? zilZuYhM6bqAX0IEL5Q^szNuIiE=Q7a!`eGXbNE_%EJ`OLlw$H6$)&ADtdzv E0Bu_nZvX%Q delta 1329 zcmeA$+^f&!66_MPSDb-?@yAB4hdf+PYh&Vro#F+&)=d7&(=YD95^QJ@&k-LS>c_>* z5%1^{#KXYA%rH4oNJ#@En6MiCeKL%w#T@VlF(2VJ36K6m#QN zYz8x#2d0<@k7Ag~yfDSQxD}hjOy+|r=EI{HW->oaF+Xm_7BG_qV2TCsD2ACV2vaPG zTd^g~WFeShAv}s~+yTMGBgDIB7qZnqgJWR1XSTSS#=7nO<839)qWNiQd diff --git a/tests/data/acpi/pc/DSDT.numamem b/tests/data/acpi/pc/DSDT.numamem index 34914bf1ed362ebd07f0dbc22434dfddd26d9a82..1c4e0c80216b53463fbec8fc548007f0326c1829 100644 GIT binary patch delta 1226 zcmca;Fvp0?CDE7ODKD4r&Y1XMr+5L^os&Cx`{n#uf(0+Sc=D@}gG%dZgKA}>rKFH|8fszP&^iF`1Hd{Bja zXbNE_^1~GJLlyF)Dzt!^C;(F^097b}rVwVLAWWekRG}cMLQ9y5LNJ9wP=!Kh3SlM+ z!xRcb6$+y&bcC5G0#hggRVad{5N4t%Ora=Lp(v_CCzy$1Foj}Jg<@z5VJ3>h6pBL? zilZuYhM6bqAX0IEL5Q^szNuIiE=Q7a!`eGXbNE_%EJ`OLlw$H6$)&w6uZF) E0MjHQkpKVy delta 1329 zcmbPZbkTszCDYbJN{_KSP41RGk!bHoRS`f)LH z#5=kK@h~tjGfdtnsH6cBOjr`&66~9inU$Ro-Q>X%Y-9jc%mP!)f=4mTWLB7BR@{n> zVJ5S|6tm$`3^SP>rkEYKViTCj95BTkcof4-=7cHc#I4vAW-=E{F&7@iFq64qin(zs zHiMbW15?a{M={J~UYKHD+=|U%CiB4*^WjkpGnpTzm>;)d3z*3QFvS9R6vIpwgeexp zt=JM~vJgzM5FW)alZ9c5g>fr(gqbV?Q!Ii?6il%c9>p+|rD2MtaVvI(nJfcSEQ3ce%w$=Z hVp-gZ-C!om!4%8kQ4BL#9;R3xte7!=v#I!VMgV}-YrX&g diff --git a/tests/data/acpi/pc/DSDT.roothp b/tests/data/acpi/pc/DSDT.roothp index bba1612c972948911ca5f5b301b10a380b8d83b7..f9a5164e0cba7c209bd3e52020cb855e8688f682 100644 GIT binary patch delta 1703 zcmZ2v)L_Ep66_MfAjQDIsI!qPpO?%1L`;0JQ@nux@yX4+_WHhuf(D>nf?a(WqMJNff(;DfIUIvS{TRTq3>@*np?;G;@GI+r1QV77xCHxVWM*Y2L^t`e z1RGdD6f=Sq^DrZPSkDyQB9#))sjA8b$!St{}^|0aA1G9%6riUG>haIOL6PP_5 zFg+YlJsi08!0h3K>EVRx;l!!O6lM<>Ob-`S4;OAdFnhRRdbpu_xN+(+gW1Ca)58PR z!-HE7%pP8t9$u&(UYvT&VfOIB^zcFT@Zr`2vxgt1haakkAEzD*m^}h8JpxcY0=V_S z>=A_N5rpay#Hq&;W{(g|j}TOk5NP!7xb?v7k%Z}ygzAyR zsmBFoj}%Og6jYBCZapx2q+xobp?aio>T!kHBLmYT1JxsgTMx`0S(qMKs2*9IdfZ_4 g$iei;LG{St)&sLg9;Qbgsz)BAhtY8}i?|#U06xyc^#A|> delta 1450 zcmZoLS!BfJ66_M9B+0D>nf?a(WqMMvqf(;DfIpTvu{TRTqlRxq*tAV%)O9EVieKRt%vJ;}4+*yJRK-z;t z{TRW@co-NMK}yvzlzOlP8$wOwVuGn`(~TsD|mHr#4q=CZ@ovg1^10yCEbrj`S@T9~<Q_G7}tvSqGKA2iQ+-hOw^25~f<5X(_GgknnRsgqJn7M*5 zwSqX+TEff~f~gh4trljkFifp5PPL9Ob46fkMR2QynJWrYD~eOC6UW8VX$QCt~7*o#F-jk59Hyu-ErJ6l`b^&k^tF62!y6 zz{J4e6zuB55Z&a-5^P`)&*2yx>c;?YU;1cYck(rg95Z&a< z5^P`rQOpQd%)`LI2+_beIYCKDA47*f3)otaI2RL43ll^O7ZYwhP+Pc|VS1RMdYEzQ zF@k!7iv^~K1*(Syw;q^1tS~*SP(7?T^%%qKVT0*mgX&?!tp{cgJ4_EdR1Z5&Jti=F zIAD4>pn5oP>w($B3Dd&~)x(KXk15O^E|?xJs2(oddSLc&!}M@N^>E|VV+ON_2d0My zs)q-+9+*A6Fg?6bJ-j&en8WPhgX!Ue>fyt!2WAgHObwah9wFR%VD<>Z^aw-s2;tEqk339|JXDW7NDrgq=DnJ7OaL*aw*3GA delta 1482 zcmdlPc{`lTCD&PVoYcyC&Nx*lYQ32{tr{=ZJT73F2X3 zU}E5K3U>8jh;DLb2{r(U2Z#DGfMppb8!9WQ#|MY{B`gVW3HHs%%*sxPZgOV{Hn522 z0Esh#)$uSeFoM-;fW%PLdayw33J&$-VuC4V!lM{!Fc&jSF*9z(Mo`ysvA`6w;86@S znH8p(6}Mtzn8|D~#cX&K!%Sv}DQ3s5*aT)W2TU;s9>p+|Ibn)9aVs{3nal-K%!NlW z%w%quVs6}u&0r?;z!dY~Q4BMg7p9mOw_>B)Fq0)=iY0L?c7d5J1yd}AM={J~X_#VZ+=^XcCd^CEhaLa` diff --git a/tests/data/acpi/q35/DSDT.multi-bridge b/tests/data/acpi/q35/DSDT.multi-bridge index ae47b004e39f9f78f3c98093727fb92a0c6c74cb..df91b798f79d4564b049e8a7dbeaa5bb99abe635 100644 GIT binary patch delta 150 zcmdnue88E@CD4*mf?a(WqnkWgf(;DfIUIvS{TRTq3>@*np?;H>C@3>JPClXF4AyB0)yc@f4AIFz JNN0p%3;^L$BxwKu delta 142 zcmX@$yv3QzCD;*)I@>^1#3f(;GgIpQ5%f_NAh zm>4*mf?a(Wqnn&rf(=08!J&Q(VA;tIipq@flg}wQgY{TK^)NCpL-a7<)1x`LSJ4;% D?2jW; diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index 1983fa596b..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,15 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/pc/DSDT", -"tests/data/acpi/pc/DSDT.acpierst", -"tests/data/acpi/pc/DSDT.acpihmat", -"tests/data/acpi/pc/DSDT.bridge", -"tests/data/acpi/pc/DSDT.cphp", -"tests/data/acpi/pc/DSDT.dimmpxm", -"tests/data/acpi/pc/DSDT.hpbridge", -"tests/data/acpi/pc/DSDT.ipmikcs", -"tests/data/acpi/pc/DSDT.memhp", -"tests/data/acpi/pc/DSDT.nohpet", -"tests/data/acpi/pc/DSDT.numamem", -"tests/data/acpi/pc/DSDT.roothp", -"tests/data/acpi/q35/DSDT.bridge", -"tests/data/acpi/q35/DSDT.multi-bridge",