From nobody Mon Apr 29 14:12:43 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 1526044927852482.90127158596783; Fri, 11 May 2018 06:22:07 -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 350EB30D857E; Fri, 11 May 2018 13:22:06 +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 ED8EB2B44F; Fri, 11 May 2018 13:22:05 +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 EA1A34CA95; Fri, 11 May 2018 13:22:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4BDM2SY014868 for ; Fri, 11 May 2018 09:22:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 05A6A7D55D; Fri, 11 May 2018 13:22:02 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9DBA683B63 for ; Fri, 11 May 2018 13:22:01 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 11 May 2018 15:21:55 +0200 Message-Id: <20180511132156.17163-2-kkoukiou@redhat.com> In-Reply-To: <20180511132156.17163-1-kkoukiou@redhat.com> References: <20180511132156.17163-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 1/2] domain: Replace State property with GetState method 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.48]); Fri, 11 May 2018 13:22:06 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" virDomainGetState API uses flags arg, thus we can't leave it as a property. Signed-off-by: Katerina Koukiou Reviewed-by: Pavel Hrdina --- data/org.libvirt.Domain.xml | 10 +++++---- src/domain.c | 49 ++++++++++++++++++++++++++---------------= ---- tests/test_domain.py | 9 ++++----- 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index bcd0779..9343dbd 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -33,10 +33,6 @@ - - - @@ -288,6 +284,12 @@ + + + + + diff --git a/src/domain.c b/src/domain.c index eaef68c..06b3f17 100644 --- a/src/domain.c +++ b/src/domain.c @@ -313,26 +313,6 @@ virtDBusDomainGetSchedulerType(const gchar *objectPath, *value =3D g_variant_new("(si)", schedtype, nparams); } =20 -static void -virtDBusDomainGetState(const gchar *objectPath, - gpointer userData, - GVariant **value, - GError **error) -{ - virtDBusConnect *connect =3D userData; - g_autoptr(virDomain) domain =3D NULL; - gint state =3D 0; - - domain =3D virtDBusDomainGetVirDomain(connect, objectPath, error); - if (!domain) - return; - - if (virDomainGetState(domain, &state, NULL, 0) < 0) - return virtDBusUtilSetLastVirtError(error); - - *value =3D g_variant_new("u", state); -} - static void virtDBusDomainGetUpdated(const gchar *objectPath, gpointer userData, @@ -1546,6 +1526,33 @@ virtDBusDomainGetSchedulerParameters(GVariant *inArg= s, *outArgs =3D g_variant_new_tuple(&grecords, 1); } =20 +static void +virtDBusDomainGetState(GVariant *inArgs, + GUnixFDList *inFDs G_GNUC_UNUSED, + const gchar *objectPath, + gpointer userData, + GVariant **outArgs, + GUnixFDList **outFDs G_GNUC_UNUSED, + GError **error) +{ + virtDBusConnect *connect =3D userData; + g_autoptr(virDomain) domain =3D NULL; + guint flags; + gint state; + gint reason; + + g_variant_get(inArgs, "(u)", &flags); + + domain =3D virtDBusDomainGetVirDomain(connect, objectPath, error); + if (!domain) + return; + + if (virDomainGetState(domain, &state, &reason, flags) < 0) + return virtDBusUtilSetLastVirtError(error); + + *outArgs =3D g_variant_new("((ii))", state, reason); +} + static void virtDBusDomainGetStats(GVariant *inArgs, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -2865,7 +2872,6 @@ static virtDBusGDBusPropertyTable virtDBusDomainPrope= rtyTable[] =3D { { "OSType", virtDBusDomainGetOsType, NULL }, { "Persistent", virtDBusDomainGetPersistent, NULL }, { "SchedulerType", virtDBusDomainGetSchedulerType, NULL}, - { "State", virtDBusDomainGetState, NULL }, { "Updated", virtDBusDomainGetUpdated, NULL }, { "UUID", virtDBusDomainGetUUID, NULL }, { 0 } @@ -2909,6 +2915,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodT= able[] =3D { { "GetNumaParameters", virtDBusDomainGetNumaParameters }, { "GetPerfEvents", virtDBusDomainGetPerfEvents }, { "GetSchedulerParameters", virtDBusDomainGetSchedulerParameters }, + { "GetState", virtDBusDomainGetState }, { "GetStats", virtDBusDomainGetStats }, { "GetTime", virtDBusDomainGetTime }, { "GetVcpus", virtDBusDomainGetVcpus }, diff --git a/tests/test_domain.py b/tests/test_domain.py index dfa19ed..511af43 100755 --- a/tests/test_domain.py +++ b/tests/test_domain.py @@ -19,7 +19,6 @@ class TestDomain(libvirttest.BaseTestClass): assert any([isinstance(props['SchedulerType'], dbus.Struct), isinstance(props['SchedulerType'][0], dbus.String), isinstance(props['SchedulerType'][1], dbus.Int32)]) - assert isinstance(props['State'], dbus.UInt32) assert isinstance(props['Updated'], dbus.Boolean) assert isinstance(props['UUID'], dbus.String) =20 @@ -59,7 +58,7 @@ class TestDomain(libvirttest.BaseTestClass): obj, domain =3D self.domain() domain.ManagedSave(0) assert domain.HasManagedSaveImage(0) =3D=3D dbus.Boolean(True) - state =3D obj.Get('org.libvirt.Domain', 'State', dbus_interface=3D= dbus.PROPERTIES_IFACE) + state, _ =3D domain.GetState(0) assert state =3D=3D libvirttest.DomainState.SHUTOFF domain.ManagedSaveRemove(0) assert domain.HasManagedSaveImage(0) =3D=3D dbus.Boolean(False) @@ -88,7 +87,7 @@ class TestDomain(libvirttest.BaseTestClass): domain.Suspend() domain.Resume() =20 - state =3D obj.Get('org.libvirt.Domain', 'State', dbus_interface=3D= dbus.PROPERTIES_IFACE) + state, _ =3D domain.GetState(0) assert state =3D=3D libvirttest.DomainState.RUNNING =20 self.main_loop() @@ -106,7 +105,7 @@ class TestDomain(libvirttest.BaseTestClass): obj, domain =3D self.domain() domain.Shutdown(0) =20 - state =3D obj.Get('org.libvirt.Domain', 'State', dbus_interface=3D= dbus.PROPERTIES_IFACE) + state, _ =3D domain.GetState(0) assert state =3D=3D libvirttest.DomainState.SHUTOFF =20 self.main_loop() @@ -124,7 +123,7 @@ class TestDomain(libvirttest.BaseTestClass): obj, domain =3D self.domain() domain.Suspend() =20 - state =3D obj.Get('org.libvirt.Domain', 'State', dbus_interface=3D= dbus.PROPERTIES_IFACE) + state, _ =3D domain.GetState(0) assert state =3D=3D libvirttest.DomainState.PAUSED =20 self.main_loop() --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon Apr 29 14:12:43 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 1526044927631641.0891827731276; Fri, 11 May 2018 06:22:07 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.25]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CF3B4300443A; Fri, 11 May 2018 13:22:05 +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 E60C220078A0; Fri, 11 May 2018 13:22:04 +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 65CA04BB79; Fri, 11 May 2018 13:22:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4BDM2Wt014876 for ; Fri, 11 May 2018 09:22:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9CD97728F5; Fri, 11 May 2018 13:22:02 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 403596B5AE for ; Fri, 11 May 2018 13:22:02 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Fri, 11 May 2018 15:21:56 +0200 Message-Id: <20180511132156.17163-3-kkoukiou@redhat.com> In-Reply-To: <20180511132156.17163-1-kkoukiou@redhat.com> References: <20180511132156.17163-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 2/2] 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.84 on 10.5.11.25 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Fri, 11 May 2018 13:22:06 +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. Note: In virtDBusNetworkGetDHCPLeases the lease->type was corrected from string to int. Signed-off-by: Katerina Koukiou --- 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.Connect.xml b/data/org.libvirt.Connect.xml index 243ef35..b4f4de4 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"/> - + - + @@ -267,28 +267,28 @@ - - + + - + - - + + - - + + 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 @@ -195,7 +195,7 @@ value=3D"See https://libvirt.org/html/libvirt-libvirt-domain.html#= virDomainGetBlockJobInfo"/> - + - + - + - + - + @@ -516,7 +516,7 @@ - + @@ -596,13 +596,13 @@ - + - + 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.= "/> - + - + diff --git a/data/org.libvirt.StoragePool.xml b/data/org.libvirt.StoragePoo= l.xml index f33ed38..4679fff 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, @@ -1341,8 +1341,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 @@ -1404,7 +1404,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 @@ -2589,7 +2589,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 53cd725..6d7aca8 100644 --- a/src/events.c +++ b/src/events.c @@ -21,7 +21,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; @@ -88,7 +88,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; @@ -113,7 +113,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 @@ -137,7 +137,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; @@ -160,7 +160,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; @@ -184,7 +184,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 1763eca..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(stssssuss)")); + 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