[Qemu-devel] [PATCH 0/4] pc: drop AML files

[Qemu-devel] [PATCH 0/4] pc: drop AML files

[Michael S. Tsirkin]

This is a lightly tested patchset that shows how it's possible to clean out old
bits without breaking any user configs.  It's quite a lot of bits, too, since
we are dealing with binaries here.  Will test later if this is received
favorably. As a bonus, seabios will be able to drop q35-acpi-dsdt.dsl if it
wants to.

Michael S. Tsirkin (4):
  pc/piix: drop acpi-dsdt.aml
  pc/q35: drop compatiility with old bios types
  pc/q35: drop dsdt aml
  configure: don't install aml links

 configure                 |   1 -
 Makefile                  |   1 -
 hw/i386/pc_q35.c          |   8 --------
 pc-bios/acpi-dsdt.aml     | Bin 4405 -> 0 bytes
 pc-bios/q35-acpi-dsdt.aml | Bin 7344 -> 0 bytes
 5 files changed, 9 deletions(-)
 delete mode 100644 pc-bios/acpi-dsdt.aml
 delete mode 100644 pc-bios/q35-acpi-dsdt.aml

-- 
MST

[Qemu-devel] [PATCH 1/4] pc/piix: drop acpi-dsdt.aml

[Michael S. Tsirkin]

