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 16db398c6f..70e3ebcd50 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 06a5f9524c..da28d7774b 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 HcwPel00001 literal 7344 zcwUv6%WoUk6~@nS_!wRe$ssv>SZ`?2qUj@gI7(Zfg~=JdY)TrFw3C7cIFge>g@J-_ z9U!(5Kvs&{(V|7HCg_q1xK8^YG|Mi%>!O=>+hvNvT3NmK4oS^7pbCh9=bm%teCM0r z<&f7L*&Vz4mjxmvRe9gBh$`>fe1<4QM9rOUD;LkM7|rlK>K)pZdS6L|!bi9B zYo^P%q9pXMMOzWyaI9uUGj?@ZdQ{hWzNYmXOsyhzphWxGvU|4!3Zw9XyJ zAyk z)cCkL5Q*p`f=$utsW`AjaU2>iPkyC*A{xr-^!@D3jg!GNaUR- zVsw6<@IwBs$ur70{pb1lU*CA)H%pKC^0c?EXExc|@%Jy}-s_P6I~Om)mzaM{W|{S^ zc889|g|mB3XLG{~U8gz;51iKK#=u$Y^u=i&RQuxO;Nc?~@_AB7)C~0#XZ>!UMnd)n zaY-!YbhfU0VZo_R!tXe(t?L74U38Rz=qQ6$U!3}_Xdo)xk!x&g-tAJ=8cwx4xm^@h z-X8qsZ8+U+;%oWpO@hL`XNJggcdI-0iqp3HE9O?e(=F3L%(w$FwfDqjhC9?hKXK{A zO`M;PXqfu^WRL#1r_;aw8yV4vr8TiEnG8$)E-qH<)f)HS;fI#P4>g+~jMn_y>cm|*_l|zp?ppoH zQYOfQEwOxE8PI@?(5kp$AJRh#MITe|=-pctds?olW?U}mbd{vgC6^Sg`hY&*<7$Y6 z@Vnc)cc#L0E-2JkWR(n2cr(n2rr!lIGE3gOCIH-Fl)qCWIt@>S^Q=@?zE!_fDO^`x ztFQUOtlprv!qW8Te2u22;b|+eATwGSELm4RRzFrXZS_#yri%#rqzbv=J+O zS(`KUOeJmAkZo$B%|@UN3r+h}{!gFKS%~-1cpuGaS~W8DJ|C6Afyj*C-%-TdX;}Z3 z-#JdZ>tt{J<}jNG^P8DkJGZLj#R`vWl+{JdLOiKY5|t+n$|l1)uOjm5#+l+3ro2q* z8W*YR^_R6FsjN>k#a9~gl+}w=^|`20*_dXEuT=GvwTo2sxrB*)R}dz}R~n`Xk5&Ny;1;AFtb zkdq;20yq=EnLy42a_YdT1E-FhI&vm~GYOnYn!srSr-_^fYi$F*~y zoCDm+|&J?dO4b}ioCV-4AZGzNi@;d~ z&LVOak+TGxCEzR}X9+p4Nu_TC<(Yp2<*9!I<*9E2^(p5-Ifu$QRL+BP9+dN_oJZvX zC>KDvfXW3_E`o9ql#8fbMCB5!?Gmi*60YqMuI(~-E`#SXdM-~q&AC3`LP=SmI!7w8Dp~h->0d7l(#s=9;%VU1b=5 z$_@``#Ns2CFt0anTkSY6Xs=~bEb&>C;_{i;V>%XdEW(e?!P5hlCJ~LqWbddI6aOoi z{1(^K-m@c(Uv?)`V7bpy6j%A~M*RDm65fNcwD+h&T!Oe{Gt;-59r{GX>`>06<&(3K zxFDGq`<-@2IX)O)gE)x!v3n)pu3W*r;&ZP^_e#LMa*2DTceE|st$;fVUBTY+*;~@y z3fNnh*jrM~rD($NQ`|2h3)v;n`pI{PAzi&^Z#ZX0W#4g|;Kw)6CNrZ=W=5Of=P=MFJEKi@Mw{U0DbOZ2 zqfKr`o8adn(8iq6#+=b6cz*}lw*v8(m#j&}