External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Handle SecurityManagerVerify in post parse

Browse Source 
Rather than open coding calls. I can't see any reason not to
This commit is contained in:
Cole Robinson 2016-01-06 20:43:15 -05:00
parent a8b628e7a8
commit 74abc3deac
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/qemu/qemu_domain.c
View File

@ -1255,6 +1255,9 @@ qemuDomainDefPostParse(virDomainDefPtr def,
if (qemuCanonicalizeMachine(def, qemuCaps) < 0) if (qemuCanonicalizeMachine(def, qemuCaps) < 0)
goto cleanup; goto cleanup;
if (virSecurityManagerVerify(driver->securityManager, def) < 0)
goto cleanup;
ret = 0; ret = 0;
cleanup: cleanup:
virObjectUnref(qemuCaps); virObjectUnref(qemuCaps);

6
src/qemu/qemu_driver.c
View File

@ -1723,9 +1723,6 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn,
if (virDomainCreateXMLEnsureACL(conn, def) < 0) if (virDomainCreateXMLEnsureACL(conn, def) < 0)
goto cleanup; goto cleanup;
if (virSecurityManagerVerify(driver->securityManager, def) < 0)
goto cleanup;
if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator))) if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator)))
goto cleanup; goto cleanup;
@ -7502,9 +7499,6 @@ static virDomainPtr qemuDomainDefineXMLFlags(virConnectPtr conn, const char *xml
if (virDomainDefineXMLFlagsEnsureACL(conn, def) < 0) if (virDomainDefineXMLFlagsEnsureACL(conn, def) < 0)
goto cleanup; goto cleanup;
if (virSecurityManagerVerify(driver->securityManager, def) < 0)
goto cleanup;
if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator))) if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator)))
goto cleanup; goto cleanup;