From nobody Fri Oct 24 09:38:23 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519414739097310.7830032961939; Fri, 23 Feb 2018 11:38:59 -0800 (PST) Received: from localhost ([::1]:46758 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epJBK-0002am-5o for importer@patchew.org; Fri, 23 Feb 2018 14:38:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50049) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epIz9-0000iI-Sb for qemu-devel@nongnu.org; Fri, 23 Feb 2018 14:26:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1epIz8-0004NZ-DC for qemu-devel@nongnu.org; Fri, 23 Feb 2018 14:26:23 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:42232 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1epIz5-0004Ic-46; Fri, 23 Feb 2018 14:26:19 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ADB8E40FB646; Fri, 23 Feb 2018 19:26:18 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-118.ams2.redhat.com [10.36.117.118]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1DEE22024CAC; Fri, 23 Feb 2018 19:26:16 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 23 Feb 2018 20:25:24 +0100 Message-Id: <20180223192549.26666-12-kwolf@redhat.com> In-Reply-To: <20180223192549.26666-1-kwolf@redhat.com> References: <20180223192549.26666-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 23 Feb 2018 19:26:18 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 23 Feb 2018 19:26:18 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kwolf@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v3 11/36] qdict: Introduce qdict_rename_keys() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, jdurgin@redhat.com, pkrempa@redhat.com, mitake.hitoshi@lab.ntt.co.jp, jcody@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com, namei.unix@gmail.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" A few block drivers will need to rename .bdrv_create options for their QAPIfication, so let's have a helper function for that. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz Reviewed-by: Eric Blake --- include/qapi/qmp/qdict.h | 6 +++ qobject/qdict.c | 34 +++++++++++++ tests/check-qdict.c | 129 +++++++++++++++++++++++++++++++++++++++++++= ++++ 3 files changed, 169 insertions(+) diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h index ff6f7842c3..7c6d844549 100644 --- a/include/qapi/qmp/qdict.h +++ b/include/qapi/qmp/qdict.h @@ -81,4 +81,10 @@ QObject *qdict_crumple(const QDict *src, Error **errp); =20 void qdict_join(QDict *dest, QDict *src, bool overwrite); =20 +typedef struct QDictRenames { + const char *from; + const char *to; +} QDictRenames; +bool qdict_rename_keys(QDict *qdict, const QDictRenames *renames, Error **= errp); + #endif /* QDICT_H */ diff --git a/qobject/qdict.c b/qobject/qdict.c index 23df84f9cd..229b8c840b 100644 --- a/qobject/qdict.c +++ b/qobject/qdict.c @@ -1072,3 +1072,37 @@ void qdict_join(QDict *dest, QDict *src, bool overwr= ite) entry =3D next; } } + +/** + * qdict_rename_keys(): Rename keys in qdict according to the replacements + * specified in the array renames. The array must be terminated by an entry + * with from =3D NULL. + * + * The renames are performed individually in the order of the array, so en= tries + * may be renamed multiple times and may or may not conflict depending on = the + * order of the renames array. + * + * Returns true for success, false in error cases. + */ +bool qdict_rename_keys(QDict *qdict, const QDictRenames *renames, Error **= errp) +{ + QObject *qobj; + + while (renames->from) { + if (qdict_haskey(qdict, renames->from)) { + if (qdict_haskey(qdict, renames->to)) { + error_setg(errp, "'%s' and its alias '%s' can't be used at= the " + "same time", renames->to, renames->from); + return false; + } + + qobj =3D qdict_get(qdict, renames->from); + qobject_incref(qobj); + qdict_put_obj(qdict, renames->to, qobj); + qdict_del(qdict, renames->from); + } + + renames++; + } + return true; +} diff --git a/tests/check-qdict.c b/tests/check-qdict.c index ec628f3453..a3faea8bfc 100644 --- a/tests/check-qdict.c +++ b/tests/check-qdict.c @@ -665,6 +665,133 @@ static void qdict_crumple_test_empty(void) QDECREF(dst); } =20 +static int qdict_count_entries(QDict *dict) +{ + const QDictEntry *e; + int count =3D 0; + + for (e =3D qdict_first(dict); e; e =3D qdict_next(dict, e)) { + count++; + } + + return count; +} + +static void qdict_rename_keys_test(void) +{ + QDict *dict =3D qdict_new(); + QDict *copy; + QDictRenames *renames; + Error *local_err =3D NULL; + + qdict_put_str(dict, "abc", "foo"); + qdict_put_str(dict, "abcdef", "bar"); + qdict_put_int(dict, "number", 42); + qdict_put_bool(dict, "flag", true); + qdict_put_null(dict, "nothing"); + + /* Empty rename list */ + renames =3D (QDictRenames[]) { + { NULL, "this can be anything" } + }; + copy =3D qdict_clone_shallow(dict); + qdict_rename_keys(copy, renames, &error_abort); + + g_assert_cmpstr(qdict_get_str(copy, "abc"), =3D=3D, "foo"); + g_assert_cmpstr(qdict_get_str(copy, "abcdef"), =3D=3D, "bar"); + g_assert_cmpint(qdict_get_int(copy, "number"), =3D=3D, 42); + g_assert_cmpint(qdict_get_bool(copy, "flag"), =3D=3D, true); + g_assert(qobject_type(qdict_get(copy, "nothing")) =3D=3D QTYPE_QNULL); + g_assert_cmpint(qdict_count_entries(copy), =3D=3D, 5); + + QDECREF(copy); + + /* Simple rename of all entries */ + renames =3D (QDictRenames[]) { + { "abc", "str1" }, + { "abcdef", "str2" }, + { "number", "int" }, + { "flag", "bool" }, + { "nothing", "null" }, + { NULL , NULL } + }; + copy =3D qdict_clone_shallow(dict); + qdict_rename_keys(copy, renames, &error_abort); + + g_assert(!qdict_haskey(copy, "abc")); + g_assert(!qdict_haskey(copy, "abcdef")); + g_assert(!qdict_haskey(copy, "number")); + g_assert(!qdict_haskey(copy, "flag")); + g_assert(!qdict_haskey(copy, "nothing")); + + g_assert_cmpstr(qdict_get_str(copy, "str1"), =3D=3D, "foo"); + g_assert_cmpstr(qdict_get_str(copy, "str2"), =3D=3D, "bar"); + g_assert_cmpint(qdict_get_int(copy, "int"), =3D=3D, 42); + g_assert_cmpint(qdict_get_bool(copy, "bool"), =3D=3D, true); + g_assert(qobject_type(qdict_get(copy, "null")) =3D=3D QTYPE_QNULL); + g_assert_cmpint(qdict_count_entries(copy), =3D=3D, 5); + + QDECREF(copy); + + /* Renames are processed top to bottom */ + renames =3D (QDictRenames[]) { + { "abc", "tmp" }, + { "abcdef", "abc" }, + { "number", "abcdef" }, + { "flag", "number" }, + { "nothing", "flag" }, + { "tmp", "nothing" }, + { NULL , NULL } + }; + copy =3D qdict_clone_shallow(dict); + qdict_rename_keys(copy, renames, &error_abort); + + g_assert_cmpstr(qdict_get_str(copy, "nothing"), =3D=3D, "foo"); + g_assert_cmpstr(qdict_get_str(copy, "abc"), =3D=3D, "bar"); + g_assert_cmpint(qdict_get_int(copy, "abcdef"), =3D=3D, 42); + g_assert_cmpint(qdict_get_bool(copy, "number"), =3D=3D, true); + g_assert(qobject_type(qdict_get(copy, "flag")) =3D=3D QTYPE_QNULL); + g_assert(!qdict_haskey(copy, "tmp")); + g_assert_cmpint(qdict_count_entries(copy), =3D=3D, 5); + + QDECREF(copy); + + /* Conflicting rename */ + renames =3D (QDictRenames[]) { + { "abcdef", "abc" }, + { NULL , NULL } + }; + copy =3D qdict_clone_shallow(dict); + qdict_rename_keys(copy, renames, &local_err); + + g_assert(local_err !=3D NULL); + error_free(local_err); + local_err =3D NULL; + + g_assert_cmpstr(qdict_get_str(copy, "abc"), =3D=3D, "foo"); + g_assert_cmpstr(qdict_get_str(copy, "abcdef"), =3D=3D, "bar"); + g_assert_cmpint(qdict_get_int(copy, "number"), =3D=3D, 42); + g_assert_cmpint(qdict_get_bool(copy, "flag"), =3D=3D, true); + g_assert(qobject_type(qdict_get(copy, "nothing")) =3D=3D QTYPE_QNULL); + g_assert_cmpint(qdict_count_entries(copy), =3D=3D, 5); + + QDECREF(copy); + + /* Renames in an empty dict */ + renames =3D (QDictRenames[]) { + { "abcdef", "abc" }, + { NULL , NULL } + }; + + QDECREF(dict); + dict =3D qdict_new(); + + qdict_rename_keys(dict, renames, &error_abort); + g_assert(qdict_first(dict) =3D=3D NULL); + + QDECREF(dict); +} + static void qdict_crumple_test_bad_inputs(void) { QDict *src; @@ -880,6 +1007,8 @@ int main(int argc, char **argv) g_test_add_func("/public/crumple/bad_inputs", qdict_crumple_test_bad_inputs); =20 + g_test_add_func("/public/rename_keys", qdict_rename_keys_test); + /* The Big one */ if (g_test_slow()) { g_test_add_func("/stress/test", qdict_stress_test); --=20 2.13.6