NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix some locking issues

Browse Source 
* src/conf/domain_conf.c: don't call virDomainObjUnlock twice
* src/qemu/qemu_driver.c: relock driver lock if an error occurs in
  qemuDomainObjBeginJobWithDriver, enter/exit monitor with driver
  in qemudDomainSave
This commit is contained in:
Matthias Bolte
2009-12-03 00:03:06 +01:00
parent 816d79143b
commit 7a18fbeeb8
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/conf/domain_conf.c
View File

@@ -5317,7 +5317,6 @@ virDomainObjIsDuplicate(virDomainObjListPtr doms,
} }
dupVM = 1; dupVM = 1;
virDomainObjUnlock(vm);
} else { } else {
/* UUID does not match, but if a name matches, refuse it */ /* UUID does not match, but if a name matches, refuse it */
vm = virDomainFindByName(doms, def->name); vm = virDomainFindByName(doms, def->name);

9
src/qemu/qemu_driver.c
View File

@@ -229,6 +229,7 @@ static int qemuDomainObjBeginJobWithDriver(struct qemud_driver *driver,
else else
virReportSystemError(NULL, errno, virReportSystemError(NULL, errno,
"%s", _("cannot acquire job mutex")); "%s", _("cannot acquire job mutex"));
qemuDriverLock(driver);
return -1; return -1;
} }
} }
@@ -3471,9 +3472,9 @@ static int qemudDomainSave(virDomainPtr dom,
if (header.compressed == QEMUD_SAVE_FORMAT_RAW) { if (header.compressed == QEMUD_SAVE_FORMAT_RAW) {
const char *args[] = { "cat", NULL }; const char *args[] = { "cat", NULL };
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
qemuDomainObjEnterMonitor(vm); qemuDomainObjEnterMonitorWithDriver(driver, vm);
rc = qemuMonitorMigrateToCommand(priv->mon, 0, args, path); rc = qemuMonitorMigrateToCommand(priv->mon, 0, args, path);
qemuDomainObjExitMonitor(vm); qemuDomainObjExitMonitorWithDriver(driver, vm);
} else { } else {
const char *prog = qemudSaveCompressionTypeToString(header.compressed); const char *prog = qemudSaveCompressionTypeToString(header.compressed);
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
@@ -3482,9 +3483,9 @@ static int qemudDomainSave(virDomainPtr dom,
"-c", "-c",
NULL NULL
}; };
qemuDomainObjEnterMonitor(vm); qemuDomainObjEnterMonitorWithDriver(driver, vm);
rc = qemuMonitorMigrateToCommand(priv->mon, 0, args, path); rc = qemuMonitorMigrateToCommand(priv->mon, 0, args, path);
qemuDomainObjExitMonitor(vm); qemuDomainObjExitMonitorWithDriver(driver, vm);
} }
if (rc < 0) if (rc < 0)