From patchwork Wed May 30 16:37:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Nefedov X-Patchwork-Id: 922888 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="febcLjrg"; 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 40wx9p4lrDz9s1w for ; Thu, 31 May 2018 02:38:38 +1000 (AEST) Received: from localhost ([::1]:39688 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fO47Q-0002aj-9E for incoming@patchwork.ozlabs.org; Wed, 30 May 2018 12:38:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40109) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fO46p-0002XK-1V for qemu-devel@nongnu.org; Wed, 30 May 2018 12:38:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fO46k-0002bs-Gv for qemu-devel@nongnu.org; Wed, 30 May 2018 12:37:59 -0400 Received: from mail-ve1eur02on072a.outbound.protection.outlook.com ([2a01:111:f400:fe06::72a]:37787 helo=EUR02-VE1-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 1fO46j-0002bE-8A for qemu-devel@nongnu.org; Wed, 30 May 2018 12:37:54 -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=gvnh+OySGGPA2jjAlwtIdw4SiXDAO2PGXsE7TaifAQc=; b=febcLjrgjazGNyx0WdsMN2VRYNV7HOsfl6VyRZ1e8N2x2BrvEq94gPwQlOyWr/2PUurQz5cxK2/n6/7DhGq3eF+LPVTlHzxQbRjTlyB6DnLIy7FUYhealVVCFPFjwclRb4AX3jrRjvlxT5vERhARh2MmVXEiQWlD62BnodTlaEk= Received: from xantnef-ws.sw.ru (195.214.232.6) by AM0PR08MB3346.eurprd08.prod.outlook.com (2603:10a6:208:5f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.11; Wed, 30 May 2018 16:37:50 +0000 From: Anton Nefedov To: qemu-devel@nongnu.org Date: Wed, 30 May 2018 19:37:30 +0300 Message-Id: <1527698252-86258-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: HE1PR0402CA0045.eurprd04.prod.outlook.com (2603:10a6:7:7c::34) To AM0PR08MB3346.eurprd08.prod.outlook.com (2603:10a6:208:5f::19) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM0PR08MB3346; X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3346; 3:ewMXPIrG2Rjai78QgtTl5lZUAxN6XGhOoiWCM8YwPqLcoFbJA70A/pXPZU1DwAVf4xbH7zQ8PbzdrEReHUY8HUgsHGQVoZLD8u8NVCc5fLeJrXylQz7LvLWxVhlGu8rw/krcEe93KJkshhkMuoR8QxAIJ0uaTqcBryaBoN3Lwc7Y1o8M3UqcerJD/4ezidEw9Ft4cTnlLuEjbuPdpkNyzeVn+QNaIrg7Q1Gh9TIldG963L/VzP1AlMZjLbhs1Ccx; 25:MhSDyvPSY72l3CjbLUg1DhSMLYm4mCe9rnhWD5ENSxGopxS6Ow5BZPbNfOGQ1g8HPdqOW3RjDmV+D3E2FSE7/8CggPom3HgDe1qkPbxmFZmU97QXwCL7Gwvyg0VCxg/zdYuICA3+6ZSRpPF1gsQ4QqAiIOGRsDriZdD3WjZ1+wCOI/naxloDLHwh6/aY3jdgCY//BB07pxBAv1m9VwbsZ/KvHPLlVUhqeTctrN3HouWNSnuPpjcGynF+/I0FeruKjyekbeg2TAaH/5Y/XrckSObDPat9t2OfY4q7cl6PGPLBWi3Qco2z35grKLPdBcAplWGx+wnI6OM7XFtg30tm6A==; 31:emTSyEr59Fat85h3xn+EAamTw02TWVIzA3zhN0iFLMm88Vran2yhQLnuHWxDcL8EapE2hs51uFjnPD8PwTwf/44fo/hWJXgNHcswY+2k41d2QWTLWIImT6Ax/5J760xsCP39GFBVvCeRA4sa1Ax5E9jQikyTfL6Zokr7kBg3L31aWpwFz7HfjLP9aCN0imLk82JH5ADRv4lgnBDLhZqFiAvsg1DCY2gWyDmoKr1Yeeg= X-MS-TrafficTypeDiagnostic: AM0PR08MB3346: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3346; 20:5Bh6VgbOXpNaS4NUlWOl+yYk5v9vS00mwQS/fmMfDl9btc9FHgul5r0bSI5PLba5AB0seaBjvcrJ/XfBpk2ONi642H15CS5SvuEjkGU5JWmjUyqcjPtMTmDFJXnIbstIo8OAwBPRWfQ7YEnAoPG9psIpSoKTb+5EWDM5D3jHSMyItKkll8+iF9KE14IqArYYAC73wuX5mbdb0+ZtFBEo756rDh9CWr+TlagAN8okkxkw+uytI46V28sQDYIbeTGkt7CDFKoVU553s8ybpJhyc/5Jwe3wsgRM+XvCzZRjoRixMJr6N07YA9mKEBC8Bxk7d9G1IQwAnn1xcqld5thvoYbndFS/FeQRVXiwdeaDAXRADyegXR8hKveBzEHP7RMzf1PGBTqw7N3AEzfPaGVIxFdc700yon9Xe+uY2Xs76QWGWK+h1jIMZinvvzstQGrR2+zM+9AzTMcU7zhty8tF+dl1esjwGb0xqc7J+Cs+6kGwVQS46XGElE70txxSAoHi; 4:YWliwIrGpQRpcutzOet11oNICqYfuwRAsz5XBSaqSvvrU37TBcMnFmlJVOYX7RhN2g2t+u1WN+0sX6pMvlXUkNONijxdQv7OnsxjP6qOJ2SrlrTlav7nsFFaqfv1tKOjN+mcHQi0ANQ4jM8S6+URsyuYgCLJl4tT+ByHwzx1sVsQXcB4U9cgz/0uOr6g/0EUywuvdxLo/Sja6VZ9kKJIbVtk2iBEKDXhw8e49gt054wQhnwQE+lyPfnZa7NBkApD7WJds4JPphwLzjcfFtYR5A== 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)(93006095)(93001095)(3002001)(10201501046)(3231254)(944501410)(52105095)(149027)(150027)(6041310)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:AM0PR08MB3346; BCL:0; PCL:0; RULEID:; SRVR:AM0PR08MB3346; X-Forefront-PRVS: 0688BF9B46 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(396003)(346002)(39850400004)(376002)(39380400002)(199004)(189003)(68736007)(478600001)(53416004)(3846002)(106356001)(316002)(105586002)(6116002)(305945005)(6666003)(186003)(6486002)(16526019)(7736002)(6916009)(107886003)(53936002)(97736004)(5660300001)(8676002)(26005)(81156014)(8936002)(81166006)(86362001)(4326008)(50226002)(66066001)(36756003)(44832011)(52116002)(6512007)(48376002)(6506007)(386003)(59450400001)(486006)(2906002)(69596002)(956004)(2361001)(2351001)(47776003)(51416003)(476003)(25786009)(55236004)(50466002)(16586007)(2616005); DIR:OUT; SFP:1102; SCL:1; SRVR:AM0PR08MB3346; H:xantnef-ws.sw.ru; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM0PR08MB3346; 23:2OlucHDr6qfCYZ2uZ/d65O8W02FnX6NtTzWdOgA7U?= ejUcj4iMhKRFVO/kPCAYbneJDo58n4EJvdrEHu9AqliJupaoN+BJeGnqE6xvCnuO8BqeXIcIh9zJziOKLea9yUIRAaIidY898lAjrDmLlEZqdVvXu49NKTp9GuneskMZQ07nQndUrq+bMWrxRN918Op2P9kYVJL00LDquhSSE4VvECnPrFFxGMHKEKg7xm/SoFr4EPFpXwnh41YyE5UE4muIaVn/q+WWGQ3Vd9OC8+91IvZeXR2vsqFV8d8CsqronHREJ89CqpVJmvf2W/swo23w3giNxhe1L+55HFGI6MG68s2YoVv0sB1agD9AZn5mFHipjr/gptqw53psoc34VkjVEzn9vxyqkTAHNXOSrGn2jle3pqXuR+Dc4zvuRicAp4LSWAzBbFNHnn259lNUvl5Qvcx8K0XzvaDJxjSYwip+TcyHntoTSE4X/dpENIkz3Be935AbLinthgCq6hpoRD+uPMhNRVqZVz3AnOZhBbMT1HVE7J2P0iSSWunTSarEoxSG1fmCTQETkiFKS1Ygm4jHGnKqR88tTXbOBSkOdZast0rTswm4P2CzZBeOpEKL5xIypTzpAOFOx+ehjLg9YxkiCGrPFGE7bHSPo8JrdNd9SM79iWtniCk+qVp+KKcfHlc4SJL0e78g/BtFytUZ0yxUVTEjI4rFI8WL0C6F80jjgk3C9rKJbFrX5edhAod1wNj3sUdaD0mFxUMxe5mYpX/E97lsO05UBE336PJCZsT7ce+OeX7+kMzQEsupWY6nnNWOPdfgQXMOpU1K8oAI4Ye/jV2A76KCyGvkcS9m3fV0NSfhtB2EyT/CObigeqVa63+BHeHvwv4vD39tGsNNtx9Zwp6SJxw/G4RZk+UQ/oSEVthDq8Vqh2mpnxLeDz2gajQQ+JvVB8CrDvPTzphapixMDjpDKPzgS5rV+C3s5rjCT9usYgyTjL+jluuabIIIIaXO4M0+oksq7tLIYFCqXbvf5nmKfYTg8XADlatM3iSWDPTCF0QHk5v/5GGbvrxdMaiqjZHLylusQrBSp6Ttl7PcK3QT8L8V/YcWQqVEEpCajlmhzq/U/5ub0ttRmfNl82b3DaEdpNtHhZOnk4OVxH6JV7h53Xz2M2Nr/sOOjON5U7zOpMvYCafYkAf9MXT8HSqKYyk0epjiiHW1NJooIieaErk+zqS4Vd4WZ/rXtlZRQK3MCuu2gvv/GH7MkZn5GCJ3opAMKpYFmGHOWuMEUwX4dF1oC86FvbQ5sD19s79kw== X-Microsoft-Antispam-Message-Info: nPcFwwYBCfszbplaySLMe9j2cMq9IKC4DQLHE1aj7kN7J7zTuK1tlqREBiO0nKa8VgNFqbYtJ7FhX4vUi2TFkPBjYELDrxvQUM0L9fPRGsu1MZAugzK7y2nEq17aXQBg4yf0uNE9KxDUnawX75V3GlrASDRQx/GamTR37UChqdaSqXHjQzr9oJpobsXKDwFW X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3346; 6:hrtmcOfRiKWPxhOkVohrE3cimAAN6k9UL18EEjcoT4rw2f4m1EghKLoX3YHGus5oSkJO2J2tNLkkoKagwU++yVGE2Gl/9HDZDl/niy1c1Cv7UJEJdmbcouVC8/+fpKehH85KuWwW1JfyT+XkcOU3CYcesc2JBc1d0gVzEFh/lBMqN+jVTIvaVgf03pswzMwASFUzoKhPellVg/wFMDikZmbCa7xBVB3iAwmPa/PfVt3IaM8ioZakeeIThO7NlzZC0UoIPRzsEStSJ1HsGEjw5oNJlvQKGNO87PFkoeos3FiW1jOxI5chfQCfJejZLfRE3ruR40k7AUs0BCvolTpqBgT5xWF+lAxFS9FY5N9ifyXXyvkjeN28wJbH+ldzlx8fA0+xdzOnzTASnqW2gdyFmd01iGw/Hgmu6UwMbO4Y3d/Ua7WZk214YGsvOk0fzzTN3+f05FeVK7gvcKMLFQIIYg==; 5:K88S/M2ou0yrOaE6Jdgcw1O7sbe59DJaB8G46zX3E/w/DLSEau+qC/XUNrcQ+813emvZxQsQv6KmIWuFOmvR241XuhwcRyhm7WPd6yswmtFaQJX6k/q1mbbRgrqoXSKz4tjr3vLekszGs7ah1tDxRi5D+u2/LUDt3oeJOsyYQdg=; 24:mgOgh3dnuN7S/PqAS2GWakgaLyFHynfO/1MsdBHmbV4nC0B3084sqIMcbd8kFTi46AlqbaIMpUT5SMqGZQCB+65gChuPjnQlpLIE9XZUrIM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3346; 7:V8zydW4o38Tg841d/3tofpcuI4u9nsBYbKtLgyAKUSQd0FsQEDsoChc+nEC+9Da/bZwc5j/jaHGItfSxwyqVqmmpnJc+uvNBP43s2IrFmUFxeXOGe20VUhbf/agKCL1i59TpheXdQ3Q5HJi0XWu4+ix7mE29XJ71wjlk8m+ReZ98V/QnfEe6NAAOWuF+9LNLcj1lDMd9BYb7ZChY8fADt7ioXIxua9ggFgsAEVP5LDwo3swVg9SCCObmDDsgymKC; 20:SWfFQ6g1l4nSz3FH0z9F1RncgbT6zEcO6WNCg/yHyPXOZZYuQkK5zrGU5V+cVr/LsqQUio9EhMSu3Qx1KKWHrGDHRwaP/+K6kVPrL+6OEygxkgkstJFYeH24Lky4HR3u6j/rbRTj3crYrn06KvZIdAECTGuK2ru2/PkiJWfSuMs= X-MS-Office365-Filtering-Correlation-Id: a571800e-5d28-4129-3f77-08d5c64baf45 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2018 16:37:50.3816 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a571800e-5d28-4129-3f77-08d5c64baf45 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3346 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe06::72a Subject: [Qemu-devel] [PATCH v3 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" since v2: remarks addressed: - qapi-code-gen.txt comment added - negative testcase (which became positive) is removed, verification added to qapi-schema-test 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 | 55 ++-------------------- 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 | 4 +- block/qcow2.c | 1 - cpus.c | 2 - scripts/qapi/common.py | 11 ++--- scripts/qapi/types.py | 4 +- scripts/qapi/visit.py | 17 +++++-- 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, 37 insertions(+), 170 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