From nobody Mon Feb 9 01:35:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1662386303; cv=none; d=zohomail.com; s=zohoarc; b=abVL0jr2osYuT7bh8gGz91jl3n852oGU3HVjrNs+FMLKZcYyzxJeeP1OSe6zDR/hDtZiZxMilrxZ5GH1Btl9F2O5Rb/qCW2+IiJr3GO0lDWUMsp0RGZ55KArUI5elrvE1+JJvSzwO14iCUogDsYUp4GijKvvmAg0ggdkBt4mxko= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662386303; 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=fdWqGUf4zJQLPjREffwxR9EnxvTmemjJAspPWUY3gHs=; b=mwnP832ORL7BxoBdokZr/RdRw5Xzk7bSFkhD8pMWpcnaP76DW/fF90Sx+LP6tU3Cz86NEx+JigLJiPP99sp5CHbY4N81GUyqkvi8dnQHuL1+k0L7TsiCL9Pvmdz713STcduxk6wO4+RcEqM+46mQmxQo3mGDSr2ahmuyMO3hG8M= 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 1662386303256554.1934645941748; Mon, 5 Sep 2022 06:58: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-673-JUjfqTGoMgGd-UN0zaVtcw-1; Mon, 05 Sep 2022 09:57:37 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F225080D08E; Mon, 5 Sep 2022 13:57:32 +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 DDFE314152E0; Mon, 5 Sep 2022 13:57:32 +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 C480D1946A48; Mon, 5 Sep 2022 13:57:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AA118193F6E6 for ; Mon, 5 Sep 2022 13:57:31 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 819732026D64; Mon, 5 Sep 2022 13:57:31 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D1F22026D4C for ; Mon, 5 Sep 2022 13:57:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1662386302; 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=fdWqGUf4zJQLPjREffwxR9EnxvTmemjJAspPWUY3gHs=; b=HDj2UJVGkLzXnx9ub40A5kpNZNg6qV8v/tOZX/sY9B6wNiEG4SmLhzwJitDrn8dRKO2JBw 1TTbqkOTtvUMvbxstsKwXdwEjwtjCxgttK7kKaeklNpaFkS/Z2v+EqgrLku4o13EnpJawH 8QZnBioILGUfsEi6VU9fQG6m7ZuwMvw= X-MC-Unique: JUjfqTGoMgGd-UN0zaVtcw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH v2 17/17] qemu & conf: move BeginNestedJob & BeginJobNowait into src/conf Date: Mon, 5 Sep 2022 15:57:15 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 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: 1662386304664100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Kristina Hanicova --- src/conf/virdomainjob.c | 44 +++++++++++++++++++++++++++++++++++++++ src/conf/virdomainjob.h | 6 ++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_domainjob.c | 44 --------------------------------------- src/qemu/qemu_domainjob.h | 7 ------- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 2 +- 8 files changed, 55 insertions(+), 54 deletions(-) diff --git a/src/conf/virdomainjob.c b/src/conf/virdomainjob.c index feb8c0e971..7915faa125 100644 --- a/src/conf/virdomainjob.c +++ b/src/conf/virdomainjob.c @@ -559,6 +559,50 @@ int virDomainObjBeginAsyncJob(virDomainObj *obj, return 0; } =20 +int +virDomainObjBeginNestedJob(virDomainObj *obj, + virDomainAsyncJob asyncJob) +{ + if (asyncJob !=3D obj->job->asyncJob) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected async job %d type expected %d"), + asyncJob, obj->job->asyncJob); + return -1; + } + + if (obj->job->asyncOwner !=3D virThreadSelfID()) { + VIR_WARN("This thread doesn't seem to be the async job owner: %llu= ", + obj->job->asyncOwner); + } + + return virDomainObjBeginJobInternal(obj, obj->job, + VIR_JOB_ASYNC_NESTED, + VIR_AGENT_JOB_NONE, + VIR_ASYNC_JOB_NONE, + false); +} + +/** + * virDomainObjBeginJobNowait: + * + * @obj: domain object + * @job: virDomainJob to start + * + * Acquires job for a domain object which must be locked before + * calling. If there's already a job running it returns + * immediately without any error reported. + * + * Returns: see virDomainObjBeginJobInternal + */ +int +virDomainObjBeginJobNowait(virDomainObj *obj, + virDomainJob job) +{ + return virDomainObjBeginJobInternal(obj, obj->job, job, + VIR_AGENT_JOB_NONE, + VIR_ASYNC_JOB_NONE, true); +} + /* * obj must be locked and have a reference before calling * diff --git a/src/conf/virdomainjob.h b/src/conf/virdomainjob.h index 3cd02ef4ae..c101334596 100644 --- a/src/conf/virdomainjob.h +++ b/src/conf/virdomainjob.h @@ -257,6 +257,12 @@ int virDomainObjBeginAsyncJob(virDomainObj *obj, virDomainJobOperation operation, unsigned long apiFlags) G_GNUC_WARN_UNUSED_RESULT; +int virDomainObjBeginNestedJob(virDomainObj *obj, + virDomainAsyncJob asyncJob) + G_GNUC_WARN_UNUSED_RESULT; +int virDomainObjBeginJobNowait(virDomainObj *obj, + virDomainJob job) + G_GNUC_WARN_UNUSED_RESULT; =20 void virDomainObjEndJob(virDomainObj *obj); void virDomainObjEndAgentJob(virDomainObj *obj); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 254abd5084..25794bc2f4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1191,6 +1191,8 @@ virDomainObjBeginAgentJob; virDomainObjBeginAsyncJob; virDomainObjBeginJob; virDomainObjBeginJobInternal; +virDomainObjBeginJobNowait; +virDomainObjBeginNestedJob; virDomainObjCanSetJob; virDomainObjClearJob; virDomainObjEndAgentJob; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 83d78900a6..d7ef23f493 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5968,7 +5968,7 @@ qemuDomainObjEnterMonitorInternal(virDomainObj *obj, =20 if (asyncJob !=3D VIR_ASYNC_JOB_NONE) { int ret; - if ((ret =3D qemuDomainObjBeginNestedJob(obj, asyncJob)) < 0) + if ((ret =3D virDomainObjBeginNestedJob(obj, asyncJob)) < 0) return ret; if (!virDomainObjIsActive(obj)) { virReportError(VIR_ERR_OPERATION_FAILED, "%s", diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 99dcdb49b9..a170fdd97d 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -655,50 +655,6 @@ qemuDomainObjReleaseAsyncJob(virDomainObj *obj) obj->job->asyncOwner =3D 0; } =20 -int -qemuDomainObjBeginNestedJob(virDomainObj *obj, - virDomainAsyncJob asyncJob) -{ - if (asyncJob !=3D obj->job->asyncJob) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected async job %d type expected %d"), - asyncJob, obj->job->asyncJob); - return -1; - } - - if (obj->job->asyncOwner !=3D virThreadSelfID()) { - VIR_WARN("This thread doesn't seem to be the async job owner: %llu= ", - obj->job->asyncOwner); - } - - return virDomainObjBeginJobInternal(obj, obj->job, - VIR_JOB_ASYNC_NESTED, - VIR_AGENT_JOB_NONE, - VIR_ASYNC_JOB_NONE, - false); -} - -/** - * qemuDomainObjBeginJobNowait: - * - * @obj: domain object - * @job: virDomainJob to start - * - * Acquires job for a domain object which must be locked before - * calling. If there's already a job running it returns - * immediately without any error reported. - * - * Returns: see qemuDomainObjBeginJobInternal - */ -int -qemuDomainObjBeginJobNowait(virDomainObj *obj, - virDomainJob job) -{ - return virDomainObjBeginJobInternal(obj, obj->job, job, - VIR_AGENT_JOB_NONE, - VIR_ASYNC_JOB_NONE, true); -} - void qemuDomainObjAbortAsyncJob(virDomainObj *obj) { diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h index 1cf9fcc113..c3de401aa5 100644 --- a/src/qemu/qemu_domainjob.h +++ b/src/qemu/qemu_domainjob.h @@ -69,13 +69,6 @@ int qemuDomainAsyncJobPhaseFromString(virDomainAsyncJob = job, void qemuDomainEventEmitJobCompleted(virQEMUDriver *driver, virDomainObj *vm); =20 -int qemuDomainObjBeginNestedJob(virDomainObj *obj, - virDomainAsyncJob asyncJob) - G_GNUC_WARN_UNUSED_RESULT; -int qemuDomainObjBeginJobNowait(virDomainObj *obj, - virDomainJob job) - G_GNUC_WARN_UNUSED_RESULT; - void qemuDomainObjAbortAsyncJob(virDomainObj *obj); void qemuDomainObjSetJobPhase(virDomainObj *obj, int phase); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 379ec95dc5..838ce8e9bd 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18841,7 +18841,7 @@ qemuConnectGetAllDomainStats(virConnectPtr conn, int rv; =20 if (flags & VIR_CONNECT_GET_ALL_DOMAINS_STATS_NOWAIT) - rv =3D qemuDomainObjBeginJobNowait(vm, VIR_JOB_QUERY); + rv =3D virDomainObjBeginJobNowait(vm, VIR_JOB_QUERY); else rv =3D virDomainObjBeginJob(vm, VIR_JOB_QUERY); =20 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c0338d25d2..0d11cabf2d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8102,7 +8102,7 @@ void qemuProcessStop(virQEMUDriver *driver, virErrorPreserveLast(&orig_err); =20 if (asyncJob !=3D VIR_ASYNC_JOB_NONE) { - if (qemuDomainObjBeginNestedJob(vm, asyncJob) < 0) + if (virDomainObjBeginNestedJob(vm, asyncJob) < 0) goto cleanup; } else if (vm->job->asyncJob !=3D VIR_ASYNC_JOB_NONE && vm->job->asyncOwner =3D=3D virThreadSelfID() && --=20 2.37.2