From 9085ccbfb46aeb06302175e03ae9d59238786cee Mon Sep 17 00:00:00 2001 From: Kristina Hanicova Date: Mon, 5 Sep 2022 15:57:09 +0200 Subject: [PATCH] qemu: use virDomainObjEndJob() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch moves qemuDomainObjEndJob() into src/conf/virdomainjob as universal virDomainObjEndJob(). Signed-off-by: Kristina Hanicova Reviewed-by: Ján Tomko Signed-off-by: Ján Tomko --- docs/kbase/internals/qemu-threads.rst | 6 +- src/conf/virdomainjob.c | 28 +++++ src/conf/virdomainjob.h | 2 + src/libvirt_private.syms | 1 + src/qemu/qemu_checkpoint.c | 6 +- src/qemu/qemu_domain.c | 4 +- src/qemu/qemu_domainjob.c | 26 ----- src/qemu/qemu_domainjob.h | 1 - src/qemu/qemu_driver.c | 156 +++++++++++++------------- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_process.c | 8 +- src/qemu/qemu_snapshot.c | 2 +- 12 files changed, 123 insertions(+), 119 deletions(-) diff --git a/docs/kbase/internals/qemu-threads.rst b/docs/kbase/internals/qemu-threads.rst index 00340bb732..22d12f61a5 100644 --- a/docs/kbase/internals/qemu-threads.rst +++ b/docs/kbase/internals/qemu-threads.rst @@ -123,7 +123,7 @@ To acquire the normal job condition isn't - Sets ``job.active`` to the job type - ``qemuDomainObjEndJob()`` + ``virDomainObjEndJob()`` - Sets job.active to 0 - Signals on job.cond condition @@ -218,7 +218,7 @@ Design patterns ...do work... - qemuDomainObjEndJob(obj); + virDomainObjEndJob(obj); virDomainObjEndAPI(&obj); @@ -242,7 +242,7 @@ Design patterns ...do final work... - qemuDomainObjEndJob(obj); + virDomainObjEndJob(obj); virDomainObjEndAPI(&obj); diff --git a/src/conf/virdomainjob.c b/src/conf/virdomainjob.c index 033ea5c517..85486f612a 100644 --- a/src/conf/virdomainjob.c +++ b/src/conf/virdomainjob.c @@ -527,3 +527,31 @@ int virDomainObjBeginJob(virDomainObj *obj, return -1; return 0; } + +/* + * obj must be locked and have a reference before calling + * + * To be called after completing the work associated with the + * earlier virDomainBeginJob() call + */ +void +virDomainObjEndJob(virDomainObj *obj) +{ + virDomainJob job = obj->job->active; + + obj->job->jobsQueued--; + + VIR_DEBUG("Stopping job: %s (async=%s vm=%p name=%s)", + virDomainJobTypeToString(job), + virDomainAsyncJobTypeToString(obj->job->asyncJob), + obj, obj->def->name); + + virDomainObjResetJob(obj->job); + + if (virDomainTrackJob(job) && + obj->job->cb->saveStatusPrivate) + obj->job->cb->saveStatusPrivate(obj); + /* We indeed need to wake up ALL threads waiting because + * grabbing a job requires checking more variables. */ + virCondBroadcast(&obj->job->cond); +} diff --git a/src/conf/virdomainjob.h b/src/conf/virdomainjob.h index adee679e72..7a06c384f3 100644 --- a/src/conf/virdomainjob.h +++ b/src/conf/virdomainjob.h @@ -249,3 +249,5 @@ int virDomainObjBeginJobInternal(virDomainObj *obj, int virDomainObjBeginJob(virDomainObj *obj, virDomainJob job) G_GNUC_WARN_UNUSED_RESULT; + +void virDomainObjEndJob(virDomainObj *obj); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 4fc2ec2cca..9d2b26bfa2 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1191,6 +1191,7 @@ virDomainObjBeginJob; virDomainObjBeginJobInternal; virDomainObjCanSetJob; virDomainObjClearJob; +virDomainObjEndJob; virDomainObjInitJob; virDomainObjPreserveJob; virDomainObjResetAgentJob; diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index c6fb3d1f97..8580158d66 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -626,7 +626,7 @@ qemuCheckpointCreateXML(virDomainPtr domain, checkpoint = virGetDomainCheckpoint(domain, chk->def->name); endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); return checkpoint; } @@ -764,7 +764,7 @@ qemuCheckpointGetXMLDescUpdateSize(virDomainObj *vm, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); return ret; } @@ -917,6 +917,6 @@ qemuCheckpointDelete(virDomainObj *vm, } endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); return ret; } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a4640c5c13..4dfb978599 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5973,7 +5973,7 @@ qemuDomainObjEnterMonitorInternal(virDomainObj *obj, if (!virDomainObjIsActive(obj)) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("domain is no longer running")); - qemuDomainObjEndJob(obj); + virDomainObjEndJob(obj); return -1; } } else if (obj->job->asyncOwner == virThreadSelfID()) { @@ -6023,7 +6023,7 @@ qemuDomainObjExitMonitor(virDomainObj *obj) priv->mon = NULL; if (obj->job->active == VIR_JOB_ASYNC_NESTED) - qemuDomainObjEndJob(obj); + virDomainObjEndJob(obj); } void qemuDomainObjEnterMonitor(virDomainObj *obj) diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 13e1f332dc..a8baf096e5 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -730,32 +730,6 @@ qemuDomainObjBeginJobNowait(virDomainObj *obj, VIR_ASYNC_JOB_NONE, true); } -/* - * obj must be locked and have a reference before calling - * - * To be called after completing the work associated with the - * earlier qemuDomainBeginJob() call - */ -void -qemuDomainObjEndJob(virDomainObj *obj) -{ - virDomainJob job = obj->job->active; - - obj->job->jobsQueued--; - - VIR_DEBUG("Stopping job: %s (async=%s vm=%p name=%s)", - virDomainJobTypeToString(job), - virDomainAsyncJobTypeToString(obj->job->asyncJob), - obj, obj->def->name); - - virDomainObjResetJob(obj->job); - if (virDomainTrackJob(job)) - qemuDomainSaveStatus(obj); - /* We indeed need to wake up ALL threads waiting because - * grabbing a job requires checking more variables. */ - virCondBroadcast(&obj->job->cond); -} - void qemuDomainObjEndAgentJob(virDomainObj *obj) { diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h index 66f18483fe..918b74748b 100644 --- a/src/qemu/qemu_domainjob.h +++ b/src/qemu/qemu_domainjob.h @@ -84,7 +84,6 @@ int qemuDomainObjBeginJobNowait(virDomainObj *obj, virDomainJob job) G_GNUC_WARN_UNUSED_RESULT; -void qemuDomainObjEndJob(virDomainObj *obj); void qemuDomainObjEndAgentJob(virDomainObj *obj); void qemuDomainObjEndAsyncJob(virDomainObj *obj); void qemuDomainObjAbortAsyncJob(virDomainObj *obj); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6f1c3f8afe..5176966b7f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1707,7 +1707,7 @@ static int qemuDomainSuspend(virDomainPtr dom) ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -1763,7 +1763,7 @@ static int qemuDomainResume(virDomainPtr dom) ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -1828,7 +1828,7 @@ qemuDomainShutdownFlagsMonitor(virDomainObj *vm, qemuDomainObjExitMonitor(vm); endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); return ret; } @@ -1948,7 +1948,7 @@ qemuDomainRebootMonitor(virDomainObj *vm, qemuDomainObjExitMonitor(vm); endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); return ret; } @@ -2041,7 +2041,7 @@ qemuDomainReset(virDomainPtr dom, unsigned int flags) virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_CRASHED); endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -2118,7 +2118,7 @@ qemuDomainDestroyFlags(virDomainPtr dom, endjob: if (ret == 0) qemuDomainRemoveInactive(driver, vm); - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -2296,7 +2296,7 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom, unsigned long newmem, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -2379,7 +2379,7 @@ static int qemuDomainSetMemoryStatsPeriod(virDomainPtr dom, int period, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -2413,7 +2413,7 @@ static int qemuDomainInjectNMI(virDomainPtr domain, unsigned int flags) qemuDomainObjExitMonitor(vm); endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -2471,7 +2471,7 @@ static int qemuDomainSendKey(virDomainPtr domain, qemuDomainObjExitMonitor(vm); endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -3400,7 +3400,7 @@ qemuDomainScreenshot(virDomainPtr dom, unlink(tmp); } - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -3624,7 +3624,7 @@ processDeviceDeletedEvent(virQEMUDriver *driver, qemuDomainSaveStatus(vm); endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); } @@ -3920,7 +3920,7 @@ processNicRxFilterChangedEvent(virDomainObj *vm, } endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virNetDevRxFilterFree(hostFilter); @@ -4003,7 +4003,7 @@ processSerialChangedEvent(virQEMUDriver *driver, } endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); } @@ -4022,7 +4022,7 @@ processJobStatusChangeEvent(virDomainObj *vm, qemuBlockJobUpdate(vm, job, VIR_ASYNC_JOB_NONE); endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); } @@ -4068,7 +4068,7 @@ processMonitorEOFEvent(virQEMUDriver *driver, endjob: qemuDomainRemoveInactive(driver, vm); - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); } @@ -4182,7 +4182,7 @@ processMemoryDeviceSizeChange(virQEMUDriver *driver, mem->currentsize); endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); virObjectEventStateQueue(driver->domainEventState, event); } @@ -4390,7 +4390,7 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, if (useAgent) qemuDomainObjEndAgentJob(vm); else - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -4546,7 +4546,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -4694,7 +4694,7 @@ qemuDomainPinEmulator(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virObjectEventStateQueue(driver->domainEventState, event); @@ -4936,7 +4936,7 @@ qemuDomainGetIOThreadsLive(virDomainObj *vm, ret = niothreads; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: if (info_ret) { @@ -5100,7 +5100,7 @@ qemuDomainPinIOThread(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virObjectEventStateQueue(driver->domainEventState, event); @@ -5644,7 +5644,7 @@ qemuDomainChgIOThread(virQEMUDriver *driver, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); return ret; } @@ -6831,7 +6831,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -8006,7 +8006,7 @@ qemuDomainAttachDeviceFlags(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -8109,7 +8109,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr dom, } endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: if (dev != dev_copy) @@ -8291,7 +8291,7 @@ qemuDomainDetachDeviceFlags(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -8326,7 +8326,7 @@ qemuDomainDetachDeviceAlias(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -8425,7 +8425,7 @@ static int qemuDomainSetAutostart(virDomainPtr dom, vm->autostart = autostart; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); } ret = 0; @@ -8565,7 +8565,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, } endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -8737,7 +8737,7 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -9018,7 +9018,7 @@ qemuDomainSetNumaParameters(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -9208,7 +9208,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -9269,7 +9269,7 @@ qemuDomainGetPerfEvents(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -9649,7 +9649,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -9969,7 +9969,7 @@ qemuDomainBlockResize(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -10143,7 +10143,7 @@ qemuDomainBlockStats(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -10230,7 +10230,7 @@ qemuDomainBlockStatsFlags(virDomainPtr dom, *nparams = nstats; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: VIR_FREE(blockstats); @@ -10533,7 +10533,7 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -10707,7 +10707,7 @@ qemuDomainMemoryStats(virDomainPtr dom, ret = qemuDomainMemoryStatsInternal(vm, stats, nr_stats); - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -10854,7 +10854,7 @@ qemuDomainMemoryPeek(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: VIR_FORCE_CLOSE(fd); @@ -11167,7 +11167,7 @@ qemuDomainGetBlockInfo(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: VIR_FREE(entry); virDomainObjEndAPI(&vm); @@ -12717,7 +12717,7 @@ qemuDomainGetJobStatsInternal(virDomainObj *vm, ret = 0; cleanup: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); return ret; } @@ -12922,7 +12922,7 @@ qemuDomainAbortJobFlags(virDomainPtr dom, } endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -12977,7 +12977,7 @@ qemuDomainMigrateSetMaxDowntime(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -13028,7 +13028,7 @@ qemuDomainMigrateGetMaxDowntime(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -13078,7 +13078,7 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -13131,7 +13131,7 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -13209,7 +13209,7 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -13262,7 +13262,7 @@ qemuDomainMigrationGetPostcopyBandwidth(virDomainObj *vm, ret = 0; cleanup: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); return ret; } @@ -13346,7 +13346,7 @@ qemuDomainMigrateStartPostCopy(virDomainPtr dom, qemuDomainObjExitMonitor(vm); endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -14080,7 +14080,7 @@ qemuDomainQemuMonitorCommandWithFiles(virDomainPtr domain, qemuDomainObjExitMonitor(vm); endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -14471,7 +14471,7 @@ qemuDomainBlockPullCommon(virDomainObj *vm, qemuBlockJobStarted(job, vm); endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: qemuBlockJobStartupFinalize(vm, job); @@ -14578,7 +14578,7 @@ qemuDomainBlockJobAbort(virDomainPtr dom, endjob: if (job && !async) qemuBlockJobSyncEnd(vm, job, VIR_ASYNC_JOB_NONE); - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -14693,7 +14693,7 @@ qemuDomainGetBlockJobInfo(virDomainPtr dom, ret = 1; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -14754,7 +14754,7 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, qemuDomainObjExitMonitor(vm); endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -15176,7 +15176,7 @@ qemuDomainBlockCopyCommon(virDomainObj *vm, if (need_unlink && virStorageSourceUnlink(mirror) < 0) VIR_WARN("%s", _("unable to remove just-created copy target")); virStorageSourceDeinit(mirror); - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); qemuBlockJobStartupFinalize(vm, job); return ret; @@ -15561,7 +15561,7 @@ qemuDomainBlockCommit(virDomainPtr dom, virErrorRestore(&orig_err); } qemuBlockJobStartupFinalize(vm, job); - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -15635,7 +15635,7 @@ qemuDomainOpenGraphics(virDomainPtr dom, qemuDomainObjExitMonitor(vm); endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -15712,7 +15712,7 @@ qemuDomainOpenGraphicsFD(virDomainPtr dom, ret = qemuMonitorOpenGraphics(priv->mon, protocol, pair[1], "graphicsfd", (flags & VIR_DOMAIN_OPEN_GRAPHICS_SKIPAUTH)); qemuDomainObjExitMonitor(vm); - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); if (ret < 0) goto cleanup; @@ -16195,7 +16195,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: VIR_FREE(info.group_name); @@ -16348,7 +16348,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: VIR_FREE(reply.group_name); @@ -16419,7 +16419,7 @@ qemuDomainGetDiskErrors(virDomainPtr dom, ret = n; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -16467,7 +16467,7 @@ qemuDomainSetMetadata(virDomainPtr dom, virObjectEventStateQueue(driver->domainEventState, ev); } - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -16584,7 +16584,7 @@ qemuDomainQueryWakeupSuspendSupport(virDomainObj *vm, ret = qemuDomainProbeQMPCurrentMachine(vm, wakeupSupported); endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); return ret; } @@ -16719,7 +16719,7 @@ qemuDomainPMWakeup(virDomainPtr dom, qemuDomainObjExitMonitor(vm); endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -17099,7 +17099,7 @@ qemuDomainGetHostnameLease(virDomainObj *vm, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); return ret; } @@ -17278,7 +17278,7 @@ qemuDomainSetTime(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -18846,7 +18846,7 @@ qemuConnectGetAllDomainStats(virConnectPtr conn, rc = qemuDomainGetStats(conn, vm, requestedStats, &tmp, domflags); if (HAVE_JOB(domflags)) - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); virObjectUnlock(vm); @@ -19024,7 +19024,7 @@ qemuDomainGetFSInfo(virDomainPtr dom, ret = virDomainFSInfoFormat(agentinfo, nfs, vm->def, info); endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: if (agentinfo) { @@ -19338,7 +19338,7 @@ static int qemuDomainRename(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -19596,7 +19596,7 @@ qemuDomainSetVcpu(virDomainPtr dom, ret = qemuDomainSetVcpuInternal(driver, vm, def, persistentDef, map, !!state); endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -19657,7 +19657,7 @@ qemuDomainSetBlockThreshold(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -19839,7 +19839,7 @@ qemuDomainSetLifecycleAction(virDomainPtr dom, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -19998,7 +19998,7 @@ qemuDomainGetSEVInfo(virDomainObj *vm, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); return ret; } @@ -20123,7 +20123,7 @@ qemuDomainSetLaunchSecurityState(virDomainPtr domain, ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); @@ -20514,7 +20514,7 @@ qemuDomainGetGuestInfo(virDomainPtr dom, qemuAgentDiskInfoFormatParams(agentdiskinfo, ndisks, vm->def, params, nparams, &maxparams); endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); } if (nifaces > 0) { @@ -20777,7 +20777,7 @@ qemuDomainStartDirtyRateCalc(virDomainPtr dom, qemuDomainObjExitMonitor(vm); endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virDomainObjEndAPI(&vm); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index d18b36e454..4dfd247d00 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2844,7 +2844,7 @@ qemuMigrationSrcBegin(virConnectPtr conn, else qemuMigrationJobFinish(vm); } else { - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); } cleanup: diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a8e848402c..c05f01c410 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -492,7 +492,7 @@ qemuProcessFakeReboot(void *opaque) ret = 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: priv->pausedShutdown = false; @@ -8389,7 +8389,7 @@ void qemuProcessStop(virQEMUDriver *driver, endjob: if (asyncJob != VIR_ASYNC_JOB_NONE) - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: virErrorRestore(&orig_err); @@ -8431,7 +8431,7 @@ qemuProcessAutoDestroy(virDomainObj *dom, qemuDomainRemoveInactive(driver, dom); - qemuDomainObjEndJob(dom); + virDomainObjEndJob(dom); virObjectEventStateQueue(driver->domainEventState, event); } @@ -8893,7 +8893,7 @@ qemuProcessReconnect(void *opaque) cleanup: if (jobStarted) - qemuDomainObjEndJob(obj); + virDomainObjEndJob(obj); if (!virDomainObjIsActive(obj)) qemuDomainRemoveInactive(driver, obj); virDomainObjEndAPI(&obj); diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index c50e9f3846..afed0f0e28 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -2373,7 +2373,7 @@ qemuSnapshotDelete(virDomainObj *vm, } endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); return ret; }