From nobody Thu Dec 18 13:43:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1522935060621904.6237594451949; Thu, 5 Apr 2018 06:31:00 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 1F239C054C43; Thu, 5 Apr 2018 13:30:58 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E744E18B11; Thu, 5 Apr 2018 13:30:57 +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 9CE194CAA0; Thu, 5 Apr 2018 13:30:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w35DTj65009503 for ; Thu, 5 Apr 2018 09:29:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3C830AB3F3; Thu, 5 Apr 2018 13:29:45 +0000 (UTC) Received: from katerina.brq.redhat.com (ovpn-204-29.brq.redhat.com [10.40.204.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id 956E49C073 for ; Thu, 5 Apr 2018 13:29:44 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Thu, 5 Apr 2018 15:29:30 +0200 Message-Id: <20180405132934.1420-7-kkoukiou@redhat.com> In-Reply-To: <20180405132934.1420-1-kkoukiou@redhat.com> References: <20180405132934.1420-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 06/10] Rename callback_ids variable to domain_callback_ids 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 05 Apr 2018 13:30:58 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The callback_ids var is domain specific. Renaming it now, so as to keep consistent naming when introducing events for other entities. Signed-off-by: Katerina Koukiou Reviewed-by: Pavel Hrdina --- src/connect.c | 8 ++++---- src/connect.h | 2 +- src/events.c | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/connect.c b/src/connect.c index f22f682..90172e3 100644 --- a/src/connect.c +++ b/src/connect.c @@ -40,12 +40,12 @@ virtDBusConnectClose(virtDBusConnect *connect, { =20 for (gint i =3D 0; i < VIR_DOMAIN_EVENT_ID_LAST; i +=3D 1) { - if (connect->callback_ids[i] >=3D 0) { + if (connect->domain_callback_ids[i] >=3D 0) { if (deregisterEvents) { virConnectDomainEventDeregisterAny(connect->connection, - connect->callback_ids[i= ]); + connect->domain_callbac= k_ids[i]); } - connect->callback_ids[i] =3D -1; + connect->domain_callback_ids[i] =3D -1; } } =20 @@ -429,7 +429,7 @@ virtDBusConnectNew(virtDBusConnect **connectp, g_mutex_init(&connect->lock); =20 for (gint i =3D 0; i < VIR_DOMAIN_EVENT_ID_LAST; i +=3D 1) - connect->callback_ids[i] =3D -1; + connect->domain_callback_ids[i] =3D -1; =20 connect->bus =3D bus; connect->uri =3D uri; diff --git a/src/connect.h b/src/connect.h index 7ed84b8..e69898c 100644 --- a/src/connect.h +++ b/src/connect.h @@ -17,7 +17,7 @@ struct virtDBusConnect { virConnectPtr connection; GMutex lock; =20 - gint callback_ids[VIR_DOMAIN_EVENT_ID_LAST]; + gint domain_callback_ids[VIR_DOMAIN_EVENT_ID_LAST]; }; typedef struct virtDBusConnect virtDBusConnect; =20 diff --git a/src/events.c b/src/events.c index c6896d4..5fa61f5 100644 --- a/src/events.c +++ b/src/events.c @@ -175,14 +175,14 @@ virtDBusDomainEventsRegisterEvent(virtDBusConnect *co= nnect, gint id, virConnectDomainEventGenericCallback cal= lback) { - g_assert(connect->callback_ids[id] =3D=3D -1); - - connect->callback_ids[id] =3D virConnectDomainEventRegisterAny(connect= ->connection, - NULL, - id, - VIR_DOMAI= N_EVENT_CALLBACK(callback), - connect, - NULL); + g_assert(connect->domain_callback_ids[id] =3D=3D -1); + + connect->domain_callback_ids[id] =3D virConnectDomainEventRegisterAny(= connect->connection, + NU= LL, + id, + VI= R_DOMAIN_EVENT_CALLBACK(callback), + co= nnect, + NU= LL); } =20 void --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list