External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-30 18:03:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: capabilities: Remove support for downstream-only QMP monitor backport

Browse Source 
Some distros (see diff) chose to backport QMP support rather than rebase
to newer version of qemu. As a hack they added the string 'libvirt' to
the qemu -help output. Remove this as downstream-only hacks should be
carried by downstream and not litter upstream.

This effectively reverts commit ff88cd5905
This commit is contained in:
Peter Krempa 2017-09-20 10:45:23 +02:00
parent 369199d1a9
commit a5852db182
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/qemu/qemu_capabilities.c
View File

@ -1335,8 +1335,7 @@ virQEMUCapsComputeCmdFlags(const char *help,
if ((netdev = strstr(help, "-netdev"))) { if ((netdev = strstr(help, "-netdev"))) {
/* Disable -netdev on 0.12 since although it exists, /* Disable -netdev on 0.12 since although it exists,
* the corresponding netdev_add/remove monitor commands * the corresponding netdev_add/remove monitor commands
* do not, and we need them to be able to do hotplug. * do not, and we need them to be able to do hotplug. */
* But see below about RHEL build. */
if (version >= 13000) { if (version >= 13000) {
if (strstr(netdev, "bridge")) if (strstr(netdev, "bridge"))
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV_BRIDGE); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV_BRIDGE);
@ -1369,20 +1368,10 @@ virQEMUCapsComputeCmdFlags(const char *help,
/* While JSON mode was available in 0.12.0, it was too /* While JSON mode was available in 0.12.0, it was too
* incomplete to contemplate using. The 0.13.0 release * incomplete to contemplate using. The 0.13.0 release
* is good enough to use, even though it lacks one or * is good enough to use, even though it lacks one or
* two features. This is also true of versions of qemu * two features. */
* built for RHEL, labeled 0.12.1, but with extra text
* in the help output that mentions that features were
* backported for libvirt. The benefits of JSON mode now
* outweigh the downside.
*/
#if WITH_YAJL #if WITH_YAJL
if (version >= 13000) { if (version >= 13000)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MONITOR_JSON); virQEMUCapsSet(qemuCaps, QEMU_CAPS_MONITOR_JSON);
} else if (version >= 12000 &&
strstr(help, "libvirt")) {
virQEMUCapsSet(qemuCaps, QEMU_CAPS_MONITOR_JSON);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV);
}
#else #else
/* Starting with qemu 0.15 and newer, upstream qemu no longer /* Starting with qemu 0.15 and newer, upstream qemu no longer
* promises to keep the human interface stable, but requests that * promises to keep the human interface stable, but requests that
@ -1392,8 +1381,7 @@ virQEMUCapsComputeCmdFlags(const char *help,
* telling them to recompile (the spec file includes the * telling them to recompile (the spec file includes the
* dependency, so distros won't hit this). This check is * dependency, so distros won't hit this). This check is
* also in m4/virt-yajl.m4 (see $with_yajl). */ * also in m4/virt-yajl.m4 (see $with_yajl). */
if (version >= 15000 || if (version >= 15000) {
(version >= 12000 && strstr(help, "libvirt"))) {
if (check_yajl) { if (check_yajl) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("this qemu binary requires libvirt to be " _("this qemu binary requires libvirt to be "