From patchwork Thu Jun 18 16:43:43 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: 486417 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 A04CB14027C for ; Fri, 19 Jun 2015 02:46:43 +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=rEVzQ2Om; dkim-atps=neutral Received: from localhost ([::1]:53922 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5cxc-0003Rz-G7 for incoming@patchwork.ozlabs.org; Thu, 18 Jun 2015 12:46:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54794) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5cuz-0007Pq-9S for qemu-devel@nongnu.org; Thu, 18 Jun 2015 12:44:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5cuv-0000rz-RH for qemu-devel@nongnu.org; Thu, 18 Jun 2015 12:43:57 -0400 Received: from mail-wi0-x22d.google.com ([2a00:1450:400c:c05::22d]:38228) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5cuv-0000rn-Ji for qemu-devel@nongnu.org; Thu, 18 Jun 2015 12:43:53 -0400 Received: by wibdq8 with SMTP id dq8so92721027wib.1 for ; Thu, 18 Jun 2015 09:43:52 -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=CbH19trLbWTNTaNuena//V6djfdXT4HFG3tPgBNCgvI=; b=rEVzQ2OmmTbt7NhuWm0liYjufddGzazzhL006YLUALO+xCn4ntXiEJ5jySTnrIGOvu tWaEWBMauP9zDnGhsAJ89/PAxNm054kcdrRvD8THb8flM5W9W9lVmvj0Cvp3C0ysqIw9 Y1H6fA+7rumv5pqXYeZZvraEn+phP0ZjDfNogEKjgrOTeEnRJIkoaoxi/qcMfsF/eLCK FEg8SvPeT4KIKGfbpr6Fh/bnVIe74oKWQkvwYGNml3rh6TbsrXfQjsvo9HCgaSTWcNja 9e9y4OdWILXScfglkbPyl7kOQRaqjw9Tpmlx5TFASWIDaJv0jzlr3UD9nGn0JmNjT/DE 0sQA== X-Received: by 10.194.47.196 with SMTP id f4mr7751950wjn.46.1434645832875; Thu, 18 Jun 2015 09:43:52 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (178-164-167-192.pool.digikabel.hu. [178.164.167.192]) by mx.google.com with ESMTPSA id fx7sm13006423wjb.10.2015.06.18.09.43.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Jun 2015 09:43:52 -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, 18 Jun 2015 18:43:43 +0200 Message-Id: X-Mailer: git-send-email 2.4.3 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::22d Cc: Michael Roth , =?utf-8?B?TMOhc3psw7M=?= Ersek , Gerd Hoffmann , Markus Armbruster Subject: [Qemu-devel] [PATCH v3 1/8] 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 f2ad6d7..f02059d 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;