From nobody Wed May 14 06:35:12 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 1525687865865349.9510396888993; Mon, 7 May 2018 03:11:05 -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 57D9BC057F4E; Mon, 7 May 2018 10:11:04 +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 132521755F; Mon, 7 May 2018 10:11: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 B71B24CAAD; Mon, 7 May 2018 10:11:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w47A6i29022979 for ; Mon, 7 May 2018 06:06:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2C3D4111F3DB; Mon, 7 May 2018 10:06:44 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id C4CCE111F3DA for ; Mon, 7 May 2018 10:06:43 +0000 (UTC) From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 7 May 2018 12:06:34 +0200 Message-Id: <48899f7daa0013c58451ab12a24d989900fed4a6.1525687535.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 7/9] domain: Introduce virtDBusDomainGVariantToMountpoints helper 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.32]); Mon, 07 May 2018 10:11:05 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- src/domain.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/src/domain.c b/src/domain.c index b361aa6..c6dc744 100644 --- a/src/domain.c +++ b/src/domain.c @@ -109,6 +109,22 @@ virtDBusDomainMemoryStatsToGVariant(virDomainMemorySta= tPtr stats, return g_variant_builder_end(&builder); } =20 +static void +virtDBusDomainGVariantToMountpoints(GVariantIter *iter, + const gchar ***mountpoints, + guint *nmountpoints) +{ + const gchar **tmp; + + *nmountpoints =3D g_variant_iter_n_children(iter); + if (*nmountpoints > 0) { + *mountpoints =3D g_new0(const gchar*, *nmountpoints); + tmp =3D *mountpoints; + while (g_variant_iter_next(iter, "&s", tmp)) + tmp++; + } +} + static virDomainPtr virtDBusDomainGetVirDomain(virtDBusConnect *connect, const gchar *objectPath, @@ -783,21 +799,14 @@ virtDBusDomainFSFreeze(GVariant *inArgs, virtDBusConnect *connect =3D userData; g_autoptr(virDomain) domain =3D NULL; g_autofree const gchar **mountpoints =3D NULL; - const gchar **tmp; g_autoptr(GVariantIter) iter; - gsize nmountpoints =3D 0; + guint nmountpoints; guint flags; gint ret; =20 g_variant_get(inArgs, "(asu)", &iter, &flags); =20 - nmountpoints =3D g_variant_iter_n_children(iter); - if (nmountpoints > 0) { - mountpoints =3D g_new0(const gchar*, nmountpoints); - tmp =3D mountpoints; - while (g_variant_iter_next(iter, "&s", tmp)) - tmp++; - } + virtDBusDomainGVariantToMountpoints(iter, &mountpoints, &nmountpoints); =20 domain =3D virtDBusDomainGetVirDomain(connect, objectPath, error); if (!domain) @@ -822,7 +831,6 @@ virtDBusDomainFSThaw(GVariant *inArgs, virtDBusConnect *connect =3D userData; g_autoptr(virDomain) domain =3D NULL; g_autofree const gchar **mountpoints =3D NULL; - const gchar **tmp; g_autoptr(GVariantIter) iter; guint nmountpoints; guint flags; @@ -830,13 +838,7 @@ virtDBusDomainFSThaw(GVariant *inArgs, =20 g_variant_get(inArgs, "(asu)", &iter, &flags); =20 - nmountpoints =3D g_variant_iter_n_children(iter); - if (nmountpoints > 0) { - mountpoints =3D g_new0(const gchar*, nmountpoints); - tmp =3D mountpoints; - while (g_variant_iter_next(iter, "&s", tmp)) - tmp++; - } + virtDBusDomainGVariantToMountpoints(iter, &mountpoints, &nmountpoints); =20 domain =3D virtDBusDomainGetVirDomain(connect, objectPath, error); if (!domain) --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list