From 73ca3ba37d6c20174bc649663c8fc359e6fecda9 Mon Sep 17 00:00:00 2001 From: Igor Mammedov Date: Wed, 15 Jan 2025 13:53:42 +0100 Subject: [PATCH] tests: acpi: update expected blobs _DSM function 7 AML should have followig change: If ((Arg2 == 0x07)) { - Local0 = Package (0x02) - { - Zero, - "" - } Local2 = AIDX (DerefOf (Arg4 [Zero]), DerefOf (Arg4 [One] )) - Local0 [Zero] = Local2 + Local0 = Package (0x02) {} + If (!((Local2 == Zero) || (Local2 == 0xFFFFFFFF))) + { + Local0 [Zero] = Local2 + Local0 [One] = "" + } + Return (Local0) } } Signed-off-by: Igor Mammedov Message-Id: <20250115125342.3883374-4-imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin (cherry picked from commit 9fb1c9a1bb26e111ee5fa5538070cd684de14c08) Signed-off-by: Michael Tokarev (Mjt: regenerate acpi tables for 9.2) --- tests/data/acpi/x86/pc/DSDT | Bin 8526 -> 8544 bytes tests/data/acpi/x86/pc/DSDT.acpierst | Bin 8437 -> 8455 bytes tests/data/acpi/x86/pc/DSDT.acpihmat | Bin 9851 -> 9869 bytes tests/data/acpi/x86/pc/DSDT.bridge | Bin 15397 -> 15415 bytes tests/data/acpi/x86/pc/DSDT.cphp | Bin 8990 -> 9008 bytes tests/data/acpi/x86/pc/DSDT.dimmpxm | Bin 10180 -> 10198 bytes tests/data/acpi/x86/pc/DSDT.hpbridge | Bin 8477 -> 8495 bytes tests/data/acpi/x86/pc/DSDT.ipmikcs | Bin 8598 -> 8616 bytes tests/data/acpi/x86/pc/DSDT.memhp | Bin 9885 -> 9903 bytes tests/data/acpi/x86/pc/DSDT.nohpet | Bin 8384 -> 8402 bytes tests/data/acpi/x86/pc/DSDT.numamem | Bin 8532 -> 8550 bytes tests/data/acpi/x86/pc/DSDT.roothp | Bin 12319 -> 12337 bytes tests/data/acpi/x86/q35/DSDT | Bin 8355 -> 8373 bytes tests/data/acpi/x86/q35/DSDT.acpierst | Bin 8372 -> 8390 bytes tests/data/acpi/x86/q35/DSDT.acpihmat | Bin 9680 -> 9698 bytes .../data/acpi/x86/q35/DSDT.acpihmat-generic-x | Bin 12565 -> 12583 bytes .../acpi/x86/q35/DSDT.acpihmat-noinitiator | Bin 8634 -> 8652 bytes tests/data/acpi/x86/q35/DSDT.applesmc | Bin 8401 -> 8419 bytes tests/data/acpi/x86/q35/DSDT.bridge | Bin 11968 -> 11986 bytes tests/data/acpi/x86/q35/DSDT.core-count | Bin 12913 -> 12931 bytes tests/data/acpi/x86/q35/DSDT.core-count2 | Bin 33770 -> 33788 bytes tests/data/acpi/x86/q35/DSDT.cphp | Bin 8819 -> 8837 bytes tests/data/acpi/x86/q35/DSDT.cxl | Bin 13146 -> 13164 bytes tests/data/acpi/x86/q35/DSDT.dimmpxm | Bin 10009 -> 10027 bytes tests/data/acpi/x86/q35/DSDT.ipmibt | Bin 8430 -> 8448 bytes tests/data/acpi/x86/q35/DSDT.ipmismbus | Bin 8443 -> 8461 bytes tests/data/acpi/x86/q35/DSDT.ivrs | Bin 8372 -> 8390 bytes tests/data/acpi/x86/q35/DSDT.memhp | Bin 9714 -> 9732 bytes tests/data/acpi/x86/q35/DSDT.mmio64 | Bin 9485 -> 9503 bytes tests/data/acpi/x86/q35/DSDT.multi-bridge | Bin 13208 -> 13226 bytes tests/data/acpi/x86/q35/DSDT.nohpet | Bin 8213 -> 8231 bytes tests/data/acpi/x86/q35/DSDT.numamem | Bin 8361 -> 8379 bytes tests/data/acpi/x86/q35/DSDT.pvpanic-isa | Bin 8456 -> 8474 bytes tests/data/acpi/x86/q35/DSDT.thread-count | Bin 12913 -> 12931 bytes tests/data/acpi/x86/q35/DSDT.thread-count2 | Bin 33770 -> 33788 bytes tests/data/acpi/x86/q35/DSDT.tis.tpm12 | Bin 8961 -> 8979 bytes tests/data/acpi/x86/q35/DSDT.tis.tpm2 | Bin 8987 -> 9005 bytes tests/data/acpi/x86/q35/DSDT.type4-count | Bin 18589 -> 18607 bytes tests/data/acpi/x86/q35/DSDT.viot | Bin 14612 -> 14630 bytes tests/data/acpi/x86/q35/DSDT.xapic | Bin 35718 -> 35736 bytes tests/qtest/bios-tables-test-allowed-diff.h | 40 ------------------ 41 files changed, 40 deletions(-) diff --git a/tests/data/acpi/x86/pc/DSDT b/tests/data/acpi/x86/pc/DSDT index 8b8235fe79e2fa08a6f840c8479edb75f5a047b9..7fcbecc7991c9230cf2ab2ad7e33e2285655e2a1 100644 GIT binary patch delta 89 zc-lMX^uUSBCDk-)%Ez{}8)z_{6%Nm?EN8897b delta 71 zc-nj5bk2#(CD@l<112AliEnl=IdM*2#+a?7IysAry+DYSiGi0Pp}^78 aC8D__hk*e|Fft?+By}V(Y<6XmmInX<(-dg{ diff --git a/tests/data/acpi/x86/pc/DSDT.acpierst b/tests/data/acpi/x86/pc/DSDT.acpierst index 06829b9c6c6d726d955dc7c99bc9f42448e22aeb..5fb2b6376fdef3e9a8ce8861f8b333de01c154a8 100644 GIT binary patch delta 89 zc-s5w*zUyT66_MfuE@Z^m^6{=0h6ET#5X&bT(~ALW6U-&pPa?TUf}5I64Bg|!@vL} r7#WfZgqWBT7D!E+I5~-7auUyfASg)cNMK+n;AQAYVBBoXbVv>W0=*r} delta 71 zc-m`s`s&E#66_N4Re^zlannSu2TVR96W{D$a^jr4j4@kDb#fLLdw~!u69X?pLV=^F aOGI-=4g&*_U}Q)tNa{#n*zC%5NDcrkCKby7 diff --git a/tests/data/acpi/x86/pc/DSDT.acpihmat b/tests/data/acpi/x86/pc/DSDT.acpihmat index 2fe355ebdbb858fa9247d09112e21712e3eddc45..51c70746c6c8ae33c48bf46e49a6f4ec2278feb4 100644 GIT binary patch delta 89 zc-s5z)9cIS66_MvtH!{k-)%Ez{}8)z_{6%$wLJITN@sE delta 71 zc-rgr{q4i$66_LEt;WE>s5X)70h5oX&boH!>hW6V}kot(wRULeHE#K6mtP~hn4 a64Bg|!@vL}7#WfZk~$I?HoG!;r~m-^6%=^@ diff --git a/tests/data/acpi/x86/pc/DSDT.bridge b/tests/data/acpi/x86/pc/DSDT.bridge index 4d4067c182a6625db1e877408eb7436113884b50..ec920896faf05c5415ef4e485696a26a10d06d80 100644 GIT binary patch delta 89 zc-mW9vAu%JCDk-)%Ez{}8)z_{6%>60Y@BO4xc delta 71 zc-q@uv9yBACDJ@YV diff --git a/tests/data/acpi/x86/pc/DSDT.cphp b/tests/data/acpi/x86/pc/DSDT.cphp index 045a52e75b7fcd4e5f840a758c548231498b96e4..b4d0f151ce4c21d7dd93d02aad29643d3cf3aea5 100644 GIT binary patch delta 89 zc-ouiw!w|dCDk-)%Ez{}8)z_{6%>9qm?3v(VA delta 71 zc-q_GHqVXACDf5e~5CDf|gg_5vYRCI()HgaSuT amx$($90mp;!N`zQkkpaDu-TPqqACC_0Tq`3 diff --git a/tests/data/acpi/x86/pc/DSDT.hpbridge b/tests/data/acpi/x86/pc/DSDT.hpbridge index 8fa8b519ec65bd5099c45f4e1c85b11b47a23845..8a410533d48ec34b174dcfe487b1fcb33cbc27b3 100644 GIT binary patch delta 89 zc-oumwBCu!CDk-)%Ez{}8)z_{6%>6IJ+`1&2# delta 71 zc-mXf|gg_5vYRCI()HgaSuT amx$($90mp;!N`zQkkpaDu-TO2TVR96W{D$a^jr4j4@kDb#fLLdw~!u69X?pLV=^F aOGI-=4g&*_U}Q)tNa{#n*zC%br2+u{z7)3r diff --git a/tests/data/acpi/x86/pc/DSDT.nohpet b/tests/data/acpi/x86/pc/DSDT.nohpet index b081030f0ed171e52b13e28cfdc8770a04c2806e..c1aa156a877f171b072aba51e82d38d11ad20f2f 100644 GIT binary patch delta 89 zc-lMQc*&8=CDu1FqxnXzg^Wx-B9qrL?qG7_oSe>-t)x0Ri;KNLh?R+fmm#6R c(bFZOxg&>x0Z1@1Bo!oeBrt4dV_q){0OOhy?*IS* diff --git a/tests/data/acpi/x86/q35/DSDT.acpierst b/tests/data/acpi/x86/q35/DSDT.acpierst index 46fd25400b7c00ee9149ddb64cb5d5bd73f6a82b..88dd156d9532100d2f9003c06077cc399a84d5f0 100644 GIT binary patch delta 91 zc-q_Ic+8Q@CDW5-6Wg^WyoqLbG$?qG7^nw-v*ZDKw-i;KO$(bFZOxg&>x t0Z1@1BozoTF(oXJnly2862s&qp8r5lkkpaDz)--;(2>Bn`3utlSpYG(9?}2+ delta 73 zc-lMWxW$pnCD3mKXGL?^Fh+`;6+H94Ir+r)fw78iSgqo+$mb4LyX t1CU^3NGcFwVoF#bHEH7HB!FW=;;#C+>yh; t03;Y0k_v>Fm=YF9O`144iD7aQ&wn5&Na{#nU?|{a=tyAP{DnzT4*>P09f|+| delta 73 zc-mW@G&PCKCD-t)x0Ri;KNLh?R+fmm#6R c(bFZOxg&>x0Z1@1Bo!oeBrt4dV^-7y0Ox!YivR!s diff --git a/tests/data/acpi/x86/q35/DSDT.acpihmat-noinitiator b/tests/data/acpi/x86/q35/DSDT.acpihmat-noinitiator index 3aaa2bbdf54a0d0cade14421e84c6ec5a42f96fa..a9a7cec8d7e2830275bfc1b69fb4fa116ecc884b 100644 GIT binary patch delta 91 zc-q_Le8!o}CDx t0Z1@1BozoTF(oXJnly2862s&qp8r5lkkpaDz)--;(2>Bn`3uuAIRG)t9@YQ= delta 73 zc-lMTyvv!(CDu1F?B delta 73 zc-njHc+ru|CD-t)x0Ri;KNLh?R+fmm#6R c(bFZOxg&>x0Z1@1Bo!oeBrt4dW4x t0Z1@1BozoTF(oXJnly2862s&qp8r5lkkpaDz)--;(2>Bn`3ut-Z2&G<9?}2+ delta 73 zc-p%Zdmxs}CD-t)x0Ri;KNLh?R+fmm#6R c(bFZOxg&>x0Z1@1Bo!oeBrt4dV?Lt|02J>O(*OVf diff --git a/tests/data/acpi/x86/q35/DSDT.core-count b/tests/data/acpi/x86/q35/DSDT.core-count index a24b04cbdbf09383b933a42a2a15182545543a87..d893781416b83305c3b0becc553f54fb04672fda 100644 GIT binary patch delta 91 zc-s4z(wxfW66_MvY{bC8n6Qy+AtRHY=;XDGJD6O!CZ{uHo0w0|;$kmw^mK`6?#N+a t01}K0Nd-boObH95CQY22#4tID=RXh>By}V(Fck1IbR;lt{=!tN4*)ER9*F<| delta 73 zc-m`D{g}e#66_LEXvDz4xPBwoLPjPZk;!WrcQ83|PEKdaR#Kgu#l>DA#LC3L%aBmu c=;;#C+>yh;03;Y0k_wVK5*RkKG1uw?01^KbiU0rr diff --git a/tests/data/acpi/x86/q35/DSDT.core-count2 b/tests/data/acpi/x86/q35/DSDT.core-count2 index 3a0cb8c581c8cc630a2ec21712b7f8b75fcad1c8..ac87bc5db07e46285f4e42ca1d884905c8050cf6 100644 GIT binary patch delta 93 zc-ni_&h)39iOVI}CFD;t0|Voxja&;Enfyd2uVvi9Hy+=(CY)AtRHY=;XDGJD6O!CZ{uHo0w0|;$kmw^mK`6?#N+a t01}K0Nd-boObH95CQY22#4tID=RXh>By}V(Fck1IbR;lt{=!r*4*(4|9vuJx delta 73 zc-m`q{p`Z!66_LEti-^;IC~@4LPjPZk;!WrcQ83|PEKdaR#Kgu#l>DA#LC3L%aBmu c=;;#C+>yh;03;Y0k_wVK5*RkKG1toj0Qoo+9smFU diff --git a/tests/data/acpi/x86/q35/DSDT.cxl b/tests/data/acpi/x86/q35/DSDT.cxl index 3c34d4dcab16783abe65f6fa5e64eb69d40795fb..6d71a26fab6cc0b55675b65835232a562c5ee32d 100644 GIT binary patch delta 91 zc-p&__9l(XCDFW=;;#C+>yh; t03;Y0k_v>Fm=YF9O`144iD7aQ&wn5&Na{#nU?|{a=tyAP{Dmpa001sL9&P{t delta 73 zc-niDb}Nm`CDDA#LC3L%aBmu c=;;#C+>yh;03;Y0k_wVK5*RkKF{c>-02K)oZvX%Q diff --git a/tests/data/acpi/x86/q35/DSDT.dimmpxm b/tests/data/acpi/x86/q35/DSDT.dimmpxm index 228374b55bd544116e359f659e546fc66cf8a895..5a0ff97b9e1a680ab0bcde0cce4272b15cb6c214 100644 GIT binary patch delta 91 zc-oukx7v@(CDFW=;;#C+>yh; t03;Y0k_v>Fm=YF9O`144iD7aQ&wn5&Na{#nU?|{a=tyAP{DnzX1pw6?9UTAw delta 73 zc-mX-H`9;HCDNE)LPjPZk;!WrcQ83|PEKdaR#Kgu#l>DA#LC3L%aBmu c=;;#C+>yh;03;Y0k_wVK5*RkKF{`Qo0M0QJ9smFU diff --git a/tests/data/acpi/x86/q35/DSDT.ipmibt b/tests/data/acpi/x86/q35/DSDT.ipmibt index 45f911ada5645f158f3d6c0c430ec1d52cadc5d8..a7e79e498335f3ffa1eb63c56b4a3bd9bcd5eed4 100644 GIT binary patch delta 91 zc-njC*xBy}V(Fck1IbR;lt{=)Q2768uK9nSy& delta 73 zc-m`ldgsXH66_N4PJw}eF?%D|LPjPZk;!WrcQ83|PEKdaR#Kgu#l>DA#LC3L%aBmu c=;;#C+>yh;03;Y0k_wVK5*RkKG5?YU00{FG&;S4c diff --git a/tests/data/acpi/x86/q35/DSDT.ipmismbus b/tests/data/acpi/x86/q35/DSDT.ipmismbus index e5d6811bee1233d74236453c49060390d74d4416..075ac613d2ba1348775c2ac6c38c5e85221b577b 100644 GIT binary patch delta 91 zc-s5z*z3gQ66_MftH{8>*t3yqAtRHY=;XDGJD6O!CZ{uHo0w0|;$kmw^mK`6?#N+a t01}K0Nd-boObH95CQY22#4tID=RXh>By}V(Fck1IbR;lt{=&pA2LSv(9d!Tz delta 73 zc-rfA`t8W&66_N4TY-Ur@y-t)x0Ri;KNLh?R+fmm#6R c(bFZOxg&>x0Z1@1Bo!oeBrt4dV`i5F04u2!b^rhX diff --git a/tests/data/acpi/x86/q35/DSDT.ivrs b/tests/data/acpi/x86/q35/DSDT.ivrs index 46fd25400b7c00ee9149ddb64cb5d5bd73f6a82b..88dd156d9532100d2f9003c06077cc399a84d5f0 100644 GIT binary patch delta 91 zc-q_Ic+8Q@CDW5-6Wg^WyoqLbG$?qG7^nw-v*ZDKw-i;KO$(bFZOxg&>x t0Z1@1BozoTF(oXJnly2862s&qp8r5lkkpaDz)--;(2>Bn`3utlSpYG(9?}2+ delta 73 zc-lMWxW$pnCDFW=;;#C+>yh; t03;Y0k_v>Fm=YF9O`144iD7aQ&wn5&Na{#nU?|{a=tyAP{DtYC5&#su9=iYl delta 73 zc-m|6`Q**z66_N4NtJDA#LC3L%aBmu c=;;#C+>yh;03;Y0k_wVK5*RkKG5=En00Yq!yZ`_I diff --git a/tests/data/acpi/x86/q35/DSDT.mmio64 b/tests/data/acpi/x86/q35/DSDT.mmio64 index bdf36c4d575bfc4eb2eac3f00c9b7b4270f88677..3d5131761ced4fdb018671a363fd805a10251e8e 100644 GIT binary patch delta 91 zc-rgrn(xKs66_Kpugbu{IBO%FW=;;#C+>yh; t03;Y0k_v>Fm=YF9O`144iD7aQ&wn5&Na{#nU?|{a=tyAP{DnzU2>|T39b^Ci delta 73 zc-ouq)$7IO66_MftIEK@_;MrHLPjPZk;!WrcQ83|PEKdaR#Kgu#l>DA#LC3L%aBmu c=;;#C+>yh;03;Y0k_wVK5*RkKF-s}|0N>IRWdHyG diff --git a/tests/data/acpi/x86/q35/DSDT.multi-bridge b/tests/data/acpi/x86/q35/DSDT.multi-bridge index 1db43a69e4c2affd8bd678bbef4d3c228380288e..a98567b923e88bdd400ac1acd32fdb169e7e77ca 100644 GIT binary patch delta 91 zc-othzABx|CD-t)x0Ri;KNLh?R+fmm#6R c(bFZOxg&>x0Z1@1Bo!oeBrt4dV_sqa0Qo-@N&o-= diff --git a/tests/data/acpi/x86/q35/DSDT.nohpet b/tests/data/acpi/x86/q35/DSDT.nohpet index c13e45e3612646cc2e30f00b3b7e53335da816ea..a550cf23c0de681b6afdd7998872d9165b1c5dee 100644 GIT binary patch delta 91 zc-oulu-t*mCDx t0Z1@1BozoTF(oXJnly2862s&qp8r5lkkpaDz)--;(2>Bn`3sYxECBOV9en@* delta 73 zc-mX;Fx7#}CDDA#LC3L%aBmu c=;;#C+>yh;03;Y0k_wVK5*RkKF)PXf0IA~=egFUf diff --git a/tests/data/acpi/x86/q35/DSDT.numamem b/tests/data/acpi/x86/q35/DSDT.numamem index ba6669437e65952f24516ded954b33fe54bdedfb..22b2a21705762f7afab457e7dd2d5fd06f8d7c84 100644 GIT binary patch delta 91 zc-mX(xZ9D-CDb%7 diff --git a/tests/data/acpi/x86/q35/DSDT.pvpanic-isa b/tests/data/acpi/x86/q35/DSDT.pvpanic-isa index 6ad42873e91c80cef5a42224cb4d31936dad59b4..c26f9b1ba6f0c949e509c0028c7888ca6e4a768a 100644 GIT binary patch delta 91 zc-rf5n&rgh66_KprO3d*IBO%FW=;;#C+>yh; t03;Y0k_v>Fm=YF9O`144iD7aQ&wn5&Na{#nU?|{a=tyAP{DnzG4glb{9XJ30 delta 73 zc-oug)ZxVC66_Mfp~%3%_;MrHLPjPZk;!WrcQ83|PEKdaR#Kgu#l>DA#LC3L%aBmu c=;;#C+>yh;03;Y0k_wVK5*RkKF^k9n0MBy}V(Fck1IbR;lt{=!tN4*)ER9*F<| delta 73 zc-m`D{g}e#66_LEXvDz4xPBwoLPjPZk;!WrcQ83|PEKdaR#Kgu#l>DA#LC3L%aBmu c=;;#C+>yh;03;Y0k_wVK5*RkKG1uw?01^KbiU0rr diff --git a/tests/data/acpi/x86/q35/DSDT.thread-count2 b/tests/data/acpi/x86/q35/DSDT.thread-count2 index 3a0cb8c581c8cc630a2ec21712b7f8b75fcad1c8..ac87bc5db07e46285f4e42ca1d884905c8050cf6 100644 GIT binary patch delta 93 zc-ni_&h)39iOVI}CFD;t0|Voxja&;Enfyd2uVvi9By}V(Fck1IbR;lt{=&qo006bo9HsyO delta 73 zc-oun*67CN66_MfsLa5?n7)x~AtRHI$mF$*JD8j}C#N%IE2&P-;$kllVr63BWk@J+ b^mK`6?#N+a01}K0Nd-wA2@IRrn0XZdwM-JH diff --git a/tests/data/acpi/x86/q35/DSDT.tis.tpm2 b/tests/data/acpi/x86/q35/DSDT.tis.tpm2 index a09253042ce4a715922027245de8a2ab7449c5b7..b9c83bea1fb891eea31ab63f175a8898408ef596 100644 GIT binary patch delta 91 zc-ouow$_cyCDx t0Z1@1BozoTF(oXJnly2862s&qp8r5lkkpaDz)--;(2>Bn`3sY}0ssi29moIx delta 73 zc-mX*HrtKMCDDA#LC3L%aBmu c=;;#C+>yh;03;Y0k_wVK5*RkKF{>*80J?q>$p8QV diff --git a/tests/data/acpi/x86/q35/DSDT.type4-count b/tests/data/acpi/x86/q35/DSDT.type4-count index edc23198cdb47a981bcbc82bc8e392b815abb554..16b46775879d9a28090220e2ecd93fcba20a9c1b 100644 GIT binary patch delta 93 zc-osgk#YS*MlP3Nmyq=y3=E7t8@U!TGWm&4Udy;*!sObomX e2?dUxE)mTgISdRyf{`JqAgLpPVKW=^N>>0sC>3o0 diff --git a/tests/data/acpi/x86/q35/DSDT.viot b/tests/data/acpi/x86/q35/DSDT.viot index 4c93dfd5c4b362714d3f9aa606a838d4625b3369..7cdde13b45d322855cfbb3894165d5c60dd20fa7 100644 GIT binary patch delta 91 zc-os%w5*8BCDx t0Z1@1BozoTF(oXJnly2862s&qp8r5lkkpaDz)--;(2>Bn`3sYR82}&F9vA=s delta 73 zc-mW5G^L2kCDDA#LC3L%aBmu c=;;#C+>yh;03;Y0k_wVK5*RkKF)Nq>0L>s182|tP diff --git a/tests/data/acpi/x86/q35/DSDT.xapic b/tests/data/acpi/x86/q35/DSDT.xapic index d4acd851c62c956436a436f9fa6d08fc5f370fa7..5a6310f45371c734fb03ac27bb864457eaeee7ad 100644 GIT binary patch delta 93 zc-m{5&NO2>6PHV{OUR6F1_s7?8@U!TGWm&4Udy