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

qemu: Use same create/define overwrite logic for migration prepare.

Browse Source
This commit is contained in:
Cole Robinson 2009-11-02 14:10:36 -05:00
parent e02f691a90
commit c26cb9234f
1 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/qemu/qemu_driver.c
View File

@ -5997,19 +5997,8 @@ qemudDomainMigratePrepareTunnel(virConnectPtr dconn,
/* Target domain name, maybe renamed. */ /* Target domain name, maybe renamed. */
dname = dname ? dname : def->name; dname = dname ? dname : def->name;
/* Ensure the name and UUID don't already exist in an active VM */ if (virDomainObjIsDuplicate(&driver->domains, def, 1) < 0)
vm = virDomainFindByUUID(&driver->domains, def->uuid); goto cleanup;
if (!vm) vm = virDomainFindByName(&driver->domains, dname);
if (vm) {
if (virDomainObjIsActive(vm)) {
qemudReportError(dconn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
_("domain with the same name or UUID already exists as '%s'"),
vm->def->name);
goto cleanup;
}
virDomainObjUnlock(vm);
}
if (!(vm = virDomainAssignDef(dconn, if (!(vm = virDomainAssignDef(dconn,
driver->caps, driver->caps,
@ -6221,19 +6210,8 @@ qemudDomainMigratePrepare2 (virConnectPtr dconn,
/* Target domain name, maybe renamed. */ /* Target domain name, maybe renamed. */
dname = dname ? dname : def->name; dname = dname ? dname : def->name;
/* Ensure the name and UUID don't already exist in an active VM */ if (virDomainObjIsDuplicate(&driver->domains, def, 1) < 0)
vm = virDomainFindByUUID(&driver->domains, def->uuid); goto cleanup;
if (!vm) vm = virDomainFindByName(&driver->domains, dname);
if (vm) {
if (virDomainObjIsActive(vm)) {
qemudReportError (dconn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
_("domain with the same name or UUID already exists as '%s'"),
vm->def->name);
goto cleanup;
}
virDomainObjUnlock(vm);
}
if (!(vm = virDomainAssignDef(dconn, if (!(vm = virDomainAssignDef(dconn,
driver->caps, driver->caps,