[v1] API name fixes

[libvirt] [dbus PATCH 2/4] events: Rename AgentLifecycle event

Posted by Pavel Hrdina 6 years, 12 months ago

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

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [dbus PATCH 2/4] events: Rename AgentLifecycle event

Posted by kkoukiou@redhat.com 6 years, 12 months ago

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>

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [dbus PATCH 2/4] events: Rename AgentLifecycle event

Posted by k.koukiou@gmail.com 6 years, 12 months ago

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

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [dbus PATCH 1/4] domain: Rename (Get|Set)BlkioParameters
[libvirt] [dbus PATCH 2/4] events: Rename AgentLifecycle event
[libvirt] [dbus PATCH 3/4] events: Rename all lifecycle event functions to follow the signal name
[libvirt] [dbus PATCH 4/4] events: Rename IOErrorReason event