From nobody Wed May 14 09:34:11 2025 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 1524651661307191.87483068995016; Wed, 25 Apr 2018 03:21:01 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B02E63002FA0; Wed, 25 Apr 2018 10:20:59 +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 0CB0060A97; Wed, 25 Apr 2018 10:20:59 +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 49BF74CA9E; Wed, 25 Apr 2018 10:20:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3PAKaep004960 for ; Wed, 25 Apr 2018 06:20:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8B2442166BC6; Wed, 25 Apr 2018 10:20:36 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2E3E3215CDCE for ; Wed, 25 Apr 2018 10:20:36 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Wed, 25 Apr 2018 12:20:21 +0200 Message-Id: <20180425102030.31145-7-kkoukiou@redhat.com> In-Reply-To: <20180425102030.31145-1-kkoukiou@redhat.com> References: <20180425102030.31145-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 06/15] Impement GetFSInfo method for Domain Interface 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Wed, 25 Apr 2018 10:21:00 +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.Domain.xml | 6 +++++ src/domain.c | 66 +++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 72 insertions(+) diff --git a/data/org.libvirt.Domain.xml b/data/org.libvirt.Domain.xml index fbf7140..b7fa35f 100644 --- a/data/org.libvirt.Domain.xml +++ b/data/org.libvirt.Domain.xml @@ -197,6 +197,12 @@ + + + + + diff --git a/src/domain.c b/src/domain.c index 67ea260..1156b84 100644 --- a/src/domain.c +++ b/src/domain.c @@ -66,6 +66,25 @@ VIRT_DBUS_ENUM_IMPL(virtDBusDomainMetadata, "title", "element") =20 +struct _virtDBusDomainFSInfoList { + virDomainFSInfoPtr *info; + gint count; +}; + +typedef struct _virtDBusDomainFSInfoList virtDBusDomainFSInfoList; + +static void +virtDBusDomainFSInfoListFree(virtDBusDomainFSInfoList *info) +{ + for (gint i =3D 0; i < info->count; i++) + virDomainFSInfoFree(info->info[i]); + + g_free(info->info); +} + +G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(virtDBusDomainFSInfoList, + virtDBusDomainFSInfoListFree); + static GVariant * virtDBusDomainMemoryStatsToGVariant(virDomainMemoryStatPtr stats, gint nr_stats) @@ -1056,6 +1075,52 @@ virtDBusDomainGetDiskErrors(GVariant *inArgs, *outArgs =3D g_variant_new_tuple(&res, 1); } =20 +static void +virtDBusDomainGetFSInfo(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; + g_auto(virtDBusDomainFSInfoList) info =3D { 0 }; + GVariantBuilder builder; + guint flags; + GVariant *gret; + + g_variant_get(inArgs, "(u)", &flags); + + domain =3D virtDBusDomainGetVirDomain(connect, objectPath, error); + if (!domain) + return; + + info.count =3D virDomainGetFSInfo(domain, &info.info, flags); + if (info.count < 0) + return virtDBusUtilSetLastVirtError(error); + + g_variant_builder_init(&builder, G_VARIANT_TYPE("a(sssas)")); + + for (gint i =3D 0; i < info.count; i++) { + g_variant_builder_open(&builder, G_VARIANT_TYPE("(sssas)")); + g_variant_builder_add(&builder, "s", info.info[i]->mountpoint); + g_variant_builder_add(&builder, "s", info.info[i]->name); + g_variant_builder_add(&builder, "s", info.info[i]->fstype); + + g_variant_builder_open(&builder, G_VARIANT_TYPE("as")); + for (guint j =3D 0; j < info.info[i]->ndevAlias; j++) { + g_variant_builder_add(&builder, "s", info.info[i]->devAlias[j]= ); + g_variant_builder_close(&builder); + } + g_variant_builder_close(&builder); + } + gret =3D g_variant_builder_end(&builder); + + *outArgs =3D g_variant_new_tuple(&gret, 1); +} + static void virtDBusDomainGetJobInfo(GVariant *inArgs G_GNUC_UNUSED, GUnixFDList *inFDs G_GNUC_UNUSED, @@ -2135,6 +2200,7 @@ static virtDBusGDBusMethodTable virtDBusDomainMethodT= able[] =3D { { "GetBlockJobInfo", virtDBusDomainGetBlockJobInfo }, { "GetControlInfo", virtDBusDomainGetControlInfo }, { "GetDiskErrors", virtDBusDomainGetDiskErrors }, + { "GetFSInfo", virtDBusDomainGetFSInfo }, { "GetJobInfo", virtDBusDomainGetJobInfo }, { "GetMemoryParameters", virtDBusDomainGetMemoryParameters }, { "GetSchedulerParameters", virtDBusDomainGetSchedulerParameters }, --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list