External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 14:15:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Move the shared disk adding and sgio setting prior to attaching

Browse Source 
The disk def could be free'ed by qemuDomainChangeEjectableMedia,
which can thus cause crash if we reference the disk pointer. On
the other hand, we have to remove the added shared disk entry from
the table on error codepath.
This commit is contained in:
Osier Yang 2013-02-19 20:27:44 +08:00
parent d0e4b76204
commit 0db7ff59cc
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/qemu/qemu_driver.c
View File

@ -5714,6 +5714,12 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn,
goto end; goto end;
} }
if (qemuAddSharedDisk(driver, disk, vm->def->name) < 0)
goto end;
if (qemuSetUnprivSGIO(disk) < 0)
goto end;
if (qemuDomainDetermineDiskChain(driver, disk, false) < 0) if (qemuDomainDetermineDiskChain(driver, disk, false) < 0)
goto end; goto end;
@ -5727,6 +5733,7 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn,
if (qemuSetupDiskCgroup(vm, cgroup, disk) < 0) if (qemuSetupDiskCgroup(vm, cgroup, disk) < 0)
goto end; goto end;
} }
switch (disk->device) { switch (disk->device) {
case VIR_DOMAIN_DISK_DEVICE_CDROM: case VIR_DOMAIN_DISK_DEVICE_CDROM:
case VIR_DOMAIN_DISK_DEVICE_FLOPPY: case VIR_DOMAIN_DISK_DEVICE_FLOPPY:
@ -5765,16 +5772,9 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn,
NULLSTR(disk->src)); NULLSTR(disk->src));
} }
if (ret == 0) {
if (qemuAddSharedDisk(driver, disk, vm->def->name) < 0)
VIR_WARN("Failed to add disk '%s' to shared disk table",
disk->src);
if (qemuSetUnprivSGIO(disk) < 0)
VIR_WARN("Failed to set unpriv_sgio of disk '%s'", disk->src);
}
end: end:
if (ret != 0)
ignore_value(qemuRemoveSharedDisk(driver, disk, vm->def->name));
if (cgroup) if (cgroup)
virCgroupFree(&cgroup); virCgroupFree(&cgroup);
return ret; return ret;
@ -5889,11 +5889,8 @@ qemuDomainDetachDeviceDiskLive(virQEMUDriverPtr driver,
break; break;
} }
if (ret == 0) { if (ret == 0)
if (qemuRemoveSharedDisk(driver, disk, vm->def->name) < 0) ignore_value(qemuRemoveSharedDisk(driver, disk, vm->def->name));
VIR_WARN("Failed to remove disk '%s' from shared disk table",
disk->src);
}
return ret; return ret;
} }