From nobody Sun Feb 8 19:03:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1662386261; cv=none; d=zohomail.com; s=zohoarc; b=bTNMF3UWHOfrwGUV8sz3EU72xyQPxcTOQzxTBTEF/HmYlyk9ixwqVukvjQk2VkK5t+nTtvg+IWfiTkJ9Ykh7CuOBHYQA0AQd/oabQzLCNBwLZzSpotbILFpMJtwDtR2/YxT8jF1AlAfpqYeh6xP9NvzItEytQfdPYHsV5CDYrE0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662386261; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=H2w6VmwxKrhE6g7+XTxc932OOsY3Bk4N6w23phGeut4=; b=H1gy6Z4enBJ7qKdUaU/yUJhM52hpNqRo07EXtYw8553iIoM+0PFJ6H/UXoWeHg35L6XTXWDfg/yDFpyJ2ryK5duNj9incoQyIBLJ+9pYQcdo3CuYjUcuvmK9M2csZnTjHvS1laD4ZKYtPl9+fXaIiJvBaxwOi8h1/gx3RuEuyJE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1662386261085892.0289804320416; Mon, 5 Sep 2022 06:57:41 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-531-HZEcine_OQiTcBeEK8LzwQ-1; Mon, 05 Sep 2022 09:57:34 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 476553815D56; Mon, 5 Sep 2022 13:57:29 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 31F2B945DB; Mon, 5 Sep 2022 13:57:29 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2263C194B97A; Mon, 5 Sep 2022 13:57:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 23725193F6ED for ; Mon, 5 Sep 2022 13:57:28 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 162F92026D4C; Mon, 5 Sep 2022 13:57:28 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id B55C62026D64 for ; Mon, 5 Sep 2022 13:57:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1662386260; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=H2w6VmwxKrhE6g7+XTxc932OOsY3Bk4N6w23phGeut4=; b=JWHoMVNWKva3Kw+Lr2F4wkmmH+jeuyZUa049jewI5nxqFryx8ZCDD6eQE+9hUctkg3iiUX JoJExvVGDy0ERxDTZPBLBqBFBHUPjMc63279fRnIMknnkOFZ/yEeGSPJxCLekb5Q5F1BLI Ez47zQ23J888RMo1MLbZhs61i4Fvdm0= X-MC-Unique: HZEcine_OQiTcBeEK8LzwQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH v2 11/17] qemu: use virDomainObjEndJob() Date: Mon, 5 Sep 2022 15:57:09 +0200 Message-Id: <7bf769c1141f9a985a9901bd4f89b4d2ce58400d.1662385930.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1662386262407100009 Content-Type: text/plain; charset="utf-8"; x-default="true" This patch moves qemuDomainObjEndJob() into src/conf/virdomainjob as universal virDomainObjEndJob(). Signed-off-by: Kristina Hanicova --- 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/q= emu-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 =20 - ``qemuDomainObjEndJob()`` + ``virDomainObjEndJob()`` - Sets job.active to 0 - Signals on job.cond condition =20 @@ -218,7 +218,7 @@ Design patterns =20 ...do work... =20 - qemuDomainObjEndJob(obj); + virDomainObjEndJob(obj); =20 virDomainObjEndAPI(&obj); =20 @@ -242,7 +242,7 @@ Design patterns =20 ...do final work... =20 - qemuDomainObjEndJob(obj); + virDomainObjEndJob(obj); virDomainObjEndAPI(&obj); =20 =20 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 =3D obj->job->active; + + obj->job->jobsQueued--; + + VIR_DEBUG("Stopping job: %s (async=3D%s vm=3D%p name=3D%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 =3D virGetDomainCheckpoint(domain, chk->def->name); =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 return checkpoint; } @@ -764,7 +764,7 @@ qemuCheckpointGetXMLDescUpdateSize(virDomainObj *vm, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); return ret; } =20 @@ -917,6 +917,6 @@ qemuCheckpointDelete(virDomainObj *vm, } =20 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 =3D=3D virThreadSelfID()) { @@ -6023,7 +6023,7 @@ qemuDomainObjExitMonitor(virDomainObj *obj) priv->mon =3D NULL; =20 if (obj->job->active =3D=3D VIR_JOB_ASYNC_NESTED) - qemuDomainObjEndJob(obj); + virDomainObjEndJob(obj); } =20 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); } =20 -/* - * 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 =3D obj->job->active; - - obj->job->jobsQueued--; - - VIR_DEBUG("Stopping job: %s (async=3D%s vm=3D%p name=3D%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; =20 -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 5f36113a9c..65f9ce6bca 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1707,7 +1707,7 @@ static int qemuDomainSuspend(virDomainPtr dom) ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -1763,7 +1763,7 @@ static int qemuDomainResume(virDomainPtr dom) ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -1828,7 +1828,7 @@ qemuDomainShutdownFlagsMonitor(virDomainObj *vm, qemuDomainObjExitMonitor(vm); =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); return ret; } =20 @@ -1948,7 +1948,7 @@ qemuDomainRebootMonitor(virDomainObj *vm, qemuDomainObjExitMonitor(vm); =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); return ret; } =20 @@ -2041,7 +2041,7 @@ qemuDomainReset(virDomainPtr dom, unsigned int flags) virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_CRAS= HED); =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -2118,7 +2118,7 @@ qemuDomainDestroyFlags(virDomainPtr dom, endjob: if (ret =3D=3D 0) qemuDomainRemoveInactive(driver, vm); - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -2296,7 +2296,7 @@ static int qemuDomainSetMemoryFlags(virDomainPtr dom,= unsigned long newmem, =20 ret =3D 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -2379,7 +2379,7 @@ static int qemuDomainSetMemoryStatsPeriod(virDomainPt= r dom, int period, =20 ret =3D 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -2413,7 +2413,7 @@ static int qemuDomainInjectNMI(virDomainPtr domain, u= nsigned int flags) qemuDomainObjExitMonitor(vm); =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -2471,7 +2471,7 @@ static int qemuDomainSendKey(virDomainPtr domain, qemuDomainObjExitMonitor(vm); =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -3400,7 +3400,7 @@ qemuDomainScreenshot(virDomainPtr dom, unlink(tmp); } =20 - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -3624,7 +3624,7 @@ processDeviceDeletedEvent(virQEMUDriver *driver, qemuDomainSaveStatus(vm); =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); } =20 =20 @@ -3920,7 +3920,7 @@ processNicRxFilterChangedEvent(virDomainObj *vm, } =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virNetDevRxFilterFree(hostFilter); @@ -4003,7 +4003,7 @@ processSerialChangedEvent(virQEMUDriver *driver, } =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); } =20 =20 @@ -4022,7 +4022,7 @@ processJobStatusChangeEvent(virDomainObj *vm, qemuBlockJobUpdate(vm, job, VIR_ASYNC_JOB_NONE); =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); } =20 =20 @@ -4068,7 +4068,7 @@ processMonitorEOFEvent(virQEMUDriver *driver, =20 endjob: qemuDomainRemoveInactive(driver, vm); - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); } =20 =20 @@ -4182,7 +4182,7 @@ processMemoryDeviceSizeChange(virQEMUDriver *driver, mem->currentsiz= e); =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); virObjectEventStateQueue(driver->domainEventState, event); } =20 @@ -4390,7 +4390,7 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, if (useAgent) qemuDomainObjEndAgentJob(vm); else - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -4546,7 +4546,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -4694,7 +4694,7 @@ qemuDomainPinEmulator(virDomainPtr dom, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virObjectEventStateQueue(driver->domainEventState, event); @@ -4936,7 +4936,7 @@ qemuDomainGetIOThreadsLive(virDomainObj *vm, ret =3D niothreads; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: if (info_ret) { @@ -5100,7 +5100,7 @@ qemuDomainPinIOThread(virDomainPtr dom, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virObjectEventStateQueue(driver->domainEventState, event); @@ -5644,7 +5644,7 @@ qemuDomainChgIOThread(virQEMUDriver *driver, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 return ret; } @@ -6831,7 +6831,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, =20 ret =3D 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -8006,7 +8006,7 @@ qemuDomainAttachDeviceFlags(virDomainPtr dom, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -8109,7 +8109,7 @@ static int qemuDomainUpdateDeviceFlags(virDomainPtr d= om, } =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: if (dev !=3D dev_copy) @@ -8291,7 +8291,7 @@ qemuDomainDetachDeviceFlags(virDomainPtr dom, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -8326,7 +8326,7 @@ qemuDomainDetachDeviceAlias(virDomainPtr dom, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -8425,7 +8425,7 @@ static int qemuDomainSetAutostart(virDomainPtr dom, vm->autostart =3D autostart; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); } ret =3D 0; =20 @@ -8565,7 +8565,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, } =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -8737,7 +8737,7 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -9018,7 +9018,7 @@ qemuDomainSetNumaParameters(virDomainPtr dom, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -9208,7 +9208,7 @@ qemuDomainSetPerfEvents(virDomainPtr dom, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -9269,7 +9269,7 @@ qemuDomainGetPerfEvents(virDomainPtr dom, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -9649,7 +9649,7 @@ qemuDomainSetSchedulerParametersFlags(virDomainPtr do= m, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -9969,7 +9969,7 @@ qemuDomainBlockResize(virDomainPtr dom, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -10143,7 +10143,7 @@ qemuDomainBlockStats(virDomainPtr dom, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -10230,7 +10230,7 @@ qemuDomainBlockStatsFlags(virDomainPtr dom, *nparams =3D nstats; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: VIR_FREE(blockstats); @@ -10533,7 +10533,7 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -10707,7 +10707,7 @@ qemuDomainMemoryStats(virDomainPtr dom, =20 ret =3D qemuDomainMemoryStatsInternal(vm, stats, nr_stats); =20 - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -10854,7 +10854,7 @@ qemuDomainMemoryPeek(virDomainPtr dom, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: VIR_FORCE_CLOSE(fd); @@ -11167,7 +11167,7 @@ qemuDomainGetBlockInfo(virDomainPtr dom, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); cleanup: VIR_FREE(entry); virDomainObjEndAPI(&vm); @@ -12717,7 +12717,7 @@ qemuDomainGetJobStatsInternal(virDomainObj *vm, ret =3D 0; =20 cleanup: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); return ret; } =20 @@ -12929,7 +12929,7 @@ qemuDomainAbortJobFlags(virDomainPtr dom, } =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -12984,7 +12984,7 @@ qemuDomainMigrateSetMaxDowntime(virDomainPtr dom, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -13035,7 +13035,7 @@ qemuDomainMigrateGetMaxDowntime(virDomainPtr dom, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -13085,7 +13085,7 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr d= om, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -13138,7 +13138,7 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr d= om, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -13216,7 +13216,7 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -13269,7 +13269,7 @@ qemuDomainMigrationGetPostcopyBandwidth(virDomainOb= j *vm, ret =3D 0; =20 cleanup: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); return ret; } =20 @@ -13353,7 +13353,7 @@ qemuDomainMigrateStartPostCopy(virDomainPtr dom, qemuDomainObjExitMonitor(vm); =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -14087,7 +14087,7 @@ qemuDomainQemuMonitorCommandWithFiles(virDomainPtr = domain, qemuDomainObjExitMonitor(vm); =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -14478,7 +14478,7 @@ qemuDomainBlockPullCommon(virDomainObj *vm, qemuBlockJobStarted(job, vm); =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: qemuBlockJobStartupFinalize(vm, job); @@ -14585,7 +14585,7 @@ qemuDomainBlockJobAbort(virDomainPtr dom, endjob: if (job && !async) qemuBlockJobSyncEnd(vm, job, VIR_ASYNC_JOB_NONE); - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -14700,7 +14700,7 @@ qemuDomainGetBlockJobInfo(virDomainPtr dom, ret =3D 1; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -14761,7 +14761,7 @@ qemuDomainBlockJobSetSpeed(virDomainPtr dom, qemuDomainObjExitMonitor(vm); =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -15183,7 +15183,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); =20 return ret; @@ -15568,7 +15568,7 @@ qemuDomainBlockCommit(virDomainPtr dom, virErrorRestore(&orig_err); } qemuBlockJobStartupFinalize(vm, job); - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -15642,7 +15642,7 @@ qemuDomainOpenGraphics(virDomainPtr dom, qemuDomainObjExitMonitor(vm); =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -15719,7 +15719,7 @@ qemuDomainOpenGraphicsFD(virDomainPtr dom, ret =3D qemuMonitorOpenGraphics(priv->mon, protocol, pair[1], "graphic= sfd", (flags & VIR_DOMAIN_OPEN_GRAPHICS_SKIPAU= TH)); qemuDomainObjExitMonitor(vm); - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); if (ret < 0) goto cleanup; =20 @@ -16202,7 +16202,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom, =20 ret =3D 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: VIR_FREE(info.group_name); @@ -16355,7 +16355,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: VIR_FREE(reply.group_name); @@ -16426,7 +16426,7 @@ qemuDomainGetDiskErrors(virDomainPtr dom, ret =3D n; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -16474,7 +16474,7 @@ qemuDomainSetMetadata(virDomainPtr dom, virObjectEventStateQueue(driver->domainEventState, ev); } =20 - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -16591,7 +16591,7 @@ qemuDomainQueryWakeupSuspendSupport(virDomainObj *v= m, ret =3D qemuDomainProbeQMPCurrentMachine(vm, wakeupSupported); =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); return ret; } =20 @@ -16726,7 +16726,7 @@ qemuDomainPMWakeup(virDomainPtr dom, qemuDomainObjExitMonitor(vm); =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -17106,7 +17106,7 @@ qemuDomainGetHostnameLease(virDomainObj *vm, =20 ret =3D 0; endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); return ret; } =20 @@ -17285,7 +17285,7 @@ qemuDomainSetTime(virDomainPtr dom, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -18853,7 +18853,7 @@ qemuConnectGetAllDomainStats(virConnectPtr conn, rc =3D qemuDomainGetStats(conn, vm, requestedStats, &tmp, domflags= ); =20 if (HAVE_JOB(domflags)) - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 virObjectUnlock(vm); =20 @@ -19031,7 +19031,7 @@ qemuDomainGetFSInfo(virDomainPtr dom, ret =3D virDomainFSInfoFormat(agentinfo, nfs, vm->def, info); =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: if (agentinfo) { @@ -19345,7 +19345,7 @@ static int qemuDomainRename(virDomainPtr dom, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -19603,7 +19603,7 @@ qemuDomainSetVcpu(virDomainPtr dom, ret =3D qemuDomainSetVcpuInternal(driver, vm, def, persistentDef, map,= !!state); =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -19664,7 +19664,7 @@ qemuDomainSetBlockThreshold(virDomainPtr dom, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -19846,7 +19846,7 @@ qemuDomainSetLifecycleAction(virDomainPtr dom, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -20005,7 +20005,7 @@ qemuDomainGetSEVInfo(virDomainObj *vm, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); return ret; } =20 @@ -20130,7 +20130,7 @@ qemuDomainSetLaunchSecurityState(virDomainPtr domai= n, ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -20521,7 +20521,7 @@ qemuDomainGetGuestInfo(virDomainPtr dom, qemuAgentDiskInfoFormatParams(agentdiskinfo, ndisks, vm->def, = params, nparams, &maxparams); =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); } =20 if (nifaces > 0) { @@ -20784,7 +20784,7 @@ qemuDomainStartDirtyRateCalc(virDomainPtr dom, qemuDomainObjExitMonitor(vm); =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index ca1f9071bc..38c2f6fdfd 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); } =20 cleanup: diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 6c0181b3ae..94429bf3f8 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -492,7 +492,7 @@ qemuProcessFakeReboot(void *opaque) ret =3D 0; =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: priv->pausedShutdown =3D false; @@ -8411,7 +8411,7 @@ void qemuProcessStop(virQEMUDriver *driver, =20 endjob: if (asyncJob !=3D VIR_ASYNC_JOB_NONE) - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virErrorRestore(&orig_err); @@ -8453,7 +8453,7 @@ qemuProcessAutoDestroy(virDomainObj *dom, =20 qemuDomainRemoveInactive(driver, dom); =20 - qemuDomainObjEndJob(dom); + virDomainObjEndJob(dom); =20 virObjectEventStateQueue(driver->domainEventState, event); } @@ -8915,7 +8915,7 @@ qemuProcessReconnect(void *opaque) =20 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, } =20 endjob: - qemuDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 return ret; } --=20 2.37.2