From patchwork Mon Jun 18 08:40:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Nefedov X-Patchwork-Id: 930743 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="da6oqAKJ"; dkim-atps=neutral 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 418Ph40VR7z9s0W for ; Mon, 18 Jun 2018 18:41:06 +1000 (AEST) Received: from localhost ([::1]:33464 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUpif-0005Zq-PS for incoming@patchwork.ozlabs.org; Mon, 18 Jun 2018 04:41:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59758) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUpiA-0005ZW-Pn for qemu-devel@nongnu.org; Mon, 18 Jun 2018 04:40:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fUpi7-0000Ih-LI for qemu-devel@nongnu.org; Mon, 18 Jun 2018 04:40:30 -0400 Received: from mail-db5eur01on0097.outbound.protection.outlook.com ([104.47.2.97]:43712 helo=EUR01-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fUpi6-0000FC-DP for qemu-devel@nongnu.org; Mon, 18 Jun 2018 04:40:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HRDt2tE19yPsTf0VIxhkdDBR5vTdiEpaAkG8yF+hy7s=; b=da6oqAKJ0nOuER9kA3OhYOGI7xe76D6IRfEod+OkMMUEv8GoFnzGfdwqgj+xm47H69hLh26b2YSIDNTZkVkWBmXTgAtIcB87jlAoc7J6wlHWECYrFjlhHDjDFeE9FBLA8j3JQRhVImAoooXkDDS3xZp3a0uu++C4vG6fG7buUGo= Received: from xantnef-ws.sw.ru (195.214.232.6) by AM6PR08MB3351.eurprd08.prod.outlook.com (2603:10a6:209:48::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.19; Mon, 18 Jun 2018 08:40:22 +0000 From: Anton Nefedov To: qemu-devel@nongnu.org Date: Mon, 18 Jun 2018 11:40:04 +0300 Message-Id: <1529311206-76847-1-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR0802CA0006.eurprd08.prod.outlook.com (2603:10a6:3:bd::16) To AM6PR08MB3351.eurprd08.prod.outlook.com (2603:10a6:209:48::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5c32c960-3f4b-408c-274d-08d5d4f72188 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(2017052603328)(7153060)(7193020); SRVR:AM6PR08MB3351; X-Microsoft-Exchange-Diagnostics: 1; AM6PR08MB3351; 3:nwGlRuND1Cs7+2mX07u9js42dVouq3i0eVgf5xrxKyK4Vq1sMJ1nulLP3tCujpYQiX8NAUQH8PdcU0rG9SAgY97fXbG+QUJtQ1/M+d/Ir86wpJm2xHfmm+3/3IlYdo/1u5hzon230rN7P8+14nAZADlrE7XvKuPMufxySham+A/ThtIAgqrQOC3ElssPnhBdJv4XGysps8yltClquPqzZ/Zja2BHZNKwBy/3SxphlZriE+ETgzAzFZZtuQ+wEBA4; 25:WXr5tS4sE37RZJ9rs4mZG3Ed1dwXrfbySOj3dtQ+7a6j/95EUGfTw6V/Gts8Cjori4pPGMRLagX2nhQBoAsmvH7a8TKqsuEtCr9ayExoF8fjVm3UbwvXP+nUeq9b6/Jgb/Y5gFS4gtdg1nd43cAZLJuaMTnqcGoaYNLWVvaMuOUZCxtrkDe/YGMzddUif1kAuDFZdgu5Ap19g9/xNjoJ5/b0Qhm4Gyha2xM++Lc69h5t8ryaGBdaSSpXN0zo/4zYfxMjli+gXv0NMsxps0c6LI2QZIbfeiMEtvCcxnffw6bT3nH7vXm3DAUtdyWaDiqMNcFnJVfI6R8I2N93LwO8wQ==; 31:ckjrKoFQGDnEco0Jcb+1nPySrYYes8yaR1gdMNByPOn/JDwAoy5MovVIwYfGGCUlAbbzegivlFs84EoZXZetE7Ncg3sSQt3pLfHYdI1mKPw4DfBE5rELQWLlfWJqFaz7ebVHILmXBK8KtBcuUZ5HOLyatJPQyVOwEA22GitO/vofwvNQxRLscMk0IwJZ/9ivLwZs/tjp7pbrYI0L3e25r2TkSeZSIEqhENQ7hK/u/g0= X-MS-TrafficTypeDiagnostic: AM6PR08MB3351: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; X-Microsoft-Exchange-Diagnostics: 1; AM6PR08MB3351; 20:r29+DUfO6IGNbTgB9GmE96s1HxHPl5IsFgpiIZBOWMdMediVA9705WdnekVpwwHQfLB92aEHP5gLpZ4eJrjsL94i6Q/G9U69vxZ4xLBssDl5cNH2/378DMP8h2sPtUMrh9OwKbcmPmLzMbeNfmuSmV2qmSiflw8DpvPt3BizxDwnzBqgkxJP8QQ0iVfUuAYQpDuD/EbDVWhgsezdcnu9pRwGsOesufcAB2AiOuuNINWcxcLIgNlA2HHpd6o0yCbYpQm0mubsWILnsXAdOpGdMF3u3RgrajAyc3/w0diTuHZjR6UT8TZZIhYOME8sTDmJGGlRmHQMAxWCtSrYCdPP2ePcOjlzSt+80Wsk8L3Nefu+Axtk5kXoQWWO5GvbrNlmhC7EnfuZRKZ4ikbJI3D/h6p/WkwBaLIc+G6QbfH59/LCOLMSH2y3ZakvLy2/SSWPPsSIq/kxw5JFilrgGChArVwfiUQ8z+4uCikbC5LGL/mBeFsxYYlfRL34tP6ewlTZ; 4:ZpBEg2qdNVNjdP5P7LYAf4LCrse52aduQNwzBnIe/biLvP/mLTUOX//4l2pKN2jJaoiMR5UhB1aC4G45m+IOv69a+a/Bz7R1g52xmQ0OQ4PfHVLZJGH6uSfHC9MgjMKtkLgctFB9/FDYp37OVe7TxQgo/X3XxAEcjVK9GfLFfSGfgT0mTgdonw3ITygX3raEDymxmBlnyyOJ8zFuYdECVSsraJGyCn3xvW0Hy30/3HRuTAmCi3DB18BncrBWmDvGuR/YVk2a3GMoL8GDiWAafQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(10201501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:AM6PR08MB3351; BCL:0; PCL:0; RULEID:; SRVR:AM6PR08MB3351; X-Forefront-PRVS: 0707248B64 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39840400004)(376002)(346002)(396003)(39380400002)(189003)(199004)(16526019)(6306002)(316002)(106356001)(48376002)(956004)(2616005)(6512007)(15188555005)(2351001)(476003)(53416004)(8936002)(6486002)(4326008)(305945005)(97736004)(186003)(86362001)(26005)(25786009)(50226002)(966005)(16586007)(69596002)(6116002)(3846002)(2906002)(55236004)(6666003)(47776003)(6506007)(105586002)(386003)(81166006)(66066001)(478600001)(107886003)(81156014)(44832011)(51416003)(50466002)(53936002)(6916009)(486006)(59450400001)(68736007)(8676002)(5660300001)(2361001)(36756003)(52116002)(7736002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM6PR08MB3351; H:xantnef-ws.sw.ru; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM6PR08MB3351; 23:zUy17cT4fYYJkhG1z48o9YEH7QjAn9fg072loiZSh?= LC60wzebagob200Zswpn8uFUswd+lSnlA4hVwLroP2Zp3c1FUxQbXxV/ccNsvpJANkQkuThorxWrKDpjPO4dI9I3a/eG/Z9wEqRMr59eqWy/AFi09pDD4g/h5VeWYHaAVB5QO1/dA+YdKNe2QI1H5T5I6MacO+V82ICl+6PaFotqcX7Hap2k+SFA6bqjJeuhyUQ5PeLVuuwANXgeYXrcgNoE8A0yFTU+Dwq9KFBABLNt07+xk7twZf/M+8jylqDfXizfCnpbgeQ6DjEQP6JD91is8VnjB7PBKK94A7zpc/hf+2tRByi25inlBIK98Za2GqAHZkBOPLk6vpWuLn+HzBVU1/o/oueH9gPqKLAYN39w+1km97eGobw/rtqjRw5SzoQTthQsWXxdr5+bhQnrE3B5T/XorK8MEhA3tL5MRl5BUxA/FDhs6ygGtt+4//UjyWBgEG51T4bQwHEEM02MoOoowc5KbPhzZcCnvQBBcqzvRzbbvaKE9WParyHbAk3G2htisfX2rt9YtZjEKx/guCkd1Zm9rksgQWq5siUtoFnxDlcW6IYrO3c3/dKal5AJlOXSiAWWe5N7YOJvxnkoAeBsTXcHKA6nEzVlukzrYRE+IGVzNRD2anDIseRo6GKZ33dZHavKrjCiecm9cWVigM+xZKxLe1F2Cg4lYlstB+p9p6gPWr2roOeuswgymcAR5na+1RPHxl7BPuUFFLMJP08XsxWXP4KS4BdU2dBA8PhYu4IunIISDRJupcy6/qzaakHjeL81LSudy9C71X888mle7cePwMwQRiUEeEA59A2InYFwMJnKCA3qzMNpz1JdsXq0DWn49xTYKG1JbQMJFdiXAgm4N5IieU1qg4aSnwJ8QtEsCyBvSAfAfNHsuHUXOOQBFwM/tzt+EV6vT0KQ04/UC/CsyhqvX65JcukBru1ozdyejZJKiEV/1QFrE54XyncRU8+bLxCRZvEY0oedRRh0kGS4uKkw1MLd6F4rbmu7yZq3JfUNkuA1AaFYlMBI3xsdUrj/Fgf4CWr7YBFTLULtxlwmuNXFhHeqe5IyRv/txVlpqVOevLS2bfWjgmakm3v7aRqPCWsq+QSbUPby4PiU9rAsqKMlYDD/h+oI1zk9HSusAvKiLUaQ09tDpIqYznVTTYQ+8mek+8Akxt3g/MsfjdGUwKN2BknAX8Z/pZ0ORQXkfkY3BwzaP4tQfeI7L9GqK3Zv73jsNXFdOB+eLE0/4vKSz5pcmnaSzLg6aMo81RKtFHzx/pAxD8a85m6O5b6SsqRo06rG8aytBswUgLpqMMfD2MyrcLJFGhKQg2tKQ== X-Microsoft-Antispam-Message-Info: +cOYgVSNsrT2Td4+dP+vYzdm6DjCiQs8q0C3bZofIBjADpemtuvAZtWq/rIPEoR4fcLQIw6prDgvcunB77ZmMw/e7GNaMWg/9XKOsV9eDPywUu8MNWH4qB8mCIz7TkyStDdBSbGm64lOw778ixJxDixak4oakA9Z9fVLiVLmDUQ5xrnwlFvYA2Z3fJJR0zj+XKxvTBG/AE8Ub1w8ErGX41RlpNtaSfjbbpcSqvLf5b3JYV+Uv58gsum8wl40DrvGJsjlBuJVZF0fj4oESZyiXeDHvwz05DJSrcmM7XN5g21gsWDaLvARR/1PvnD0o2IH X-Microsoft-Exchange-Diagnostics: 1; AM6PR08MB3351; 6:5PuMLvUK9uSyE3zcV41bR5mKJRjmKdDDrJIrdO9R5CFgSK1ZcJdVq0ij/KoXIub9Px22mpuyN1AgiC4ugDreDEeTY+JNYXSWduw2CzvXz6pae7jOae8d9JLU59fDb4CyxlYhXDruHS47ckSZoSfTZcHXIBGZ/syDmTL5JdL2L98MAxM0oa8XIp8jciWzcC/xOQdDEvzZzzjk+yzMi1b3qHygFJ6x5/q61pPTF7hPpJhLD0O943M7FvS+JcKDs/BhQ65qc6tJrZf9DUVO5reucQHJIYug54rYTVHH2ZF7c3rpuWYCrYMPOrsyLiR2ThPsiJLSHs4XI6zAsHbjPjjJM/piXsYknxkDB4ZfEi1xkONKKjw7bc6cF2rlJp4GL1ZRAt6OXvztD7cMepXgVkSWa6OQxhXGxD18u2f6ju5HjCMRjFgFNukTuqXtfgGlu0VXt9/hMg3ppBEp0/p53NNknw==; 5:1gL2l7A9b0UJLGmu2h4AISX3lTomA3vNVkPJmsavDWSN/kOvwuFt5BQKNIOgdm9qOrgEbU+HzRB5pWMiUo7lzKlK+hNk+5kCQMTAqH8lDw715OVr8NbYNY2/U8ZVyEf2R4FzqoUys0AWM1RO5EcfnsDl5NtfscdMjtiF/Ams2V4=; 24:Cng5540T5Cd63CKX31CIOu8STvzk/WSrjNnj3HLnpx6OHyV4ZhXoLRVP7JZJvTLGwlfZoiZZ97f6X0gP+b3cB6J7M7W+rNJrYkx18/HUKoY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM6PR08MB3351; 7:e/Q78JAJVMaF98x4EVRw1MwmWUqGKjnv0tTM0FpdoALfIdT/HQI1rD37v8Jln+6+ZQN8zxhkOHf4NBMV8yB7xoUnDlFnfBBiWL+oZXSek0Z2lpSADo6mO2Yo/4zHha6CY98phVhRTGERWSP0wcq43UutRz7RbIQQDInn7NgKRDYwh/2oIJI/9XotwH/2p3+aX1W5SzxWNUNzLk4RE0KAkACxX8S5Yr1pVNmjplhCGfMx5q1Q9Gi1FRqYfyZflvV9; 20:b1RbrCyfjdCAABgECJTZY/4dUINIjv0o2cyjZUKWGdg0EE4Wy6W5g6kjNELGqA6G05zleXH75HFBGMRU4KfPGb/5WVC20PbGLYtn3tLC2Fr7knMhejgEstbv9pMWPhCYXxphL6zH6QHJve4RWs9tVvN41ZH6+NCvPSuYiBof9kA= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2018 08:40:22.3302 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5c32c960-3f4b-408c-274d-08d5d4f72188 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3351 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.2.97 Subject: [Qemu-devel] [PATCH v5 0/2] qapi: allow empty branches in flat unions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anton Nefedov , armbru@redhat.com, mdroth@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" v5: remarks for patch 1 fixed v4: http://lists.nongnu.org/archive/html/qemu-devel/2018-06/msg03638.html Anton Nefedov (2): qapi: allow empty branches in flat unions qapi: remove empty flat union branches and types docs/devel/qapi-code-gen.txt | 8 ++-- qapi/block-core.json | 52 ++-------------------- qapi/crypto.json | 13 +----- qapi/misc.json | 46 +------------------ qapi/net.json | 12 ----- qapi/ui.json | 19 +------- .../qapi-schema/flat-union-incomplete-branch.json | 9 ---- tests/qapi-schema/qapi-schema-test.json | 6 ++- block/qcow2.c | 1 - cpus.c | 2 - scripts/qapi/common.py | 15 ++++--- scripts/qapi/types.py | 2 + scripts/qapi/visit.py | 19 +++++--- tests/Makefile.include | 1 - tests/qapi-schema/flat-union-incomplete-branch.err | 1 - .../qapi-schema/flat-union-incomplete-branch.exit | 1 - tests/qapi-schema/flat-union-incomplete-branch.out | 0 tests/qapi-schema/qapi-schema-test.out | 3 +- 18 files changed, 42 insertions(+), 168 deletions(-) delete mode 100644 tests/qapi-schema/flat-union-incomplete-branch.json delete mode 100644 tests/qapi-schema/flat-union-incomplete-branch.err delete mode 100644 tests/qapi-schema/flat-union-incomplete-branch.exit delete mode 100644 tests/qapi-schema/flat-union-incomplete-branch.out