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

[k.koukiou at gmail.com]

On Wed, 2018-05-16 at 10:54 +0200, kkoukiou at 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 at 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 at 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