]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemuConnectGetDomainCapabilities: Report error on unknown arch
authorMichal Privoznik <mprivozn@redhat.com>
Thu, 24 Jul 2014 14:40:01 +0000 (16:40 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Thu, 24 Jul 2014 16:01:57 +0000 (18:01 +0200)
If user hasn't provided any @emulatorbin, the qemuCaps are
searched by @arch provided (which in fact can be guessed from the
host). However, there's no guarantee that the qemu binary for
@arch will exist.  Therefore qemu capabilities may be nonexistent
too. If that's the case, we should throw an error message prior
jumping onto 'cleanup' label as the helper lookup function
remains silent on no search result.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
src/qemu/qemu_driver.c

index be622af6c03853162f26ee064222986ae83d21f9..ca0d77f1f20e9d34cb781f4b7546a453dc0ccdc6 100644 (file)
@@ -16976,8 +16976,12 @@ qemuConnectGetDomainCapabilities(virConnectPtr conn,
         }
     } else {
         if (!(qemuCaps = virQEMUCapsCacheLookupByArch(driver->qemuCapsCache,
-                                                      arch)))
+                                                      arch))) {
+            virReportError(VIR_ERR_INVALID_ARG,
+                           _("unable to find any emulator to serve '%s' "
+                             "architecture"), virArchToString(arch));
             goto cleanup;
+        }
 
         emulatorbin = virQEMUCapsGetBinary(qemuCaps);
     }