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

qemu: Move vm->persistent check into qemuDomainRemoveInactive

Browse Source 
So far we have the following pattern occurring over and over
again:

  if (!vm->persistent)
      qemuDomainRemoveInactive(driver, vm);

It's safe to put the check into the function and save some LoC.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2015-09-22 15:25:00 +02:00
parent c99b8cec82
commit f41be29635
4 changed files with 33 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/qemu/qemu_domain.c
View File

@ -2619,7 +2619,14 @@ qemuDomainRemoveInactive(virQEMUDriverPtr driver,
{
bool haveJob = true;
char *snapDir;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
virQEMUDriverConfigPtr cfg;
if (vm->persistent) {
/* Short-circuit, we don't want to remove a persistent domain */
return;
}
cfg = virQEMUDriverGetConfig(driver);
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
haveJob = false;

42
src/qemu/qemu_driver.c
View File

@ -1753,8 +1753,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn,
def = NULL;
if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0) {
if (!vm->persistent)
qemuDomainRemoveInactive(driver, vm);
qemuDomainRemoveInactive(driver, vm);
goto cleanup;
}
@ -1764,8 +1763,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr conn,
start_flags) < 0) {
virDomainAuditStart(vm, "booted", false);
qemuDomainObjEndJob(driver, vm);
if (!vm->persistent)
qemuDomainRemoveInactive(driver, vm);
qemuDomainRemoveInactive(driver, vm);
goto cleanup;
}
@ -2250,7 +2248,7 @@ qemuDomainDestroyFlags(virDomainPtr dom,
ret = 0;
endjob:
qemuDomainObjEndJob(driver, vm);
if (ret == 0 && !vm->persistent)
if (ret == 0)
qemuDomainRemoveInactive(driver, vm);
cleanup:
@ -3273,7 +3271,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, virDomainPtr dom,
}
}
qemuDomainObjEndAsyncJob(driver, vm);
if (ret == 0 && !vm->persistent)
if (ret == 0)
qemuDomainRemoveInactive(driver, vm);
cleanup:
@ -3774,7 +3772,7 @@ qemuDomainCoreDumpWithFormat(virDomainPtr dom,
}
qemuDomainObjEndAsyncJob(driver, vm);
if (ret == 0 && flags & VIR_DUMP_CRASH && !vm->persistent)
if (ret == 0 && flags & VIR_DUMP_CRASH)
qemuDomainRemoveInactive(driver, vm);
cleanup:
@ -4054,8 +4052,7 @@ processGuestPanicEvent(virQEMUDriverPtr driver,
virDomainAuditStop(vm, "destroyed");
if (!vm->persistent)
qemuDomainRemoveInactive(driver, vm);
qemuDomainRemoveInactive(driver, vm);
break;
case VIR_DOMAIN_LIFECYCLE_CRASH_COREDUMP_RESTART:
@ -6831,7 +6828,7 @@ qemuDomainRestoreFlags(virConnectPtr conn,
VIR_WARN("Failed to close %s", path);
qemuDomainObjEndJob(driver, vm);
if (ret < 0 && !vm->persistent)
if (ret < 0)
qemuDomainRemoveInactive(driver, vm);
cleanup:
@ -7526,6 +7523,7 @@ static virDomainPtr qemuDomainDefineXMLFlags(virConnectPtr conn, const char *xml
} else {
/* Brand new domain. Remove it */
VIR_INFO("Deleting domain '%s'", vm->def->name);
vm->persistent = 0;
qemuDomainRemoveInactive(driver, vm);
}
goto cleanup;
@ -7651,11 +7649,9 @@ qemuDomainUndefineFlags(virDomainPtr dom,
* domainDestroy and domainShutdown will take care of removing the
* domain obj from the hash table.
*/
if (virDomainObjIsActive(vm)) {
vm->persistent = 0;
} else {
vm->persistent = 0;
if (!virDomainObjIsActive(vm))
qemuDomainRemoveInactive(driver, vm);
}
ret = 0;
@ -15550,12 +15546,9 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
}
if (qemuDomainSnapshotRevertInactive(driver, vm, snap) < 0) {
if (!vm->persistent) {
qemuDomainObjEndJob(driver, vm);
qemuDomainRemoveInactive(driver, vm);
goto cleanup;
}
goto endjob;
qemuDomainObjEndJob(driver, vm);
qemuDomainRemoveInactive(driver, vm);
goto cleanup;
}
if (config)
virDomainObjAssignDef(vm, config, false, NULL);
@ -15575,12 +15568,9 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot,
start_flags);
virDomainAuditStart(vm, "from-snapshot", rc >= 0);
if (rc < 0) {
if (!vm->persistent) {
qemuDomainObjEndJob(driver, vm);
qemuDomainRemoveInactive(driver, vm);
goto cleanup;
}
goto endjob;
qemuDomainObjEndJob(driver, vm);
qemuDomainRemoveInactive(driver, vm);
goto cleanup;
}
detail = VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT;
event = virDomainEventLifecycleNewFromObj(vm,

14
src/qemu/qemu_migration.c
View File

@ -3483,8 +3483,7 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
VIR_FREE(priv->origname);
virPortAllocatorRelease(driver->migrationPorts, priv->nbdPort);
priv->nbdPort = 0;
if (!vm->persistent)
qemuDomainRemoveInactive(driver, vm);
qemuDomainRemoveInactive(driver, vm);
}
virDomainObjEndAPI(&vm);
qemuDomainEventQueue(driver, event);
@ -3873,8 +3872,7 @@ qemuMigrationConfirm(virConnectPtr conn,
flags, cancelled);
qemuMigrationJobFinish(driver, vm);
if (!virDomainObjIsActive(vm) &&
(!vm->persistent || (flags & VIR_MIGRATE_UNDEFINE_SOURCE))) {
if (!virDomainObjIsActive(vm)) {
if (flags & VIR_MIGRATE_UNDEFINE_SOURCE)
virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm);
qemuDomainRemoveInactive(driver, vm);
@ -5357,9 +5355,7 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver,
}
qemuMigrationJobFinish(driver, vm);
if (!virDomainObjIsActive(vm) &&
(!vm->persistent ||
(ret == 0 && (flags & VIR_MIGRATE_UNDEFINE_SOURCE)))) {
if (!virDomainObjIsActive(vm) && ret == 0) {
if (flags & VIR_MIGRATE_UNDEFINE_SOURCE)
virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm);
qemuDomainRemoveInactive(driver, vm);
@ -5435,7 +5431,7 @@ qemuMigrationPerformPhase(virQEMUDriverPtr driver,
qemuMigrationJobFinish(driver, vm);
else
qemuMigrationJobContinue(vm);
if (!virDomainObjIsActive(vm) && !vm->persistent)
if (!virDomainObjIsActive(vm))
qemuDomainRemoveInactive(driver, vm);
cleanup:
@ -5804,7 +5800,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
VIR_WARN("Unable to encode migration cookie");
qemuMigrationJobFinish(driver, vm);
if (!vm->persistent && !virDomainObjIsActive(vm))
if (!virDomainObjIsActive(vm))
qemuDomainRemoveInactive(driver, vm);
cleanup:

12
src/qemu/qemu_process.c
View File

@ -323,8 +323,7 @@ qemuProcessHandleMonitorEOF(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
qemuProcessStop(driver, vm, stopReason, stopFlags);
virDomainAuditStop(vm, auditReason);
if (!vm->persistent)
qemuDomainRemoveInactive(driver, vm);
qemuDomainRemoveInactive(driver, vm);
cleanup:
virObjectUnlock(vm);
@ -3898,8 +3897,7 @@ qemuProcessReconnect(void *opaque)
qemuProcessStop(driver, obj, state, stopFlags);
}
if (!obj->persistent)
qemuDomainRemoveInactive(driver, obj);
qemuDomainRemoveInactive(driver, obj);
cleanup:
virDomainObjEndAPI(&obj);
@ -3943,8 +3941,7 @@ qemuProcessReconnectHelper(virDomainObjPtr obj,
"might be incomplete"));
/* We can't spawn a thread and thus connect to monitor. Kill qemu. */
qemuProcessStop(src->driver, obj, VIR_DOMAIN_SHUTOFF_FAILED, 0);
if (!obj->persistent)
qemuDomainRemoveInactive(src->driver, obj);
qemuDomainRemoveInactive(src->driver, obj);
virDomainObjEndAPI(&obj);
virObjectUnref(data->conn);
@ -5750,8 +5747,7 @@ qemuProcessAutoDestroy(virDomainObjPtr dom,
qemuDomainObjEndJob(driver, dom);
if (!dom->persistent)
qemuDomainRemoveInactive(driver, dom);
qemuDomainRemoveInactive(driver, dom);
qemuDomainEventQueue(driver, event);