[libvirt] [dbus PATCH 2/2] Replace uint -> int wherever libvirt uses int type

[Pavel Hrdina]

On Fri, May 11, 2018 at 03:21:56PM +0200, Katerina Koukiou wrote:
> Follow this pattern even if negative values will not
> appear, in order to be consistent with libvirt APIs.
> 
> Note: In virtDBusNetworkGetDHCPLeases the lease->type
> was corrected from string to int.

This should be separate patch.

> Signed-off-by: Katerina Koukiou <kkoukiou at redhat.com>
> ---
>  data/org.libvirt.Connect.xml     | 18 +++++++++---------
>  data/org.libvirt.Domain.xml      | 16 ++++++++--------
>  data/org.libvirt.Network.xml     |  2 +-
>  data/org.libvirt.Secret.xml      |  2 +-
>  data/org.libvirt.StoragePool.xml |  2 +-
>  src/connect.c                    |  6 +++---
>  src/domain.c                     | 18 +++++++++---------
>  src/events.c                     | 12 ++++++------
>  src/network.c                    |  4 ++--
>  src/secret.c                     |  2 +-
>  src/storagepool.c                |  2 +-
>  11 files changed, 42 insertions(+), 42 deletions(-)

[...]

> diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml
> index 9343dbd..21c017e 100644
> --- a/data/org.libvirt.Domain.xml
> +++ b/data/org.libvirt.Domain.xml

MemoryStats needs to be updated as well, the struct is

struct virDomainMemoryStatStruct {
    int	tag
    unsigned long long	val
}

but our type is "a{ut}".

> diff --git a/data/org.libvirt.Network.xml b/data/org.libvirt.Network.xml
> index 6ac25e9..dec3533 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(stusssuss)" direction="out"/>
> +      <arg name="leases" type="a(stisssuss)" direction="out"/>

The signature should by "a(sxisssuss)", the second value is "long long"
in the virNetworkDHCPLease struct.

>      </method>
>      <method name="GetXMLDesc">
>        <annotation name="org.gtk.GDBus.DocString"

Pavel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20180511/2b78a744/attachment-0001.sig>