[PATCH] tests: qemucapabilitiesdata: Update qemu capabilities on x86_64 to 6.0.0-rc2

[Peter Krempa]

On Wed, Apr 07, 2021 at 09:34:23 +0100, Daniel Berrange wrote:
> On Wed, Apr 07, 2021 at 09:54:02AM +0200, Peter Krempa wrote:
> > 'block_passwd' command was removed 'display-reload' command was added
> > and the 'acpi-index' property for PCI devices was added.
> > 
> > There are no noticable changes for us.
> > 
> > Signed-off-by: Peter Krempa <pkrempa at redhat.com>
> > ---
> >  .../caps_6.0.0.x86_64.replies                 | 2757 +++++++++--------
> 
> Super annoying that QEMU always emits dicts in random hashtable
> order. They don't want to fix that, but I wonder if libvirt
> should add sorting client side, so that we get useful diffs.

It indeed is. The unfortunate part is that it will require adding logic
to qemucapsprobe to interpret the data to have some fields sorted.

I might have a look at it once I finish my series of bumping minimum
qemu to 2.11 to celebrate the 2nd anniversary of rhel-8 release.

Unfortunately some bits may still have huge diffs despite being sorted,
such as the QMP schema which is neatly sorted, but renumbered when
deleting an early command ...

> 
> >  .../caps_6.0.0.x86_64.xml                     |    8 +-
> >  2 files changed, 1465 insertions(+), 1300 deletions(-)
> 
> Reviewed-by: Daniel P. Berrangé <berrange at redhat.com>
> 
> 
> > diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
> > index 3a1e65ae44..8d12645a8e 100644
> > --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
> > +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
> 
> >    <hostCPU type='kvm' model='base' migratability='yes'>
> >      <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/>
> > @@ -1471,8 +1471,8 @@
> >    <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
> >    <machine type='kvm' name='x-remote' maxCpus='1'/>
> >    <machine type='kvm' name='pc-q35-5.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/>
> > -  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
> >    <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
> > +  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
> >    <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
> >    <machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
> >    <machine type='kvm' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
> > @@ -3280,8 +3280,8 @@
> >    <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
> >    <machine type='tcg' name='x-remote' maxCpus='1'/>
> >    <machine type='tcg' name='pc-q35-5.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' defaultRAMid='pc.ram'/>
> > -  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
> >    <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
> > +  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
> >    <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
> >    <machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
> >    <machine type='tcg' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
> 
> We should at least make our own capabilities list of CPU models be
> alphabetically sorted to avoid these kind of diffs. Not a blocker
> for  this patch of course.
> 
> Regards,
> Daniel
> -- 
> |: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org         -o-            https://fstop138.berrange.com :|
> |: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
>