From patchwork Thu Jan 14 13:45:14 2016 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: 567404 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 A26F014029E for ; Fri, 15 Jan 2016 00:47:08 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Qj98f9p6; dkim-atps=neutral Received: from localhost ([::1]:42516 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiF0-0002JK-IT for incoming@patchwork.ozlabs.org; Thu, 14 Jan 2016 08:47:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35334) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiE8-00011h-Qg for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJiE4-0003LE-Gd for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:12 -0500 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:35646) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiE4-0003L6-Ac for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:08 -0500 Received: by mail-wm0-x244.google.com with SMTP id f206so43691712wmf.2 for ; Thu, 14 Jan 2016 05:46:08 -0800 (PST) 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=Of9PMxwA1cgxrTxhzN/kZHXmIS0JJz5UPz1rmJanHa0=; b=Qj98f9p6q0XVBvcxLfQi8Pk/5Fb2UoYGPZTzQcrZ9S9jwKJixHEuC3Chg9qKxpLu0n BrgNW6RRl125+7VTT0k4f3Ww+NjIQTN17qKHed/PILOw0QyTTNFqmsMdcXXkZQGx5KEM 6SAbWfwFnxuHa4roXsuleDN010B1AciGCBBNTxg78Axgx9Op0DPkTyH0viZCSXKmgrXl +cOClyW+lMFaXR1XIgo9HVsm2rH/f7BbYXesq6I6duNYFK348SXepQkuk2Ge8gawdxgg Q4lJdVvgLboBz15TUmIg0LkeNCju646Rg7lzSEI1d2+YZAk2Yxw9/8JXr5/Gq8YZuuwX Ow1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=Of9PMxwA1cgxrTxhzN/kZHXmIS0JJz5UPz1rmJanHa0=; b=kiXHzm1NFaVmCfpngC5kXE8QQ9Tn3w5iKo1U6GLfSX+V+T3NctVwMv7ZnNouNhoIj7 VsS4ta0PEoeqqbhAfzjKDCv7PIujFFo8P9x4XO61QXf3ZbzI0LHawB5syAy0IlmOPNaO q5DJOmp0bdTmQdI/TqSs2qhJnPc/yM9HawlihmuM5qvopkhJie2xSjjLYfgY1tciPNvj w3h1NIDoG2KlGKGVUDt1b23yWS+2LCyQpxgYa7qB6F1wuQ2Ac/+AH5hQ2D14hvMpzhJi OGjdy7kZ6F3UjgHJNHszsGRlcsao/zMU/Yqe3AcNzoZAHgnyq0pG6c+h2C2r2Wa0NqhR Uu/w== X-Gm-Message-State: ALoCoQnPMCsthBHAwxhxlRgixSWM+6fUVcZKw2g7JEjmMt+HUDqIH+GSG+sQFfFDoQFeqYrQAx7afGIROXbDTZYsX5BNkqxQhQ== X-Received: by 10.194.77.137 with SMTP id s9mr4021130wjw.171.1452779167741; Thu, 14 Jan 2016 05:46:07 -0800 (PST) Received: from nullptr.home.dirty-ice.org (188-143-126-18.pool.digikabel.hu. [188.143.126.18]) by smtp.gmail.com with ESMTPSA id 79sm7398061wmo.7.2016.01.14.05.46.06 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 14 Jan 2016 05:46:06 -0800 (PST) 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, 14 Jan 2016 14:45:14 +0100 Message-Id: X-Mailer: git-send-email 2.7.0 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::244 Cc: Michael Roth , Gerd Hoffmann , Markus Armbruster Subject: [Qemu-devel] [PATCH 01/51] 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 ef5fb8b..1820d54 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;