From patchwork Fri Mar 1 20:13:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 224444 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 00C792C030B for ; Sat, 2 Mar 2013 07:17:19 +1100 (EST) Received: from localhost ([::1]:48423 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBWOL-0000k1-3s for incoming@patchwork.ozlabs.org; Fri, 01 Mar 2013 15:17:17 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52440) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBWL5-0003RL-4H for qemu-devel@nongnu.org; Fri, 01 Mar 2013 15:13:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UBWL3-0008RU-4p for qemu-devel@nongnu.org; Fri, 01 Mar 2013 15:13:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41600) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBWL2-0008RM-TN for qemu-devel@nongnu.org; Fri, 01 Mar 2013 15:13:53 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r21KDqKY022540 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 1 Mar 2013 15:13:52 -0500 Received: from dhcp-200-207.str.redhat.com (ovpn-116-83.ams2.redhat.com [10.36.116.83]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r21KDhI0020065; Fri, 1 Mar 2013 15:13:50 -0500 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Fri, 1 Mar 2013 21:13:37 +0100 Message-Id: <1362168821-25668-4-git-send-email-kwolf@redhat.com> In-Reply-To: <1362168821-25668-1-git-send-email-kwolf@redhat.com> References: <1362168821-25668-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, armbru@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH 3/7] Add qdict_clone_shallow() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake --- include/qapi/qmp/qdict.h | 2 ++ qobject/qdict.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h index 6d9a4be..685b2e3 100644 --- a/include/qapi/qmp/qdict.h +++ b/include/qapi/qmp/qdict.h @@ -64,4 +64,6 @@ 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); +QDict *qdict_clone_shallow(const QDict *src); + #endif /* QDICT_H */ diff --git a/qobject/qdict.c b/qobject/qdict.c index 7543ccc..ed381f9 100644 --- a/qobject/qdict.c +++ b/qobject/qdict.c @@ -401,6 +401,28 @@ const QDictEntry *qdict_next(const QDict *qdict, const QDictEntry *entry) } /** + * qdict_clone_shallow(): Clones a given QDict. Its entries are not copied, but + * another reference is added. + */ +QDict *qdict_clone_shallow(const QDict *src) +{ + QDict *dest; + QDictEntry *entry; + int i; + + dest = qdict_new(); + + for (i = 0; i < QDICT_BUCKET_MAX; i++) { + QLIST_FOREACH(entry, &src->table[i], next) { + qobject_incref(entry->value); + qdict_put_obj(dest, entry->key, entry->value); + } + } + + return dest; +} + +/** * qentry_destroy(): Free all the memory allocated by a QDictEntry */ static void qentry_destroy(QDictEntry *e)