From nobody Sun Feb 8 17:03:26 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=1659530702; cv=none; d=zohomail.com; s=zohoarc; b=T+BuI3PY8ok4+m/7nHSnGFvi0tYkdgQosF6pMkG7RL9Vo/uiaA76iaWu3FtwpRGavtky0sA001spFXBwiGcjVEfoPTPoZay0sdKjqeYCAargXvTSM08ULSOaPlrhLyrn4hHdQ7h1rzzzcrKZ7kLPF60/pwNoHkbMB+oycN3vpIk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659530702; 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=KdfoIGoh5HRA1piv19cNq6y5IpjHKNW/W2tB3ZAC6Qo=; b=ZaVMhLxMxhd8vsbliJA/xs8QbImRFozr4v1GcB4boQoBulqBIqwhVUn5GT4jOtV50W4uHqCh8DqzI1vplbUmoQ6Y9nuU0AfDqxo4OM6CTB1T3RVDvXe7mXQdYpH9L98Ux6e5issLvkxSkfOf/8tcnFkNDGN3mpIbwFF/VpdZ098= 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 1659530702558712.1349528659989; Wed, 3 Aug 2022 05:45:02 -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-486-R8tZoaF4PRSonwMmY5CHVg-1; Wed, 03 Aug 2022 08:44:54 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6FFB4382C97B; Wed, 3 Aug 2022 12:44:52 +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 5DADD1121319; Wed, 3 Aug 2022 12:44:52 +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 33C481946A69; Wed, 3 Aug 2022 12:44:52 +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 CACFC1946A5C for ; Wed, 3 Aug 2022 12:44:47 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id BE35EC28125; Wed, 3 Aug 2022 12:44:47 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A3F6C28100 for ; Wed, 3 Aug 2022 12:44:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659530701; 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=KdfoIGoh5HRA1piv19cNq6y5IpjHKNW/W2tB3ZAC6Qo=; b=dUakZo4POseUi4jdJfaAyj2xzgiO5+9+E2gsiu6IFezVw7nBXhzRFWgvDrHGMhGWzfcecM FOopjdr/062cw6LLMDJtAQPjvww+sKG67e1w/0vzWMruiQrbP+fUNLm0Zdw1N98CL9Nn2X ymbQz0Cy+K0e+WljnIsMFYR4yOguiKQ= X-MC-Unique: R8tZoaF4PRSonwMmY5CHVg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 09/11] qemu & hypervisor: move qemuDomainTrackJob() into hypervisor Date: Wed, 3 Aug 2022 14:43:20 +0200 Message-Id: <43b9ebc91e60bbe2d0326ae738650f69aae620e6.1659530249.git.khanicov@redhat.com> 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.78 on 10.11.54.3 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: 1659530704056100005 Content-Type: text/plain; charset="utf-8"; x-default="true" This patch moves qemuDomainTrackJob() as virDomainTrackJob() into hypervisor because it is called in begin job and end job functions that will be generalized in the following series. Signed-off-by: Kristina Hanicova --- src/hypervisor/domain_job.c | 6 ++++++ src/hypervisor/domain_job.h | 2 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_domainjob.c | 13 +++---------- src/qemu/qemu_domainjob.h | 2 -- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/hypervisor/domain_job.c b/src/hypervisor/domain_job.c index 2a19811670..08e84d575f 100644 --- a/src/hypervisor/domain_job.c +++ b/src/hypervisor/domain_job.c @@ -220,3 +220,9 @@ virDomainObjClearJob(virDomainJobObj *job) if (job->cb) g_clear_pointer(&job->privateData, job->cb->freeJobPrivate); } + +bool +virDomainTrackJob(virDomainJob job) +{ + return (VIR_DOMAIN_TRACK_JOBS & JOB_MASK(job)) !=3D 0; +} diff --git a/src/hypervisor/domain_job.h b/src/hypervisor/domain_job.h index 53ce6706d4..824876b460 100644 --- a/src/hypervisor/domain_job.h +++ b/src/hypervisor/domain_job.h @@ -220,3 +220,5 @@ int virDomainObjPreserveJob(virDomainJobObj *currJob, =20 void virDomainObjClearJob(virDomainJobObj *job); G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(virDomainJobObj, virDomainObjClearJob); + +bool virDomainTrackJob(virDomainJob job); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 0e355abd69..4c35e2a945 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1596,6 +1596,7 @@ virDomainObjPreserveJob; virDomainObjResetAgentJob; virDomainObjResetAsyncJob; virDomainObjResetJob; +virDomainTrackJob; =20 =20 # hypervisor/virclosecallbacks.h diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index f323f28c77..f92ec44cb7 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -185,13 +185,6 @@ qemuDomainObjRestoreAsyncJob(virDomainObj *vm, } =20 =20 -bool -qemuDomainTrackJob(virDomainJob job) -{ - return (VIR_DOMAIN_TRACK_JOBS & JOB_MASK(job)) !=3D 0; -} - - int qemuDomainJobDataUpdateTime(virDomainJobData *jobData) { @@ -870,7 +863,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriver *driver, priv->job.agentStarted =3D now; } =20 - if (qemuDomainTrackJob(job)) + if (virDomainTrackJob(job)) qemuDomainSaveStatus(obj); =20 return 0; @@ -1092,7 +1085,7 @@ qemuDomainObjEndJob(virDomainObj *obj) obj, obj->def->name); =20 virDomainObjResetJob(&priv->job); - if (qemuDomainTrackJob(job)) + if (virDomainTrackJob(job)) qemuDomainSaveStatus(obj); /* We indeed need to wake up ALL threads waiting because * grabbing a job requires checking more variables. */ @@ -1156,7 +1149,7 @@ qemuDomainObjPrivateXMLFormatJob(virBuffer *buf, g_auto(virBuffer) childBuf =3D VIR_BUFFER_INIT_CHILD(buf); virDomainJob job =3D priv->job.active; =20 - if (!qemuDomainTrackJob(job)) + if (!virDomainTrackJob(job)) job =3D VIR_JOB_NONE; =20 if (job =3D=3D VIR_JOB_NONE && diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h index eed94cd87c..7f2869bb41 100644 --- a/src/qemu/qemu_domainjob.h +++ b/src/qemu/qemu_domainjob.h @@ -131,8 +131,6 @@ int qemuDomainJobDataToParams(virDomainJobData *jobData, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); =20 -bool qemuDomainTrackJob(virDomainJob job); - int qemuDomainObjPrivateXMLFormatJob(virBuffer *buf, virDomainObj *vm); --=20 2.37.1