From patchwork Tue Jun 23 13:32:57 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: 487628 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 EECC114012C for ; Tue, 23 Jun 2015 23:33:38 +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=kieNI8jN; dkim-atps=neutral Received: from localhost ([::1]:45354 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7OKX-00010V-52 for incoming@patchwork.ozlabs.org; Tue, 23 Jun 2015 09:33:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33197) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7OJz-00007R-NW for qemu-devel@nongnu.org; Tue, 23 Jun 2015 09:33:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z7OJv-0008JI-TE for qemu-devel@nongnu.org; Tue, 23 Jun 2015 09:33:03 -0400 Received: from mail-wi0-x234.google.com ([2a00:1450:400c:c05::234]:38659) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z7OJv-0008J7-NT for qemu-devel@nongnu.org; Tue, 23 Jun 2015 09:32:59 -0400 Received: by wibdq8 with SMTP id dq8so16978716wib.1 for ; Tue, 23 Jun 2015 06:32:59 -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=J5rFSDgklL3yaaEqQ7JdQkZQwE+ndC72rwKLYempmwY=; b=kieNI8jNgL6/eWYnUAo6Pav0QBSrCQmFjEgXh+j9jmFxALYlrrGKwGtFesnDgw74lh OdXQLgpnEAik6a+QAbwr4ateOd6oJCfq6xoDkr+YWO4J3lZhT9Bzi1UhmLJh7N6TCwFJ kje7aZFqqcRCMXMtXT3i7AyFc+clERocLi+g9ie0v4upJZgmtyYOEIAWBaTpzfBv2zaP ivp79euFdoW9kBT29TdP1IgXGjcLgubsXx7hff4WphcN7WXi5Bh5rbo9YVslavCHfr4W 6xS2ItegL+iWUEJxJh03vkh96Jx2l1H0UWBPb8EfQtRwEL9bcVFWOG/rXL8PBEz31Q7g Fv/g== X-Received: by 10.195.13.113 with SMTP id ex17mr60098003wjd.17.1435066379140; Tue, 23 Jun 2015 06:32:59 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (178-164-170-200.pool.digikabel.hu. [178.164.170.200]) by mx.google.com with ESMTPSA id fi6sm22381631wib.6.2015.06.23.06.32.57 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Jun 2015 06:32:58 -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: Tue, 23 Jun 2015 15:32:57 +0200 Message-Id: <69dd0a1eb3b3c9d1510720be55b4c663885239ae.1435064848.git.DirtY.iCE.hu@gmail.com> 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::234 Cc: Markus Armbruster , Stefan Hajnoczi , Michael Roth Subject: [Qemu-devel] [PATCH 1/5] 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;