1. Patchew
  2. Libvirt
  3. [libvirt] [dbus PATCH 00/25] Introduce more Domain* APIs
  4. View patch

[libvirt] [dbus PATCH 10/25] Implement BlockRebase method for Domain Interface

Katerina Koukiou posted 25 patches 7 years, 8 months ago
There is a newer version of this series
[libvirt] [dbus PATCH 10/25] Implement BlockRebase method for Domain Interface
Posted by Katerina Koukiou 7 years, 8 months ago 
Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com>
---
 data/org.libvirt.Domain.xml |  8 ++++++++
 src/domain.c                | 29 +++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
index 46a6632..f5c7fb0 100644
--- a/data/org.libvirt.Domain.xml
+++ b/data/org.libvirt.Domain.xml
@@ -91,6 +91,14 @@
       <arg name="bandwidth" type="t" direction="in"/>
       <arg name="flags" type="u" direction="in"/>
     </method>
+    <method name="BlockRebase">
+      <annotation name="org.gtk.GDBus.DocString"
+        value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainBlockRebase"/>
+      <arg name="disk" type="s" direction="in"/>
+      <arg name="base" type="s" direction="in"/>
+      <arg name="bandwidth" type="t" direction="in"/>
+      <arg name="flags" type="u" direction="in"/>
+    </method>
     <method name="Create">
       <annotation name="org.gtk.GDBus.DocString"
         value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainCreateWithFlags"/>
diff --git a/src/domain.c b/src/domain.c
index af8cc73..107355e 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -521,6 +521,34 @@ virtDBusDomainBlockPull(GVariant *inArgs,
         virtDBusUtilSetLastVirtError(error);
 }
 
+static void
+virtDBusDomainBlockRebase(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;
+    const gchar *disk;
+    const gchar *base;
+    gulong bandwidth;
+    guint flags;
+
+    g_variant_get(inArgs, "(&s&stu)", &disk, &base, &bandwidth, &flags);
+    if (g_strcmp0(base, "") == 0)
+        base = NULL;
+
+    domain = virtDBusDomainGetVirDomain(connect, objectPath, error);
+    if (!domain)
+        return;
+
+    if (virDomainBlockRebase(domain, disk, base, bandwidth, flags) < 0)
+        virtDBusUtilSetLastVirtError(error);
+}
+
 static void
 virtDBusDomainCreate(GVariant *inArgs,
                      GUnixFDList *inFDs G_GNUC_UNUSED,
@@ -1383,6 +1411,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodTable[] = {
     { "BlockJobAbort", virtDBusDomainBlockJobAbort },
     { "BlockPeek", virtDBusDomainBlockPeek },
     { "BlockPull", virtDBusDomainBlockPull },
+    { "BlockRebase", virtDBusDomainBlockRebase },
     { "Create", virtDBusDomainCreate },
     { "Destroy", virtDBusDomainDestroy },
     { "DetachDevice", virtDBusDomainDetachDevice },
-- 
2.15.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [dbus PATCH 10/25] Implement BlockRebase method for Domain Interface
Posted by Pavel Hrdina 7 years, 8 months ago 
On Tue, Apr 17, 2018 at 02:04:29PM +0200, Katerina Koukiou wrote:
> Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com>
> ---
>  data/org.libvirt.Domain.xml |  8 ++++++++
>  src/domain.c                | 29 +++++++++++++++++++++++++++++
>  2 files changed, 37 insertions(+)
> 
> diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
> index 46a6632..f5c7fb0 100644
> --- a/data/org.libvirt.Domain.xml
> +++ b/data/org.libvirt.Domain.xml
> @@ -91,6 +91,14 @@
>        <arg name="bandwidth" type="t" direction="in"/>
>        <arg name="flags" type="u" direction="in"/>
>      </method>
> +    <method name="BlockRebase">
> +      <annotation name="org.gtk.GDBus.DocString"
> +        value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainBlockRebase"/>
> +      <arg name="disk" type="s" direction="in"/>
> +      <arg name="base" type="s" direction="in"/>
> +      <arg name="bandwidth" type="t" direction="in"/>
> +      <arg name="flags" type="u" direction="in"/>
> +    </method>
>      <method name="Create">
>        <annotation name="org.gtk.GDBus.DocString"
>          value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainCreateWithFlags"/>
> diff --git a/src/domain.c b/src/domain.c
> index af8cc73..107355e 100644
> --- a/src/domain.c
> +++ b/src/domain.c
> @@ -521,6 +521,34 @@ virtDBusDomainBlockPull(GVariant *inArgs,
>          virtDBusUtilSetLastVirtError(error);
>  }
>  
> +static void
> +virtDBusDomainBlockRebase(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;
> +    const gchar *disk;
> +    const gchar *base;
> +    gulong bandwidth;
> +    guint flags;
> +
> +    g_variant_get(inArgs, "(&s&stu)", &disk, &base, &bandwidth, &flags);
> +    if (g_strcmp0(base, "") == 0)

You can use g_str_equal().

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [dbus PATCH 10/25] Implement BlockRebase method for Domain Interface
Posted by Pavel Hrdina 7 years, 8 months ago 
On Tue, Apr 17, 2018 at 07:26:15PM +0200, Pavel Hrdina wrote:
> On Tue, Apr 17, 2018 at 02:04:29PM +0200, Katerina Koukiou wrote:
> > Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com>
> > ---
> >  data/org.libvirt.Domain.xml |  8 ++++++++
> >  src/domain.c                | 29 +++++++++++++++++++++++++++++
> >  2 files changed, 37 insertions(+)
> > 
> > diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
> > index 46a6632..f5c7fb0 100644
> > --- a/data/org.libvirt.Domain.xml
> > +++ b/data/org.libvirt.Domain.xml
> > @@ -91,6 +91,14 @@
> >        <arg name="bandwidth" type="t" direction="in"/>
> >        <arg name="flags" type="u" direction="in"/>
> >      </method>
> > +    <method name="BlockRebase">
> > +      <annotation name="org.gtk.GDBus.DocString"
> > +        value="See https://libvirt.org/html/libvirt-libvirt-domain.html#virDomainBlockRebase"/>

One more thing, we should document that empty string is same as
NULL, for example:

"Empty string can be used to pass a NULL as @base argument."

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

Patchew 2.1-devel-8c64711

© 2016 - 2025 Red Hat, Inc.