[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/5] bios: Add tests for the IPMI ACPI and SMBIOS en
|
From: |
minyard |
|
Subject: |
[Qemu-devel] [PATCH 5/5] bios: Add tests for the IPMI ACPI and SMBIOS entries |
|
Date: |
Wed, 24 Feb 2016 12:59:16 -0600 |
From: Corey Minyard <address@hidden>
Signed-off-by: Corey Minyard <address@hidden>
---
tests/acpi-test-data/pc/DSDT.ipmikcs | Bin 0 -> 5574 bytes
tests/acpi-test-data/q35/DSDT.ipmibt | Bin 0 -> 8420 bytes
tests/bios-tables-test.c | 58 ++++++++++++++++++++++++++++++++---
3 files changed, 54 insertions(+), 4 deletions(-)
create mode 100644 tests/acpi-test-data/pc/DSDT.ipmikcs
create mode 100644 tests/acpi-test-data/q35/DSDT.ipmibt
diff --git a/tests/acpi-test-data/pc/DSDT.ipmikcs
b/tests/acpi-test-data/pc/DSDT.ipmikcs
new file mode 100644
index
0000000000000000000000000000000000000000..b73ccc0ee985c5d0d3aa9d11715d1e7ea9e1e85a
GIT binary patch
literal 5574
zcmb7I-ER}w6+hQANygW9GERmNz7{L6(4__Z0Rg0{iaq1R4jyOlIEZRcXPgApX}e_<
zKw5}a3RyK|dE2^F?VF)~hCiWws`|Kp!uDU-s)Z-gb7p)UH!#vRQfBTs=XZbSew=ge
z9UHdM{QD6A=9HH8ik&Ilv2+7<3;?K2Z?!7l1!vnRExIfblbQ205w!79Qna5KrIkhY
zr?&S;&wKdHV=W(6U#TxvTmDyj-YO92(W=imHPl(xF1gOm2}`eL6}M6~lErViq_{<+
z0gAg)HJEBDA*QTUta4L;address@hidden>CwI6OsVmzE6PcJXJ}ax?Qdt8LMHq8EwwBn?>+R
z<N2g&address@hidden(7z8Jm`3d{rw(v$G_>c;18`N{PW)<J?QZX#nl^jI?cy-<2Yj^2N~co
zsGnY<(a><6onzLWTp<{1QUZoUv2q1H27F#V_9<*HqDLmVzF;jU!$82301_uMZo
address@hidden>o2C
zgAZzK7T6-&giVNzJ_cv!+Rc(NfJ>4V57uTd-Jqif9x&{+4(address@hidden)K
z)address@hidden;#}j;Jk$o?HFM+(s-b!zA9cSm^
zf*d&gS<Pw=oXP_#TA`0nsXVpFzL36<6lHch=wFugWiuyMXM}|address@hidden
zs|GX+M3X;6!(#&;address@hidden;0=D9EE$l!KVqwsgD667ZTU7_lVi7*Z=4d>9#L+b%C*
zW+|^JKoTVArEGZ#4W+u-U<oxekf4|9D`v)FrJ8;dv`;O)ycBcJkhH(=x5?-~W*b1=
address@hidden)4{8rTB{$-}axhcnntkt<Bada0%ABYG(~W
zam<2R{iXry-LsuF)=hU>Tpp-xSbv!sNJRvtJ8L{P(3JWbX`s<z-T(6ODpvvX5cbvq
z{H+%H+goSgukU#+c+~27&eOA(B^oUSJtYsb8n?0vK63QP)address@hidden&-)>_L
z$9p`X%~fydjW_}t+4MM1d_4+rDq*-G&q>address@hidden;UXaGFK2=}D{y
address@hidden)19RCvmpEeOD6Aglfr=?w^YQvY*=G%d0g3=RuG^9X2>e>yP
zJ#UAjz~a=XlD_Y~bjUl#?+^B#8}gnDyytLy!`^e+$GzvA9h2s+AM(y)|A+hhko$b#
address@hidden<9_#%No_%4+eIamPIOM(%;lAMPEXz21`>=aCbT2}P4u!`sD1!-Y
zG}vq{5w0-}6;-sms+pv8)2`~4S!8$y>eh0-4W6G)a0L|address@hidden;33X
z+Hu{&kUr?u9r3VszLa{PaowV1pXLA1mPXN^4j4eTdk>FWAG}u!BQLyX<g4G=gI1Ss
zd3+3>tg_XYNmSp%gHQs>@>address@hidden>5-?_FCJ8}
address@hidden@%^ZT2RGwu5i{og$LWoGl<gZqy**X}(4Z7Rr;ZoFd}
z^#&dWn4}IfgYs1zHEq2P2R59CbB1jD`>%fb!lNF(XWHdjcdBDn>address@hidden|m(yLX
zV>Zm&p_WUiMrqSyo^zf^dQ7`$HfT8yX#GF8As|e2%(Cq=pHB$1rxj;R%$T?sg1{<f
zW9~}2z_ZVP41g#9p}+V0;h#|V#eJ+e)RB+lU~6G>5}TE<d9GF#+6&n1Yp2cPoj&$B
zHY>i_C{?HvHEKkJjar2|address@hidden@&^(7%NQ}3?!f^=lxB$)-ubf9Dp2O4VC$X4qb
zV;address@hidden&?<Jh;~oW=pUK6xgyPvm6uX`E#0
z?+|qxH0Q2pXHDyl$qsLTk6QO&n|@?2+fDfc(1y8OzU}`Cje1C_&6?$<EFO<xM2YRh
address@hidden|yJ(ez<WCiKtD4PXNMk0~vRTk>xaDjPoHKV1Zeig`JEXAmdeb>Sq#%T*
zV$VF>4O0hGRXc`?0^GeUi|ZUE5=DRD>q_YIYWV68;94kM4_`OJS228*!j~StjPO+s
zUkjj?(|y;address@hidden>address@hidden
zo{m5Ii$P!sj#m_w{r$hb4-D|P|IpP?mvL#stKp$)address@hidden>M+m_T8KB
address@hidden
zq^o4138=;2-KBkUc5cd-=o(@*%7X)fj|address@hidden<
zRKMp{=c|address@hidden(P3Y0-0VvS73<address@hidden
zPfCowpoZcxsMta69a>+!#&DRSK~*feVFKqf&ePK*NK|address@hidden&
zJP&FoW;Ryjpa9eT)p>d(?2q+2L%E0#ThC~tRJ3ENd7oBNDWMf(BVlK=c-5!RK4<5G
zo$Cu2e=*Q-FLDMR71YR!Mu8g6&S!S+I(D>I>iy3~>>`0S8LSOmhsgn%37RKbg5qh8
zt`Le}6%kOuIwGJWQP6^5#YhNQM<bzvbxc6<3+dwnxFT2;0aYTQf;address@hidden
zM?wWFCSo|PL=<#RuqFjG83`4vDFIDIL9YqcaRD8VgbG%?r-x&mh=N`htg3*jkx;>!
z7SMDQ^oC%a6wt{?s9>EE(5WbBQLtj<address@hidden@fF6m0mIUjxfKEq31?y1(JsJho
z1?!A}&O|~5>oEa676ml~>u~`+9tjn!Cj|address@hidden
z5-M0v3+U;OLAA;W<959n>n69___44{wQeI2R1~n9g+hh|VVOq(D^h6LCV?!et#$%`
zdfK(Itn{TANdudV5*CNPjeK1l*vJ{Cc;80e<_0!$hl$#^k-uwXo7ie&b;VP4*T#es
zGM=j_AK3A9-L)}wgdM+zP(HA$Bx4c?dnS+%?DHgJI1BrBARpL+8Dn4yJ02#xwmxL1
zS!0L|>@;s<$WAlIU>VpmBoEo=QO0c_*tbbWyLOuHf%pp?{Q^T<h-cjj>o*K8smmin
address@hidden&ED|H{4&ZJqW+6P)WD9;7;@^`IjV%;YX<ARu}Mw
address@hidden<@;F
literal 0
HcmV?d00001
diff --git a/tests/acpi-test-data/q35/DSDT.ipmibt
b/tests/acpi-test-data/q35/DSDT.ipmibt
new file mode 100644
index
0000000000000000000000000000000000000000..2e8f3e33137888ae7c050d396a42cf613f1656db
GIT binary patch
literal 8420
zcmb7J&u<&Y8J#65YBi*!rL>address@hidden@|Vq()+FtupaHJrxRslx
zStvG;#0X$3Kz{g8AYmP}H_FgC|3Y)@F}DWjsX)*}fnHJ+_9^Q7W;oK!Dgt61xbw}v
z_kHtbcjv8k{EpxKrpTD}pURro=oBljg`ST-i!nxRIy%kFHP*Z9SL%H$m&#bZdpXg@
address@hidden<HV$P}IJlpS7`n|iM*Xde0
z_65(2cE!r&zo4|}uUrVdX2o{a@&dYD&m%6`{YKNzm%rk+-S=cGZTHK5o7w#<P2aLR
zSHh6lUbo$1u0PRV>v);_Z!ph)b$M7DA8Zz8xzh{&vGQo~)P>Jqy;c75SAYM_{Wo|9
zfU`K-IIhGLP#$WmP^vrh!%x%i(D`g|(|R9gmIZowIQQ8=;bgZ%Cu0Ir|address@hidden<i=
zH=Mwhda8CKtag<i3o0;v%x)v>1}x9mSKsAWrgzVwc=l>_)h~u^zh89E_dDG(i>W7y
zscZech&$0R|LGuNgDAJRx66i8pAOd9pVss2pZ^=%WxISDv(@et3ViCr30z1dXBo!c
zWln4Sc^VE)ZEt%m+w7G4VmdK^MGPivwlAl6M3<+9`ys{e@>K6$k=o2#3(9F`;ZVV$
z6?Xj;OVxa!1h|^w+XP+!xXQe8b=C4J_-TdssrmSES|?vftLjv_w|%DF^)LW=jdQrB
address@hidden@C0&R)lHDFxNN
z?Pr3uEBnOh*(address@hidden;Kd9S?ca6d%$=9hPXeN07E`{<b~5`FPxAS?^=<mwG|SYj
zN9jkHn57Hsxr`|K3g&3PXl6eZP0078a`<H3dMEu(+P0VO3Vt<%xn5SYGiJ#<UX6%m
z_^33G(~r~4UUEd58l^d#NW)address@hidden(VYLLM7=?6B$8n49n8XvLcpIe)xj(dBf!
ze~U*oY<I(%OK;zu$z^a?vexRQDwAys?HZfOQ$J53sH-52puuJ)address@hidden
zlsqSRfU1y~$S<%d!31^`5mP}^OfUfzOoYV5XaqJbm}&%cUyG~)nwCsJRY*)#1<#Yj
ziaZ&?RM3oMs=*`Fb&eT2#{^SB$0Sn?9-*!?Yv{}hrh;Zood|WE<A%<0L+7}u6QQot
zHgwvCPTSOpP}hl-N1N#hL+6C46QQn?8#=k6lbbpb>N<0V&YYn$XX-?#>%<DEUC+Fs
zGjHldsOy|GbWR#NCrzCQb)8d&&M8CZl&KS;u5;address@hidden
z3x>{up|fD>M5ybWF?7xtI%iCs2z8yahR#_-=d7s{p{~<4bh?I4*VKtn*Llp)dCbsx
z%+!fc*EwhCoHKOJnK}{bI*%JVj~hCVn>rEdI_C|address@hidden|qk5<AHf>{|Y
zb|)m$I|zyCkFW~{bHQLPm`sE^^Q6H%X)sTkOoTe~l)address@hidden)9GggW!I!8~m+Pn%4H
zI`b*PR4((BV5&9#Dalj|H$q}6Cs{OVE*do#&6)^hO&bPU)(o`XY3>^++9*6SPy{F|
zgERtF6b34B!jde!I|-n2%#?(xkeEsu3{+y3fof1PPze=GGEjsVjWSS)9Ys`Ac`X^J
zgzg(CLJVDCVW1K_iioKumkd-w1(OUEq0$Khl~}=qfof1PPze=GGEjs{Ck#|#1rr9U
zLCHWRR4~av5h|T9P>B^x7^ns%1C>z0Bm+gLbizO-Rxn|p8k7uFLIsly6rs`y1C?08
zgn?>MGEfN>Ofpb}N+%3dVg(ZhszJ#>B~&oUKoKgPFi?pVOc<yJB?FaE!6XAksC2?W
zB~~zDpc<46R6+%l3>2Z#2?Lc_!GwWoP%=;n6-+Wvgi0q2RAL1a2C6~HKqXW#$v_b*
zoiI>|6-*eY1|<WPP{AYvMW}SbKqXc%VW1k63{*k|lMEE0(g_2VSiyvWYEUvz2^CB-
zP=rb+3{+wT69%e5$v`DkFv&m>DxEM;i4{y3s0Jkil~BPX14XEG!ayZfFkzq?lnhit
z1(OUEq0$Khl~}=qfof1PPze=GGEjs{Ck#|#1rr9ULCHWRR4~av5h|T9P>B^x7^ns%
z1C>z0Bm+gLbizO-Rxn|p8k7uFLIsly6rs`y14X16C?efJ5$XntP%}`C2?N!bWS|<8
z3{+#nKs6=|address@hidden>AsKz7%)tE3)MC$6o
address@hidden|;7Sq~?|k6rq}1GEjs*a~JxsP&UjD#6PRM^bhGy
zmJa3Ky<fbLrvFmuy90gYu)_A`G934Eg?>address@hidden|;s+uF+4Oej2tr+q{g=R>O%q
z{O%?`u1xImoO`Z$*=tV#&@L6Gc<z%do1jl-_)qyh_3<(MHsd>address@hidden|Q6OKTkO
z2xaxZcpjf==p&GgVRs61eD;$mHj#$AF|6MVD>1UU)AAb!4FRJmyM?~r?6CK#&F_ky
zY5Hoyc4<H&KHl%NJJ$Wp(HN*a^^dAo64mip;address@hidden@9buU_eG2c+Fg
zROhKDDDP?IJyG6El=qG(?~Tg)address@hidden@T6tfT_Y>v)address@hidden<
zd^J(NdPMo^sC+G1e(VX#*R=9AQNETaUpu0FZB)address@hidden
zB+HLKLHUMOz9Gst66G65lyCI5s~K9#66Hrvy;?i)RzY9c#0OBb&&`VGd6Xvk_$Jce
z72{AE*=MFnK8J}kc;7gbM)sL$lFw5j4PHJDrICGRn&fklNP{<#Luq86nI?IEC(_`x
z<WL&fXQoNsr-?LpM>&*6_L*st_gf+jURVyLk$s~yP9Szd+!wttC|address@hidden
z9Jd+%tDwL2c=O|Ro?_yVW^sfl!*<u*1uukW9k7OD5x!dQq<5Liy|8*Q)m!3!b1!DG
z`gsid3Z4E9?BB#JdRQBK5Pd|oM&yXC5BZ&lkF)nStc{&Kx^G|$0$)xy;yW7_yFOg{
zY_NVkzAgqBu^}H^w^qBgUq{xCEsi{WJ91XfXgd$(GeIMiH_v3a8kWkX^OzoZ;bd^*
z&address@hidden@XT3=bFXSwYLY#N2W==y<E_
z;2d=HenjW?_8$K7K}3u=3Od!+aCQ(address@hidden
zl3mL^6SQeM57Nee*<>PNZV*&address@hidden;b5uCT&O_kYS*9usK(
zeYYq7RPQL<!z%?5`4k4*lFb=38?yOytEzgRLvz$S7nENcVHePB#6i2#AQClNln9Mh
zg9y}UQIaj{rUr2-5T}VfbRSS3o!_F^5}gInY2DiIp;n8|wTAxqfVvqZubeF`@>3t-
z-ae2_Qb{IB6!KQia*p(UXhL%e+);B51M0_AnNG))oKD6xPC7NZLPXndo<HaQI0#=0
ztmFlV(c3?`Og{<MI^E16(address@hidden>yA)I}mQsg+7P?0Ra4NiC59K;address@hidden
zsf1e^PjahNl80sHI{j+tEW0M313Y)`33RNmYcFKft{6QPbSn$uIZ1p`9!A+-lF`fZ
address@hidden;address@hidden;$Lk+vR`B7=HuSz>@m2v)uk0)6Q|GLw~pdaj<J<dPQTQ>SF
zdBGmx^yB<~JSi^SfAtH>aUtn-mHtvpoDna>2*2Fh`|Ee&1pD$8+F|oDm?yczmU#53
zUwh!OZ`v*MoV3JA&g)h&Tg+P6rgNUXhSj38(address@hidden|&address@hidden@;ie98MRMfe6
z;address@hidden|>-^Vws|XEv?WS$)uk*avyO$RM
zEua^i-UlmQhzl<MuvZq8yKI-1Z`wGcZCnJME^{aQxSuQp)r)M?EzlyF!m_!^J|y~0
zn^xbMv}IxQ_}amisaP__;-}3C{#D>?o(9zjgEscoIiK&{TcjXOk9v_FeEhVi)j|tT
address@hidden(f$AVd;hXFqwujpoJ)l50HjNCrXbxI}dZ_;Lb
zZ~M7U>17$<Zn2n)>09=(N>k&kYOIJxHuP4z%&BBGZE`z!EfX{;CG7`4jqhD_4ce18
t<2P^iH*QITKp)address@hidden;A#K>
literal 0
HcmV?d00001
diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c
index 0a80ddf..e681ced 100644
--- a/tests/bios-tables-test.c
+++ b/tests/bios-tables-test.c
@@ -50,6 +50,8 @@ typedef struct {
GArray *tables;
uint32_t smbios_ep_addr;
struct smbios_21_entry_point smbios_ep_table;
+ uint8_t *required_struct_types;
+ int required_struct_types_len;
} test_data;
#define ACPI_READ_FIELD(field, addr) \
@@ -335,7 +337,7 @@ static void test_acpi_tables(test_data *data)
for (i = 0; i < tables_nr; i++) {
AcpiSdtTable ssdt_table;
- memset(&ssdt_table, 0 , sizeof(ssdt_table));
+ memset(&ssdt_table, 0, sizeof(ssdt_table));
uint32_t addr = data->rsdt_tables_addr[i + 1]; /* fadt is first */
test_dst_table(&ssdt_table, addr);
g_array_append_val(data->tables, ssdt_table);
@@ -654,7 +656,6 @@ static void test_smbios_structs(test_data *data)
uint32_t addr = ep_table->structure_table_address;
int i, len, max_len = 0;
uint8_t type, prv, crt;
- uint8_t required_struct_types[] = {0, 1, 3, 4, 16, 17, 19, 32, 127};
/* walk the smbios tables */
for (i = 0; i < ep_table->number_of_structures; i++) {
@@ -694,8 +695,8 @@ static void test_smbios_structs(test_data *data)
g_assert_cmpuint(ep_table->max_structure_size, ==, max_len);
/* required struct types must all be present */
- for (i = 0; i < ARRAY_SIZE(required_struct_types); i++) {
- g_assert(test_bit(required_struct_types[i], struct_bitmap));
+ for (i = 0; i < data->required_struct_types_len; i++) {
+ g_assert(test_bit(data->required_struct_types[i], struct_bitmap));
}
}
@@ -735,6 +736,9 @@ static void test_acpi_one(const char *params, test_data
*data)
g_free(args);
}
+static uint8_t base_required_struct_types[] =
+ {0, 1, 3, 4, 16, 17, 19, 32, 127};
+
static void test_acpi_piix4_tcg(void)
{
test_data data;
@@ -744,6 +748,8 @@ static void test_acpi_piix4_tcg(void)
*/
memset(&data, 0, sizeof(data));
data.machine = MACHINE_PC;
+ data.required_struct_types = base_required_struct_types;
+ data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types);
test_acpi_one("-machine accel=tcg", &data);
free_test_data(&data);
}
@@ -755,6 +761,8 @@ static void test_acpi_piix4_tcg_bridge(void)
memset(&data, 0, sizeof(data));
data.machine = MACHINE_PC;
data.variant = ".bridge";
+ data.required_struct_types = base_required_struct_types;
+ data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types);
test_acpi_one("-machine accel=tcg -device pci-bridge,chassis_nr=1", &data);
free_test_data(&data);
}
@@ -765,6 +773,8 @@ static void test_acpi_q35_tcg(void)
memset(&data, 0, sizeof(data));
data.machine = MACHINE_Q35;
+ data.required_struct_types = base_required_struct_types;
+ data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types);
test_acpi_one("-machine q35,accel=tcg", &data);
free_test_data(&data);
}
@@ -776,11 +786,49 @@ static void test_acpi_q35_tcg_bridge(void)
memset(&data, 0, sizeof(data));
data.machine = MACHINE_Q35;
data.variant = ".bridge";
+ data.required_struct_types = base_required_struct_types;
+ data.required_struct_types_len = ARRAY_SIZE(base_required_struct_types);
test_acpi_one("-machine q35,accel=tcg -device pci-bridge,chassis_nr=1",
&data);
free_test_data(&data);
}
+static uint8_t ipmi_required_struct_types[] =
+ {0, 1, 3, 4, 16, 17, 19, 32, 38, 127};
+
+static void test_acpi_q35_tcg_ipmi(void)
+{
+ test_data data;
+
+ memset(&data, 0, sizeof(data));
+ data.machine = MACHINE_Q35;
+ data.variant = ".ipmibt";
+ data.required_struct_types = ipmi_required_struct_types;
+ data.required_struct_types_len = ARRAY_SIZE(ipmi_required_struct_types);
+ test_acpi_one("-machine q35,accel=tcg -device ipmi-bmc-sim,id=bmc0"
+ " -device isa-ipmi-bt,bmc=bmc0",
+ &data);
+ free_test_data(&data);
+}
+
+static void test_acpi_piix4_tcg_ipmi(void)
+{
+ test_data data;
+
+ /* Supplying -machine accel argument overrides the default (qtest).
+ * This is to make guest actually run.
+ */
+ memset(&data, 0, sizeof(data));
+ data.machine = MACHINE_PC;
+ data.variant = ".ipmikcs";
+ data.required_struct_types = ipmi_required_struct_types;
+ data.required_struct_types_len = ARRAY_SIZE(ipmi_required_struct_types);
+ test_acpi_one("-machine accel=tcg -device ipmi-bmc-sim,id=bmc0"
+ " -device isa-ipmi-kcs,irq=0,bmc=bmc0",
+ &data);
+ free_test_data(&data);
+}
+
int main(int argc, char *argv[])
{
const char *arch = qtest_get_arch();
@@ -797,6 +845,8 @@ int main(int argc, char *argv[])
qtest_add_func("acpi/piix4/tcg/bridge", test_acpi_piix4_tcg_bridge);
qtest_add_func("acpi/q35/tcg", test_acpi_q35_tcg);
qtest_add_func("acpi/q35/tcg/bridge", test_acpi_q35_tcg_bridge);
+ qtest_add_func("acpi/piix4/tcg/ipmi", test_acpi_piix4_tcg_ipmi);
+ qtest_add_func("acpi/q35/tcg/ipmi", test_acpi_q35_tcg_ipmi);
}
ret = g_test_run();
boot_sector_cleanup(disk);
--
2.5.0