[libvirt] [PATCH v2 1/1] Enable QEMU_CAPS_PCI_MULTIBUS capability for QEMU2.0 forward on PPC64.

[Daniel P. Berrange]

On Thu, Apr 10, 2014 at 06:36:10AM -0600, Eric Blake wrote:
> On 04/10/2014 02:59 AM, Li Zhang wrote:
> > From: Li Zhang <zhlcindy at linux.vnet.ibm.com>
> > 
> > For QEMU2.0 forward version on PPC64, it supports PCI multibus.
> > Currently, libvirt still disables it which causes an error
> > "Bus 'pci' not found".
> > 
> > Signed-off-by: Li Zhang <zhlcindy at linux.vnet.ibm.com>
> > ---
> >  src/qemu/qemu_capabilities.c | 26 ++++++++++++++++----------
> >  1 file changed, 16 insertions(+), 10 deletions(-)
> > 
> > diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> > index 381b3ec..812bbe0 100644
> > --- a/src/qemu/qemu_capabilities.c
> > +++ b/src/qemu/qemu_capabilities.c
> > @@ -2813,13 +2813,16 @@ virQEMUCapsInitHelp(virQEMUCapsPtr qemuCaps, uid_t runUid, gid_t runGid)
> >                                  false) < 0)
> >          goto cleanup;
> >  
> > -    /* Currently only x86_64 and i686 support PCI-multibus. */
> > -    if (qemuCaps->arch == VIR_ARCH_X86_64 ||
> > -        qemuCaps->arch == VIR_ARCH_I686) {
> > +    /* Currently only x86_64, i686 and PPC64 support PCI-multibus. */
> > +    if ((qemuCaps->arch == VIR_ARCH_PPC64 &&
> > +        qemuCaps->version >= 2000000) ||
> > +        ARCH_IS_X86(qemuCaps->arch)) {
> 
> Yuck.  Why again did you push this into qemu 2.0 without also providing
> a QMP witness command to query whether the new naming is in effect?
> 
> We may be forced to take this patch, but I'm not very happy with the
> situation.

This was also supposed to have been done against all QEMU architectures,
not merely PPC64, so we could avoid this architecture specific dep :-(
I wonder if QEMU would be willing to revert this patch before 2.0 to
allow a properly complete fix to be done.

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|