From patchwork Tue May 29 16:41: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: 922243 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="a520+76r"; 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 40wKJZ5Rk0z9s1R for ; Wed, 30 May 2018 02:42:21 +1000 (AEST) Received: from localhost ([::1]:33949 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNhhQ-0002Wn-Sn for incoming@patchwork.ozlabs.org; Tue, 29 May 2018 12:42:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47806) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fNhh1-0002Wb-Rh for qemu-devel@nongnu.org; Tue, 29 May 2018 12:41:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fNhgx-0003sS-2N for qemu-devel@nongnu.org; Tue, 29 May 2018 12:41:51 -0400 Received: from mail-db5eur01on0139.outbound.protection.outlook.com ([104.47.2.139]:7424 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 1fNhgw-0003qD-Gv for qemu-devel@nongnu.org; Tue, 29 May 2018 12:41:47 -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=xfVflv33Uml1/zvlgS7cUFqTDzDISrLeQ5Sxn1hHpaw=; b=a520+76rxZ/Qt8I8MY3h7ziXB1V4DAWJak0Y+KzZoFt++YyQXEUh8I+9YC9WnUd/IV/pwurwAA6kbBv0gvHGiM0vde20Iya/g64UBsqMqAzD0zMZ3UfNQhyRMYjtQmatuGaipRAMLh/1c0+Ht7PN1S2QJGFOIpqgAUSvR0nXWTE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; Received: from xantnef-ws.sw.ru (195.214.232.6) by AM0PR08MB3345.eurprd08.prod.outlook.com (2603:10a6:208:5f::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.797.11; Tue, 29 May 2018 16:41:43 +0000 From: Anton Nefedov To: qemu-devel@nongnu.org Date: Tue, 29 May 2018 19:41:30 +0300 Message-Id: <1527612092-65980-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: HE1PR0102CA0008.eurprd01.prod.exchangelabs.com (2603:10a6:7:14::21) To AM0PR08MB3345.eurprd08.prod.outlook.com (2603:10a6:208:5f::18) 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:AM0PR08MB3345; X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3345; 3:C6cPOv8nDYwbKU+okY2M/eFDmqK99vmGWiqiRVxntzEHCQmIJ33QN3zVwqbVLzLemhbUvI9Xqk+MPNwHRX2Xcg9xs9ySVv2BkwPNQcYozdaMq+XkGLeY9bnKbqmDf7qdBnNH2EVTwfZj8sUJsDKFGE4LixY3TwPUlIo6hRokxqocxttsmN85ossvCxEhDyAOzXpgw6vXGI3OlS95njDJUaUnbp+h822RNaQPJUsvzx2IxdJChnSmcRbGvXOeRG7q; 25:YcBP42T0gQiyw7b+sM9WtEZxB9RetKgtGvDz92ZbDgOvgbWLxEsbwdvbRTXiysF8PqujJhYKCHHeLGNEQX1yx0qt0KiGw886iDCMIsJaXr5rPyfFTpFIKCozOOh6aDoiF8yflftGPgsk6cpc3LIfm2HALbvbV7rUP0dPinygMCZLG8ThTXhvXWhIt1eicKQWNDEQsSdmMv8gVZun34uKDuFjQqu3ueSKG+7FDQern/0tOsWGic8KAkN4ovC9HYy+b/Agr+9aT/5HBAlpx5PgAV/QRkdb/Elvv2iAvImSITyemuuVnCPkafYYjF/DGpj5opHlH2SdfZvXPbuqD9L/Yg==; 31:jyS/u6f2l0PsLFj635Wt7Ae+/Kk4P6F/2WtBEcHKiQi/escTaBUiJLsHYyTfqGLUbeaZR0rxvYuNgKUWauSNGd1tRDGbXLMpUfewtGfkiZ7m5GL0Z3HVxP8UOWuo5gX10f4rEhOKcPq2nMEgoahFw3KJhx0BFRA9jPzPs95bKyJ5+two8+kJjsV7T4ziRq0RHDw2tq+WT6LZCP140UML9Q+jGN0OnLgz0uJF6m60A2s= X-MS-TrafficTypeDiagnostic: AM0PR08MB3345: X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3345; 20:hrenOELIjxWhkC8JYI6E1zqRmeNSq1wKMtsRTaCGa0KKP89/Z4xY5gl8sWzjnoAg8bfFfypyF6syVxEYL+0ALjIuVqPfb0SrxDuL6QwEt/LI9kNBkTQ/qYne0YnbTVOVrjYBSgXicuEVc/rxemalUxXyC9WeyV35xIIP5eGBcd16xHokvpkuF7mF0RzLYjq5b5Od40zn/IdKfUqaA+TtQ+RFLAeg5KMpwsdf9skGEwzj12PSDu/VGUTld7gLT3xNBTYbzMUNMMA9emff01/m97K3kj8bokUQ4yG0XhJ+Ub7NEFa7iS9Zsa00IpKl+y4jlRkGPx0E6ei8dXsYlq2FdnGmdtmjj5wxLO4tPORfkjCpPBY3RRjgZmwphyrO8y+UrlYFmgkx8hBbmyMOaJ05YSEsZifLqe4Nk8e/XCVnSIi/wBK8Gl4Z/rwT7JNXaQXu9lIFfsFznwAN4NOgJeT5hciDfS++zmCl4SjXbHyseNBqOJ5QZC1SH1pWGOnSILt6; 4:uiS5dKPqioMUKTi9Gu+FadwRKKQV2+LyDPJi1UTTmLqMZiidGnOMBNmIGw4Kk50zZgFLIp5mw4W+gpjjFFj+hhfOnh+fHmEiAi8Y9ErbqkA9jY5cDE40mATQjtG2nV0ugUbbE/tO6UZyz8G2JHRV20wDesxj4EEqdry/MG1kfaZOZra1ZzxyT9Cl3NTfDYNFt1YWBwBKdwZKotx1D/b4tZy/RE3n99iXiRhKqOq55OBG4MTzpansDCENedZdNH2ypqrxoCeCgDSy6CBUNiHibQ== 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)(20161123564045)(20161123558120)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:AM0PR08MB3345; BCL:0; PCL:0; RULEID:; SRVR:AM0PR08MB3345; X-Forefront-PRVS: 0687389FB0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(376002)(396003)(39850400004)(39380400002)(346002)(199004)(189003)(50226002)(8676002)(6512007)(106356001)(48376002)(97736004)(50466002)(105586002)(4326008)(51416003)(107886003)(478600001)(52116002)(25786009)(68736007)(81166006)(81156014)(6306002)(53416004)(966005)(8936002)(2616005)(2361001)(36756003)(956004)(6486002)(476003)(47776003)(66066001)(53936002)(7736002)(16586007)(44832011)(2351001)(3846002)(486006)(6116002)(26005)(6506007)(5660300001)(69596002)(305945005)(86362001)(15188555005)(2906002)(186003)(316002)(6916009)(55236004)(6666003)(386003)(16526019); DIR:OUT; SFP:1102; SCL:1; SRVR:AM0PR08MB3345; 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; AM0PR08MB3345; 23:l5132AeDeUi7a7xCCiPvBqjXfQILR9DYTAs6aJTgk?= HtxqfqFCYTY8+Hx8dxJZUfQ1TVideVWVXqw/Xgjj+CVh5yfWFDLkBd+lVVsqGKXzFgK5WkK8zYp7LwhAQbtObyjLR4vYY3cx5ab+HCBTTVVE03l6yg6/BzKAr11XVN9fJz1sNaJQQwzZqKHSsk6YfVyqSKryAenVi08s9sfm+uiicO8EsqCxHUj9KLZOOfrpj+eMQHrSEKhqdwHng+9omKmEQeqnXk/gLCRyNv4r5rPWJgPJd1pRnZGSxF0L28+iHsM+nHBcdmfyx1q0YhBCBAoF7qZxCF56nN0CKZXdLibGdYcyqfVWgrdKmrSF9VWVUALklJ91QxHeKVnI9pCdsQPmp0ILj9qwYsvWkmMoFtw4dr8KMBZbkdMeeBRVseux/CzDjgUQdJEOOvY2dvXAVj2PnKwZPBZLDpu8ar+aT3zythWysAC07f/nu+eJG3dMC1J/IxyTPCBtUXzs5/j81fEGMeE/P3Zr4NSz7T2M22qeZMNePPdMOtlMiH9/JOkk8eeW5lx6lLtxS1YDtoGjzNsdE+2pSdZqwAB5JriXe9tWqPqrEP7bNjtRCce5xpuJNjJTQHcW6ukJ+Cb5A9zuLFN4mlc8Fj4iOg/Nas09qOq3QRfUKdJcmpuJycw3KC+G1zZ53W/SqDGX/tIq8YVtPOaI8ZRxMQUIxqcFw5ba3U0GVPIDL/X3eEig68c+oCSklBAW7Wwg8TJGgx5iwed/9QmTLCQOcPs2r/bnBqERCV6twFppOaM49RHSvnvv3HafYflck6HyWKNzW/Cy43+QPgHAMVjUR5NhRyL8RNB9IOrPDfaP0sSo0XCxFZYYE7/qTlVnEwm1KM6xSw0ZBZMqxGjgchYCV0k5ZrYeHWJZJceplnpsuR3wqJTPxBBrU4KenSod/MDSsqFTTEva9+NXdItJUapNqDLZB+aCbnl9alShrqrJTZPmJMO28lKIP702jYzHyvEFhaAnDBgvNuJzw3r4t7ok/ECwnKbY+avIYYyh3RfqcfmnwrHLvB4QgqCqb1o7wQ5ppknHLDnQEbUfPQG0CPkhZi4Y7j9JeKOxOBdC7C/hMr9D2mHe6vJ6csKNhWCbhYaOMQUQn4PQQqPSIQCg7tPS7MJxZLgv+SuL17Uip1Eq9D2G0XDJI/yEBx8Ox1+64Huk975l/h4mXsygMq0cS+Ed0BnuagiRc18QMrGgTQ61De/saEfAcGWKwFaG+5f9OZpctJSI7LLWHqkg3F3q1XA/F+p18yVkXRDh4gcXiLXMVx1frlKx2yF1WpGKXF8JzSANfF0huSPPCEeFGO4 X-Microsoft-Antispam-Message-Info: Bel9I6hEHJ110zDZPlvkIWJdlymiFyeHL7Rp+ExsT9Go6N/SnOLK5mEvK1UsRyizrQfS0R8jdzSq5RByUomflphptLfgVY2cNgjgpZnRzJHVD1GAr95SoC7RsEgbyomUyHeTwky22NtsEG1iJuWoNPCUE8Dny+lWwUURyMHyjOBiTnndLrCIRMQSkD/9V/xi X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3345; 6:cT9cIcwcFgQjff0APKtGkMaMddRBzrbXZqXf4yn3W9hUB2qPptgBf7PbYuQ1+qJQnZTRj7iInBaKblo9Y0svEQeZ6VXKHLjKDVB74GXyMExT9fBw2AsuM5W4SNfW6RaxnBRDgggtVOvQgC/rQbfz8wvf/HFFnNDF18K98cayaBezyzOfeK35aiiFwFBv9B5KizEyvMu+HIf0QOMNKkBeb1RaFl/ZVvoBxxaXoP0Dlr2+U5CQWd6htHw2oDKdruMcLZnYIlmMjox/hKtucpAHiB35a//aC2lI1uBYSCrYv+wqkaXNbtCvVHpuOUEqjHjq91T9uSrUXok96oSgBnDO/bzOsnc1gab26VL0lLAu5iqnQOHQnrAXtWmCjO5TKJwikqaT9NrRuE/81dmmMBdqRdRdAHhfqDJpwdGIl3omTDjE8FMgRgzjgmwv3Z0NgQMN0F4FrEAffexPHKy4G/VdwQ==; 5:Pzy01/U3qkSQVFe8PHZ8Jyps7M7L4bymhaWAoFdar1PNgIvrfdNChSro0WC2HjCvPdWL20f+uogUwXiOx+SjebU1ccdVX3s0tR9aK3E7T1Wg9d1alB74PAWVu7MJESc2roNYOwmEP679gJDAPgVYvUnXaz5O1fbFAhnunnzNE7k=; 24:2jf5uKy1GU4TRbOVALCxfLLaLbWCzdG5zfGjRJPVUV0zTmZqtC8FjDIqxK8sQgE9TJNngizBvA+wO7twZq9VNEBvosVtGbZWoHiC7lR1iDw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3345; 7:v44xihy3FXMDmABCoRyniVOltmOoEBiiwNxYtf0ieLzQl10bkAv7C35iyEPHn2ep49BrKQm9p4r8k1fcPtcY9hynqA3xRjYeZtZIKsvhJUkRxmKy8Ko7+ySt7d4UXfmq4pRbRENuQBd1c67Sdc8gMmfY6UCsGseXg1ZIL9Zcc1uJvaRkeiDXY+wPKVgTqa8GhZEwk1KHIU35Uti3MKk05PyqQz19xWj+Cq93RK27R60HRgV0kSlvp7pvXHY81TNa; 20:um4xopgZ8MEosXXYOKbtVyzeZGSudGp4yo2vNIbdh7775gR1cyH/d1qhnW/yIvp3MCOwDS9mlKEbmVFarzuiR9C5r5d17S7CHjddL6LY897uQU6sIyR1m8OSH/JsqBzJ4FzF4BILvB0CtJ84quM131n/1tJUv5ALMuCJGI9M+Pw= X-MS-Office365-Filtering-Correlation-Id: 2b7fb1e7-534f-4484-7e29-08d5c5830f89 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2018 16:41:43.0616 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2b7fb1e7-534f-4484-7e29-08d5c5830f89 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3345 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.2.139 Subject: [Qemu-devel] [PATCH v2 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 v1: - reworked to always allow empty branches - more types removed in patch 2 v1: http://lists.nongnu.org/archive/html/qemu-devel/2018-05/msg02525.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 | 7 +-- qapi/block-core.json | 55 ++-------------------- qapi/crypto.json | 13 +---- qapi/misc.json | 46 +----------------- qapi/net.json | 12 ----- qapi/ui.json | 19 +------- block/qcow2.c | 1 - cpus.c | 2 - scripts/qapi/common.py | 11 ++--- scripts/qapi/types.py | 4 +- scripts/qapi/visit.py | 17 +++++-- tests/qapi-schema/flat-union-incomplete-branch.err | 1 - .../qapi-schema/flat-union-incomplete-branch.exit | 2 +- tests/qapi-schema/flat-union-incomplete-branch.out | 14 ++++++ 14 files changed, 47 insertions(+), 157 deletions(-)