From: Cole Robinson <crobinso@redhat.com>
Date: Thu, 16 Apr 2015 18:51:26 +0000 (-0400)
Subject: qemu: Always refresh capabilities if no <guests> found
X-Git-Tag: v1.2.15-rc1~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95546c43de51a3d54f9a7f65059a6492a64d4f69;p=thirdparty%2Flibvirt.git

qemu: Always refresh capabilities if no <guests> found

- Remove all qemu emulators
- Restart libvirtd
- Install qemu emulators
- Call 'virsh version' -> errors

The only thing that will force the qemu driver to refresh it's cached
capablities info is an explict API call to GetCapabilities.

However in the case when the initial caps lookup at driver connect didn't
find a single qemu emulator to poll, the driver is effectively useless
and really can't do anything until it's populated some qemu capabilities
info.

With the above steps, the user would have to either know about the
magic refresh capabilities call, or restart libvirtd to pick up the
changes.

Instead, this patch changes things so that every time a part of th
driver requests access to capabilities info, check to see if
we've previously seen any emulators. If not, force a refresh.

In the case of 'still no emulators found', this is still very quick, so
I can't think of a downside.

https://bugzilla.redhat.com/show_bug.cgi?id=1000116
---

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 2cf3905a3e..b662b69287 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -965,6 +965,13 @@ virCapsPtr virQEMUDriverGetCapabilities(virQEMUDriverPtr driver,
         qemuDriverLock(driver);
     }
 
+    if (driver->caps->nguests == 0 && !refresh) {
+        VIR_DEBUG("Capabilities didn't detect any guests. Forcing a "
+            "refresh.");
+        qemuDriverUnlock(driver);
+        return virQEMUDriverGetCapabilities(driver, true);
+    }
+
     ret = virObjectRef(driver->caps);
     qemuDriverUnlock(driver);
     return ret;