[libvirt] [libvirt PATCH v2 03/44] Force QMP capability probing

[Daniel P. Berrangé]

On Thu, Apr 05, 2018 at 02:22:54PM +0200, Ján Tomko wrote:
> Remove the qmpOnly attribute of virQEMUCapsNewForBinaryInternal
> and instead always assume it's true.
> 
> This effectively sets the minimum QEMU version to 1.2.0,
> breaking support for QEMU in RHEL6.
> 

> @@ -5077,8 +4225,7 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch,
>                                  uid_t runUid,
>                                  gid_t runGid,
>                                  unsigned int microcodeVersion,
> -                                const char *kernelVersion,
> -                                bool qmpOnly)
> +                                const char *kernelVersion)
>  {
>      virQEMUCapsPtr qemuCaps;
>      struct stat sb;
> @@ -5114,7 +4261,7 @@ virQEMUCapsNewForBinaryInternal(virArch hostArch,
>          goto error;
>      }
>  
> -    if (qmpOnly && !qemuCaps->usedQMP) {
> +    if (!qemuCaps->usedQMP) {
>          virReportError(VIR_ERR_INTERNAL_ERROR,
>                         _("Failed to probe QEMU binary with QMP: %s"),
>                         qmperr ? qmperr : _("unknown error"));

We should be able to kill this now. We only have "usedQMP" because we
want to gracefully get out of virQEMUCapsInitQMPCommandRun() when
launching with QMP fails. We can make that method return -1 or 0 only
now, and drop "usedQMP"


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 :|