From nobody Sun Feb 8 19:55:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1661352156; cv=none; d=zohomail.com; s=zohoarc; b=CSrww9S5tHM/1Zfxd8KabQmQuis1v72sDLmL/l+vn7XVRcl3snzEwuQZSf6wF4+c8hQjKhwnCtpt3qwzhD/vcXWxRrpDGuOVoTDY3YylBI4TnyOWLHUJ0pWUFhNjS6+Rv93s6jLb4jEe/2xXzF5GMQnNoWWK4T1qLeO826aoISs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661352156; 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=tutqgDYdmZL4NRnPcxfhcC0ARBmCUMTn0ZOiHmGe2VM=; b=Jk5zTT/HnY+4OWKu8h2ENOXR6TJDsRIbxC2SrhTl55FxOlFdvuI+hG8/+oLFEAs9j2Hyo90xFNEDJ5odjBQicYwOv98b6rOBJQjDPqqB/cAithBYhfmuoAMXljemZvCQ7bHkOmiL3UFBelRW9ZQx1bPUV1le5nxu+Lfq3/DvJy8= 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 1661352156412723.6388799456753; Wed, 24 Aug 2022 07:42:36 -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-472-aZrmJ7bsMKauCh7SPmCtfg-1; Wed, 24 Aug 2022 10:42:32 -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 C81922932495; Wed, 24 Aug 2022 14:42:29 +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 B5F7F18ECC; Wed, 24 Aug 2022 14:42:29 +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 464F51946A63; Wed, 24 Aug 2022 14:42:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BF92B1946A42 for ; Wed, 24 Aug 2022 13:43:53 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B2775945D7; Wed, 24 Aug 2022 13:43:53 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5DF2F18ECC for ; Wed, 24 Aug 2022 13:43:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661352154; 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=tutqgDYdmZL4NRnPcxfhcC0ARBmCUMTn0ZOiHmGe2VM=; b=SQVSy+Hu+X/eH99X2hkklC+gEcgjQkCL9AA84wDwkfA79jTKh1saUZZuOHEEiyNVcfyz0B oc1ni+whJADe33MqUvXd8Jqma4coBE0igrM0ePgGn1cGPxs7T84K12v8ccgBXIfFddMHTQ C4V0PbHWx+i95JMJmCN1CqFgwnub5d4= X-MC-Unique: aZrmJ7bsMKauCh7SPmCtfg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 13/17] LXC: use virDomainObjEndJob() Date: Wed, 24 Aug 2022 15:43:36 +0200 Message-Id: <158fd0227f7cff364691f3f09b1096a9bc0ccabe.1661348244.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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: 1661352157969100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This patch removes virLXCDomainObjEndJob() and replaces it with call to the generalized virDomainObjEndJob(). Signed-off-by: Kristina Hanicova Reviewed-by: J=C3=A1n Tomko --- src/lxc/lxc_domain.c | 20 ---------------- src/lxc/lxc_domain.h | 4 ---- src/lxc/lxc_driver.c | 57 +++++++++++++++++++------------------------- 3 files changed, 24 insertions(+), 57 deletions(-) diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index aad9dae694..1a39129f82 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -35,26 +35,6 @@ VIR_LOG_INIT("lxc.lxc_domain"); =20 =20 -/* - * obj must be locked and have a reference before calling - * - * To be called after completing the work associated with the - * earlier virLXCDomainBeginJob() call - */ -void -virLXCDomainObjEndJob(virLXCDriver *driver G_GNUC_UNUSED, - virDomainObj *obj) -{ - virDomainJob job =3D obj->job->active; - - VIR_DEBUG("Stopping job: %s", - virDomainJobTypeToString(job)); - - virDomainObjResetJob(obj->job); - virCondSignal(&obj->job->cond); -} - - static void * virLXCDomainObjPrivateAlloc(void *opaque) { diff --git a/src/lxc/lxc_domain.h b/src/lxc/lxc_domain.h index e7b19fb2ff..d22c2ea153 100644 --- a/src/lxc/lxc_domain.h +++ b/src/lxc/lxc_domain.h @@ -72,10 +72,6 @@ extern virXMLNamespace virLXCDriverDomainXMLNamespace; extern virDomainXMLPrivateDataCallbacks virLXCDriverPrivateDataCallbacks; extern virDomainDefParserConfig virLXCDriverDomainDefParserConfig; =20 -void -virLXCDomainObjEndJob(virLXCDriver *driver, - virDomainObj *obj); - =20 char * virLXCDomainGetMachineName(virDomainDef *def, pid_t pid); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 7aa13673a6..19861aed95 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -709,7 +709,7 @@ static int lxcDomainSetMemoryFlags(virDomainPtr dom, un= signed long newmem, ret =3D 0; =20 endjob: - virLXCDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -793,7 +793,7 @@ lxcDomainSetMemoryParameters(virDomainPtr dom, ret =3D 0; =20 endjob: - virLXCDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -1005,7 +1005,7 @@ static int lxcDomainCreateWithFiles(virDomainPtr dom, } =20 endjob: - virLXCDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -1114,7 +1114,7 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn, if (virLXCProcessStart(driver, vm, nfiles, files, autoDestroyConn, VIR_DOMAIN_RUNNING_BOOTED) < 0) { virDomainAuditStart(vm, "booted", false); - virLXCDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); if (!vm->persistent) virDomainObjListRemove(driver->domains, vm); goto cleanup; @@ -1127,7 +1127,7 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn, =20 dom =3D virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); =20 - virLXCDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -1365,7 +1365,7 @@ lxcDomainDestroyFlags(virDomainPtr dom, virDomainAuditStop(vm, "destroyed"); =20 endjob: - virLXCDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); if (!vm->persistent) virDomainObjListRemove(driver->domains, vm); =20 @@ -1896,7 +1896,7 @@ lxcDomainSetSchedulerParametersFlags(virDomainPtr dom, ret =3D 0; =20 endjob: - virLXCDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -2021,7 +2021,6 @@ lxcDomainBlockStats(virDomainPtr dom, const char *path, virDomainBlockStatsPtr stats) { - virLXCDriver *driver =3D dom->conn->privateData; int ret =3D -1; virDomainObj *vm; virDomainDiskDef *disk =3D NULL; @@ -2077,7 +2076,7 @@ lxcDomainBlockStats(virDomainPtr dom, &stats->wr_req); =20 endjob: - virLXCDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -2092,7 +2091,6 @@ lxcDomainBlockStatsFlags(virDomainPtr dom, int * nparams, unsigned int flags) { - virLXCDriver *driver =3D dom->conn->privateData; int tmp, ret =3D -1; virDomainObj *vm; virDomainDiskDef *disk =3D NULL; @@ -2205,7 +2203,7 @@ lxcDomainBlockStatsFlags(virDomainPtr dom, *nparams =3D tmp; =20 endjob: - virLXCDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -2285,7 +2283,7 @@ lxcDomainSetBlkioParameters(virDomainPtr dom, } =20 endjob: - virLXCDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -2387,7 +2385,6 @@ lxcDomainInterfaceStats(virDomainPtr dom, { virDomainObj *vm; int ret =3D -1; - virLXCDriver *driver =3D dom->conn->privateData; virDomainNetDef *net =3D NULL; =20 if (!(vm =3D lxcDomObjFromDomain(dom))) @@ -2412,7 +2409,7 @@ lxcDomainInterfaceStats(virDomainPtr dom, ret =3D 0; =20 endjob: - virLXCDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -2508,7 +2505,7 @@ static int lxcDomainSetAutostart(virDomainPtr dom, ret =3D 0; =20 endjob: - virLXCDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -2631,7 +2628,7 @@ static int lxcDomainSuspend(virDomainPtr dom) ret =3D 0; =20 endjob: - virLXCDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); =20 cleanup: virObjectEventStateQueue(driver->domainEventState, event); @@ -2687,7 +2684,7 @@ static int lxcDomainResume(virDomainPtr dom) ret =3D 0; =20 endjob: - virLXCDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); =20 cleanup: virObjectEventStateQueue(driver->domainEventState, event); @@ -2763,7 +2760,6 @@ lxcDomainSendProcessSignal(virDomainPtr dom, unsigned int signum, unsigned int flags) { - virLXCDriver *driver =3D dom->conn->privateData; virDomainObj *vm =3D NULL; virLXCDomainObjPrivate *priv; pid_t victim; @@ -2825,7 +2821,7 @@ lxcDomainSendProcessSignal(virDomainPtr dom, ret =3D 0; =20 endjob: - virLXCDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -2854,7 +2850,6 @@ static int lxcDomainShutdownFlags(virDomainPtr dom, unsigned int flags) { - virLXCDriver *driver =3D dom->conn->privateData; virLXCDomainObjPrivate *priv; virDomainObj *vm; int ret =3D -1; @@ -2912,7 +2907,7 @@ lxcDomainShutdownFlags(virDomainPtr dom, ret =3D 0; =20 endjob: - virLXCDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -2930,7 +2925,6 @@ static int lxcDomainReboot(virDomainPtr dom, unsigned int flags) { - virLXCDriver *driver =3D dom->conn->privateData; virLXCDomainObjPrivate *priv; virDomainObj *vm; int ret =3D -1; @@ -2988,7 +2982,7 @@ lxcDomainReboot(virDomainPtr dom, ret =3D 0; =20 endjob: - virLXCDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -4344,7 +4338,7 @@ static int lxcDomainAttachDeviceFlags(virDomainPtr do= m, } =20 endjob: - virLXCDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); =20 cleanup: if (dev !=3D dev_copy) @@ -4415,7 +4409,7 @@ static int lxcDomainUpdateDeviceFlags(virDomainPtr do= m, ret =3D 0; =20 endjob: - virLXCDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainDeviceDefFree(dev); @@ -4506,7 +4500,7 @@ static int lxcDomainDetachDeviceFlags(virDomainPtr do= m, } =20 endjob: - virLXCDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); =20 cleanup: if (dev !=3D dev_copy) @@ -4529,7 +4523,6 @@ static int lxcDomainLxcOpenNamespace(virDomainPtr dom, int **fdlist, unsigned int flags) { - virLXCDriver *driver =3D dom->conn->privateData; virDomainObj *vm; virLXCDomainObjPrivate *priv; int ret =3D -1; @@ -4564,7 +4557,7 @@ static int lxcDomainLxcOpenNamespace(virDomainPtr dom, ret =3D nfds; =20 endjob: - virLXCDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -4617,7 +4610,6 @@ lxcDomainMemoryStats(virDomainPtr dom, virLXCDomainObjPrivate *priv; unsigned long long swap_usage; unsigned long mem_usage; - virLXCDriver *driver =3D dom->conn->privateData; =20 virCheckFlags(0, -1); =20 @@ -4659,7 +4651,7 @@ lxcDomainMemoryStats(virDomainPtr dom, } =20 endjob: - virLXCDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -4812,7 +4804,7 @@ lxcDomainSetMetadata(virDomainPtr dom, virObjectEventStateQueue(driver->domainEventState, ev); } =20 - virLXCDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -4890,7 +4882,6 @@ static char * lxcDomainGetHostname(virDomainPtr dom, unsigned int flags) { - virLXCDriver *driver =3D dom->conn->privateData; virDomainObj *vm =3D NULL; char macaddr[VIR_MAC_STRING_BUFLEN]; g_autoptr(virConnect) conn =3D NULL; @@ -4954,7 +4945,7 @@ lxcDomainGetHostname(virDomainPtr dom, } =20 endjob: - virLXCDomainObjEndJob(driver, vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); --=20 2.37.1