From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50640) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLEGc-0005zM-Op for qemu-devel@nongnu.org; Wed, 05 Mar 2014 11:02:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WLEGW-0006QM-Pq for qemu-devel@nongnu.org; Wed, 05 Mar 2014 11:01:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:15617) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLEGW-0006QB-FF for qemu-devel@nongnu.org; Wed, 05 Mar 2014 11:01:52 -0500 Date: Wed, 5 Mar 2014 17:01:43 +0100 From: Kevin Wolf Message-ID: <20140305160143.GD4483@dhcp-200-207.str.redhat.com> References: <1393860533-2063-1-git-send-email-mreitz@redhat.com> <1393860533-2063-2-git-send-email-mreitz@redhat.com> <20140305155520.GC1709@irqsave.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <20140305155520.GC1709@irqsave.net> 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: =?iso-8859-1?Q?Beno=EEt?= Canet Cc: qemu-devel@nongnu.org, Stefan Hajnoczi , Max Reitz Am 05.03.2014 um 16:55 hat Beno=EEt Canet geschrieben: > 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 *sta= rt); > > 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, = move all > > + * elements from src to dest. > > + * > > + * If an element from src has a key already present in dest, it will= not be > > + * moved unless overwrite is true. > > + * > > + * If overwrite is true, the conflicting values in dest will be disc= arded and > > + * replaced by the corresponding values from src. > > + * > > + * Therefore, with overwrite being true, the src QDict will always b= e empty when > > + * this function returns. If overwrite is false, the src QDict will = be empty > > + * iff there were no conflicts. > s/iff/if/ "iff" means "if and only if" and it seems to be correct here. Kevin