From nobody Mon Feb 9 05:44:29 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1659530700; cv=none; d=zohomail.com; s=zohoarc; b=fLQF7uGllyhf4iOqWI2HEcSv2qeFmrAQTEvF1v19gDgq5OP8Lq9eWlDP/E0X+hJ+V9NB00BDp7xr4cY70tqMRf59zObC+gF7HXQkBb8JIhL1dwzjgDdp76Oeg/t3AGqBWOB3sYdUqQEj0mJkAwl7WB44pAWbcVZqQH3bZk0sfvw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659530700; 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=ixUjlCz7Qw+6HHRrCObOyHEhUYuSfNGNA59ELMS9Koc=; b=ms+9hp/UIcj0KbIFYgHIjeZrFbQ0yYLniJrT75p17qA0FuyhUoa0di5dNKTJZCMpiI9fR1KKpCgYLAe/PEx0o1VqWspnXJQc5oa1bi1RWpBCqxJ0HnH30+G4QIrJ/fpmjR/ObUatJY2gpBXEDxw1sOI16OdLoM0R/luXYTWn/n0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1659530700181719.7192574647198; Wed, 3 Aug 2022 05:45:00 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-594-yJqzlCP1Osmvx1n3_wtt4Q-1; Wed, 03 Aug 2022 08:44:54 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E6649802E5C; Wed, 3 Aug 2022 12:44:51 +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 CE99640CFD0B; Wed, 3 Aug 2022 12:44:51 +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 80CB91946A60; Wed, 3 Aug 2022 12:44:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9D3581946A52 for ; Wed, 3 Aug 2022 12:44:45 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 7D0A3C28100; Wed, 3 Aug 2022 12:44:45 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 290BCC28125 for ; Wed, 3 Aug 2022 12:44:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659530698; 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=ixUjlCz7Qw+6HHRrCObOyHEhUYuSfNGNA59ELMS9Koc=; b=JoUyp0OSGx9jaNnK+cINTL74jcb9zdJbbdMRqv/2+r8ktmoO5enoBrp+XEjx0exeAg0Xy9 OMFLwKaI6HMNc4tZ0yRK1M9TftI8N7SxPYJRClOID6MFHNsyE/j2v2HWjwB9HfGgYC6P3H JfaG5BrklXt9gsXr4z8167dYzEIhDrY= X-MC-Unique: yJqzlCP1Osmvx1n3_wtt4Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 05/11] qemu & hypervisor: move qemuDomainObjClearJob() into hypervisor Date: Wed, 3 Aug 2022 14:43:16 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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.84 on 10.11.54.1 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: 1659530701971100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This patch moves qemuDomainObjClearJob() as virDomainObjClearJob() into hypervisor in order to be used by other hypervisors as well. Signed-off-by: Kristina Hanicova --- src/hypervisor/domain_job.c | 14 ++++++++++++++ src/hypervisor/domain_job.h | 3 +++ src/libvirt_private.syms | 1 + src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domainjob.c | 14 -------------- src/qemu/qemu_domainjob.h | 3 --- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/hypervisor/domain_job.c b/src/hypervisor/domain_job.c index 804a58047f..2a19811670 100644 --- a/src/hypervisor/domain_job.c +++ b/src/hypervisor/domain_job.c @@ -206,3 +206,17 @@ virDomainObjPreserveJob(virDomainJobObj *currJob, virDomainObjResetAsyncJob(currJob); return 0; } + +void +virDomainObjClearJob(virDomainJobObj *job) +{ + virDomainObjResetJob(job); + virDomainObjResetAsyncJob(job); + g_clear_pointer(&job->current, virDomainJobDataFree); + g_clear_pointer(&job->completed, virDomainJobDataFree); + virCondDestroy(&job->cond); + virCondDestroy(&job->asyncCond); + + if (job->cb) + g_clear_pointer(&job->privateData, job->cb->freeJobPrivate); +} diff --git a/src/hypervisor/domain_job.h b/src/hypervisor/domain_job.h index 44e4bfdb4a..53ce6706d4 100644 --- a/src/hypervisor/domain_job.h +++ b/src/hypervisor/domain_job.h @@ -217,3 +217,6 @@ void virDomainObjResetAsyncJob(virDomainJobObj *job); =20 int virDomainObjPreserveJob(virDomainJobObj *currJob, virDomainJobObj *job); + +void virDomainObjClearJob(virDomainJobObj *job); +G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(virDomainJobObj, virDomainObjClearJob); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index edfa38c857..0e355abd69 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1590,6 +1590,7 @@ virDomainJobDataInit; virDomainJobStatusToType; virDomainJobTypeFromString; virDomainJobTypeToString; +virDomainObjClearJob; virDomainObjInitJob; virDomainObjPreserveJob; virDomainObjResetAgentJob; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a53c25f36e..8beb2f31c1 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1716,7 +1716,7 @@ qemuDomainObjPrivateFree(void *data) qemuDomainObjPrivateDataClear(priv); =20 virObjectUnref(priv->monConfig); - qemuDomainObjClearJob(&priv->job); + virDomainObjClearJob(&priv->job); g_free(priv->lockState); g_free(priv->origname); =20 diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 4b8ba3f0bc..f323f28c77 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -185,20 +185,6 @@ qemuDomainObjRestoreAsyncJob(virDomainObj *vm, } =20 =20 -void -qemuDomainObjClearJob(virDomainJobObj *job) -{ - virDomainObjResetJob(job); - virDomainObjResetAsyncJob(job); - g_clear_pointer(&job->current, virDomainJobDataFree); - g_clear_pointer(&job->completed, virDomainJobDataFree); - virCondDestroy(&job->cond); - virCondDestroy(&job->asyncCond); - - if (job->cb) - g_clear_pointer(&job->privateData, job->cb->freeJobPrivate); -} - bool qemuDomainTrackJob(virDomainJob job) { diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h index 6272f9d845..eed94cd87c 100644 --- a/src/qemu/qemu_domainjob.h +++ b/src/qemu/qemu_domainjob.h @@ -133,9 +133,6 @@ int qemuDomainJobDataToParams(virDomainJobData *jobData, =20 bool qemuDomainTrackJob(virDomainJob job); =20 -void qemuDomainObjClearJob(virDomainJobObj *job); -G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(virDomainJobObj, qemuDomainObjClearJob); - int qemuDomainObjPrivateXMLFormatJob(virBuffer *buf, virDomainObj *vm); --=20 2.37.1