From nobody Wed May 14 19:36:39 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 1522744221327917.6204401683904; Tue, 3 Apr 2018 01:30:21 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C6CA5C04AC5C; Tue, 3 Apr 2018 08:30:19 +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 A02C6600C8; Tue, 3 Apr 2018 08:30: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 5E8834CAA0; Tue, 3 Apr 2018 08:30:19 +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 w338U8rx008757 for ; Tue, 3 Apr 2018 04:30:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0C1277C24; Tue, 3 Apr 2018 08:30:08 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id A719D7C4D for ; Tue, 3 Apr 2018 08:30:07 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Tue, 3 Apr 2018 10:29:59 +0200 Message-Id: <20180403083000.27851-5-kkoukiou@redhat.com> In-Reply-To: <20180403083000.27851-1-kkoukiou@redhat.com> References: <20180403083000.27851-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 v4 4/5] events: Introduce virtDBusEventsDomainEventToString function 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 03 Apr 2018 08:30:20 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This function replaces the manual translation of Event ENUMS. Signed-off-by: Katerina Koukiou --- src/events.c | 55 +++++++++++++++++++++---------------------------------- 1 file changed, 21 insertions(+), 34 deletions(-) diff --git a/src/events.c b/src/events.c index dada55f..1877115 100644 --- a/src/events.c +++ b/src/events.c @@ -4,6 +4,26 @@ =20 #include =20 +VIRT_DBUS_ENUM_DECL(virtDBusEventsDomainEvent) +VIRT_DBUS_ENUM_IMPL(virtDBusEventsDomainEvent, + VIR_DOMAIN_EVENT_LAST, + "DomainDefined", + "DomainUndefined", + "DomainStarted", + "DomainSuspended", + "DomainResumed", + "DomainStopped", + "DomainShutdown", + "DomainPMSuspended", + "DomainCrashed") + +static const gchar * +virtDBusEventsDomainEventToString(gint event) +{ + const gchar *str =3D virtDBusEventsDomainEventTypeToString(event); + return str ? str : "unknown"; +} + static gint virtDBusEventsDomainLifecycle(virConnectPtr connection G_GNUC_UNUSED, virDomainPtr domain, @@ -12,42 +32,9 @@ virtDBusEventsDomainLifecycle(virConnectPtr connection G= _GNUC_UNUSED, gpointer opaque) { virtDBusConnect *connect =3D opaque; - const gchar *signal =3D NULL; const gchar *name; g_autofree gchar *path =3D NULL; =20 - switch (event) { - case VIR_DOMAIN_EVENT_DEFINED: - signal =3D "DomainDefined"; - break; - case VIR_DOMAIN_EVENT_UNDEFINED: - signal =3D "DomainUndefined"; - break; - case VIR_DOMAIN_EVENT_STARTED: - signal =3D "DomainStarted"; - break; - case VIR_DOMAIN_EVENT_SUSPENDED: - signal =3D "DomainSuspended"; - break; - case VIR_DOMAIN_EVENT_RESUMED: - signal =3D "DomainResumed"; - break; - case VIR_DOMAIN_EVENT_STOPPED: - signal =3D "DomainStopped"; - break; - case VIR_DOMAIN_EVENT_SHUTDOWN: - signal =3D "DomainShutdown"; - break; - case VIR_DOMAIN_EVENT_PMSUSPENDED: - signal =3D "DomainPMSuspended"; - break; - case VIR_DOMAIN_EVENT_CRASHED: - signal =3D "DomainCrashed"; - break; - default: - return 0; - } - name =3D virDomainGetName(domain); path =3D virtDBusUtilBusPathForVirDomain(domain, connect->domainPath); =20 @@ -55,7 +42,7 @@ virtDBusEventsDomainLifecycle(virConnectPtr connection G_= GNUC_UNUSED, NULL, connect->connectPath, VIRT_DBUS_CONNECT_INTERFACE, - signal, + virtDBusEventsDomainEventToString(event), g_variant_new("(so)", name, path), NULL); =20 --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list