From nobody Sat Feb 7 15:26:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1598422229; cv=none; d=zohomail.com; s=zohoarc; b=lchpJ7O75gH6H6Z4bHW7cAtVw1YPIvj8GcfhfKRbamW9MauHxFJ6QC9239vOVLGGPB8ihX9S2e3z13eFDqRorgFQueRx3vkf3nLXqGHVt5e2++rcCj3xLOLKX26PFhszrFk3B8YEavd58Kxn0BRCsGGbAtvaXIq0wMwfSwpMwv8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598422229; h=Content-Type:Content-Transfer-Encoding:Cc: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=GjSXz5+obyfHSPBHIB0YKHSPqbQoiB23kqr9/aexxbA=; b=l0dFJRVmkkKS7MRRjkgosIpHN2D3BcczUWE/Vfiv/MupfxMRYNx46pdbu+TMtw20PaPZMGqiMEmyCWazy9Kf4GzIuvJdHyJK4Gs9ElMJzINF2eiMM80CYIRHjCpoYm9q9F2sUz0JlDsbaoaQbkJs0WGwpMW9I+nW1IGxV9e41zk= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1598422229207288.6552476191231; Tue, 25 Aug 2020 23:10:29 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-436-ZYqRvNRdMJm1NSbfyGc6ew-1; Wed, 26 Aug 2020 02:10:24 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2BA29640C5; Wed, 26 Aug 2020 06:10:19 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0890560C0F; Wed, 26 Aug 2020 06:10:19 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C94C01826D2A; Wed, 26 Aug 2020 06:10:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 07Q6AG6N008957 for ; Wed, 26 Aug 2020 02:10:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id B7A8E114B9A7; Wed, 26 Aug 2020 06:10:14 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4C83B114B9A5 for ; Wed, 26 Aug 2020 06:10:10 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DE7078EE625 for ; Wed, 26 Aug 2020 06:10:09 +0000 (UTC) Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-25-SAEQznzVOFK4mCZCl7ikkw-1; Wed, 26 Aug 2020 02:10:02 -0400 Received: by mail-pj1-f66.google.com with SMTP id kx11so380504pjb.5; Tue, 25 Aug 2020 23:10:01 -0700 (PDT) Received: from localhost.localdomain ([116.72.86.23]) by smtp.gmail.com with ESMTPSA id hr13sm924745pjb.38.2020.08.25.23.09.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Aug 2020 23:10:00 -0700 (PDT) X-MC-Unique: ZYqRvNRdMJm1NSbfyGc6ew-1 X-MC-Unique: SAEQznzVOFK4mCZCl7ikkw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GjSXz5+obyfHSPBHIB0YKHSPqbQoiB23kqr9/aexxbA=; b=rXW2zt+m1n+s7f9cCpbN/jJckp8K0g7SN4TwcO9Ks5q8bw1xTVEnEfE8CC/EVV+xQo 48jfsmFatuL9n2RnXu1whq0wS+2npNbPLlVF6gwjs1kBF1feOa7Fsw1WA4etLcNJVrAr HyzVbwfMLqsItnEzvOz07NQ5sFamwXKGsqcphgl4zPFg+gA8ydYauPJzOAmAoPnvN9mx S2Bxdtc4TaThmt3BF5XQn4h9iCt8qWmiMPXM7x085FfZBEloyAnNW+nVSqqjzpD0wRXm Uop5bHgV4hHpfV8i3bJIDjeP/VEksAoBgrf8bvVzQCMorI54Gif1f2zfM5QOp+e/tFIK awoQ== X-Gm-Message-State: AOAM530dKoKWrnIO+LMt3hRmx7QKAplgxTiIzXMjfUXPyhBz4xxejFHV KmzMJi5h3W1W4WRmDrtJXLjlttbuLvxQrQ== X-Google-Smtp-Source: ABdhPJxMU1hxjoeeLNtRIPqsVK3V2ZxIR39sLV59mMHNQU9UCtDzDDjqUzjbbaCeSOnZXeHBzIshXg== X-Received: by 2002:a17:90a:c505:: with SMTP id k5mr4448845pjt.188.1598422200506; Tue, 25 Aug 2020 23:10:00 -0700 (PDT) From: Prathamesh Chavan To: libvir-list@redhat.com Subject: [GSoC][PATCH v4 4/8] qemu_domainjob: callback function added to access `maxQueuedJobs` Date: Wed, 26 Aug 2020 11:39:38 +0530 Message-Id: <20200826060942.17320-5-pc44800@gmail.com> In-Reply-To: <20200826060942.17320-1-pc44800@gmail.com> References: <20200826060942.17320-1-pc44800@gmail.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false; X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: mkletzan@redhat.com, mprivozn@redhat.com, Prathamesh Chavan , eskultet@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0.003 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Reference to `maxQueuedJobs` required us to access config of the qemu-driver. To avoid jobs accessing them directly, we add callback function `getMaxQueuedJobs` to job's private-callback functions structure. Signed-off-by: Prathamesh Chavan --- src/qemu/qemu_domain.c | 11 +++++++++++ src/qemu/qemu_domainjob.c | 9 ++++----- src/qemu/qemu_domainjob.h | 2 ++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index bb062c6dd1..d64c262971 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -798,6 +798,14 @@ qemuDomainDecreaseJobsQueued(virDomainObjPtr vm) priv->jobs_queued--; } =20 +static int +qemuDomainGetMaxQueuedJobs(virDomainObjPtr vm) +{ + qemuDomainObjPrivatePtr priv =3D vm->privateData; + virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(priv->driver); + return cfg->maxQueuedJobs; +} + static qemuDomainObjPrivateJobCallbacks qemuPrivateJobCallbacks =3D { .allocJobPrivate =3D qemuJobAllocPrivate, .freeJobPrivate =3D qemuJobFreePrivate, @@ -809,6 +817,7 @@ static qemuDomainObjPrivateJobCallbacks qemuPrivateJobC= allbacks =3D { .getJobsQueued =3D qemuDomainGetJobsQueued, .increaseJobsQueued =3D qemuDomainIncreaseJobsQueued, .decreaseJobsQueued =3D qemuDomainDecreaseJobsQueued, + .getMaxQueuedJobs =3D qemuDomainGetMaxQueuedJobs, }; =20 /** @@ -2256,6 +2265,8 @@ static void * qemuDomainObjPrivateAlloc(void *opaque) { qemuDomainObjPrivatePtr priv; + virQEMUDriverPtr driver =3D opaque; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); =20 if (VIR_ALLOC(priv) < 0) return NULL; diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index 4c7492813a..dbc9c06d33 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -344,7 +344,6 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, unsigned long long then; bool nested =3D job =3D=3D QEMU_JOB_ASYNC_NESTED; bool async =3D job =3D=3D QEMU_JOB_ASYNC; - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); const char *blocker =3D NULL; const char *agentBlocker =3D NULL; int ret =3D -1; @@ -370,8 +369,8 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, =20 retry: if ((!async && job !=3D QEMU_JOB_DESTROY) && - cfg->maxQueuedJobs && - priv->job.cb->getJobsQueued(obj) > cfg->maxQueuedJobs) { + priv->job.cb->getMaxQueuedJobs(obj) && + priv->job.cb->getJobsQueued(obj) > priv->job.cb->getMaxQueuedJobs(= obj)) { goto error; } =20 @@ -501,8 +500,8 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver, _("cannot acquire state change lock")); } ret =3D -2; - } else if (cfg->maxQueuedJobs && - priv->job.cb->getJobsQueued(obj) > cfg->maxQueuedJobs) { + } else if (priv->job.cb->getMaxQueuedJobs(obj) && + priv->job.cb->getJobsQueued(obj) > priv->job.cb->getMaxQueu= edJobs(obj)) { if (blocker && agentBlocker) { virReportError(VIR_ERR_OPERATION_FAILED, _("cannot acquire state change " diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h index d3bc59cbcb..f3d9218ec0 100644 --- a/src/qemu/qemu_domainjob.h +++ b/src/qemu/qemu_domainjob.h @@ -116,6 +116,7 @@ typedef void (*qemuDomainObjCurrentJobInfoInit)(qemuDom= ainJobObjPtr, typedef int (*qemuDomainObjGetJobsQueued)(virDomainObjPtr); typedef void (*qemuDomainObjIncreaseJobsQueued)(virDomainObjPtr); typedef void (*qemuDomainObjDecreaseJobsQueued)(virDomainObjPtr); +typedef int (*qemuDomainObjGetMaxQueuedJobs)(virDomainObjPtr); =20 typedef struct _qemuDomainObjPrivateJobCallbacks qemuDomainObjPrivateJobCa= llbacks; typedef qemuDomainObjPrivateJobCallbacks *qemuDomainObjPrivateJobCallbacks= Ptr; @@ -130,6 +131,7 @@ struct _qemuDomainObjPrivateJobCallbacks { qemuDomainObjGetJobsQueued getJobsQueued; qemuDomainObjIncreaseJobsQueued increaseJobsQueued; qemuDomainObjDecreaseJobsQueued decreaseJobsQueued; + qemuDomainObjGetMaxQueuedJobs getMaxQueuedJobs; }; =20 struct _qemuDomainJobObj { --=20 2.25.1