[libvirt] [dbus PATCH 0/4] API name fixes
Pavel Hrdina (4): domain: Rename (Get|Set)BlkioParameters events: Rename AgentLifecycle event events: Rename all lifecycle event functions to follow the signal name events: Rename IOErrorReason event data/org.libvirt.Domain.xml | 8 +++--- src/domain.c | 32 ++++++++++----------- src/events.c | 56 ++++++++++++++++++------------------- 3 files changed, 48 insertions(+), 48 deletions(-) -- 2.17.0
Use (Get|Set)BlockIOParameters names to have the API names unified. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- data/org.libvirt.Domain.xml | 4 ++-- src/domain.c | 32 ++++++++++++++++---------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index adb93a6..2a14b8e 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -177,7 +177,7 @@ <arg name="minimum" type="t" direction="in"/> <arg name="flags" type="u" direction="in"/> </method> - <method name="GetBlkioParameters"> + <method name="GetBlockIOParameters"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainGetBlkioParameters"/> <arg name="flags" type="u" direction="in"/> @@ -491,7 +491,7 @@ <arg name="sigNum" type="u" direction="in"/> <arg name="flags" type="u" direction="in"/> </method> - <method name="SetBlkioParameters"> + <method name="SetBlockIOParameters"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainSetBlkioParameters"/> <arg name="params" type="a{sv}" direction="in"/> diff --git a/src/domain.c b/src/domain.c index caf6508..4aeb855 100644 --- a/src/domain.c +++ b/src/domain.c @@ -910,13 +910,13 @@ virtDBusDomainFSTrim(GVariant *inArgs, } static void -virtDBusDomainGetBlkioParameters(GVariant *inArgs, - GUnixFDList *inFDs G_GNUC_UNUSED, - const gchar *objectPath, - gpointer userData, - GVariant **outArgs, - GUnixFDList **outFDs G_GNUC_UNUSED, - GError **error) +virtDBusDomainGetBlockIOParameters(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) { virtDBusConnect *connect = userData; g_autoptr(virDomain) domain = NULL; @@ -2533,13 +2533,13 @@ virtDBusDomainSendProcessSignal(GVariant *inArgs, } static void -virtDBusDomainSetBlkioParameters(GVariant *inArgs, - GUnixFDList *inFDs G_GNUC_UNUSED, - const gchar *objectPath, - gpointer userData, - GVariant **outArgs G_GNUC_UNUSED, - GUnixFDList **outFDs G_GNUC_UNUSED, - GError **error) +virtDBusDomainSetBlockIOParameters(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs G_GNUC_UNUSED, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) { virtDBusConnect *connect = userData; g_autoptr(virDomain) domain = NULL; @@ -3067,7 +3067,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = { { "FSFreeze", virtDBusDomainFSFreeze }, { "FSThaw", virtDBusDomainFSThaw }, { "FSTrim", virtDBusDomainFSTrim }, - { "GetBlkioParameters", virtDBusDomainGetBlkioParameters }, + { "GetBlockIOParameters", virtDBusDomainGetBlockIOParameters }, { "GetBlockIOTune", virtDBusDomainGetBlockIOTune }, { "GetBlockJobInfo", virtDBusDomainGetBlockJobInfo }, { "GetControlInfo", virtDBusDomainGetControlInfo }, @@ -3118,7 +3118,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = { { "Save", virtDBusDomainSave }, { "SendKey", virtDBusDomainSendKey }, { "SendProcessSignal", virtDBusDomainSendProcessSignal }, - { "SetBlkioParameters", virtDBusDomainSetBlkioParameters }, + { "SetBlockIOParameters", virtDBusDomainSetBlockIOParameters }, { "SetBlockIOTune", virtDBusDomainSetBlockIOTune }, { "SetGuestVcpus", virtDBusDomainSetGuestVcpus }, { "SetInterfaceParameters", virtDBusDomainSetInterfaceParameters }, -- 2.17.0
Other lifecycle events use "{object}Event" format so use the same format for this event as well. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- data/org.libvirt.Domain.xml | 2 +- src/events.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 2a14b8e..11dd922 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -604,7 +604,7 @@ <arg name="xml" type="s" direction="in"/> <arg name="flags" type="u" direction="in"/> </method> - <signal name="AgentLifecycle"> + <signal name="AgentEvent"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainEventAgentLifecycleCallback"/> <arg name="state" type="i"/> diff --git a/src/events.c b/src/events.c index 8a23ce4..deda9cc 100644 --- a/src/events.c +++ b/src/events.c @@ -6,11 +6,11 @@ #include <libvirt/libvirt.h> static gint -virtDBusEventsDomainAgentLifecycle(virConnectPtr connection G_GNUC_UNUSED, - virDomainPtr domain, - gint state, - gint reason, - gpointer opaque) +virtDBusEventsDomainAgentEvent(virConnectPtr connection G_GNUC_UNUSED, + virDomainPtr domain, + gint state, + gint reason, + gpointer opaque) { virtDBusConnect *connect = opaque; g_autofree gchar *path = NULL; @@ -21,7 +21,7 @@ virtDBusEventsDomainAgentLifecycle(virConnectPtr connection G_GNUC_UNUSED, NULL, path, VIRT_DBUS_DOMAIN_INTERFACE, - "AgentLifecycle", + "AgentEvent", g_variant_new("(ii)", state, reason), NULL); -- 2.17.0
On Tue, 2018-05-15 at 15:35 +0200, Pavel Hrdina wrote:
Other lifecycle events use "{object}Event" format so use the same format for this event as well.
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- data/org.libvirt.Domain.xml | 2 +- src/events.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 2a14b8e..11dd922 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -604,7 +604,7 @@ <arg name="xml" type="s" direction="in"/> <arg name="flags" type="u" direction="in"/> </method> - <signal name="AgentLifecycle"> + <signal name="AgentEvent"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.h tml#virConnectDomainEventAgentLifecycleCallback"/>; <arg name="state" type="i"/> diff --git a/src/events.c b/src/events.c index 8a23ce4..deda9cc 100644 --- a/src/events.c +++ b/src/events.c @@ -6,11 +6,11 @@ #include <libvirt/libvirt.h>
static gint -virtDBusEventsDomainAgentLifecycle(virConnectPtr connection G_GNUC_UNUSED, - virDomainPtr domain, - gint state, - gint reason, - gpointer opaque) +virtDBusEventsDomainAgentEvent(virConnectPtr connection G_GNUC_UNUSED, + virDomainPtr domain, + gint state, + gint reason, + gpointer opaque) { virtDBusConnect *connect = opaque; g_autofree gchar *path = NULL; @@ -21,7 +21,7 @@ virtDBusEventsDomainAgentLifecycle(virConnectPtr connection G_GNUC_UNUSED, NULL, path, VIRT_DBUS_DOMAIN_INTERFACE, - "AgentLifecycle", + "AgentEvent", g_variant_new("(ii)", state, reason), NULL);
I think you missed this, @@ -701,7 +701,7 @@ virtDBusEventsRegister(virtDBusConnect *connect) { virtDBusEventsRegisterDomainEvent(connect, VIR_DOMAIN_EVENT_ID_AGENT_LIFECY CLE, - VIR_DOMAIN_EVENT_CALLBACK(virtDB usEventsDomainAgentLifecycle)); + VIR_DOMAIN_EVENT_CALLBACK(virtDB usEventsDomainAgentEvent)); With this fixed, Reviewed-by: Katerina Koukiou <kkoukiou@redhat.com>
On Wed, 2018-05-16 at 10:54 +0200, kkoukiou@redhat.com wrote:
On Tue, 2018-05-15 at 15:35 +0200, Pavel Hrdina wrote:
Other lifecycle events use "{object}Event" format so use the same format for this event as well.
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- data/org.libvirt.Domain.xml | 2 +- src/events.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 2a14b8e..11dd922 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -604,7 +604,7 @@ <arg name="xml" type="s" direction="in"/> <arg name="flags" type="u" direction="in"/> </method> - <signal name="AgentLifecycle"> + <signal name="AgentEvent"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain .h tml#virConnectDomainEventAgentLifecycleCallback"/>; <arg name="state" type="i"/> diff --git a/src/events.c b/src/events.c index 8a23ce4..deda9cc 100644 --- a/src/events.c +++ b/src/events.c @@ -6,11 +6,11 @@ #include <libvirt/libvirt.h>
static gint -virtDBusEventsDomainAgentLifecycle(virConnectPtr connection G_GNUC_UNUSED, - virDomainPtr domain, - gint state, - gint reason, - gpointer opaque) +virtDBusEventsDomainAgentEvent(virConnectPtr connection G_GNUC_UNUSED, + virDomainPtr domain, + gint state, + gint reason, + gpointer opaque) { virtDBusConnect *connect = opaque; g_autofree gchar *path = NULL; @@ -21,7 +21,7 @@ virtDBusEventsDomainAgentLifecycle(virConnectPtr connection G_GNUC_UNUSED, NULL, path, VIRT_DBUS_DOMAIN_INTERFACE, - "AgentLifecycle", + "AgentEvent", g_variant_new("(ii)", state, reason), NULL);
I think you missed this,
@@ -701,7 +701,7 @@ virtDBusEventsRegister(virtDBusConnect *connect) { virtDBusEventsRegisterDomainEvent(connect, VIR_DOMAIN_EVENT_ID_AGENT_LIFE CY CLE, - VIR_DOMAIN_EVENT_CALLBACK(virt DB usEventsDomainAgentLifecycle)); + VIR_DOMAIN_EVENT_CALLBACK(virt DB usEventsDomainAgentEvent));
With this fixed,
Reviewed-by: Katerina Koukiou <kkoukiou@redhat.com>
So, I see you changed the name in the next patch. You can change the definition of the virtDBusEventsDomainAgentLifecycle in next patch as well, so that with this one it will be able to compile. Katerina
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/events.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/events.c b/src/events.c index deda9cc..6cc2164 100644 --- a/src/events.c +++ b/src/events.c @@ -96,11 +96,11 @@ virtDBusEventsDomainControlError(virConnectPtr connection G_GNUC_UNUSED, } static gint -virtDBusEventsDomainLifecycle(virConnectPtr connection G_GNUC_UNUSED, - virDomainPtr domain, - gint event, - gint detail, - gpointer opaque) +virtDBusEventsDomainEvent(virConnectPtr connection G_GNUC_UNUSED, + virDomainPtr domain, + gint event, + gint detail, + gpointer opaque) { virtDBusConnect *connect = opaque; g_autofree gchar *path = NULL; @@ -545,7 +545,7 @@ virtDBusEventsDomainDiskChange(virConnectPtr connection G_GNUC_UNUSED, } static gint -virtDBusEventsNetworkLifecycle(virConnectPtr connection G_GNUC_UNUSED, +virtDBusEventsNetworkEvent(virConnectPtr connection G_GNUC_UNUSED, virNetworkPtr network, gint event, gint detail G_GNUC_UNUSED, @@ -568,7 +568,7 @@ virtDBusEventsNetworkLifecycle(virConnectPtr connection G_GNUC_UNUSED, } static gint -virtDBusEventsSecretLifecycle(virConnectPtr connection G_GNUC_UNUSED, +virtDBusEventsSecretEvent(virConnectPtr connection G_GNUC_UNUSED, virSecretPtr secret, gint event, gint detail, @@ -591,7 +591,7 @@ virtDBusEventsSecretLifecycle(virConnectPtr connection G_GNUC_UNUSED, } static gint -virtDBusEventsStoragePoolLifecycle(virConnectPtr connection G_GNUC_UNUSED, +virtDBusEventsStoragePoolEvent(virConnectPtr connection G_GNUC_UNUSED, virStoragePoolPtr storagePool, gint event, gint detail, @@ -701,7 +701,7 @@ virtDBusEventsRegister(virtDBusConnect *connect) { virtDBusEventsRegisterDomainEvent(connect, VIR_DOMAIN_EVENT_ID_AGENT_LIFECYCLE, - VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDomainAgentLifecycle)); + VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDomainAgentEvent)); virtDBusEventsRegisterDomainEvent(connect, VIR_DOMAIN_EVENT_ID_BALLOON_CHANGE, @@ -717,7 +717,7 @@ virtDBusEventsRegister(virtDBusConnect *connect) virtDBusEventsRegisterDomainEvent(connect, VIR_DOMAIN_EVENT_ID_LIFECYCLE, - VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDomainLifecycle)); + VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDomainEvent)); virtDBusEventsRegisterDomainEvent(connect, VIR_DOMAIN_EVENT_ID_DEVICE_ADDED, @@ -741,7 +741,7 @@ virtDBusEventsRegister(virtDBusConnect *connect) virtDBusEventsRegisterDomainEvent(connect, VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON, - VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDomainIOErrorReason)); + VIR_DOMAIN_EVENT_CALLBACK(virtDBusEventsDomainIOError)); virtDBusEventsRegisterDomainEvent(connect, VIR_DOMAIN_EVENT_ID_JOB_COMPLETED, @@ -789,15 +789,15 @@ virtDBusEventsRegister(virtDBusConnect *connect) virtDBusEventsRegisterNetworkEvent(connect, VIR_NETWORK_EVENT_ID_LIFECYCLE, - VIR_NETWORK_EVENT_CALLBACK(virtDBusEventsNetworkLifecycle)); + VIR_NETWORK_EVENT_CALLBACK(virtDBusEventsNetworkEvent)); virtDBusEventsRegisterSecretEvent(connect, VIR_SECRET_EVENT_ID_LIFECYCLE, - VIR_SECRET_EVENT_CALLBACK(virtDBusEventsSecretLifecycle)); + VIR_SECRET_EVENT_CALLBACK(virtDBusEventsSecretEvent)); virtDBusEventsRegisterStoragePoolEvent(connect, VIR_STORAGE_POOL_EVENT_ID_LIFECYCLE, - VIR_STORAGE_POOL_EVENT_CALLBACK(virtDBusEventsStoragePoolLifecycle)); + VIR_STORAGE_POOL_EVENT_CALLBACK(virtDBusEventsStoragePoolEvent)); virtDBusEventsRegisterStoragePoolEvent(connect, VIR_STORAGE_POOL_EVENT_ID_REFRESH, -- 2.17.0
On Tue, 2018-05-15 at 15:35 +0200, Pavel Hrdina wrote:
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/events.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/events.c b/src/events.c index deda9cc..6cc2164 100644 --- a/src/events.c +++ b/src/events.c @@ -96,11 +96,11 @@ virtDBusEventsDomainControlError(virConnectPtr connection G_GNUC_UNUSED, }
static gint -virtDBusEventsDomainLifecycle(virConnectPtr connection G_GNUC_UNUSED, - virDomainPtr domain, - gint event, - gint detail, - gpointer opaque) +virtDBusEventsDomainEvent(virConnectPtr connection G_GNUC_UNUSED, + virDomainPtr domain, + gint event, + gint detail, + gpointer opaque) { virtDBusConnect *connect = opaque; g_autofree gchar *path = NULL; @@ -545,7 +545,7 @@ virtDBusEventsDomainDiskChange(virConnectPtr connection G_GNUC_UNUSED, }
static gint -virtDBusEventsNetworkLifecycle(virConnectPtr connection G_GNUC_UNUSED, +virtDBusEventsNetworkEvent(virConnectPtr connection G_GNUC_UNUSED, virNetworkPtr network, gint event, gint detail G_GNUC_UNUSED, @@ -568,7 +568,7 @@ virtDBusEventsNetworkLifecycle(virConnectPtr connection G_GNUC_UNUSED, }
static gint -virtDBusEventsSecretLifecycle(virConnectPtr connection G_GNUC_UNUSED, +virtDBusEventsSecretEvent(virConnectPtr connection G_GNUC_UNUSED, virSecretPtr secret, gint event, gint detail, @@ -591,7 +591,7 @@ virtDBusEventsSecretLifecycle(virConnectPtr connection G_GNUC_UNUSED, }
static gint -virtDBusEventsStoragePoolLifecycle(virConnectPtr connection G_GNUC_UNUSED, +virtDBusEventsStoragePoolEvent(virConnectPtr connection G_GNUC_UNUSED, virStoragePoolPtr storagePool, gint event, gint detail, @@ -701,7 +701,7 @@ virtDBusEventsRegister(virtDBusConnect *connect) { virtDBusEventsRegisterDomainEvent(connect, VIR_DOMAIN_EVENT_ID_AGENT_LIFE CYCLE, - VIR_DOMAIN_EVENT_CALLBACK(virt DBusEventsDomainAgentLifecycle)); + VIR_DOMAIN_EVENT_CALLBACK(virt DBusEventsDomainAgentEvent));
virtDBusEventsRegisterDomainEvent(connect, VIR_DOMAIN_EVENT_ID_BALLOON_CH ANGE, @@ -717,7 +717,7 @@ virtDBusEventsRegister(virtDBusConnect *connect)
virtDBusEventsRegisterDomainEvent(connect, VIR_DOMAIN_EVENT_ID_LIFECYCLE, - VIR_DOMAIN_EVENT_CALLBACK(virt DBusEventsDomainLifecycle)); + VIR_DOMAIN_EVENT_CALLBACK(virt DBusEventsDomainEvent));
virtDBusEventsRegisterDomainEvent(connect, VIR_DOMAIN_EVENT_ID_DEVICE_ADD ED, @@ -741,7 +741,7 @@ virtDBusEventsRegister(virtDBusConnect *connect)
virtDBusEventsRegisterDomainEvent(connect, VIR_DOMAIN_EVENT_ID_IO_ERROR_R EASON, - VIR_DOMAIN_EVENT_CALLBACK(virt DBusEventsDomainIOErrorReason)); + VIR_DOMAIN_EVENT_CALLBACK(virt DBusEventsDomainIOError));
This should be done in the next patch since function definition was not changed. Katerina
virtDBusEventsRegisterDomainEvent(connect, VIR_DOMAIN_EVENT_ID_JOB_COMPLE TED, @@ -789,15 +789,15 @@ virtDBusEventsRegister(virtDBusConnect *connect)
virtDBusEventsRegisterNetworkEvent(connect, VIR_NETWORK_EVENT_ID_LIFECYCL E, - VIR_NETWORK_EVENT_CALLBACK(vi rtDBusEventsNetworkLifecycle)); + VIR_NETWORK_EVENT_CALLBACK(vi rtDBusEventsNetworkEvent));
virtDBusEventsRegisterSecretEvent(connect, VIR_SECRET_EVENT_ID_LIFECYCLE, - VIR_SECRET_EVENT_CALLBACK(virt DBusEventsSecretLifecycle)); + VIR_SECRET_EVENT_CALLBACK(virt DBusEventsSecretEvent));
virtDBusEventsRegisterStoragePoolEvent(connect, VIR_STORAGE_POOL_EVENT_ID _LIFECYCLE, - VIR_STORAGE_POOL_EVENT_CA LLBACK(virtDBusEventsStoragePoolLifecycle)); + VIR_STORAGE_POOL_EVENT_CA LLBACK(virtDBusEventsStoragePoolEvent));
virtDBusEventsRegisterStoragePoolEvent(connect, VIR_STORAGE_POOL_EVENT_ID _REFRESH,
On Wed, May 16, 2018 at 11:20:38AM +0200, kkoukiou@redhat.com wrote:
On Tue, 2018-05-15 at 15:35 +0200, Pavel Hrdina wrote:
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- src/events.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/events.c b/src/events.c index deda9cc..6cc2164 100644 --- a/src/events.c +++ b/src/events.c @@ -96,11 +96,11 @@ virtDBusEventsDomainControlError(virConnectPtr connection G_GNUC_UNUSED, }
static gint -virtDBusEventsDomainLifecycle(virConnectPtr connection G_GNUC_UNUSED, - virDomainPtr domain, - gint event, - gint detail, - gpointer opaque) +virtDBusEventsDomainEvent(virConnectPtr connection G_GNUC_UNUSED, + virDomainPtr domain, + gint event, + gint detail, + gpointer opaque) { virtDBusConnect *connect = opaque; g_autofree gchar *path = NULL; @@ -545,7 +545,7 @@ virtDBusEventsDomainDiskChange(virConnectPtr connection G_GNUC_UNUSED, }
static gint -virtDBusEventsNetworkLifecycle(virConnectPtr connection G_GNUC_UNUSED, +virtDBusEventsNetworkEvent(virConnectPtr connection G_GNUC_UNUSED, virNetworkPtr network, gint event, gint detail G_GNUC_UNUSED, @@ -568,7 +568,7 @@ virtDBusEventsNetworkLifecycle(virConnectPtr connection G_GNUC_UNUSED, }
static gint -virtDBusEventsSecretLifecycle(virConnectPtr connection G_GNUC_UNUSED, +virtDBusEventsSecretEvent(virConnectPtr connection G_GNUC_UNUSED, virSecretPtr secret, gint event, gint detail, @@ -591,7 +591,7 @@ virtDBusEventsSecretLifecycle(virConnectPtr connection G_GNUC_UNUSED, }
static gint -virtDBusEventsStoragePoolLifecycle(virConnectPtr connection G_GNUC_UNUSED, +virtDBusEventsStoragePoolEvent(virConnectPtr connection G_GNUC_UNUSED, virStoragePoolPtr storagePool, gint event, gint detail, @@ -701,7 +701,7 @@ virtDBusEventsRegister(virtDBusConnect *connect) { virtDBusEventsRegisterDomainEvent(connect, VIR_DOMAIN_EVENT_ID_AGENT_LIFE CYCLE, - VIR_DOMAIN_EVENT_CALLBACK(virt DBusEventsDomainAgentLifecycle)); + VIR_DOMAIN_EVENT_CALLBACK(virt DBusEventsDomainAgentEvent));
virtDBusEventsRegisterDomainEvent(connect, VIR_DOMAIN_EVENT_ID_BALLOON_CH ANGE, @@ -717,7 +717,7 @@ virtDBusEventsRegister(virtDBusConnect *connect)
virtDBusEventsRegisterDomainEvent(connect, VIR_DOMAIN_EVENT_ID_LIFECYCLE, - VIR_DOMAIN_EVENT_CALLBACK(virt DBusEventsDomainLifecycle)); + VIR_DOMAIN_EVENT_CALLBACK(virt DBusEventsDomainEvent));
virtDBusEventsRegisterDomainEvent(connect, VIR_DOMAIN_EVENT_ID_DEVICE_ADD ED, @@ -741,7 +741,7 @@ virtDBusEventsRegister(virtDBusConnect *connect)
virtDBusEventsRegisterDomainEvent(connect, VIR_DOMAIN_EVENT_ID_IO_ERROR_R EASON, - VIR_DOMAIN_EVENT_CALLBACK(virt DBusEventsDomainIOErrorReason)); + VIR_DOMAIN_EVENT_CALLBACK(virt DBusEventsDomainIOError));
This should be done in the next patch since function definition was not changed.
Oh, right, nice catch. That's what happen if you have all the changes and then you split it into commits :). Pavel
The "Reason" suffix exists in C API because there is another event without the reason and the suffix, however, in libvirt-dbus we will have only the version with reason. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- data/org.libvirt.Domain.xml | 2 +- src/events.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 11dd922..b4ed495 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -659,7 +659,7 @@ <arg name="authScheme" type="s"/> <arg name="identities" type="a(ss)"/> </signal> - <signal name="IOErrorReason"> + <signal name="IOError"> <annotation name="org.gtk.GDBus.DocString" value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virConnectDomainEventIOErrorReasonCallback"/> <arg name="srcPath" type="s"/> diff --git a/src/events.c b/src/events.c index 6cc2164..b51664f 100644 --- a/src/events.c +++ b/src/events.c @@ -241,13 +241,13 @@ virtDBusEventsDomainGraphics(virConnectPtr connection G_GNUC_UNUSED, } static gint -virtDBusEventsDomainIOErrorReason(virConnectPtr connection G_GNUC_UNUSED, - virDomainPtr domain, - const gchar *srcPath, - const gchar *device, - gint action, - const gchar *reason, - gpointer opaque) +virtDBusEventsDomainIOError(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; @@ -258,7 +258,7 @@ virtDBusEventsDomainIOErrorReason(virConnectPtr connection G_GNUC_UNUSED, NULL, path, VIRT_DBUS_DOMAIN_INTERFACE, - "IOErrorReason", + "IOError", g_variant_new("(ssis)", srcPath, VIRT_DBUS_EMPTY_STR(device), action, reason), -- 2.17.0
participants (3)
-
k.koukiou＠gmail.com -
kkoukiou＠redhat.com -
Pavel Hrdina