From e2863e7768f73c964c6ad07701f6da71b3219285 Mon Sep 17 00:00:00 2001 From: Pavel Fedin Date: Wed, 9 Sep 2015 17:03:16 +0300 Subject: [PATCH] Removed unneeded check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since test suite now correctly creates capabilities cache, the hack is not needed any more. Signed-off-by: Pavel Fedin Signed-off-by: Ján Tomko --- src/qemu/qemu_domain.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e4a88cd02f..2bc818e2f4 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1040,10 +1040,7 @@ qemuDomainDefPostParse(virDomainDefPtr def, return ret; - /* This condition is actually a (temporary) hack for test suite which - * does not create capabilities cache */ - if (driver && driver->qemuCapsCache) - qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator); + qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator); /* Add implicit PCI root controller if the machine has one */ switch (def->os.arch) { @@ -1242,10 +1239,7 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, if (driver) cfg = virQEMUDriverGetConfig(driver); - /* This condition is actually a (temporary) hack for test suite which - * does not create capabilities cache */ - if (driver && driver->qemuCapsCache) - qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator); + qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator); if (dev->type == VIR_DOMAIN_DEVICE_NET && dev->data.net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV && -- GitLab