From nobody Tue Apr 30 06:59:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526055425045242.82559838324278; Fri, 11 May 2018 09:17:05 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5C30A3E2DE; Fri, 11 May 2018 16:17:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2994F3001648; Fri, 11 May 2018 16:17:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id CC501180474F; Fri, 11 May 2018 16:17:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4BGGx8j025163 for ; Fri, 11 May 2018 12:16:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9BF8E2026E03; Fri, 11 May 2018 16:16:59 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 419DD2026DEF for ; Fri, 11 May 2018 16:16:59 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 11 May 2018 18:16:54 +0200 Message-Id: <20180511161656.17745-2-kkoukiou@redhat.com> In-Reply-To: <20180511161656.17745-1-kkoukiou@redhat.com> References: <20180511161656.17745-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH v2 1/3] virtDBusNetworkGetDHCPLeases: fix lease type X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 11 May 2018 16:17:04 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Katerina Koukiou Reviewed-by: Pavel Hrdina --- src/network.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network.c b/src/network.c index 1763eca..7596687 100644 --- a/src/network.c +++ b/src/network.c @@ -228,7 +228,7 @@ virtDBusNetworkGetDHCPLeases(GVariant *inArgs, if (nleases < 0) return virtDBusUtilSetLastVirtError(error); =20 - g_variant_builder_init(&builder, G_VARIANT_TYPE("a(stssssuss)")); + g_variant_builder_init(&builder, G_VARIANT_TYPE("a(stusssuss)")); for (gint i =3D 0; i < nleases; i++) { virNetworkDHCPLeasePtr lease =3D leases[i]; =20 --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 06:59:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526055425524775.7617288023296; Fri, 11 May 2018 09:17:05 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C113230D8582; Fri, 11 May 2018 16:17:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9A06E5D6A6; Fri, 11 May 2018 16:17:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5162C4CA95; Fri, 11 May 2018 16:17:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4BGH0oh025173 for ; Fri, 11 May 2018 12:17:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5C8B32026E03; Fri, 11 May 2018 16:17:00 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id D83762026DEF for ; Fri, 11 May 2018 16:16:59 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 11 May 2018 18:16:55 +0200 Message-Id: <20180511161656.17745-3-kkoukiou@redhat.com> In-Reply-To: <20180511161656.17745-1-kkoukiou@redhat.com> References: <20180511161656.17745-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH v2 2/3] Replace uint -> int wherever libvirt uses int type X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Fri, 11 May 2018 16:17:04 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Follow this pattern even if negative values will not appear, in order to be consistent with libvirt APIs. Signed-off-by: Katerina Koukiou Reviewed-by: Pavel Hrdina --- Added type change for MemoryStats data/org.libvirt.Connect.xml | 18 +++++++++--------- data/org.libvirt.Domain.xml | 18 +++++++++--------- 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 | 22 +++++++++++----------- src/events.c | 12 ++++++------ src/network.c | 4 ++-- src/secret.c | 2 +- src/storagepool.c | 2 +- 11 files changed, 45 insertions(+), 45 deletions(-) diff --git a/data/org.libvirt.Connect.xml b/data/org.libvirt.Connect.xml index ba78acc..e96f91b 100644 --- a/data/org.libvirt.Connect.xml +++ b/data/org.libvirt.Connect.xml @@ -40,7 +40,7 @@ value=3D"See https://libvirt.org/html/libvirt-libvirt-host.html#vi= rConnectCompareCPU"/> - + - + @@ -288,28 +288,28 @@ - - + + - + - - + + - - + + diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index 0452592..f1a980c 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -195,7 +195,7 @@ value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#= virDomainGetBlockJobInfo"/> - + - + - + - + - + @@ -372,7 +372,7 @@ - + - + @@ -640,7 +640,7 @@ - + - + - + - + diff --git a/data/org.libvirt.StoragePool.xml b/data/org.libvirt.StoragePoo= l.xml index 01ab39d..e9d6b0e 100644 --- a/data/org.libvirt.StoragePool.xml +++ b/data/org.libvirt.StoragePool.xml @@ -49,7 +49,7 @@ - + type, + *outArgs =3D g_variant_new("((ittttttttttt))", jobInfo->type, jobInfo->timeElapsed, jobInfo->timeRemaining, jobInfo->dataTotal, jobInfo->dataProcessed, jobInfo->dataRemaining, jobInfo->memTotal, @@ -1385,8 +1385,8 @@ virtDBusDomainGetJobStats(GVariant *inArgs, =20 grecords =3D virtDBusUtilTypedParamsToGVariant(params.params, params.n= params); =20 - g_variant_builder_init(&builder, G_VARIANT_TYPE("(ua{sv})")); - g_variant_builder_add(&builder, "u", type); + g_variant_builder_init(&builder, G_VARIANT_TYPE("(ia{sv})")); + g_variant_builder_add(&builder, "i", type); g_variant_builder_add_value(&builder, grecords); gret =3D g_variant_builder_end(&builder); =20 @@ -1448,7 +1448,7 @@ virtDBusDomainGetMetadata(GVariant *inArgs, guint flags; g_autofree gchar *ret =3D NULL; =20 - g_variant_get(inArgs, "(u&su)", &type, &uri, &flags); + g_variant_get(inArgs, "(i&su)", &type, &uri, &flags); if (g_str_equal(uri, "")) uri =3D NULL; =20 @@ -2758,7 +2758,7 @@ virtDBusDomainSetMetadata(GVariant *inArgs, const gchar *uri; guint flags; =20 - g_variant_get(inArgs, "(u&s&s&su)", &type, &metadata, &key, &uri, &fla= gs); + g_variant_get(inArgs, "(i&s&s&su)", &type, &metadata, &key, &uri, &fla= gs); if (g_str_equal(key, "")) key =3D NULL; if (g_str_equal(uri, "")) diff --git a/src/events.c b/src/events.c index 206c79f..76d9ab5 100644 --- a/src/events.c +++ b/src/events.c @@ -88,7 +88,7 @@ virtDBusEventsDomainLifecycle(virConnectPtr connection G_= GNUC_UNUSED, connect->connectPath, VIRT_DBUS_CONNECT_INTERFACE, "DomainEvent", - g_variant_new("(ouu)", path, event, deta= il), + g_variant_new("(oii)", path, event, deta= il), NULL); =20 return 0; @@ -357,7 +357,7 @@ virtDBusEventsDomainTrayChange(virConnectPtr connection= G_GNUC_UNUSED, path, VIRT_DBUS_DOMAIN_INTERFACE, "TrayChange", - g_variant_new("(su)", device, reason), + g_variant_new("(si)", device, reason), NULL); =20 return 0; @@ -430,7 +430,7 @@ virtDBusEventsDomainDiskChange(virConnectPtr connection= G_GNUC_UNUSED, path, VIRT_DBUS_DOMAIN_INTERFACE, "DiskChange", - g_variant_new("(sssu)", old_src_path, + g_variant_new("(sssi)", old_src_path, new_src_path, device, reas= on), NULL); =20 @@ -454,7 +454,7 @@ virtDBusEventsNetworkLifecycle(virConnectPtr connection= G_GNUC_UNUSED, connect->connectPath, VIRT_DBUS_CONNECT_INTERFACE, "NetworkEvent", - g_variant_new("(ou)", path, event), + g_variant_new("(oi)", path, event), NULL); =20 return 0; @@ -477,7 +477,7 @@ virtDBusEventsSecretLifecycle(virConnectPtr connection = G_GNUC_UNUSED, connect->connectPath, VIRT_DBUS_CONNECT_INTERFACE, "SecretEvent", - g_variant_new("(ouu)", path, event, deta= il), + g_variant_new("(oii)", path, event, deta= il), NULL); =20 return 0; @@ -501,7 +501,7 @@ virtDBusEventsStoragePoolLifecycle(virConnectPtr connec= tion G_GNUC_UNUSED, connect->connectPath, VIRT_DBUS_CONNECT_INTERFACE, "StoragePoolEvent", - g_variant_new("(ouu)", path, event, deta= il), + g_variant_new("(oii)", path, event, deta= il), NULL); =20 return 0; diff --git a/src/network.c b/src/network.c index 7596687..e7087f7 100644 --- a/src/network.c +++ b/src/network.c @@ -228,11 +228,11 @@ virtDBusNetworkGetDHCPLeases(GVariant *inArgs, if (nleases < 0) return virtDBusUtilSetLastVirtError(error); =20 - g_variant_builder_init(&builder, G_VARIANT_TYPE("a(stusssuss)")); + g_variant_builder_init(&builder, G_VARIANT_TYPE("a(stisssuss)")); for (gint i =3D 0; i < nleases; i++) { virNetworkDHCPLeasePtr lease =3D leases[i]; =20 - g_variant_builder_add(&builder, "(stusssuss)", + g_variant_builder_add(&builder, "(stisssuss)", lease->iface, lease->expirytime, lease->type, lease->mac, lease->iaid ? lease->iaid : "" , diff --git a/src/secret.c b/src/secret.c index 3aaed03..903cfc2 100644 --- a/src/secret.c +++ b/src/secret.c @@ -83,7 +83,7 @@ virtDBusSecretGetUsageType(const gchar *objectPath, if (usageType < 0) return virtDBusUtilSetLastVirtError(error); =20 - *value =3D g_variant_new("u", usageType); + *value =3D g_variant_new("i", usageType); } =20 static void diff --git a/src/storagepool.c b/src/storagepool.c index c8b6467..0da732f 100644 --- a/src/storagepool.c +++ b/src/storagepool.c @@ -268,7 +268,7 @@ virtDBusStoragePoolGetInfo(GVariant *inArgs G_GNUC_UNUS= ED, if (virStoragePoolGetInfo(storagePool, info) < 0) return virtDBusUtilSetLastVirtError(error); =20 - *outArgs =3D g_variant_new("((uttt))", info->state, + *outArgs =3D g_variant_new("((ittt))", info->state, info->capacity, info->allocation, info->available); } --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Tue Apr 30 06:59:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1526055432030321.3960353687985; Fri, 11 May 2018 09:17:12 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0E0C430C54E5; Fri, 11 May 2018 16:17:10 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D012127BD5; Fri, 11 May 2018 16:17:09 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7C41D1804750; Fri, 11 May 2018 16:17:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4BGH16R025181 for ; Fri, 11 May 2018 12:17:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id F30DB2026E03; Fri, 11 May 2018 16:17:00 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 986632026DEF for ; Fri, 11 May 2018 16:17:00 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 11 May 2018 18:16:56 +0200 Message-Id: <20180511161656.17745-4-kkoukiou@redhat.com> In-Reply-To: <20180511161656.17745-1-kkoukiou@redhat.com> References: <20180511161656.17745-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH v2 3/3] virtDBusNetworkGetDHCPLeases: fix type for expirytime X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Fri, 11 May 2018 16:17:11 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Katerina Koukiou Reviewed-by: Pavel Hrdina --- 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.= "/> - + iface, lease->expirytime, lease->type, lease->mac, lease->iaid ? lease->iaid : "" , --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list