Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com> --- 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="See https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainEventBalloonChangeCallback"/> <arg name="actual" type="t"/> </signal> + <signal name="BlockJob"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainEventBl... + Callback was registered using VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2"/> + <arg name="disk" type="s"/> + <arg name="type" type="i"/> + <arg name="status" type="i"/> + </signal> <signal name="ControlError"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainEventGenericCallback"/> 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 connection G_GNUC_UNUSED, return 0; } +static gint +virtDBusEventsDomainBlockJob(virConnectPtr connection G_GNUC_UNUSED, + virDomainPtr domain, + gchar *disk, + gint type, + gint status, + gpointer opaque) +{ + virtDBusConnect *connect = opaque; + g_autofree gchar *path = NULL; + + path = virtDBusUtilBusPathForVirDomain(domain, connect->domainPath); + + g_dbus_connection_emit_signal(connect->bus, + NULL, + path, + VIRT_DBUS_DOMAIN_INTERFACE, + "BlockJob", + g_variant_new("(sii)", disk, type, status), + 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(virtDBusEventsDomainBalloonChange)); + virtDBusEventsRegisterDomainEvent(connect, + VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2, + VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDomainBlockJob)); + virtDBusEventsRegisterDomainEvent(connect, VIR_DOMAIN_EVENT_ID_CONTROL_ERROR, VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDomainControlError)); -- 2.15.0

Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com> --- 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 @@ <arg name="device" type="s"/> <arg name="reason" type="u"/> </signal> + <signal name="Graphics"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainEventGraphicsCallback"/> + <arg name="phase" type="i"/> + <arg name="local" type="(iss)"/> + <arg name="remote" type="(iss)"/> + <arg name="authScheme" type="s"/> + <arg name="identities" type="a(ss)"/> + </signal> <signal name="JobCompleted"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainEventJobCompletedCallback"/> 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 connection G_GNUC_UNUSED, return 0; } +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 = opaque; + g_autofree gchar *path = NULL; + GVariantBuilder builder; + GVariant *gret; + + path = 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->service)); + 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->service)); + 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 = 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 = 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(virtDBusEventsDomainDiskChange)); + virtDBusEventsRegisterDomainEvent(connect, + VIR_DOMAIN_EVENT_ID_GRAPHICS, + VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDomainGraphics)); + virtDBusEventsRegisterDomainEvent(connect, VIR_DOMAIN_EVENT_ID_JOB_COMPLETED, VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDomainJobCompleted)); 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 @@ #include <libvirt/libvirt.h> +#define VIRT_DBUS_EMPTY_STR(s) ((s) ? (s) : "") + #define VIRT_DBUS_ERROR virtDBusErrorQuark() #define virtDBusUtilAutoLock g_autoptr(GMutexLocker) G_GNUC_UNUSED -- 2.15.0

Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com> --- 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 @@ <arg name="authScheme" type="s"/> <arg name="identities" type="a(ss)"/> </signal> + <signal name="IOErrorReason"> + <annotation name="org.gtk.GDBus.DocString" + value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainEventIOErrorReasonCallback"/> + <arg name="srcPath" type="s"/> + <arg name="device" type="s"/> + <arg name="action" type="i"/> + <arg name="reason" type="s"/> + </signal> <signal name="JobCompleted"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainEventJobCompletedCallback"/> 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; } +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 = opaque; + g_autofree gchar *path = NULL; + + path = 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(virtDBusEventsDomainGraphics)); + virtDBusEventsRegisterDomainEvent(connect, + VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON, + VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDomainIOErrorReason)); + virtDBusEventsRegisterDomainEvent(connect, VIR_DOMAIN_EVENT_ID_JOB_COMPLETED, VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDomainJobCompleted)); -- 2.15.0