From 7d488a7c4585046e61313547dd4a227b3e857117 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 15 Jul 2020 15:53:11 +0100 Subject: [PATCH] Partially revert "qemu: fix missing error reports in capabilities probing" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This partially reverts commit 5331c4804f4f419b9e75741084f926e52413d3a1. The original commit mistakenly thought virFileCacheLookup did not set an error. In fact the only case it doesn't set an error for is when the cache key is NULL. This in fact the fault of the caller for passing an invalid cache key, so doesn't need to be handled. This caller bug was fixed by checking for a NULL binary in the virQEMUCapsCacheLookupDefault method. Reviewed-by: Michal Privoznik Signed-off-by: Daniel P. Berrangé --- src/qemu/qemu_capabilities.c | 5 ----- src/qemu/qemu_domain.c | 4 +--- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index d6bfec9996..98ddd2dcdc 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5640,11 +5640,6 @@ virQEMUCapsCacheLookup(virFileCachePtr cache, priv->microcodeVersion = virHostCPUGetMicrocodeVersion(); ret = virFileCacheLookup(cache, binary); - if (!ret) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("no capabilities available for %s"), binary); - return NULL; - } VIR_DEBUG("Returning caps %p for %s", ret, binary); return ret; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c365d92ae0..7530edac53 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5306,10 +5306,8 @@ qemuDomainPostParseDataAlloc(const virDomainDef *def, virQEMUDriverPtr driver = opaque; if (!(*parseOpaque = virQEMUCapsCacheLookup(driver->qemuCapsCache, - def->emulator))) { - virResetLastError(); + def->emulator))) return 1; - } return 0; } -- 2.47.2