openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed unneeded check 

Since test suite now correctly creates capabilities cache, the hack is not
needed any more.

Signed-off-by: Pavel Fedin <p.fedin@samsung.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Pavel Fedin 2015-09-09 17:03:16 +03:00 committed by Ján Tomko
parent 0636c4a8f6
commit e2863e7768
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qemu/qemu_domain.c
View File

@ -1040,10 +1040,7 @@ qemuDomainDefPostParse(virDomainDefPtr def,
return ret; return ret;
/* This condition is actually a (temporary) hack for test suite which qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator);
* does not create capabilities cache */
if (driver && driver->qemuCapsCache)
qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator);
/* Add implicit PCI root controller if the machine has one */ /* Add implicit PCI root controller if the machine has one */
switch (def->os.arch) { switch (def->os.arch) {
@ -1242,10 +1239,7 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
if (driver) if (driver)
cfg = virQEMUDriverGetConfig(driver); cfg = virQEMUDriverGetConfig(driver);
/* This condition is actually a (temporary) hack for test suite which qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator);
* does not create capabilities cache */
if (driver && driver->qemuCapsCache)
qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator);
if (dev->type == VIR_DOMAIN_DEVICE_NET && if (dev->type == VIR_DOMAIN_DEVICE_NET &&
dev->data.net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV && dev->data.net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV &&