From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49359) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLEAJ-0007Ux-Ca for qemu-devel@nongnu.org; Wed, 05 Mar 2014 10:55:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WLEAD-0004GQ-Bh for qemu-devel@nongnu.org; Wed, 05 Mar 2014 10:55:27 -0500 Received: from lnantes-156-75-100-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:55724 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLEAD-0004Ei-5O for qemu-devel@nongnu.org; Wed, 05 Mar 2014 10:55:21 -0500 Date: Wed, 5 Mar 2014 16:55:20 +0100 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140305155520.GC1709@irqsave.net> References: <1393860533-2063-1-git-send-email-mreitz@redhat.com> <1393860533-2063-2-git-send-email-mreitz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1393860533-2063-2-git-send-email-mreitz@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 01/10] qdict: Add qdict_join() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Reitz Cc: Kevin Wolf , qemu-devel@nongnu.org, Stefan Hajnoczi The Monday 03 Mar 2014 =E0 16:28:44 (+0100), Max Reitz wrote : > This function joins two QDicts by absorbing one into the other. >=20 > Signed-off-by: Max Reitz > --- > include/qapi/qmp/qdict.h | 3 +++ > qobject/qdict.c | 32 ++++++++++++++++++++++++++++++++ > 2 files changed, 35 insertions(+) >=20 > diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h > index 1ddf97b..d68f4eb 100644 > --- a/include/qapi/qmp/qdict.h > +++ b/include/qapi/qmp/qdict.h > @@ -16,6 +16,7 @@ > #include "qapi/qmp/qobject.h" > #include "qapi/qmp/qlist.h" > #include "qemu/queue.h" > +#include > #include > =20 > #define QDICT_BUCKET_MAX 512 > @@ -70,4 +71,6 @@ void qdict_flatten(QDict *qdict); > void qdict_extract_subqdict(QDict *src, QDict **dst, const char *start= ); > void qdict_array_split(QDict *src, QList **dst); > =20 > +void qdict_join(QDict *dest, QDict *src, bool overwrite); > + > #endif /* QDICT_H */ > diff --git a/qobject/qdict.c b/qobject/qdict.c > index 42ec4c0..ea239f0 100644 > --- a/qobject/qdict.c > +++ b/qobject/qdict.c > @@ -665,3 +665,35 @@ void qdict_array_split(QDict *src, QList **dst) > qlist_append_obj(*dst, subqobj ?: QOBJECT(subqdict)); > } > } > + > +/** > + * qdict_join(): Absorb the src QDict into the dest QDict, that is, mo= ve all > + * elements from src to dest. > + * > + * If an element from src has a key already present in dest, it will n= ot be > + * moved unless overwrite is true. > + * > + * If overwrite is true, the conflicting values in dest will be discar= ded and > + * replaced by the corresponding values from src. > + * > + * Therefore, with overwrite being true, the src QDict will always be = empty when > + * this function returns. If overwrite is false, the src QDict will be= empty > + * iff there were no conflicts. s/iff/if/ > + */ > +void qdict_join(QDict *dest, QDict *src, bool overwrite) > +{ > + const QDictEntry *entry, *next; > + > + entry =3D qdict_first(src); > + while (entry) { > + next =3D qdict_next(src, entry); > + > + if (overwrite || !qdict_haskey(dest, entry->key)) { > + qobject_incref(entry->value); > + qdict_put_obj(dest, entry->key, entry->value); > + qdict_del(src, entry->key); > + } > + > + entry =3D next; > + } > +} > --=20 > 1.9.0 >=20 >=20 Reviewed-by: Benoit Canet