From patchwork Thu Aug 6 18:28:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?B?Wm9sdMOhbiBLxZF2w6Fnw7M=?= X-Patchwork-Id: 504797 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6906D1402B8 for ; Fri, 7 Aug 2015 06:21:16 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=hO0HT5PV; dkim-atps=neutral Received: from localhost ([::1]:46166 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNPuM-00082T-MJ for incoming@patchwork.ozlabs.org; Thu, 06 Aug 2015 14:28:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48741) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNPtt-0007nS-W8 for qemu-devel@nongnu.org; Thu, 06 Aug 2015 14:28:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZNPtr-0000sH-9O for qemu-devel@nongnu.org; Thu, 06 Aug 2015 14:28:21 -0400 Received: from mail-wi0-x229.google.com ([2a00:1450:400c:c05::229]:34337) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNPtq-0000qE-RU for qemu-devel@nongnu.org; Thu, 06 Aug 2015 14:28:19 -0400 Received: by wicne3 with SMTP id ne3so33145293wic.1 for ; Thu, 06 Aug 2015 11:28:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=BR6640M2PLoYoWh92cXysMh107sddLWCf05enZPuK6I=; b=hO0HT5PV6R6ROPR96Fsq/J7o3cFuKuTOLzyAhdL3YOQX2R3bMCR1RNoCBNBeDzQ4O9 qK83OOhab4usNK2ZLWQ3huGKRw/2ZTwRCU4NEQaQ3YXwWTNA04witq5pqZoBE6nAoPLC lSn0E3OLKQHqCvZ3Uy6yrucL+FG0XPAKXZ5660xo1SYf9giApnIeGimywSbVk5tlJbyo PknzkXgm4N5d1moqBCLSNTNjFidPBQPQ/PEac9qPFlodOpAFe+4nbufHOGy+K/zzwMW9 fhdO3hiU5lWkBMSrjkLC0trz9wKf2Zr2Ko5/P3heSPj7OLQTD+rXX3UT8+kX2w/NxpEg ISuQ== X-Received: by 10.180.85.74 with SMTP id f10mr8595545wiz.45.1438885698174; Thu, 06 Aug 2015 11:28:18 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (84-236-21-48.pool.digikabel.hu. [84.236.21.48]) by smtp.gmail.com with ESMTPSA id i6sm10726509wje.33.2015.08.06.11.28.16 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 06 Aug 2015 11:28:17 -0700 (PDT) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?= To: qemu-devel@nongnu.org Date: Thu, 6 Aug 2015 20:28:13 +0200 Message-Id: X-Mailer: git-send-email 2.4.5 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::229 Cc: Michael Roth , Gerd Hoffmann , Markus Armbruster Subject: [Qemu-devel] [PATCH 01/25] qapi: support implicit structs in OptsVisitor 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 They are required for flat unions (you still have to allocate the structs). Signed-off-by: Kővágó, Zoltán --- qapi/opts-visitor.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c index 7ae33b3..aa68814 100644 --- a/qapi/opts-visitor.c +++ b/qapi/opts-visitor.c @@ -149,6 +149,12 @@ opts_start_struct(Visitor *v, void **obj, const char *kind, } } +static void +opts_start_implicit_struct(Visitor *v, void **obj, size_t size, Error **errp) +{ + opts_start_struct(v, obj, NULL, NULL, size, errp); +} + static gboolean ghr_true(gpointer ign_key, gpointer ign_value, gpointer ign_user_data) @@ -185,6 +191,12 @@ opts_end_struct(Visitor *v, Error **errp) ov->fake_id_opt = NULL; } +static void +opts_end_implicit_struct(Visitor *v, Error **errp) +{ + opts_end_struct(v, errp); +} + static GQueue * lookup_distinct(const OptsVisitor *ov, const char *name, Error **errp) @@ -508,6 +520,9 @@ opts_visitor_new(const QemuOpts *opts) ov->visitor.start_struct = &opts_start_struct; ov->visitor.end_struct = &opts_end_struct; + ov->visitor.start_implicit_struct = &opts_start_implicit_struct; + ov->visitor.end_implicit_struct = &opts_end_implicit_struct; + ov->visitor.start_list = &opts_start_list; ov->visitor.next_list = &opts_next_list; ov->visitor.end_list = &opts_end_list;