[libvirt] [dbus PATCH v2 3/3] virtDBusNetworkGetDHCPLeases: fix type for expirytime

Katerina Koukiou kkoukiou at redhat.com
Fri May 11 16:16:56 UTC 2018


Signed-off-by: Katerina Koukiou <kkoukiou at redhat.com>
---
 data/org.libvirt.Network.xml | 2 +-
 src/network.c                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/org.libvirt.Network.xml b/data/org.libvirt.Network.xml
index dec3533..19ad132 100644
--- a/data/org.libvirt.Network.xml
+++ b/data/org.libvirt.Network.xml
@@ -42,7 +42,7 @@
                Empty string will be returned in output for NULL variables."/>
       <arg name="mac" type="s" direction="in"/>
       <arg name="flags" type="u" direction="in"/>
-      <arg name="leases" type="a(stisssuss)" direction="out"/>
+      <arg name="leases" type="a(sxisssuss)" direction="out"/>
     </method>
     <method name="GetXMLDesc">
       <annotation name="org.gtk.GDBus.DocString"
diff --git a/src/network.c b/src/network.c
index e7087f7..1bacb81 100644
--- a/src/network.c
+++ b/src/network.c
@@ -228,11 +228,11 @@ virtDBusNetworkGetDHCPLeases(GVariant *inArgs,
     if (nleases < 0)
         return virtDBusUtilSetLastVirtError(error);
 
-    g_variant_builder_init(&builder, G_VARIANT_TYPE("a(stisssuss)"));
+    g_variant_builder_init(&builder, G_VARIANT_TYPE("a(sxisssuss)"));
     for (gint i = 0; i < nleases; i++) {
         virNetworkDHCPLeasePtr lease = leases[i];
 
-        g_variant_builder_add(&builder, "(stisssuss)",
+        g_variant_builder_add(&builder, "(sxisssuss)",
                               lease->iface, lease->expirytime,
                               lease->type, lease->mac,
                               lease->iaid ? lease->iaid : "" ,
-- 
2.15.0




More information about the libvir-list mailing list