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: process: Call disk startup policy check after cloning domain def

Browse Source 
In commit 1e38ef72 the disk startup policy check was moved prior to the
call to virDomainObjSetDefTransient which dropped the disk from the
config rather than the def to be started which is a bug.

Additionally we'd not report the disk change event for this since the
disk aliases were not set at that point.

Finally 'volume' based disks would not work with startup policy too.

Fix it by moving it back after the definition is copied, aliases are
assigned and disk sources are translated.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1341415
This commit is contained in:
Peter Krempa 2016-06-02 15:32:00 +02:00
parent 1e467f6622
commit 9cda91d6f6
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/qemu/qemu_process.c
View File

@ -4344,10 +4344,6 @@ qemuProcessStartValidate(virQEMUDriverPtr driver,
}
}
if (qemuDomainCheckDiskPresence(driver, vm,
flags & VIR_QEMU_PROCESS_START_COLD) < 0)
return -1;
VIR_DEBUG("Checking domain and device security labels");
if (virSecurityManagerCheckAllLabel(driver->securityManager, vm->def) < 0)
return -1;
@ -4870,6 +4866,14 @@ qemuProcessPrepareDomain(virConnectPtr conn,
goto cleanup;
}
/* drop possibly missing disks from the definition. This needs to happen
* after the def is copied, aliases are set and disk sources are translated */
if (!(flags & VIR_QEMU_PROCESS_START_PRETEND)) {
if (qemuDomainCheckDiskPresence(driver, vm,
flags & VIR_QEMU_PROCESS_START_COLD) < 0)
goto cleanup;
}
VIR_DEBUG("Create domain masterKey");
if (qemuDomainMasterKeyCreate(vm) < 0)
goto cleanup;