From 75fb3d286eae1b0f7a93897be2d67f42dc466e8e Mon Sep 17 00:00:00 2001 From: Eduardo Habkost Date: Sat, 23 Jan 2016 14:02:12 -0200 Subject: [PATCH] q35: Remove unused q35-acpi-dsdt.aml file The file was used only by older machine-types, and it is not needed anymore. Signed-off-by: Eduardo Habkost Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Laszlo Ersek Reviewed-by: Markus Armbruster Reviewed-by: Igor Mammedov --- Makefile | 2 +- hw/i386/pc_q35.c | 4 ---- pc-bios/q35-acpi-dsdt.aml | Bin 7344 -> 0 bytes 3 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 pc-bios/q35-acpi-dsdt.aml diff --git a/Makefile b/Makefile index 16db398c6f4..70e3ebcd50d 100644 --- a/Makefile +++ b/Makefile @@ -391,7 +391,7 @@ bepo cz ifdef INSTALL_BLOBS BLOBS=bios.bin bios-256k.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \ vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin vgabios-virtio.bin \ -acpi-dsdt.aml q35-acpi-dsdt.aml \ +acpi-dsdt.aml \ ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin QEMU,cgthree.bin \ pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \ pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \ diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 06a5f9524c3..da28d7774b1 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -116,10 +116,6 @@ static void pc_q35_init(MachineState *machine) } pc_cpus_init(pcms); - if (!pcmc->has_acpi_build) { - /* only machine types 1.7 & older need this */ - pc_acpi_init("q35-acpi-dsdt.aml"); - } kvmclock_create(); diff --git a/pc-bios/q35-acpi-dsdt.aml b/pc-bios/q35-acpi-dsdt.aml deleted file mode 100644 index d71b3a328ced5ce2cb16d153cfa7cda0aca966a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc-jL100001 literal 7344 zc-obj%WoUk6~@nS_!wRe$ssu;Wxb(Ai>8n0;V5l^7A9x-vMFgy(oPB*n30?mDhw2a z>j1Hh0J2iljutIqH9?nDz;)99pjme5T^HT7+b&ZS*2?O=b4hAGf)XGu?mg%7eCM0r z<%m}r*=@V?*Lfl(Res;Gh|2HVe1#}PM2+oEGZ)V;8;$Ti>K@qTnyVy2VWs;l;m3R^ zYvzya@|~LUmwoR`&wKRTQ+9i__m%O*-fr*H7v3I;qL21^jETVbf!i*--2=yJca#Ku z&2&F5D+&E;(N@Ga9IH{*j2+!CJ*??GU)9`t!`4f$n5Mawj8x4n*)7uCI}KaW+IJj> zG^^8Ul4-}?owgM|dO()_-devJJKoRan9<$(=f>-$`5Rxp_o(#kFaGiCqX#U^3)cCp z@p+>s646Hl8=}=yF|Y+O_KlavzfnFB4gKo1e&OZus7@{$V(f`rte@y|RamSI9vIvC zp9mly#%fjCnR1N%_C=CHI*Her7?hfFs-NnL#@7{H6-%%A+o$?CPo9aw|2{7g$@hsE zot-6Q$Uimz9c7sQ>+I}rZ)EuG;$yx&toP1jl~MRTr@48(=d6j2ejqyfLDLm){a!Q>mEOQJwlsOWRJ6KN>5Og{MfGnF ze)HCy&KB{#eDx+l;qEg-9#v1>WLMvCzf`fc+Bwn`sc?U9eath zvjO!}pC9kipLcco_x~aT8nCn`wk4BcsXxTUZoPU#VXPj9=>(AR&xD&mD?+1 z@(W$FY2XLzqhLb>Ml%-B?L-^xbKw$aa2l=KA?Ar6nx{p? zGM}1G#|}}bYV#_;xDsNAqIg!sWR)u0idE)A)8Rwa=7Z6kds`j33+L|Pk6Rtf9c^WT zB3H4UO&n|sR5mY$HF-_Q&YZEzf&n(Q(mjD z`Npi=ptr)l=`Z;njZMSjR$@b@v@%$-rhKe^tZLfIfv>NG`ChM$8blQNJv3?~cKD(; zr|PLn+KS<~sfsr16Kz;%+^2j=pU`QD_tAJC&1qOwGIf{FN^f6e#vkt};^Q=||M=fI zPOIZ&Z~g8dn+WrpnVQ?TDkNit$5qPeB4#0;)JBQQlR9OSVVzeI$+}^t$ikG&d|mxK zRb_v_HsmX7<4g&ZhNQA`o~i*C)mPTXnGz^frLuaSssWcUQQ!)~qy$RCG@=}(LCy$p zMu0PdoDt-V0%sIBqsSRW&KPjUfHQ`iG33;MQv*&7IW^>r17{pK z;27jbVFac`Hva|t|` z&~s_zDGtz5-~g?)8{-3%$L9wqPtFfeo&*k1SvNXBW#RY$m8IhYRQ4Yopt5#!fCfrK zQW-oz11_qs3>=_=QdKI02WY@0Occ0+Fe!o3FpVh32WY@00-O=xj38$OIitWC1~MQ$tP-Ipe??2hKQh#*vc&Cj(A~oD4Y=z?lHf1ac;jQwL5R zICbRIkuwRLN#IN(XA(J6z?lNh6mq7JGYy<+;7lWD8aWN%G=S4UP6IhJz?lKg402|W zGYgzq;LIXt7CCdknFG!oa^{fJ1Wpq;P2@C@GY_13;LIau9ytrZSpd!gau$%Y2%JUW zEFxzSIcI=#1~_Msa|SuD`O3fn%Cq1B%G2Nh%G1CB8c@!Hau$`dsGI}k94O~dIfu%5 zP|kyL9+mT`Tma<)C>Kz z#2=(5Q8AUe&wl>4I(qIPo^mKo>voBsxVOtme0HSq%Wh{1EcaQ8;%dZy;zpE^5605+QH8h!ami-JwHs~vM8xdCUrGB<&IaOw z{JiM4TW#fNe|QaI5bHzt@`Sr`1^05mz3jV}C)~>yxR<+!Tf*I%aA%<_*joX6%eS{C z?5zvzt)aa=X|Gd?M6X&=3UeJx;L^X+RB_O%P_YeW0`qPyOh-!|+|@vo~Bbqki9EoATvtGE>@QrnIpxZ-XHET?ia z)LmhJ@A4bj|2Nq;Y`ObP_Y*$2Hw^P;lm`~|MEYTm_Il)fRgHY%Js16kZ9UrUv!@=5 z(UU!8??mUzA3pK;W$^N+dkWp}ue?0oz2Cb(tnRbp`^t8w`YTU4(fpaIA9==(=GGi} z3nWXH(^y?y-4vV9TwNv8;L{r2lmE5gSLCm+%eOb=bX`vG$Z05jS57~b)6e8ol2chu NmYi%kRpeBq{{whewp#!I -- 2.39.5