commit 9fb7aaaf4c58c9108327f0ae4766087e3e496b47 ("pc: drop external DSDT
loading") removes the only use of acpi-dsdt.aml. It's safe to drop it
from QEMU source.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 Makefile              |   2 +-
 pc-bios/acpi-dsdt.aml | Bin 4405 -> 0 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 pc-bios/acpi-dsdt.aml

diff --git a/Makefile b/Makefile
index d0de2d4..fa36a48 100644
--- a/Makefile
+++ b/Makefile
@@ -390,7 +390,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 \
+q35-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/pc-bios/acpi-dsdt.aml b/pc-bios/acpi-dsdt.aml
deleted file mode 100644
index 558c10f51ccbbf9ec2f47a4a998a7055059a8963..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4405
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
U_=PAMqG*c36NN8|mMC`Mf01wzJpcdz

-- 
MST

[Qemu-devel] [PATCH 2/4] pc/q35: drop compatiility with old bios types

[Michael S. Tsirkin]

We don't ship bios without support for loading ACPI anymore, and old q35
machine types don't allow migrating such bios.  Drop it, as well as
has_*mr flags that are there for migration compatibility.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/i386/pc_q35.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index 208a224..22a0fdc 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();
 
@@ -435,7 +431,6 @@ static void pc_q35_1_7_machine_options(MachineClass *m)
     pc_q35_2_0_machine_options(m);
     m->hw_version = "1.7.0";
     m->default_machine_opts = NULL;
-    m->option_rom_has_mr = true;
     SET_MACHINE_COMPAT(m, PC_COMPAT_1_7);
     pcmc->smbios_defaults = false;
     pcmc->gigabyte_align = false;
@@ -447,12 +442,9 @@ DEFINE_Q35_MACHINE(v1_7, "pc-q35-1.7", pc_compat_1_7,
 
 static void pc_q35_1_6_machine_options(MachineClass *m)
 {
-    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
     pc_q35_machine_options(m);
     m->hw_version = "1.6.0";
-    m->rom_file_has_mr = false;
     SET_MACHINE_COMPAT(m, PC_COMPAT_1_6);
-    pcmc->has_acpi_build = false;
 }
 
 DEFINE_Q35_MACHINE(v1_6, "pc-q35-1.6", pc_compat_1_6,
-- 
MST

[Qemu-devel] [PATCH 3/4] pc/q35: drop dsdt aml

[Michael S. Tsirkin]

DSDT AML binary is now unused, drop it.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 Makefile                  |   1 -
 pc-bios/q35-acpi-dsdt.aml | Bin 7344 -> 0 bytes
 2 files changed, 1 deletion(-)
 delete mode 100644 pc-bios/q35-acpi-dsdt.aml

diff --git a/Makefile b/Makefile
index fa36a48..bc9444a 100644
--- a/Makefile
+++ b/Makefile
@@ -390,7 +390,6 @@ 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 \
-q35-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/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
HcmV?d00001

literal 7344
zcmb7JOK%(38ND;4q|uO)h7v8y@)KILX!?jAj?xxrVRD9~Xj9UNl${hbz>%C3Dhw2a
z>i}_#0J2)tjutIqH9?njz;)Vx&@8+3u8VHkZI>wuYi0F(-^VN8JBol<i<x`woO8c9
zcOGYW6}6(xzg|$v885#Zhf0;-jnJc%tCXs*Z8oMxC$9wc>}}QFjmou-lXJ69`%#YD
z*p$8E52EtTn)BzK<ntuC|2T2Bx@!B2;Ir+m?r)zY+lojZY<GR18o~EEt#YTm8;7k;
zC#Syj^V}{wx%`(jEc(mW;;>%!g7rL8_iB0Id9SllkMgDGzUOs9X=S`lDQYUObF&^f
zUh8HYD=*w^HdHYh?X0)L?EYO9M(-^2sv`$Gg(*L1ul{rC#pMgvK7Z$a>8qdp<Cpt)
z{VWKJ*n8M7bqUZo)L5dS9@56YNZVfU^x#*{$2hXU?1kR+(*w<u?tl(<iA?>^^3qEs
z7W#LCwKG2=Lu@8&R$7Jfi2v&+W6I5Arj<IPjZ<?D^M`rIL%);HP}d6_KFlBEu_Ge>
z_wiY!<hWA4Iy%Y`6@RYcBaR^TucM>Cy_EJ>mmXkxn#)%UOaA=+_g~57@Gf>o^e6Cm
zOZ^X2vE+BcW=rkUiTk(X*3zOhlenUrJ8@%au^Z2~I&>I~N{0@1@7?Dn`jw-I)5{;k
z3%5F|PlNrDPRSpSTgz9aIUQGY^E+{4`D!;_pb@!2BXXnBp+mo;0Z5<plVH`8+oj^I
z#Fb5byEwQ>aC_k9U5PhW73T8!%bd!#9|eS`ZdKNzD{(XGTq!PhTAL-+rJkfqU0WX|
zevtI?pB^OYAjusa^;K{D(}OMbr>(sD_y30as_#$WW^A?!1%LeaqcmmDU#cw4SFn71
zt=oHV+^Us2e6OOsql!4ug-G?ev8WqM)Cd|QhHibh-g+gx3=eU=x#9W=Jv5Ctj9h=$
zciWGyP+NuTtEG%`uq$KNh&Llwxzz|PCRbd4kI1tiS5#Q4tT|yBn?{UHHNqxnoPRT;
z?@+4T-uq#5GsKz8lb6GjMrLRHGc~8Hx+-wz=!U(g?kRWpfoku)eWM&5(=(akC{O9}
zEU_?AiE^NNPrZlzoQuh7?|pZ5{pPW7Vk#~4{GmA&5b=5zj*j02BdRzfSB(rLy<uFb
zzIv8Du6W*`sX1R~zRsv@&3Tb|fr**BrryYM(Vt_Ej*DiGhoTAjhM@v~tmb@}`7q;o
zbGxjsWHHwZdUl2!c@OC`q8UDIn8VCrMtO4q4^yRK7E{Cc?(sOdNT-hD9=aIE!#G}C
z538z}?_lqAcL)W4xarX448s5LJ11^##*;UGvpbo~;$~KjwHp;BZ3peDn#@zb?*h~`
z$N;RU$+2wy=m_r=;SCU}KpdB2tOHd;Qeu4OB1(iiK%~@ESFsXQRsxa|XTw~)0fjq2
zq}0@mC_!Z<ASrQ1%*A6U+yNSRWNKEF`s4vkpF@_<Av{a3d=80HpFE)HbJ+4Z%t}oi
zwtWJcK1VE{BdpXuM{J*frcclE>9JBziD&x+G=1WQ1!sDuM=hVDwogFQr*HZ6EuX&a
z6VUXDm_kj=315|*<uhmd1T=l()oEPMyyY`*`vf$7j#)mDtH$*lvwZ@ZKF2Me<Cf2H
z+b5vubHegDVfmb}eFB<31IuS%`3!8IfTqua<+EV<EZ9B)O`nsN&q>SYr0o;X^f_hu
zoU(jQ***bHpGC`O(ehceeFB<3&saXsSU%6#J^@Xi)0WR^%jdN16VUXDuPx)gJ!|<q
zYx@K=ea=`uXDpvHwogFQ=Q&oE2G7blR+a}ZyK|xpUqMnv1MaM)oVAp*wi3`(p0||e
zE#-Mz31}+u3j$}L&-Q|)ykIK<P31*PdC^i{w3UFS@)9d`%3NZle)nAxrGCc)l2X5U
zE?YG(TQx7+H36ljhX5@Z0a|O-QJTZlK^uh!0SbV!0x|%)C<0V?{PJ_~?ZiZ#n66MY
zB&D{702MAPT~_K~p#T*sD=9z$^=lmg3Z%~f-#-SG0#vB1qyPmp0#vv<Kn*Gds8Cr+
z0Sc(AAV7u7N(87ur2rKwD=9z$wNC`7a9N1}HK-JzLS-cdD4_O<02MAP5ugT@0#vB1
zqyPofJ`te8WhDaCpi+Pem6a5rfZ8VlRJg1}fErW^P@%Gt0u)gDM1TsHl?YISN&zZV
zR#JchYM%&D;j$6|YEUUah000_P(bYy0V-TpB0vo)1*lM2NdXF|eIh`G%Sr^OL8Sl{
zDk~{K0kuyAsBl?{05zx-ph9IO1t_5Qi2xNYD-oaul>$_#tfT-1)IJfQ!eu1_)Syy;
z3YC=<pn%#Z0#vxHM1UGp3Q(c4k^&S^`$T{Wmz4-mgGvD^R8~@e0&1TKP~ox?0cubw
zK!wUm3Q$1p69Fn*Rw6(RDg~%eSxEs3sC^<ph096=s6nLw6)Gz!KmoN+1gLOXi2yaI
z6re(7B?Ty;_K5%$E-MkB29*L-sH~&_1=Kzfpu%M(0@R>VfC`nB6rh0GCjt~mM-l=Q
z$P7?GGe7~205y~dP(w)pYA7i{4J889P$EDLB?YLVqyROP2v9?b05y~ppoWqH)KDTo
z4J889P*Q*zN(xXzi2w!CR~G>age%6ANdXFo%b+1C_1q#rf%M!WK!Nn!Qh);LxupOF
zj8t*9g9uf${6jxh`}BkK*)Z)&?MFX-Gef^pY2ATVIh?q;Q9|NwlxY*vCh`=PYBnm=
zuF|GPn-#A(Ro}p3VsG@Jzq^AqnbE$VD_*T{gw0V9n)8KmKljP78s#;y2Wp@C{2^@X
z-G@8=grXKsqB-B*YmCr0jQ%a2$LbEP9eFtIR$<zo`ea;<W{_@JaZ`#`+^{e<A!{6T
z3OJimvCxU?E%h<A{ax;v;FYsJoe<-*omR8u?C%WDfyz_=pn5q~9m@*ex_a5DUgqj$
zoFA>*>FVX;H&-vW_g2Y!n5yo(uTefU%7<J&OqCB$DIX5XN9podz5CYgBcpu8<)c*j
z=#=u&pnN4=KKmNwD@OSWm#?JCS57Hk8I-T4%MZOq`KnRA%H^x6^3_wyR|n;5>GH#`
zQNCuBuW|WWs(kH~^0h(vm2~-$*C@YYlwaZUE2;7;r<7l5?^Uw&Dod3gJoWnBfv*Z$
zW#a`<yRSIR&+}lI^y8Zv2A>!whLJvdnDld)8V27RCx($edzkd|lo|#fA18*9K6{w-
zbCDVbUm_=lkv@Bv^!=S02A?G-hLJvdnDl*`8V27eCx($edzke7mKp{hEGLGMzQHg-
zZJbtDi*JSTYRSRBy25yUZAT^DLeBRTepS%lR(I#gmhURwWmGo-%BucWaW;&RS+7*R
zp#-be&ocP0fFH({>u!6_|2r1^oBVIGzxY?$kMaz#>0Aqn*N4#v75-7t>b#Htw{=zW
zMRn-2<T0JaVAw=$_56p4KcYU`cDA48(fvODr-7e@+ueuTj=IyEdwQ^Sr+bG_JyAXX
z;EuDlS^Y)gJo9+(XFf=Rb+1#4<rWw#g>ij;etubD5*qXKsu*Cmpl-{5EpSHMzbJ>7
jWOr3|Z^>>TeOu6vW%m==m1I|zT_`(zH&CsL?5gVjcvrSt

-- 
MST

[Qemu-devel] [PATCH 4/4] configure: don't install aml links

[Michael S. Tsirkin]

There aren't any left.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 configure | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configure b/configure
index d4411a1..06cb815 100755
--- a/configure
+++ b/configure
@@ -5967,7 +5967,6 @@ FILES="$FILES roms/seabios/Makefile roms/vgabios/Makefile"
 FILES="$FILES pc-bios/qemu-icon.bmp"
 for bios_file in \
     $source_path/pc-bios/*.bin \
-    $source_path/pc-bios/*.aml \
     $source_path/pc-bios/*.rom \
     $source_path/pc-bios/*.dtb \
     $source_path/pc-bios/*.img \
-- 
MST

Re: [Qemu-devel] [PATCH 2/4] pc/q35: drop compatiility with old bios types

[Gerd Hoffmann]

On So, 2016-02-07 at 12:29 +0200, Michael S. Tsirkin wrote:
> We don't ship bios without support for loading ACPI anymore, and old q35
> machine types don't allow migrating such bios.  Drop it, as well as
> has_*mr flags that are there for migration compatibility.

Wouldn't that break migration between 2.5 and 2.6 with -M q35-1.6 ?
It's also a guest-visible change as acpi tables change ...

I'm all for cleaning up this old cruft, but I think it would be cleaner
to just drop the old (pre-migration support) q35 machine types instead
of changing them in subtle ways ...

cheers,
  Gerd

Re: [Qemu-devel] [PATCH 2/4] pc/q35: drop compatiility with old bios types

[Michael S. Tsirkin]

On Mon, Feb 15, 2016 at 11:58:24AM +0100, Gerd Hoffmann wrote:
> On So, 2016-02-07 at 12:29 +0200, Michael S. Tsirkin wrote:
> > We don't ship bios without support for loading ACPI anymore, and old q35
> > machine types don't allow migrating such bios.  Drop it, as well as
> > has_*mr flags that are there for migration compatibility.
> 
> Wouldn't that break migration between 2.5 and 2.6 with -M q35-1.6 ?

I think I said this somewhere but I'll repeat it here: I think we should
just mark the old machine types non migrateable.

> It's also a guest-visible change as acpi tables change ...

acpi tables change yes but not too much - there are just bugfixes.  We
change acpi tables without versioning within reason.
For example, recent change by Igor completely removed SSDT and
affected old machine types too.

> I'm all for cleaning up this old cruft, but I think it would be cleaner
> to just drop the old (pre-migration support) q35 machine types instead
> of changing them in subtle ways ...
> 
> cheers,
>   Gerd

Easier, sure. Not sure about the cleaner ...

-- 
MST

Re: [Qemu-devel] [PATCH 2/4] pc/q35: drop compatiility with old bios types

[Markus Armbruster]

Gerd Hoffmann <kraxel@redhat.com> writes:

> On So, 2016-02-07 at 12:29 +0200, Michael S. Tsirkin wrote:
>> We don't ship bios without support for loading ACPI anymore, and old q35
>> machine types don't allow migrating such bios.  Drop it, as well as
>> has_*mr flags that are there for migration compatibility.
>
> Wouldn't that break migration between 2.5 and 2.6 with -M q35-1.6 ?
> It's also a guest-visible change as acpi tables change ...

Madness.

> I'm all for cleaning up this old cruft, but I think it would be cleaner
> to just drop the old (pre-migration support) q35 machine types instead
> of changing them in subtle ways ...

Yup.

Re: [Qemu-devel] [PATCH 2/4] pc/q35: drop compatiility with old bios types

[Eduardo Habkost]

On Mon, Feb 15, 2016 at 01:30:49PM +0200, Michael S. Tsirkin wrote:
> On Mon, Feb 15, 2016 at 11:58:24AM +0100, Gerd Hoffmann wrote:
> > On So, 2016-02-07 at 12:29 +0200, Michael S. Tsirkin wrote:
> > > We don't ship bios without support for loading ACPI anymore, and old q35
> > > machine types don't allow migrating such bios.  Drop it, as well as
> > > has_*mr flags that are there for migration compatibility.
> > 
> > Wouldn't that break migration between 2.5 and 2.6 with -M q35-1.6 ?
> 
> I think I said this somewhere but I'll repeat it here: I think we should
> just mark the old machine types non migrateable.

If you are making changes that break migration, I believe you
need to mark the machines as non-migratable before making those
changes.

...or we could stop wasting time changing those old machines and
remove them.

-- 
Eduardo