From nobody Sun May 5 03:13:56 2024 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526053822139400.3453753043269; Fri, 11 May 2018 08:50:22 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3AEAE3001779; Fri, 11 May 2018 15:50:20 +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 880CB2015984; Fri, 11 May 2018 15:50: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 9BB204CA94; Fri, 11 May 2018 15:50:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4BFnQFl017561 for ; Fri, 11 May 2018 11:49:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 430212026DFD; Fri, 11 May 2018 15:49:26 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id DC5782026DEF for ; Fri, 11 May 2018 15:49:25 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 11 May 2018 17:49:21 +0200 Message-Id: <20180511154923.29923-2-kkoukiou@redhat.com> In-Reply-To: <20180511154923.29923-1-kkoukiou@redhat.com> References: <20180511154923.29923-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH v2 1/3] events: Register VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2 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.84 on 10.5.11.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Fri, 11 May 2018 15:50:20 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Katerina Koukiou Reviewed-by: Pavel Hrdina --- Use only v2 of BlockJob data/org.libvirt.Domain.xml | 8 ++++++++ src/events.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index b6e49d6..f5e49b0 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -613,6 +613,14 @@ value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#= virConnectDomainEventBalloonChangeCallback"/> + + + + + + diff --git a/src/events.c b/src/events.c index 206c79f..21d6d07 100644 --- a/src/events.c +++ b/src/events.c @@ -50,6 +50,30 @@ virtDBusEventsDomainBalloonChange(virConnectPtr connecti= on G_GNUC_UNUSED, return 0; } =20 +static gint +virtDBusEventsDomainBlockJob(virConnectPtr connection G_GNUC_UNUSED, + virDomainPtr domain, + gchar *disk, + gint type, + gint status, + gpointer opaque) +{ + virtDBusConnect *connect =3D opaque; + g_autofree gchar *path =3D NULL; + + path =3D virtDBusUtilBusPathForVirDomain(domain, connect->domainPath); + + g_dbus_connection_emit_signal(connect->bus, + NULL, + path, + VIRT_DBUS_DOMAIN_INTERFACE, + "BlockJob", + g_variant_new("(sii)", disk, type, statu= s), + NULL); + + return 0; +} + static gint virtDBusEventsDomainControlError(virConnectPtr connection G_GNUC_UNUSED, virDomainPtr domain, @@ -600,6 +624,10 @@ virtDBusEventsRegister(virtDBusConnect *connect) VIR_DOMAIN_EVENT_ID_BALLOON_CHANGE, VIR_DOMAIN_EVENT_CALLBACK(virtDBusEv= entsDomainBalloonChange)); =20 + virtDBusEventsRegisterDomainEvent(connect, + VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2, + VIR_DOMAIN_EVENT_CALLBACK(virtDBusEv= entsDomainBlockJob)); + virtDBusEventsRegisterDomainEvent(connect, VIR_DOMAIN_EVENT_ID_CONTROL_ERROR, VIR_DOMAIN_EVENT_CALLBACK(virtDBusEv= entsDomainControlError)); --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 03:13:56 2024 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526053776753208.78661074785862; Fri, 11 May 2018 08:49:36 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D2AC330B930A; Fri, 11 May 2018 15:49:34 +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 A863374E91; Fri, 11 May 2018 15:49:34 +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 602401801244; Fri, 11 May 2018 15:49:34 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4BFnQtx017570 for ; Fri, 11 May 2018 11:49:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id D91D72026DFD; Fri, 11 May 2018 15:49:26 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7EB142026DEF for ; Fri, 11 May 2018 15:49:26 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 11 May 2018 17:49:22 +0200 Message-Id: <20180511154923.29923-3-kkoukiou@redhat.com> In-Reply-To: <20180511154923.29923-1-kkoukiou@redhat.com> References: <20180511154923.29923-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH v2 2/3] events: Register VIR_DOMAIN_EVENT_ID_GRAPHICS 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Fri, 11 May 2018 15:49:35 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Katerina Koukiou Reviewed-by: Pavel Hrdina --- Return empty string when variable is NULL data/org.libvirt.Domain.xml | 9 +++++++ src/events.c | 60 +++++++++++++++++++++++++++++++++++++++++= ++++ src/util.h | 2 ++ 3 files changed, 71 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index f5e49b0..824ab82 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -648,6 +648,15 @@ + + + + + + + + diff --git a/src/events.c b/src/events.c index 21d6d07..f206d8a 100644 --- a/src/events.c +++ b/src/events.c @@ -184,6 +184,62 @@ virtDBusEventsDomainDeviceRemoved(virConnectPtr connec= tion G_GNUC_UNUSED, return 0; } =20 +static gint +virtDBusEventsDomainGraphics(virConnectPtr connection G_GNUC_UNUSED, + virDomainPtr domain, + gint phase, + const virDomainEventGraphicsAddress *local, + const virDomainEventGraphicsAddress *remote, + const gchar *authScheme, + const virDomainEventGraphicsSubject *subject, + gpointer opaque) +{ + virtDBusConnect *connect =3D opaque; + g_autofree gchar *path =3D NULL; + GVariantBuilder builder; + GVariant *gret; + + path =3D virtDBusUtilBusPathForVirDomain(domain, connect->domainPath); + + g_variant_builder_init(&builder, G_VARIANT_TYPE("(i(iss)(iss)sa(ss))")= ); + + g_variant_builder_add(&builder, "i", phase); + + g_variant_builder_open(&builder, G_VARIANT_TYPE("(iss)")); + g_variant_builder_add(&builder, "i", local->family); + g_variant_builder_add(&builder, "s", VIRT_DBUS_EMPTY_STR(local->node)); + g_variant_builder_add(&builder, "s", VIRT_DBUS_EMPTY_STR(local->servic= e)); + g_variant_builder_close(&builder); + + g_variant_builder_open(&builder, G_VARIANT_TYPE("(iss)")); + g_variant_builder_add(&builder, "i", remote->family); + g_variant_builder_add(&builder, "s", VIRT_DBUS_EMPTY_STR(remote->node)= ); + g_variant_builder_add(&builder, "s", VIRT_DBUS_EMPTY_STR(remote->servi= ce)); + g_variant_builder_close(&builder); + + g_variant_builder_add(&builder, "s", authScheme); + + g_variant_builder_open(&builder, G_VARIANT_TYPE("a(ss)")); + for (gint i =3D 0; i < subject->nidentity; i++) { + g_variant_builder_open(&builder, G_VARIANT_TYPE("(ss)")); + g_variant_builder_add(&builder, "s", subject->identities[i].type); + g_variant_builder_add(&builder, "s", subject->identities[i].name); + g_variant_builder_close(&builder); + } + g_variant_builder_close(&builder); + gret =3D g_variant_builder_end(&builder); + + g_dbus_connection_emit_signal(connect->bus, + NULL, + path, + VIRT_DBUS_DOMAIN_INTERFACE, + "Graphics", + gret, + NULL); + + return 0; +} + static gint virtDBusEventsDomainJobCompleted(virConnectPtr connection G_GNUC_UNUSED, virDomainPtr domain, @@ -652,6 +708,10 @@ virtDBusEventsRegister(virtDBusConnect *connect) VIR_DOMAIN_EVENT_ID_DISK_CHANGE, VIR_DOMAIN_EVENT_CALLBACK(virtDBusEv= entsDomainDiskChange)); =20 + virtDBusEventsRegisterDomainEvent(connect, + VIR_DOMAIN_EVENT_ID_GRAPHICS, + VIR_DOMAIN_EVENT_CALLBACK(virtDBusEv= entsDomainGraphics)); + virtDBusEventsRegisterDomainEvent(connect, VIR_DOMAIN_EVENT_ID_JOB_COMPLETED, VIR_DOMAIN_EVENT_CALLBACK(virtDBusEv= entsDomainJobCompleted)); diff --git a/src/util.h b/src/util.h index 2f37933..729d933 100644 --- a/src/util.h +++ b/src/util.h @@ -4,6 +4,8 @@ =20 #include =20 +#define VIRT_DBUS_EMPTY_STR(s) ((s) ? (s) : "") + #define VIRT_DBUS_ERROR virtDBusErrorQuark() =20 #define virtDBusUtilAutoLock g_autoptr(GMutexLocker) G_GNUC_UNUSED --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 03:13:56 2024 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526053835263554.5232238981383; Fri, 11 May 2018 08:50:35 -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 B6D3230D857B; Fri, 11 May 2018 15:50:33 +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 784BF65F5A; Fri, 11 May 2018 15:50:33 +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 1E72D180B5B1; Fri, 11 May 2018 15:50:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4BFnRi2017578 for ; Fri, 11 May 2018 11:49:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7B0692026DFD; Fri, 11 May 2018 15:49:27 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 208662026DEF for ; Fri, 11 May 2018 15:49:27 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 11 May 2018 17:49:23 +0200 Message-Id: <20180511154923.29923-4-kkoukiou@redhat.com> In-Reply-To: <20180511154923.29923-1-kkoukiou@redhat.com> References: <20180511154923.29923-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH v2 3/3] events: Register VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON 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.48]); Fri, 11 May 2018 15:50:34 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Katerina Koukiou Reviewed-by: Pavel Hrdina --- Return empty string when variable is NULL data/org.libvirt.Domain.xml | 8 ++++++++ src/events.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 824ab82..a0b39b0 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -657,6 +657,14 @@ + + + + + + + diff --git a/src/events.c b/src/events.c index f206d8a..06c5832 100644 --- a/src/events.c +++ b/src/events.c @@ -240,6 +240,33 @@ virtDBusEventsDomainGraphics(virConnectPtr connection = G_GNUC_UNUSED, return 0; } =20 +static gint +virtDBusEventsDomainIOErrorReason(virConnectPtr connection G_GNUC_UNUSED, + virDomainPtr domain, + const gchar *srcPath, + const gchar *device, + gint action, + const gchar *reason, + gpointer opaque) +{ + virtDBusConnect *connect =3D opaque; + g_autofree gchar *path =3D NULL; + + path =3D virtDBusUtilBusPathForVirDomain(domain, connect->domainPath); + + g_dbus_connection_emit_signal(connect->bus, + NULL, + path, + VIRT_DBUS_DOMAIN_INTERFACE, + "IOErrorReason", + g_variant_new("(ssis)", srcPath, + VIRT_DBUS_EMPTY_STR(device= ), + action, reason), + NULL); + + return 0; +} + static gint virtDBusEventsDomainJobCompleted(virConnectPtr connection G_GNUC_UNUSED, virDomainPtr domain, @@ -712,6 +739,10 @@ virtDBusEventsRegister(virtDBusConnect *connect) VIR_DOMAIN_EVENT_ID_GRAPHICS, VIR_DOMAIN_EVENT_CALLBACK(virtDBusEv= entsDomainGraphics)); =20 + virtDBusEventsRegisterDomainEvent(connect, + VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON, + VIR_DOMAIN_EVENT_CALLBACK(virtDBusEv= entsDomainIOErrorReason)); + virtDBusEventsRegisterDomainEvent(connect, VIR_DOMAIN_EVENT_ID_JOB_COMPLETED, VIR_DOMAIN_EVENT_CALLBACK(virtDBusEv= entsDomainJobCompleted)); --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list