]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: capabilities: Tolerate missing @qemuCaps in virQEMUCapsSupportsGICVersion
authorPeter Krempa <pkrempa@redhat.com>
Wed, 16 Aug 2017 13:44:35 +0000 (15:44 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Fri, 18 Aug 2017 13:07:44 +0000 (15:07 +0200)
Report the given GIC version as unsupported if @qemuCapsi is NULL. This
will be helpful to run post parse callbacks even if qemu is not
currently installed.

src/qemu/qemu_capabilities.c

index f05e7650a20b89bd2ff831a90c85e79e1be7ea8a..38a9f09f53adb83b2d0804d7df4788673d61cb72 100644 (file)
@@ -5676,7 +5676,8 @@ virQEMUCapsFillDomainDeviceHostdevCaps(virQEMUCapsPtr qemuCaps,
  * @version: GIC version
  *
  * Checks the QEMU binary with capabilities @qemuCaps supports a specific
- * GIC version for a domain of type @virtType.
+ * GIC version for a domain of type @virtType. If @qemuCaps is NULL, the GIC
+ * @version is considered unsupported.
  *
  * Returns: true if the binary supports the requested GIC version, false
  *          otherwise
@@ -5688,6 +5689,9 @@ virQEMUCapsSupportsGICVersion(virQEMUCapsPtr qemuCaps,
 {
     size_t i;
 
+    if (!qemuCaps)
+        return false;
+
     for (i = 0; i < qemuCaps->ngicCapabilities; i++) {
         virGICCapabilityPtr cap = &(qemuCaps->gicCapabilities[i]);