From nobody Tue May 21 17:26:23 2024 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=1659530690; cv=none; d=zohomail.com; s=zohoarc; b=jufcQXHyoTukeawDmAm+n4hlLWV0c8rEAPcjAD0HhNyUKKLn1JEJTnr9aC8Mrp5D7yx1+S02F97TmS77lp/aJuMz/p+Z0Rk4w/AfYQ46OO1XzOPCPGYSFk4hl+sMeygdvIzuYkUUCA8015+eyXi7iv+hb8ZlAokFGIZRFYsy5xM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659530690; 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=p1IgiwD5wl2h1QjUkIkWDXxffvJzDe37IVDcOm0TcwE=; b=jNLpkcbuxEwNLH5+Aiajxvdm2UN6jAaSQlM2XBG9W0RSxNm6Pg71z80pVnJ5m2gkgJj6wqR0W1rVGz7p3pSbUOAFoeu6U2cbhiBwsYOqMt1ZRjnfzxmALQX6kkbxvb+2TLocs0rzFgkQ/Excdi7MwFM+QuaJVtIfhgivrp/qrfw= 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 1659530690661933.5535661399136; Wed, 3 Aug 2022 05:44:50 -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-329-GNi9KW_QOhKLwGIWGO1ZsQ-1; Wed, 03 Aug 2022 08:44:48 -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 B0D8E3826A66; Wed, 3 Aug 2022 12:44:44 +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 9DC1718EB5; Wed, 3 Aug 2022 12:44:44 +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 12E251946A50; Wed, 3 Aug 2022 12:44:44 +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 4890D1946A4E for ; Wed, 3 Aug 2022 12:44:43 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3A434C28129; Wed, 3 Aug 2022 12:44:43 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id DA64AC28100 for ; Wed, 3 Aug 2022 12:44:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659530689; 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=p1IgiwD5wl2h1QjUkIkWDXxffvJzDe37IVDcOm0TcwE=; b=Wii/YXoJSm3BLnN/75TUERhZDq7Cj2bzv4YqSqyspJb2vLq3+PIRgOybRqy+9v76+FtOKu 9y2YOs+HUwfumIuSnbiOPi+O76Ey4EvLHW9h5J+OilSRMq/vLtiRZwYCV24iu8putIA5cP tRqBRY/IZJriwakaTp4aCSGEjXvKQwo= X-MC-Unique: GNi9KW_QOhKLwGIWGO1ZsQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 01/11] qemu & hypervisor: move qemuDomainObjResetAgentJob() into hypervisor Date: Wed, 3 Aug 2022 14:43:12 +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.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: 1659530691927100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This patch moves qemuDomainObjResetAgentJob() as virDomainObjResetAgentJob() into hypervisor. Signed-off-by: Kristina Hanicova Reviewed-by: Michal Privoznik --- src/hypervisor/domain_job.c | 9 +++++++++ src/hypervisor/domain_job.h | 2 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_domainjob.c | 14 ++------------ 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/hypervisor/domain_job.c b/src/hypervisor/domain_job.c index 5b97624287..9fbea500c4 100644 --- a/src/hypervisor/domain_job.c +++ b/src/hypervisor/domain_job.c @@ -146,3 +146,12 @@ virDomainObjResetJob(virDomainJobObj *job) g_clear_pointer(&job->ownerAPI, g_free); job->started =3D 0; } + +void +virDomainObjResetAgentJob(virDomainJobObj *job) +{ + job->agentActive =3D VIR_AGENT_JOB_NONE; + job->agentOwner =3D 0; + g_clear_pointer(&job->agentOwnerAPI, g_free); + job->agentStarted =3D 0; +} diff --git a/src/hypervisor/domain_job.h b/src/hypervisor/domain_job.h index 4c32296117..7a9197cbde 100644 --- a/src/hypervisor/domain_job.h +++ b/src/hypervisor/domain_job.h @@ -210,3 +210,5 @@ int virDomainObjInitJob(virDomainJobObj *job, virDomainObjPrivateJobCallbacks *cb); =20 void virDomainObjResetJob(virDomainJobObj *job); + +void virDomainObjResetAgentJob(virDomainJobObj *job); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d5046604dd..a50f9aea28 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1591,6 +1591,7 @@ virDomainJobStatusToType; virDomainJobTypeFromString; virDomainJobTypeToString; virDomainObjInitJob; +virDomainObjResetAgentJob; virDomainObjResetJob; =20 =20 diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index a45103256a..0f3b38108c 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -150,16 +150,6 @@ qemuDomainEventEmitJobCompleted(virQEMUDriver *driver, } =20 =20 -static void -qemuDomainObjResetAgentJob(virDomainJobObj *job) -{ - job->agentActive =3D VIR_AGENT_JOB_NONE; - job->agentOwner =3D 0; - g_clear_pointer(&job->agentOwnerAPI, g_free); - job->agentStarted =3D 0; -} - - static void qemuDomainObjResetAsyncJob(virDomainJobObj *job) { @@ -936,7 +926,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriver *driver, } =20 if (agentJob) { - qemuDomainObjResetAgentJob(&priv->job); + virDomainObjResetAgentJob(&priv->job); =20 VIR_DEBUG("Started agent job: %s (vm=3D%p name=3D%s job=3D%s async= =3D%s)", virDomainAgentJobTypeToString(agentJob), @@ -1191,7 +1181,7 @@ qemuDomainObjEndAgentJob(virDomainObj *obj) virDomainAsyncJobTypeToString(priv->job.asyncJob), obj, obj->def->name); =20 - qemuDomainObjResetAgentJob(&priv->job); + virDomainObjResetAgentJob(&priv->job); /* We indeed need to wake up ALL threads waiting because * grabbing a job requires checking more variables. */ virCondBroadcast(&priv->job.cond); --=20 2.37.1 From nobody Tue May 21 17:26:23 2024 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=1659530700; cv=none; d=zohomail.com; s=zohoarc; b=cpvLtlt08j4t9g7JykyUV3s3JY9q+MlVB+PC3VwT1yXnnc3EowzO1vpKblLsOITuGgmDnOxrIyeSWQAeZ5haVVKkMs39pd1oysRwqU49isZzo+xo/LaUxFMzIgdwcUsxpkAIuwcfhRP3CgZUYbGRZmxhWAjqJP8D+xRs0OxYGiQ= 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=OKYuAkj5KwY+ancTK8kBj4RVGKkiC22dnUfijflkhqc=; b=jkLTA26MlqmTY1we7vrdv8CQmsZEhWS//AHa6AYSXFQwVhxOSkF2GmUiVkBJRJlIGWe0IoGeXU1Z69O5a02cSZmV3r031nuNH8MK+RMXbIKKaeKFDbGDI9DKnzkQlsyCQFoyWnuiapJmEcpFcbrdwKUZ4WYtyB+DIXYoufI1S/g= 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 1659530700618670.0887039898709; Wed, 3 Aug 2022 05:45:00 -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-425-NTWq8tjlMyuZ2YlayHgCGA-1; Wed, 03 Aug 2022 08:44:53 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8C0783826A61; Wed, 3 Aug 2022 12:44:45 +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 79F022024CB6; Wed, 3 Aug 2022 12:44:45 +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 5D1A11946A50; Wed, 3 Aug 2022 12:44:45 +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 F286C1946A67 for ; Wed, 3 Aug 2022 12:44:43 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C534DC23DBF; Wed, 3 Aug 2022 12:44:43 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 71326C28100 for ; Wed, 3 Aug 2022 12:44:43 +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=OKYuAkj5KwY+ancTK8kBj4RVGKkiC22dnUfijflkhqc=; b=c5OooflObtx5Py3mAvufeCAj+CQnpTiMUL2yWATOdkcJAljo2QUi44hggbax9OweP8KOds FcYtMrD2FncsVh/T2LnSU/iEEJyMfNQ3j+JzICKwb4Oh5Wpw1AiAZZ4KbJLpmAYvzj6LPV QGTAJaubbjMGELKY1x2eWwhHMNDqzgQ= X-MC-Unique: NTWq8tjlMyuZ2YlayHgCGA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 02/11] qemu & hypervisor: move qemuDomainObjResetAsyncJob() into hypervisor Date: Wed, 3 Aug 2022 14:43:13 +0200 Message-Id: <697613fc7df566f03fbb89de734fe7a2d84b1efb.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.4 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: 1659530701984100002 Content-Type: text/plain; charset="utf-8"; x-default="true" This patch moves qemuDomainObjResetAsyncJob() as virDomainObjResetAsyncJob() into hypervisor. Signed-off-by: Kristina Hanicova Reviewed-by: Michal Privoznik --- src/hypervisor/domain_job.c | 19 +++++++++++++++++++ src/hypervisor/domain_job.h | 2 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_domainjob.c | 29 +++++------------------------ 4 files changed, 27 insertions(+), 24 deletions(-) diff --git a/src/hypervisor/domain_job.c b/src/hypervisor/domain_job.c index 9fbea500c4..1cd9b8d728 100644 --- a/src/hypervisor/domain_job.c +++ b/src/hypervisor/domain_job.c @@ -9,6 +9,7 @@ #include =20 #include "domain_job.h" +#include "viralloc.h" =20 =20 VIR_ENUM_IMPL(virDomainJob, @@ -155,3 +156,21 @@ virDomainObjResetAgentJob(virDomainJobObj *job) g_clear_pointer(&job->agentOwnerAPI, g_free); job->agentStarted =3D 0; } + +void +virDomainObjResetAsyncJob(virDomainJobObj *job) +{ + job->asyncJob =3D VIR_ASYNC_JOB_NONE; + job->asyncOwner =3D 0; + g_clear_pointer(&job->asyncOwnerAPI, g_free); + job->asyncStarted =3D 0; + job->phase =3D 0; + job->mask =3D VIR_JOB_DEFAULT_MASK; + job->abortJob =3D false; + VIR_FREE(job->error); + g_clear_pointer(&job->current, virDomainJobDataFree); + job->apiFlags =3D 0; + + if (job->cb) + job->cb->resetJobPrivate(job->privateData); +} diff --git a/src/hypervisor/domain_job.h b/src/hypervisor/domain_job.h index 7a9197cbde..f857fccce2 100644 --- a/src/hypervisor/domain_job.h +++ b/src/hypervisor/domain_job.h @@ -212,3 +212,5 @@ int virDomainObjInitJob(virDomainJobObj *job, void virDomainObjResetJob(virDomainJobObj *job); =20 void virDomainObjResetAgentJob(virDomainJobObj *job); + +void virDomainObjResetAsyncJob(virDomainJobObj *job); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a50f9aea28..a8b9d5249f 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1592,6 +1592,7 @@ virDomainJobTypeFromString; virDomainJobTypeToString; virDomainObjInitJob; virDomainObjResetAgentJob; +virDomainObjResetAsyncJob; virDomainObjResetJob; =20 =20 diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 0f3b38108c..132f2a0025 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -150,25 +150,6 @@ qemuDomainEventEmitJobCompleted(virQEMUDriver *driver, } =20 =20 -static void -qemuDomainObjResetAsyncJob(virDomainJobObj *job) -{ - job->asyncJob =3D VIR_ASYNC_JOB_NONE; - job->asyncOwner =3D 0; - g_clear_pointer(&job->asyncOwnerAPI, g_free); - job->asyncStarted =3D 0; - job->phase =3D 0; - job->mask =3D VIR_JOB_DEFAULT_MASK; - job->abortJob =3D false; - VIR_FREE(job->error); - g_clear_pointer(&job->current, virDomainJobDataFree); - job->apiFlags =3D 0; - - if (job->cb) - job->cb->resetJobPrivate(job->privateData); -} - - /** * qemuDomainObjPreserveJob * @param obj domain with a job that needs to be preserved @@ -200,7 +181,7 @@ qemuDomainObjPreserveJob(virDomainObj *obj, job->cb =3D priv->job.cb; =20 virDomainObjResetJob(&priv->job); - qemuDomainObjResetAsyncJob(&priv->job); + virDomainObjResetAsyncJob(&priv->job); return 0; } =20 @@ -244,7 +225,7 @@ void qemuDomainObjClearJob(virDomainJobObj *job) { virDomainObjResetJob(job); - qemuDomainObjResetAsyncJob(job); + virDomainObjResetAsyncJob(job); g_clear_pointer(&job->current, virDomainJobDataFree); g_clear_pointer(&job->completed, virDomainJobDataFree); virCondDestroy(&job->cond); @@ -753,7 +734,7 @@ qemuDomainObjDiscardAsyncJob(virDomainObj *obj) =20 if (priv->job.active =3D=3D VIR_JOB_ASYNC_NESTED) virDomainObjResetJob(&priv->job); - qemuDomainObjResetAsyncJob(&priv->job); + virDomainObjResetAsyncJob(&priv->job); qemuDomainSaveStatus(obj); } =20 @@ -914,7 +895,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriver *driver, VIR_DEBUG("Started async job: %s (vm=3D%p name=3D%s)", virDomainAsyncJobTypeToString(asyncJob), obj, obj->def->name); - qemuDomainObjResetAsyncJob(&priv->job); + virDomainObjResetAsyncJob(&priv->job); priv->job.current =3D virDomainJobDataInit(&qemuJobDataPrivate= DataCallbacks); priv->job.current->status =3D VIR_DOMAIN_JOB_STATUS_ACTIVE; priv->job.asyncJob =3D asyncJob; @@ -1198,7 +1179,7 @@ qemuDomainObjEndAsyncJob(virDomainObj *obj) virDomainAsyncJobTypeToString(priv->job.asyncJob), obj, obj->def->name); =20 - qemuDomainObjResetAsyncJob(&priv->job); + virDomainObjResetAsyncJob(&priv->job); qemuDomainSaveStatus(obj); virCondBroadcast(&priv->job.asyncCond); } --=20 2.37.1 From nobody Tue May 21 17:26:23 2024 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=1659530696; cv=none; d=zohomail.com; s=zohoarc; b=ZUf5kgnrT7XLoQaoo/drAndYg6ObIE+DTkabfYTRyEkuePQtm0CKqaBoQ9qdFUIMp6bqerPyUJOjzMEcJmgIJpUT5uMQMsXR707iO7RjLM4ZOPfilfyx+cXLUwdZFSmgyOQFiU6wrEpx1JBhTj4FeHQM7+ZiY1JSdOTQe/aDwKY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659530696; 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=Trqj5pB0Wu08RtfA3ekwLkkN9x1MFlkjnKXkm0SfvcA=; b=XkJKX00ma+2lvoS33zHgF9ZUaFpLN3OaA94Uv5XzrFqyXZJj76bM114JggAWn7O4qIobhWO+O8Jr75Qzrlm5ty+H8f3Sg/1WQI1UzgSUbl4/2L/uG7ks7j+dKktEkEXo0xGMMHhg4T1k9ZpVOAHcF0jQpdV2TB/b0gMiIzrb5ig= 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 1659530696274944.6193023423954; Wed, 3 Aug 2022 05:44:56 -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-249-pkzKx3M3Pry1YYPec_tmUA-1; Wed, 03 Aug 2022 08:44:48 -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 EEE728039B7; Wed, 3 Aug 2022 12:44:45 +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 D2F63945D7; Wed, 3 Aug 2022 12:44:45 +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 A61AE1946A65; Wed, 3 Aug 2022 12:44:45 +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 6CB2B1946A70 for ; Wed, 3 Aug 2022 12:44:44 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5CD4AC28136; Wed, 3 Aug 2022 12:44:44 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0822FC23DBF for ; Wed, 3 Aug 2022 12:44:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659530695; 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=Trqj5pB0Wu08RtfA3ekwLkkN9x1MFlkjnKXkm0SfvcA=; b=Hrgfjs7OMoNyYUOlPmWt5cxcXxTQu/C9L3qz8TiRciuyDqm1zvnpCQxOqyiw4XQKylpXkd yV1PH+b4s3a26RwYuxWn7dd46+wb8s44ZZ7VRq2WVMTV1ofwQskCKkH5EW/Ns+S3TlDAzs W5EkUx+xpxPqMUG/7aK1SnvlAdaQjT0= X-MC-Unique: pkzKx3M3Pry1YYPec_tmUA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 03/11] qemu: propagate virDomainJobObj into qemuDomainObjPreserveJob() Date: Wed, 3 Aug 2022 14:43:14 +0200 Message-Id: <738733992606e707e03aa2c8e5fc46cf2203d9d9.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.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: 1659530698021100001 Content-Type: text/plain; charset="utf-8"; x-default="true" It does not make sense to propagate virDomainObj and get qemuDomainObjPrivate from it, when it is already accessible in the only function qemuDomainObjPreserveJob() is called from. That being said, we can also propagate virDomainJobObj directly and avoid using qemu private structure. Signed-off-by: Kristina Hanicova Reviewed-by: Michal Privoznik --- src/qemu/qemu_domainjob.c | 31 ++++++++++++++----------------- src/qemu/qemu_domainjob.h | 2 +- src/qemu/qemu_process.c | 2 +- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 132f2a0025..260717aa88 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -160,28 +160,25 @@ qemuDomainEventEmitJobCompleted(virQEMUDriver *driver, * Returns 0 on success, -1 on failure. */ int -qemuDomainObjPreserveJob(virDomainObj *obj, +qemuDomainObjPreserveJob(virDomainJobObj *currJob, virDomainJobObj *job) { - qemuDomainObjPrivate *priv =3D obj->privateData; - memset(job, 0, sizeof(*job)); - job->active =3D priv->job.active; - job->owner =3D priv->job.owner; - job->asyncJob =3D priv->job.asyncJob; - job->asyncOwner =3D priv->job.asyncOwner; - job->asyncStarted =3D priv->job.asyncStarted; - job->phase =3D priv->job.phase; - job->privateData =3D g_steal_pointer(&priv->job.privateData); - job->apiFlags =3D priv->job.apiFlags; - - if (priv->job.cb && - !(priv->job.privateData =3D priv->job.cb->allocJobPrivate())) + job->active =3D currJob->active; + job->owner =3D currJob->owner; + job->asyncJob =3D currJob->asyncJob; + job->asyncOwner =3D currJob->asyncOwner; + job->phase =3D currJob->phase; + job->privateData =3D g_steal_pointer(&currJob->privateData); + job->apiFlags =3D currJob->apiFlags; + + if (currJob->cb && + !(currJob->privateData =3D currJob->cb->allocJobPrivate())) return -1; - job->cb =3D priv->job.cb; + job->cb =3D currJob->cb; =20 - virDomainObjResetJob(&priv->job); - virDomainObjResetAsyncJob(&priv->job); + virDomainObjResetJob(currJob); + virDomainObjResetAsyncJob(currJob); return 0; } =20 diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h index 36747154c6..a0cd79c705 100644 --- a/src/qemu/qemu_domainjob.h +++ b/src/qemu/qemu_domainjob.h @@ -105,7 +105,7 @@ qemuDomainObjStartJobPhase(virDomainObj *obj, int phase); void qemuDomainObjSetAsyncJobMask(virDomainObj *obj, unsigned long long allowedJobs); -int qemuDomainObjPreserveJob(virDomainObj *obj, +int qemuDomainObjPreserveJob(virDomainJobObj *currJob, virDomainJobObj *job); void qemuDomainObjRestoreAsyncJob(virDomainObj *vm, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d29da63242..fc42434a0d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8874,7 +8874,7 @@ qemuProcessReconnect(void *opaque) cfg =3D virQEMUDriverGetConfig(driver); priv =3D obj->privateData; =20 - qemuDomainObjPreserveJob(obj, &oldjob); + qemuDomainObjPreserveJob(&priv->job, &oldjob); if (oldjob.asyncJob =3D=3D VIR_ASYNC_JOB_MIGRATION_IN) stopFlags |=3D VIR_QEMU_PROCESS_STOP_MIGRATED; if (oldjob.asyncJob =3D=3D VIR_ASYNC_JOB_BACKUP && priv->backup) --=20 2.37.1 From nobody Tue May 21 17:26:23 2024 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=1659530704; cv=none; d=zohomail.com; s=zohoarc; b=U2Z3cghCZlJ7yY9wxICMhw0qY8kZGGQe2ueYLy3BPj2n7asZ8hJL3NwIInp3Qz5F2ZHkR+wA+YxUpCfGmkBXu0TgL1T454vvGb7mGhS0zlMjVkPXCAOChUWUY1QZo8Fs1m/ayAL3jUzaMLuWI480jp2HUdDT6OIVUvU3pS49ZB0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659530704; 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=lOuI726RGqPMpKUTM5F4IjDQ2nlNuqnCLY23CMvQZtA=; b=M5+4l/1MbLO5QEZFdj2lLUD1BEVn+0gPEeLoKBBTgkpsH558selbySS8KxwLilgcuJlmESq0+QNIbIT8DDK4+lCZQQYO296g0QtvR2I1hMC9WNTVzCBxd/aqe3lW2qkoBzPGiidl8GMOhPzbjc+0NSONr0yZ/PEWjH0v6GUcS6g= 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 1659530704331978.9367726740988; Wed, 3 Aug 2022 05:45:04 -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-395-Nn71bUiFOJ22yjdlyeJ5Bw-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 9EA70185A79C; 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 863CE40CFD0A; 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 3A9621946A5F; 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 20F1E1946A4E for ; Wed, 3 Aug 2022 12:44:45 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id E6FA6C28100; Wed, 3 Aug 2022 12:44:44 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9359EC28125 for ; Wed, 3 Aug 2022 12:44:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659530703; 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=lOuI726RGqPMpKUTM5F4IjDQ2nlNuqnCLY23CMvQZtA=; b=fGgVEfiY6k2Qv7+YUl5TDLWLNlLoLzCqxAGRmr6qyvoJxs5z90x0/FfTVdhcM1GpF9wRsY lUKTiTbIvOB6fqyjGPRlURzPR3EgXXR80Fk6qNXadGMHP5QThu4UQmoa7KDVkDPTx1UZwE fqV2J+M2KP6iK/wOqVMGlvGIdf5XvgI= X-MC-Unique: Nn71bUiFOJ22yjdlyeJ5Bw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 04/11] qemu & hypervisor: move qemuDomainObjPreserveJob() into hypervisor Date: Wed, 3 Aug 2022 14:43:15 +0200 Message-Id: <5ead96e95002281cff36a11e3da97d0070c086d4.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.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: 1659530706017100008 Content-Type: text/plain; charset="utf-8"; x-default="true" This patch moves qemuDomainObjPreserveJob() as virDomainObjPreserveJob() into hypervisor in order to be used by other hypervisors as well. Signed-off-by: Kristina Hanicova Reviewed-by: Michal Privoznik --- src/hypervisor/domain_job.c | 32 ++++++++++++++++++++++++++++++++ src/hypervisor/domain_job.h | 3 +++ src/libvirt_private.syms | 1 + src/qemu/qemu_domainjob.c | 33 --------------------------------- src/qemu/qemu_domainjob.h | 2 -- src/qemu/qemu_process.c | 2 +- 6 files changed, 37 insertions(+), 36 deletions(-) diff --git a/src/hypervisor/domain_job.c b/src/hypervisor/domain_job.c index 1cd9b8d728..804a58047f 100644 --- a/src/hypervisor/domain_job.c +++ b/src/hypervisor/domain_job.c @@ -174,3 +174,35 @@ virDomainObjResetAsyncJob(virDomainJobObj *job) if (job->cb) job->cb->resetJobPrivate(job->privateData); } + +/** + * virDomainObjPreserveJob + * @param currJob structure is a job that needs to be preserved + * @param job structure where to store job details from @currJob + * + * Saves the current job details from @currJob to @job and resets the job = in @currJob. + * + * Returns 0 on success, -1 on failure. + */ +int +virDomainObjPreserveJob(virDomainJobObj *currJob, + virDomainJobObj *job) +{ + memset(job, 0, sizeof(*job)); + job->active =3D currJob->active; + job->owner =3D currJob->owner; + job->asyncJob =3D currJob->asyncJob; + job->asyncOwner =3D currJob->asyncOwner; + job->phase =3D currJob->phase; + job->privateData =3D g_steal_pointer(&currJob->privateData); + job->apiFlags =3D currJob->apiFlags; + + if (currJob->cb && + !(currJob->privateData =3D currJob->cb->allocJobPrivate())) + return -1; + job->cb =3D currJob->cb; + + virDomainObjResetJob(currJob); + virDomainObjResetAsyncJob(currJob); + return 0; +} diff --git a/src/hypervisor/domain_job.h b/src/hypervisor/domain_job.h index f857fccce2..44e4bfdb4a 100644 --- a/src/hypervisor/domain_job.h +++ b/src/hypervisor/domain_job.h @@ -214,3 +214,6 @@ void virDomainObjResetJob(virDomainJobObj *job); void virDomainObjResetAgentJob(virDomainJobObj *job); =20 void virDomainObjResetAsyncJob(virDomainJobObj *job); + +int virDomainObjPreserveJob(virDomainJobObj *currJob, + virDomainJobObj *job); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index a8b9d5249f..edfa38c857 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1591,6 +1591,7 @@ virDomainJobStatusToType; virDomainJobTypeFromString; virDomainJobTypeToString; virDomainObjInitJob; +virDomainObjPreserveJob; virDomainObjResetAgentJob; virDomainObjResetAsyncJob; virDomainObjResetJob; diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 260717aa88..4b8ba3f0bc 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -150,39 +150,6 @@ qemuDomainEventEmitJobCompleted(virQEMUDriver *driver, } =20 =20 -/** - * qemuDomainObjPreserveJob - * @param obj domain with a job that needs to be preserved - * @param job structure where to store job details from @obj - * - * Saves the current job details from @obj to @job and resets the job in @= obj. - * - * Returns 0 on success, -1 on failure. - */ -int -qemuDomainObjPreserveJob(virDomainJobObj *currJob, - virDomainJobObj *job) -{ - memset(job, 0, sizeof(*job)); - job->active =3D currJob->active; - job->owner =3D currJob->owner; - job->asyncJob =3D currJob->asyncJob; - job->asyncOwner =3D currJob->asyncOwner; - job->phase =3D currJob->phase; - job->privateData =3D g_steal_pointer(&currJob->privateData); - job->apiFlags =3D currJob->apiFlags; - - if (currJob->cb && - !(currJob->privateData =3D currJob->cb->allocJobPrivate())) - return -1; - job->cb =3D currJob->cb; - - virDomainObjResetJob(currJob); - virDomainObjResetAsyncJob(currJob); - return 0; -} - - void qemuDomainObjRestoreAsyncJob(virDomainObj *vm, virDomainAsyncJob asyncJob, diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h index a0cd79c705..6272f9d845 100644 --- a/src/qemu/qemu_domainjob.h +++ b/src/qemu/qemu_domainjob.h @@ -105,8 +105,6 @@ qemuDomainObjStartJobPhase(virDomainObj *obj, int phase); void qemuDomainObjSetAsyncJobMask(virDomainObj *obj, unsigned long long allowedJobs); -int qemuDomainObjPreserveJob(virDomainJobObj *currJob, - virDomainJobObj *job); void qemuDomainObjRestoreAsyncJob(virDomainObj *vm, virDomainAsyncJob asyncJob, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index fc42434a0d..2010c013a6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8874,7 +8874,7 @@ qemuProcessReconnect(void *opaque) cfg =3D virQEMUDriverGetConfig(driver); priv =3D obj->privateData; =20 - qemuDomainObjPreserveJob(&priv->job, &oldjob); + virDomainObjPreserveJob(&priv->job, &oldjob); if (oldjob.asyncJob =3D=3D VIR_ASYNC_JOB_MIGRATION_IN) stopFlags |=3D VIR_QEMU_PROCESS_STOP_MIGRATED; if (oldjob.asyncJob =3D=3D VIR_ASYNC_JOB_BACKUP && priv->backup) --=20 2.37.1 From nobody Tue May 21 17:26:23 2024 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 Reviewed-by: Michal Privoznik --- 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 From nobody Tue May 21 17:26:23 2024 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=1659530783; cv=none; d=zohomail.com; s=zohoarc; b=Bqn4blCZgGK1P7LBP2TVu4smg2HSmqk8c1ZNnOxaQtOJaM/1hr/Zm2M0yHfV7QkXkWvvReOFH8FFVhRID1vOBbJ0s+39pYz/tw5KltX5LG8U/ADhuj3zWDbgUvFUrR9E5nAkqHydfJgBlv7mRzW+DvzVzaPItssqBVKLNYoiggg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659530783; 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=VKHAnS0KeitV9yNnfnnSwpSLHCCpdNwKVSNTKRs2emU=; b=JsuB1dnk6rfHjQB/BLAc7fNDS8ndL+3uV24iPhBwc77tM0/HsUJ1w+p/wrVkUhYJBk3nK3zSN+PQ+7Lbj+ddO31UprKEkI/a43qrzy5QhOATxdeUCEu3HEPMF9mYrSmrbhLrF515nedagvUalZ4AbPQtYUj3rH3I8Zm0vY4t2YM= 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 1659530783043704.8715176492123; Wed, 3 Aug 2022 05:46:23 -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-484-0NNZXMWjMLWEgjNUo9Y4Hw-1; Wed, 03 Aug 2022 08:44:54 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3F0DB1035376; 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 2C4DD404E4D3; 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 DCF771946A62; 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 362BF1946A5C for ; Wed, 3 Aug 2022 12:44:46 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 14DD3C28100; Wed, 3 Aug 2022 12:44:46 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id B3ADAC28136 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=1659530782; 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=VKHAnS0KeitV9yNnfnnSwpSLHCCpdNwKVSNTKRs2emU=; b=VsSrsKOLzvZIcF4a3JKnohzWr8Gl09+U3PhTC92EPKixqwynGcC34yitidMsKWW0DLBdRo XJHwbaQ1hrcf3gykW8/NcRYU2UFaovdRAuXnS1cF6t67sa5hqxO7cogUafQ0zbaAmzPPpw Ub6WnpRBDsS8/Gsbbojsf5MG1EX2yFE= X-MC-Unique: 0NNZXMWjMLWEgjNUo9Y4Hw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 06/11] libxl: use virDomainObjClearJob() instead of libxlDomainObjFreeJob() Date: Wed, 3 Aug 2022 14:43:17 +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.2 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: 1659530784768100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Kristina Hanicova Reviewed-by: Michal Privoznik --- src/libxl/libxl_domain.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 467c1ee914..9a23598512 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -44,13 +44,6 @@ VIR_LOG_INIT("libxl.libxl_domain"); =20 =20 -static void -libxlDomainObjFreeJob(libxlDomainObjPrivate *priv) -{ - ignore_value(virCondDestroy(&priv->job.cond)); - virDomainJobDataFree(priv->job.current); -} - /* Give up waiting for mutex after 30 seconds */ #define LIBXL_JOB_WAIT_TIME (1000ull * 30) =20 @@ -185,7 +178,7 @@ libxlDomainObjPrivateFree(void *data) libxlDomainObjPrivate *priv =3D data; =20 g_free(priv->lockState); - libxlDomainObjFreeJob(priv); + virDomainObjClearJob(&priv->job); virChrdevFree(priv->devs); g_free(priv); } --=20 2.37.1 From nobody Tue May 21 17:26:23 2024 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=1659530713; cv=none; d=zohomail.com; s=zohoarc; b=SkuffplqY1Lpuq8/LOd+BCzcRK1rHd+r8U7gFFmBamaeR9UFDUyzTE68mmyW01kQ/lnYwLBc9+5t0W6hDHqeI6zclXL7LPUh+RpAzBNtPs6j8Lnqz6+qkUAgNNI4QvKc5XtIvlsBFbMmfbYWFFSwLYLyxWOUH9PEEPhWdz+dtcY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659530713; 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=jK+1H3gMHiDTyOf/aXXYK6bjYoS7MS7ulVX+BmCkw8c=; b=gt88DnTSMnSYtc3pQ0NyFmb1+4kV3o017dycKP2Fo1A3JGBtH/ZsmzEm7KRQ7vLM37stYlrtj348Jezb2uSxtt/QEDpuiPQZg+dH0imECmIp1IPdajwnp7QcARrniLNClEKLm0/NZgxescusziDyXS41nmrdYDJn0yWNIclcUzg= 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 1659530713171528.4309082929798; Wed, 3 Aug 2022 05:45:13 -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-286-xj2kSB2XOomIYQtOohWTCA-1; Wed, 03 Aug 2022 08:45:07 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 62CEC2804021; Wed, 3 Aug 2022 12:45:03 +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 4D5D3C28100; Wed, 3 Aug 2022 12:45:03 +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 2B9D11946A52; Wed, 3 Aug 2022 12:45:03 +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 A893E1946A5C for ; Wed, 3 Aug 2022 12:44:46 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9DB2CC23DBF; Wed, 3 Aug 2022 12:44:46 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 49A95C28125 for ; Wed, 3 Aug 2022 12:44:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659530711; 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=jK+1H3gMHiDTyOf/aXXYK6bjYoS7MS7ulVX+BmCkw8c=; b=an9iIPnoQw179wHcD4DZYQg6FiNV9aTLn31quNqLGgidf4MTCNWeQwH1jV4rkMGNd3bCJd rf4A6tXBc/owPVjA36pruC4PqFzOJAU3Bd9DY4W3QVxdUohE/BYXVsdiL/1avKVCGMe580 tCuQFTN93d6UZs86mXOZvYBv1U9DjE4= X-MC-Unique: xj2kSB2XOomIYQtOohWTCA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 07/11] LXC: use virDomainObjClearJob() instead of virLXCDomainObjFreeJob() Date: Wed, 3 Aug 2022 14:43:18 +0200 Message-Id: <9d6dfb636deea29103ab7d38e3d71effe36d2290.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.85 on 10.11.54.8 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: 1659530714286100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Kristina Hanicova Reviewed-by: Michal Privoznik --- src/lxc/lxc_domain.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index 6f048a128a..654c35c640 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -35,11 +35,6 @@ =20 VIR_LOG_INIT("lxc.lxc_domain"); =20 -static void -virLXCDomainObjFreeJob(virLXCDomainObjPrivate *priv) -{ - ignore_value(virCondDestroy(&priv->job.cond)); -} =20 /* Give up waiting for mutex after 30 seconds */ #define LXC_JOB_WAIT_TIME (1000ull * 30) @@ -142,7 +137,7 @@ virLXCDomainObjPrivateFree(void *data) virLXCDomainObjPrivate *priv =3D data; =20 virCgroupFree(priv->cgroup); - virLXCDomainObjFreeJob(priv); + virDomainObjClearJob(&priv->job); g_free(priv); } =20 --=20 2.37.1 From nobody Tue May 21 17:26:23 2024 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=1659530706; cv=none; d=zohomail.com; s=zohoarc; b=gscUQBgk2r5TLudTrQ8a2XCzebMOz+pVxo8a7YjyfdhyQfslImRQYfFaajG1Bt98jkpAQqXepfRasGodLEfWSDA5xCwOWszT2ZNOGI1jrngBXTin0kD82/AGR24TO/cymkR23rHLRfgUv/k3orW8jbWX+7qmgcKNTyA3Pwjkp8Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659530706; 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=sPZz2S/GcMcwgCPhMSgtUnRGnhitxd11M3L7XFkEDrE=; b=LHnBbkJdwIPSD+q+Xdws/kvJ6zjXJKrVvUFj+vBtjIEk0BWnJ5qDm7vMKvR7t/YJhCmhJQuWMPfvafkNzt6859iLty7/dGS95ZvDIG8LggJOi4qo8MuBCpxwEFgmBHy9yrc0FFqBqvAGPK8yByfbUpN0yhnqvv6PfoYLgBdLQq0= 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 1659530706250346.27049573636907; Wed, 3 Aug 2022 05:45:06 -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-651-Vo3C7ohpMBuJFRQKTOehAA-1; Wed, 03 Aug 2022 08:44:56 -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 E1B1F1035349; Wed, 3 Aug 2022 12:44:53 +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 CFC971121314; Wed, 3 Aug 2022 12:44:53 +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 E7B5E1946A53; 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 4D54E1946A5C for ; Wed, 3 Aug 2022 12:44:47 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3378BC28125; 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 D3D18C27DB3 for ; Wed, 3 Aug 2022 12:44:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659530704; 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=sPZz2S/GcMcwgCPhMSgtUnRGnhitxd11M3L7XFkEDrE=; b=YD425AvxkfrTFEFMEe2Z6AIBHxgbWzyiza8qxToNFQv7ZSOoD0zDmshFhsU19KBI+Z9vZ0 89sjUUHbp3k+7VOxgF5Qip9Lq+1b98jIdrTRImu1b+vcAHxzIVukL21o9jJyM5HDb26hJF yHOxDil/mTu7wmV4WUs7AlTE71N0ffg= X-MC-Unique: Vo3C7ohpMBuJFRQKTOehAA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 08/11] CH: use virDomainObjClearJob() instead of virCHDomainObjFreeJob() Date: Wed, 3 Aug 2022 14:43:19 +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.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: 1659530708260100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Kristina Hanicova Reviewed-by: Michal Privoznik --- src/ch/ch_domain.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c index 499d31cf4a..817b1176d5 100644 --- a/src/ch/ch_domain.c +++ b/src/ch/ch_domain.c @@ -32,12 +32,6 @@ =20 VIR_LOG_INIT("ch.ch_domain"); =20 -static void -virCHDomainObjFreeJob(virCHDomainObjPrivate *priv) -{ - ignore_value(virCondDestroy(&priv->job.cond)); -} - /* * obj must be locked before calling, virCHDriver must NOT be locked * @@ -129,7 +123,7 @@ virCHDomainObjPrivateAlloc(void *opaque) } =20 if (!(priv->chrdevs =3D virChrdevAlloc())) { - virCHDomainObjFreeJob(priv); + virDomainObjClearJob(&priv->job); g_free(priv); return NULL; } @@ -144,7 +138,7 @@ virCHDomainObjPrivateFree(void *data) virCHDomainObjPrivate *priv =3D data; =20 virChrdevFree(priv->chrdevs); - virCHDomainObjFreeJob(priv); + virDomainObjClearJob(&priv->job); g_free(priv->machineName); g_free(priv); } --=20 2.37.1 From nobody Tue May 21 17:26:23 2024 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 Reviewed-by: Michal Privoznik --- 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 From nobody Tue May 21 17:26:23 2024 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=1659530704; cv=none; d=zohomail.com; s=zohoarc; b=k0fRMl2XVoRcUY7kRcJ9VN5sgzxcur8/J4eatmTnJPJ89irek73NDXEQ8wNBG4ebJ69yFGAoQYjTKMHjs2K4ah7NTY9JbVQHSK+QljGSGFDPPBeEbsF4u1Y2FPKPDzrvZEvCKptzMdE0xBG53PWecQbfSEWupxuzDVNVZBxvrBg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659530704; 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=xhuUvJqQzgVGvRWa2/e4lrl+fykZICI1wuPTyp5LCqY=; b=GxhlkkIA+JOODuHkrfP7lvH1Kzz/wS2UT0QEjMBpFnguzwEJWUAIES6JEGxB3DufErTsgKXuPP4DPfqnxY9Qj2AdRJ507ajvJywF8gVhzGWTs+QWoTO9wbncCUbeeog4sS8Qi22oTCykYL5EjtQTc8YdwHJprM0DdNC2kST2QfI= 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 1659530704636643.9397991134847; Wed, 3 Aug 2022 05:45:04 -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-280-myhyC1PYO2CS9BqBADZQkg-1; Wed, 03 Aug 2022 08:45:00 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E52DC824073; Wed, 3 Aug 2022 12:44:57 +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 D111A40D2962; Wed, 3 Aug 2022 12:44:57 +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 984EA1946A5E; Wed, 3 Aug 2022 12:44:57 +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 607AF1946A5C for ; Wed, 3 Aug 2022 12:44:48 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 55627C23DBF; Wed, 3 Aug 2022 12:44:48 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 01A89C28125 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=1659530703; 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=xhuUvJqQzgVGvRWa2/e4lrl+fykZICI1wuPTyp5LCqY=; b=DJ3mLdIGV71MDkGYB+1Bxod07gt2KfWJUJSP9/WEeYjmili+R9as6KiqKPidroJZO56zFs v+57vU+OG9a5TtO3t0XDACKWkE7X/ejii4d6I0SCPaLvJEjNaft/GRpL1Bc9BqI0Whoxif vt5V+dEq/5Ds6gAOCT6lR3EK5taGyfk= X-MC-Unique: myhyC1PYO2CS9BqBADZQkg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 10/11] qemu: move virDomainNestedJobAllowed into hypervisor Date: Wed, 3 Aug 2022 14:43:21 +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.2 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: 1659530706015100007 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Kristina Hanicova Reviewed-by: Michal Privoznik --- src/hypervisor/domain_job.c | 8 ++++++++ src/hypervisor/domain_job.h | 2 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_domainjob.c | 14 +++----------- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/hypervisor/domain_job.c b/src/hypervisor/domain_job.c index 08e84d575f..6a7116fb2a 100644 --- a/src/hypervisor/domain_job.c +++ b/src/hypervisor/domain_job.c @@ -226,3 +226,11 @@ virDomainTrackJob(virDomainJob job) { return (VIR_DOMAIN_TRACK_JOBS & JOB_MASK(job)) !=3D 0; } + +bool +virDomainNestedJobAllowed(virDomainJobObj *jobs, virDomainJob newJob) +{ + return !jobs->asyncJob || + newJob =3D=3D VIR_JOB_NONE || + (jobs->mask & JOB_MASK(newJob)); +} diff --git a/src/hypervisor/domain_job.h b/src/hypervisor/domain_job.h index 824876b460..618fba45bd 100644 --- a/src/hypervisor/domain_job.h +++ b/src/hypervisor/domain_job.h @@ -222,3 +222,5 @@ void virDomainObjClearJob(virDomainJobObj *job); G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(virDomainJobObj, virDomainObjClearJob); =20 bool virDomainTrackJob(virDomainJob job); + +bool virDomainNestedJobAllowed(virDomainJobObj *jobs, virDomainJob newJob); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 4c35e2a945..16117970f2 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1590,6 +1590,7 @@ virDomainJobDataInit; virDomainJobStatusToType; virDomainJobTypeFromString; virDomainJobTypeToString; +virDomainNestedJobAllowed; virDomainObjClearJob; virDomainObjInitJob; virDomainObjPreserveJob; diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index f92ec44cb7..46fb2d704b 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -697,14 +697,6 @@ qemuDomainObjReleaseAsyncJob(virDomainObj *obj) priv->job.asyncOwner =3D 0; } =20 -static bool -qemuDomainNestedJobAllowed(virDomainJobObj *jobs, virDomainJob newJob) -{ - return !jobs->asyncJob || - newJob =3D=3D VIR_JOB_NONE || - (jobs->mask & JOB_MASK(newJob)) !=3D 0; -} - static bool qemuDomainObjCanSetJob(virDomainJobObj *job, virDomainJob newJob, @@ -787,7 +779,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriver *driver, goto error; } =20 - while (!nested && !qemuDomainNestedJobAllowed(&priv->job, job)) { + while (!nested && !virDomainNestedJobAllowed(&priv->job, job)) { if (nowait) goto cleanup; =20 @@ -807,7 +799,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriver *driver, =20 /* No job is active but a new async job could have been started while = obj * was unlocked, so we need to recheck it. */ - if (!nested && !qemuDomainNestedJobAllowed(&priv->job, job)) + if (!nested && !virDomainNestedJobAllowed(&priv->job, job)) goto retry; =20 if (obj->removing) { @@ -896,7 +888,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriver *driver, duration / 1000, agentDuration / 1000, asyncDuration / 1000); =20 if (job) { - if (nested || qemuDomainNestedJobAllowed(&priv->job, job)) + if (nested || virDomainNestedJobAllowed(&priv->job, job)) blocker =3D priv->job.ownerAPI; else blocker =3D priv->job.asyncOwnerAPI; --=20 2.37.1 From nobody Tue May 21 17:26:23 2024 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=1659530707; cv=none; d=zohomail.com; s=zohoarc; b=h046Y5x4XAwJyCgY65/kQn6jvu0iZQSJfOPiWiJaT/tqfZUs++0s5FIqVD99bBet8skIjDOwlbK2mb9ctmiRf/3SGPbZU/tpDe22OjjLj2qC2nT0lpTYfVPmbj1CeN82Ye5ydZGs4R3c9DSMTzs3W1vCPKejC5ez3cldDqsFlsg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659530707; 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=ErA71Z7tQWMOo1MY2hzOicHwZkLkPDzIpWXzmPTS1DY=; b=CUPoeTaNi2fW0XFHfchpzR359QQqOxQqDu72K/SvEHeIDSmkGVgI/nzrfpt8d+3MusvZtLxD9yrYvquWGMd4aZP+zDcvOOLKqAkAoQc/Uy+RnssoHoKc+jqRB7WNvAmehZeuHOd1LB/mqpuJe1FGnkaPHKhw2/+zmZCAbTikOmQ= 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 1659530707065577.8679033231596; Wed, 3 Aug 2022 05:45:07 -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-328-OegtxgNMPHaOhITIiFVKaQ-1; Wed, 03 Aug 2022 08:44:58 -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 A8B4D2804001; Wed, 3 Aug 2022 12:44:56 +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 962B590A04; Wed, 3 Aug 2022 12:44:56 +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 405B01946A78; Wed, 3 Aug 2022 12:44:53 +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 088AF1946A5C for ; Wed, 3 Aug 2022 12:44:49 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id DFC1BC27DB3; Wed, 3 Aug 2022 12:44:48 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C001C23DBF for ; Wed, 3 Aug 2022 12:44:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659530706; 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=ErA71Z7tQWMOo1MY2hzOicHwZkLkPDzIpWXzmPTS1DY=; b=M3dh5rQTkQ9te/pALGibx3ADlVX/bNPLVFO09xSB5INjN6sDTUaWG05MmPA1lxmFMMzkXP 956NG4MDtZYktIJq124KOuMfWLq/kXww/EI1QjmQTUXN5QS4zxWXHGq44fv66v6F6LopYd Mt1dcbh5ix+x+6Ck0xQmymNZ54fsRUM= X-MC-Unique: OegtxgNMPHaOhITIiFVKaQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 11/11] qemu: move virDomainObjCanSetJob() into hypervisor Date: Wed, 3 Aug 2022 14:43:22 +0200 Message-Id: <43c10ee6e746d676de7daefe63580bdaa7bf66a0.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.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: 1659530708262100002 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Kristina Hanicova Reviewed-by: Michal Privoznik --- src/hypervisor/domain_job.c | 11 +++++++++++ src/hypervisor/domain_job.h | 4 ++++ src/libvirt_private.syms | 1 + src/qemu/qemu_domainjob.c | 13 +------------ 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/hypervisor/domain_job.c b/src/hypervisor/domain_job.c index 6a7116fb2a..0afed46418 100644 --- a/src/hypervisor/domain_job.c +++ b/src/hypervisor/domain_job.c @@ -234,3 +234,14 @@ virDomainNestedJobAllowed(virDomainJobObj *jobs, virDo= mainJob newJob) newJob =3D=3D VIR_JOB_NONE || (jobs->mask & JOB_MASK(newJob)); } + +bool +virDomainObjCanSetJob(virDomainJobObj *job, + virDomainJob newJob, + virDomainAgentJob newAgentJob) +{ + return ((newJob =3D=3D VIR_JOB_NONE || + job->active =3D=3D VIR_JOB_NONE) && + (newAgentJob =3D=3D VIR_AGENT_JOB_NONE || + job->agentActive =3D=3D VIR_AGENT_JOB_NONE)); +} diff --git a/src/hypervisor/domain_job.h b/src/hypervisor/domain_job.h index 618fba45bd..30893dabc3 100644 --- a/src/hypervisor/domain_job.h +++ b/src/hypervisor/domain_job.h @@ -224,3 +224,7 @@ G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(virDomainJobObj, virDo= mainObjClearJob); bool virDomainTrackJob(virDomainJob job); =20 bool virDomainNestedJobAllowed(virDomainJobObj *jobs, virDomainJob newJob); + +bool virDomainObjCanSetJob(virDomainJobObj *job, + virDomainJob newJob, + virDomainAgentJob newAgentJob); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 16117970f2..9f6389ae63 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1591,6 +1591,7 @@ virDomainJobStatusToType; virDomainJobTypeFromString; virDomainJobTypeToString; virDomainNestedJobAllowed; +virDomainObjCanSetJob; virDomainObjClearJob; virDomainObjInitJob; virDomainObjPreserveJob; diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 46fb2d704b..d682f7be38 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -697,17 +697,6 @@ qemuDomainObjReleaseAsyncJob(virDomainObj *obj) priv->job.asyncOwner =3D 0; } =20 -static bool -qemuDomainObjCanSetJob(virDomainJobObj *job, - virDomainJob newJob, - virDomainAgentJob newAgentJob) -{ - return ((newJob =3D=3D VIR_JOB_NONE || - job->active =3D=3D VIR_JOB_NONE) && - (newAgentJob =3D=3D VIR_AGENT_JOB_NONE || - job->agentActive =3D=3D VIR_AGENT_JOB_NONE)); -} - /* Give up waiting for mutex after 30 seconds */ #define QEMU_JOB_WAIT_TIME (1000ull * 30) =20 @@ -788,7 +777,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriver *driver, goto error; } =20 - while (!qemuDomainObjCanSetJob(&priv->job, job, agentJob)) { + while (!virDomainObjCanSetJob(&priv->job, job, agentJob)) { if (nowait) goto cleanup; =20 --=20 2.37.1