From 3d968f409fa7f5bf95069ea08983b1454992d166 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Thu, 24 Jul 2014 16:40:01 +0200 Subject: [PATCH] qemuConnectGetDomainCapabilities: Report error on unknown arch 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 --- src/qemu/qemu_driver.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index be622af6c0..ca0d77f1f2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -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); } -- 2.47.2