From nobody Sun Feb 8 22:21:32 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=1661353261; cv=none; d=zohomail.com; s=zohoarc; b=Hr4sgnKOxhbPZfAeZ09wx45EYLe/zA5i3v13tk5rOseLZWAbykwpKeNN5IxIx3kA4dHZL5W6MEd1oBFl1JCJ15vka/iK7+l5YPOL1xou7X0S074o6H8bz3fMLOCCdBJx2PObKD/KKUmoOEBYsJ5b7RoUX9FQWBtdzthCo/Kpr1g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661353261; 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=zNOEwz1T9JYJD8yfdvAccxi0552EjvxW5JyTg78rGro=; b=ik9H0qfFWCGHEHKlxSjW9X2CSuqwjhWH4c89/ZYsQYP3dwbVhNAP16Gz/yNyuFWpvCkMYyHjkKUmwAAiUM78O/IRjc3EBUglugqmmKZXKBhool1qyFhU90Y9BNr/iOPz6fyYS/IIA3xH4pnk1u0g9z2tyWNOqauVrc/Gi3bSb+k= 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 1661353261431637.9904886179519; Wed, 24 Aug 2022 08:01:01 -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-121-_s1VtmeYPgqq5MsOtiUWxg-1; Wed, 24 Aug 2022 11:00: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 D03BA101E98C; Wed, 24 Aug 2022 15:00: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 725719459C; Wed, 24 Aug 2022 15:00: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 5ACA61946A47; Wed, 24 Aug 2022 15:00:52 +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 643641946A42 for ; Wed, 24 Aug 2022 13:43:54 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4AB4F18ECC; Wed, 24 Aug 2022 13:43:54 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.166]) by smtp.corp.redhat.com (Postfix) with ESMTP id E9412945DF 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=1661353260; 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=zNOEwz1T9JYJD8yfdvAccxi0552EjvxW5JyTg78rGro=; b=PxpfZ5Lr1K3X7y8wkJMnk/2YM+g0ShHx2YY6yjJLt90bnJmH75ppRwHIxtYGDRp/xGMSnR 3fN5YyW/ICqsxWMdc+YotZU4q/EeK5S+6lHlJIRo5Xsz5WTFShV52XsRr9fE0H6V6S8e5x +KIPTTr8P4Ew4hAJFrzFls5XdGUJeSo= X-MC-Unique: _s1VtmeYPgqq5MsOtiUWxg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 14/17] CH: use virDomainObjEndJob() Date: Wed, 24 Aug 2022 15:43:37 +0200 Message-Id: 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: 1661353263302100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This patch removes virCHDomainObjEndJob() and replaces it with call to the generalized virDomainObjEndJob(). Signed-off-by: Kristina Hanicova Reviewed-by: J=C3=A1n Tomko --- src/ch/ch_domain.c | 18 ------------------ src/ch/ch_domain.h | 3 --- src/ch/ch_driver.c | 20 ++++++++++---------- 3 files changed, 10 insertions(+), 31 deletions(-) diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c index c592c6ffbb..dc666243a4 100644 --- a/src/ch/ch_domain.c +++ b/src/ch/ch_domain.c @@ -32,24 +32,6 @@ =20 VIR_LOG_INIT("ch.ch_domain"); =20 -/* - * obj must be locked and have a reference before calling - * - * To be called after completing the work associated with the - * earlier virDomainObjBeginJob() call - */ -void -virCHDomainObjEndJob(virDomainObj *obj) -{ - virDomainJob job =3D obj->job->active; - - VIR_DEBUG("Stopping job: %s", - virDomainJobTypeToString(job)); - - virDomainObjResetJob(obj->job); - virCondSignal(&obj->job->cond); -} - void virCHDomainRemoveInactive(virCHDriver *driver, virDomainObj *vm) diff --git a/src/ch/ch_domain.h b/src/ch/ch_domain.h index 076043f772..88e27d50b1 100644 --- a/src/ch/ch_domain.h +++ b/src/ch/ch_domain.h @@ -60,9 +60,6 @@ struct _virCHDomainVcpuPrivate { extern virDomainXMLPrivateDataCallbacks virCHDriverPrivateDataCallbacks; extern virDomainDefParserConfig virCHDriverDomainDefParserConfig; =20 -void -virCHDomainObjEndJob(virDomainObj *obj); - void virCHDomainRemoveInactive(virCHDriver *driver, virDomainObj *vm); diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index b089a7c9c7..43d6396af7 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -226,7 +226,7 @@ chDomainCreateXML(virConnectPtr conn, dom =3D virGetDomain(conn, vm->def->name, vm->def->uuid, vm->def->id); =20 endjob: - virCHDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: if (vm && !dom) { @@ -256,7 +256,7 @@ chDomainCreateWithFlags(virDomainPtr dom, unsigned int = flags) =20 ret =3D virCHProcessStart(driver, vm, VIR_DOMAIN_RUNNING_BOOTED); =20 - virCHDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -414,7 +414,7 @@ chDomainShutdownFlags(virDomainPtr dom, ret =3D 0; =20 endjob: - virCHDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -473,7 +473,7 @@ chDomainReboot(virDomainPtr dom, unsigned int flags) ret =3D 0; =20 endjob: - virCHDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -518,7 +518,7 @@ chDomainSuspend(virDomainPtr dom) ret =3D 0; =20 endjob: - virCHDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -563,7 +563,7 @@ chDomainResume(virDomainPtr dom) ret =3D 0; =20 endjob: - virCHDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -607,7 +607,7 @@ chDomainDestroyFlags(virDomainPtr dom, unsigned int fla= gs) ret =3D 0; =20 endjob: - virCHDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -1253,7 +1253,7 @@ chDomainPinVcpuFlags(virDomainPtr dom, ret =3D 0; =20 endjob: - virCHDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -1417,7 +1417,7 @@ chDomainPinEmulator(virDomainPtr dom, ret =3D 0; =20 endjob: - virCHDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); @@ -1679,7 +1679,7 @@ chDomainSetNumaParameters(virDomainPtr dom, ret =3D 0; =20 endjob: - virCHDomainObjEndJob(vm); + virDomainObjEndJob(vm); =20 cleanup: virDomainObjEndAPI(&vm); --=20 2.37.1