From nobody Wed May 14 13:26:04 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 1524226686826550.6726858795797; Fri, 20 Apr 2018 05:18:06 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 39CB130014A8; Fri, 20 Apr 2018 12:18:05 +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 EC8FA65AD1; Fri, 20 Apr 2018 12:18: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 83F32180BAE5; Fri, 20 Apr 2018 12:18:04 +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 w3KCI1Lw018063 for ; Fri, 20 Apr 2018 08:18:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7E7302026E0E; Fri, 20 Apr 2018 12:18:01 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 228452026DFD for ; Fri, 20 Apr 2018 12:18:01 +0000 (UTC) From: Pavel Hrdina To: libvir-list@redhat.com Date: Fri, 20 Apr 2018 14:17:58 +0200 Message-Id: <23347fb8ca5d50ddecf2dbc54e6397341953607d.1524226506.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 2/3] util: Introduce virtDBusUtilGVariantToTypedParams 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Fri, 20 Apr 2018 12:18:05 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This converts D-Bus dictionary into virTypedParameters. Signed-off-by: Pavel Hrdina Reviewed-by: Katerina Koukiou --- src/util.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++= ++++ src/util.h | 6 +++++ 2 files changed, 89 insertions(+) diff --git a/src/util.c b/src/util.c index ac965c4..5a69c89 100644 --- a/src/util.c +++ b/src/util.c @@ -69,6 +69,89 @@ virtDBusUtilTypedParamsToGVariant(virTypedParameterPtr p= arams, return g_variant_builder_end(&builder); } =20 +gboolean +virtDBusUtilGVariantToTypedParams(GVariantIter *iter, + virTypedParameterPtr *params, + gint *nparams, + GError **error) +{ + g_autofree gchar *name =3D NULL; + g_autoptr(GVariant) value =3D NULL; + gint maxParams =3D 0; + + while (g_variant_iter_loop(iter, "{sv}", &name, &value)) { + const gchar *type =3D g_variant_get_type_string(value); + + switch (type[0]) { + case 'i': + if (virTypedParamsAddInt(params, nparams, &maxParams, name, + g_variant_get_int32(value)) < 0) { + virtDBusUtilSetLastVirtError(error); + return FALSE; + } + break; + + case 'u': + if (virTypedParamsAddUInt(params, nparams, &maxParams, name, + g_variant_get_uint32(value)) < 0) { + virtDBusUtilSetLastVirtError(error); + return FALSE; + } + break; + + case 'x': + if (virTypedParamsAddLLong(params, nparams, &maxParams, name, + g_variant_get_int64(value)) < 0) { + virtDBusUtilSetLastVirtError(error); + return FALSE; + } + break; + + case 't': + if (virTypedParamsAddULLong(params, nparams, &maxParams, name, + g_variant_get_uint64(value)) < 0) { + virtDBusUtilSetLastVirtError(error); + return FALSE; + } + break; + + case 'd': + if (virTypedParamsAddDouble(params, nparams, &maxParams, name, + g_variant_get_double(value)) < 0) { + virtDBusUtilSetLastVirtError(error); + return FALSE; + } + break; + + case 'b': + if (virTypedParamsAddBoolean(params, nparams, &maxParams, name, + g_variant_get_boolean(value)) < 0= ) { + virtDBusUtilSetLastVirtError(error); + return FALSE; + } + break; + + case 's': + if (virTypedParamsAddString(params, nparams, &maxParams, name, + g_variant_get_string(value, NULL))= < 0) { + virtDBusUtilSetLastVirtError(error); + return FALSE; + } + break; + + default: + g_set_error(error, VIRT_DBUS_ERROR, VIRT_DBUS_ERROR_LIBVIRT, + "Invalid typed parameter '%s'.", type); + return FALSE; + } + } + + name =3D NULL; + value =3D NULL; + + return TRUE; +} + void virtDBusUtilSetLastVirtError(GError **error) { diff --git a/src/util.h b/src/util.h index 4ffc15c..86d2edc 100644 --- a/src/util.h +++ b/src/util.h @@ -31,6 +31,12 @@ GVariant * virtDBusUtilTypedParamsToGVariant(virTypedParameterPtr params, gint nparams); =20 +gboolean +virtDBusUtilGVariantToTypedParams(GVariantIter *iter, + virTypedParameterPtr *params, + gint *nparams, + GError **error); + void virtDBusUtilSetLastVirtError(GError **error); =20 --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list