From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54618) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YroVa-0005dP-Lw for qemu-devel@nongnu.org; Mon, 11 May 2015 10:16:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YroVZ-0003J6-KD for qemu-devel@nongnu.org; Mon, 11 May 2015 10:16:38 -0400 Message-ID: <5550B9BA.505@redhat.com> Date: Mon, 11 May 2015 16:16:26 +0200 From: Max Reitz MIME-Version: 1.0 References: <1431105726-3682-1-git-send-email-kwolf@redhat.com> <1431105726-3682-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1431105726-3682-3-git-send-email-kwolf@redhat.com> Content-Type: text/plain; charset=iso-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 02/34] qdict: Add qdict_{set, copy}_default() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf , qemu-block@nongnu.org Cc: armbru@redhat.com, qemu-devel@nongnu.org On 08.05.2015 19:21, Kevin Wolf wrote: > In the block layer functions that determine options for a child block > device, it's a common pattern to either copy options from the parent's > options or to set a default string if the option isn't explicitly set > yet for the child. Provide convenience functions so that it becomes a > one-liner for each option. > > Signed-off-by: Kevin Wolf > --- > include/qapi/qmp/qdict.h | 3 +++ > qobject/qdict.c | 34 ++++++++++++++++++++++++++++++++++ > 2 files changed, 37 insertions(+) > > diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h > index d20db94..9fbf68e 100644 > --- a/include/qapi/qmp/qdict.h > +++ b/include/qapi/qmp/qdict.h > @@ -65,6 +65,9 @@ int64_t qdict_get_try_int(const QDict *qdict, const char *key, > int qdict_get_try_bool(const QDict *qdict, const char *key, int def_value); > const char *qdict_get_try_str(const QDict *qdict, const char *key); > > +void qdict_copy_default(QDict *dst, QDict *src, const char *key); > +void qdict_set_default_str(QDict *dst, const char *key, const char *val); > + > QDict *qdict_clone_shallow(const QDict *src); > void qdict_flatten(QDict *qdict); > > diff --git a/qobject/qdict.c b/qobject/qdict.c > index 2fcb7fe..45ba42c 100644 > --- a/qobject/qdict.c > +++ b/qobject/qdict.c > @@ -477,6 +477,40 @@ static void qdict_destroy_obj(QObject *obj) > g_free(qdict); > } > > +/** > + * qdict_copy_default(): If no entry mapped by 'key' exists in 'dst' yet, the > + * value of 'key' in 'src' is copied there (and the refcount increased > + * accordingly). > + */ > +void qdict_copy_default(QDict *dst, QDict *src, const char *key) > +{ > + QObject *val; > + > + if (qdict_haskey(dst, key)) { > + return; > + } > + > + val = qdict_get(src, key); > + if (val) { > + qobject_incref(val); > + qdict_put_obj(dst, key, val); > + } > +} > + > +/** > + * qdict_set_default_str(): If no entry mapped by 'key' exists in 'dst' yet, > + * 'val' is put there, with the QDict taking the reference. Otherwise, the > + * refcount of 'val' is decreased. With the comment fixed: Reviewed-by: Max Reitz > + */ > +void qdict_set_default_str(QDict *dst, const char *key, const char *val) > +{ > + if (qdict_haskey(dst, key)) { > + return; > + } > + > + qdict_put(dst, key, qstring_from_str(val)); > +} > + > static void qdict_flatten_qdict(QDict *qdict, QDict *target, > const char *prefix); >