External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

CH: use virDomainObjEndJob()

Browse Source 
This patch removes virCHDomainObjEndJob() and replaces it with
call to the generalized virDomainObjEndJob().

Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Kristina Hanicova 2022-09-05 15:57:12 +02:00 committed by Ján Tomko
parent 565e3caf55
commit ac57f744fc
3 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ch/ch_domain.c
View File

@ -32,24 +32,6 @@
VIR_LOG_INIT("ch.ch_domain"); VIR_LOG_INIT("ch.ch_domain");
/*
* obj must be locked and have a reference before calling
*
* To be called after completing the work associated with the
* earlier virDomainObjBeginJob() call
*/
void
virCHDomainObjEndJob(virDomainObj *obj)
{
virDomainJob job = obj->job->active;
VIR_DEBUG("Stopping job: %s",
virDomainJobTypeToString(job));
virDomainObjResetJob(obj->job);
virCondSignal(&obj->job->cond);
}
void void
virCHDomainRemoveInactive(virCHDriver *driver, virCHDomainRemoveInactive(virCHDriver *driver,
virDomainObj *vm) virDomainObj *vm)

3
src/ch/ch_domain.h
View File

@ -57,9 +57,6 @@ struct _virCHDomainVcpuPrivate {
extern virDomainXMLPrivateDataCallbacks virCHDriverPrivateDataCallbacks; extern virDomainXMLPrivateDataCallbacks virCHDriverPrivateDataCallbacks;
extern virDomainDefParserConfig virCHDriverDomainDefParserConfig; extern virDomainDefParserConfig virCHDriverDomainDefParserConfig;
void
virCHDomainObjEndJob(virDomainObj *obj);
void void
virCHDomainRemoveInactive(virCHDriver *driver, virCHDomainRemoveInactive(virCHDriver *driver,
virDomainObj *vm); virDomainObj *vm);

20
src/ch/ch_driver.c
View File

@ -226,7 +226,7 @@ chDomainCreateXML(virConnectPtr conn,
dom = virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); dom = virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id);
endjob: endjob:
virCHDomainObjEndJob(vm); virDomainObjEndJob(vm);
cleanup: cleanup:
if (vm && !dom) { if (vm && !dom) {
@ -256,7 +256,7 @@ chDomainCreateWithFlags(virDomainPtr dom, unsigned int flags)
ret = virCHProcessStart(driver, vm, VIR_DOMAIN_RUNNING_BOOTED); ret = virCHProcessStart(driver, vm, VIR_DOMAIN_RUNNING_BOOTED);
virCHDomainObjEndJob(vm); virDomainObjEndJob(vm);
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
@ -414,7 +414,7 @@ chDomainShutdownFlags(virDomainPtr dom,
ret = 0; ret = 0;
endjob: endjob:
virCHDomainObjEndJob(vm); virDomainObjEndJob(vm);
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
@ -473,7 +473,7 @@ chDomainReboot(virDomainPtr dom, unsigned int flags)
ret = 0; ret = 0;
endjob: endjob:
virCHDomainObjEndJob(vm); virDomainObjEndJob(vm);
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
@ -518,7 +518,7 @@ chDomainSuspend(virDomainPtr dom)
ret = 0; ret = 0;
endjob: endjob:
virCHDomainObjEndJob(vm); virDomainObjEndJob(vm);
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
@ -563,7 +563,7 @@ chDomainResume(virDomainPtr dom)
ret = 0; ret = 0;
endjob: endjob:
virCHDomainObjEndJob(vm); virDomainObjEndJob(vm);
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
@ -607,7 +607,7 @@ chDomainDestroyFlags(virDomainPtr dom, unsigned int flags)
ret = 0; ret = 0;
endjob: endjob:
virCHDomainObjEndJob(vm); virDomainObjEndJob(vm);
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
@ -1254,7 +1254,7 @@ chDomainPinVcpuFlags(virDomainPtr dom,
ret = 0; ret = 0;
endjob: endjob:
virCHDomainObjEndJob(vm); virDomainObjEndJob(vm);
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
@ -1418,7 +1418,7 @@ chDomainPinEmulator(virDomainPtr dom,
ret = 0; ret = 0;
endjob: endjob:
virCHDomainObjEndJob(vm); virDomainObjEndJob(vm);
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);
@ -1680,7 +1680,7 @@ chDomainSetNumaParameters(virDomainPtr dom,
ret = 0; ret = 0;
endjob: endjob:
virCHDomainObjEndJob(vm); virDomainObjEndJob(vm);
cleanup: cleanup:
virDomainObjEndAPI(&vm); virDomainObjEndAPI(&vm);