From patchwork Wed Jun 13 15:53:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Nefedov X-Patchwork-Id: 928955 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="XKFgp+eM"; 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 415WXv2DQjz9s0W for ; Thu, 14 Jun 2018 01:54:55 +1000 (AEST) Received: from localhost ([::1]:35295 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fT86m-0007YV-Sy for incoming@patchwork.ozlabs.org; Wed, 13 Jun 2018 11:54:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43750) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fT863-0007V3-WD for qemu-devel@nongnu.org; Wed, 13 Jun 2018 11:54:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fT85z-0000j7-RW for qemu-devel@nongnu.org; Wed, 13 Jun 2018 11:54:08 -0400 Received: from mail-he1eur04on0719.outbound.protection.outlook.com ([2a01:111:f400:fe0d::719]:12324 helo=EUR04-HE1-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 1fT85z-0000d6-1b for qemu-devel@nongnu.org; Wed, 13 Jun 2018 11:54:03 -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=GXMCRa2fbLN4bhNN/LzvjFxn15a85r6Zswe7ll2Iwu0=; b=XKFgp+eMcLdhGLMJjS2Fey6ObRxpCRdagfkdKY+5nrlOufUX6HJmHv1u3Mp7XUekS2YElZpM/zW0KNielYAIkHzObPY6STuI1lgqZaGrY1BGijy8sXnUTXbA7AeaJZe+pgRmwYhNt0y1/3hmEpZKyzLnNP7FZgXCl2uf/ujOibc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; Received: from xantnef-ws.sw.ru (195.214.232.6) by VI1PR08MB3360.eurprd08.prod.outlook.com (2603:10a6:803:3f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.841.16; Wed, 13 Jun 2018 15:53:59 +0000 From: Anton Nefedov To: qemu-devel@nongnu.org Date: Wed, 13 Jun 2018 18:53:46 +0300 Message-Id: <1528905228-25694-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: HE1P190CA0003.EURP190.PROD.OUTLOOK.COM (2603:10a6:3:bc::13) To VI1PR08MB3360.eurprd08.prod.outlook.com (2603:10a6:803:3f::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: becc1c91-b4a6-43b1-087c-08d5d145e11c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(711020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:VI1PR08MB3360; X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB3360; 3:NizrYHWy6bzothLqFPeAQ3VWgYsP+BktomkaLqBVYXsmVZ695Z79ZQAe+CTTlkevOVCMFJRFs+7K5I0Q2PeVvMFvErytyX4O8lYadi2ROlbt5mg9aC0C/2KyGKoyiOHLfBwdirB2ZBNDRza5FLfCKlmDSr19bzKtlXHLgcUe1N6+crw1wD+xhRH/dQk55yZD5Lfq+3doIZoyqCSsXb4k8FOrtwVOMODeJiasOyd32oSlRzQAv8PK6R/63iHN0Svs; 25:QEW1HY5IkecjmspzLsc9/8MdGNEB/vI17tnHL8Kn7Hwq8nTV1DvoC7DlmiNIo5PX6v4DdwWlPVrct3PEeQWJjaJ2YPk/5PbdFXVMgOMpGIBf5F4Zt7s+tlPcK6RmGd8U6wvBHn0NFnThz/Brwh5m4QU5mIuQZodops7aHWqhLDVzVZiVExn4P6KxG3qWfWgjCyxN2e9wN30C8vmN4zYZSoxHkQhXqTL7uTcZHGE9ltrz1OvtrpTspkyZUSp3JqTHAYmud8HGh212MuKHwypKH6EuHwRuxLLaaqJjoP5uAsIaHUY3+pUNOfJUKVqreV/HYhPl7te9hMhhQrlKf2i9YA==; 31:b/F75CM9UgLVBtwYZfH+s3l09jxqGz62IN2OdczjjtkC+TtMGr+tMJpIKsGEi3JbE4X7e18xDFvpmE17N0dbFSbsLLJnoFTnQw8ELJtaBZBFYs2lvYG3+RSEORhOVzwkFbmn07HnXF8lDB4/dDtL6JU4bg95vFEWf3Upde5Jw0nSawvEn8w3ZwZH6BcabxvI5NNXHZoWJ9SzF6b+5KSDQcE7Ba5Mh3vSV0JzA6jod4U= X-MS-TrafficTypeDiagnostic: VI1PR08MB3360: X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB3360; 20:/ZHKmW6WEk3+avICAVOVUHAMJSJlAFXJwD/XMQBPTkOr9iGxJ5p9p+9v3j40tIQ9RXBoB/qvmSqJaTmfIyNK4EbpMws8SgMihjyObDl1K6DABS9KYAed2Gf3GSIGPGllJlNtkw8AHuxY0y7hnXBN+qp1ZZv5DHSfkqwWRvfJfNOiT7ERIgQgYuNPBSeCil8bLdQZXdVaYUqChxR3MyT4G4EKoQ58ALbvnlWq4WfJ0XDJXaWGXnq1ytj2KZvJ5EIJg73vZJ1+Otqos1lbg+Uv++zjm0T5s6Sekw2/kixDi9znE34LBFSbYDR1c2Hg/L91trSv+izNTFHETDQ0LsJ0vFHSvnSit0QkbVS/rqRoHx6GPf4iNtCgQHxpHILu/c3uZxGIHcv5751X5AIPOeMuUFBuMKnyHYMmMcceMgZuN/+1Z+ibTDZlrEvFswBg1+4eVZb1eWO96Rn0yc98UdfMC4FIr3gBlC5Meuba0vFSrEUO/wHmYE7EvyOcEHGGQSTq; 4:JDZpZSnKrGUpkrseEmnRR+9QQ7z76gv0H80ead0b/lh1Aty4pTmwcSxINFFynfQihgR2o1nrfXFTLa0PIIYLg0ZWkKE+RdUT0cdWx0akiSbSCgpggkl1FIx9ZK5M6uHOpTAHvuymS0tttixyzijnXcowYfT6tufaubZSy9wR86wUPzfOpbN/lE5SR+QOhY8NA0nBR521SsaXWPdVOLx2msfw1to7AExvodjFvT1F0mHScqzfviZEf6v4lNST+pSEoZa6hjk1KECB/OW4hAvFtg== 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)(5005006)(8121501046)(3231254)(944501410)(52105095)(10201501046)(93006095)(93001095)(3002001)(149027)(150027)(6041310)(20161123562045)(20161123564045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:VI1PR08MB3360; BCL:0; PCL:0; RULEID:; SRVR:VI1PR08MB3360; X-Forefront-PRVS: 07025866F6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39380400002)(396003)(39850400004)(376002)(366004)(346002)(199004)(189003)(5660300001)(97736004)(956004)(966005)(6306002)(81156014)(2351001)(7736002)(44832011)(26005)(2616005)(69596002)(2906002)(66066001)(476003)(50226002)(6116002)(8936002)(86362001)(36756003)(3846002)(478600001)(81166006)(6666003)(486006)(6916009)(47776003)(8676002)(316002)(16586007)(55236004)(305945005)(6512007)(68736007)(48376002)(6506007)(16526019)(107886003)(53936002)(4326008)(51416003)(25786009)(186003)(6486002)(50466002)(53416004)(52116002)(2361001)(59450400001)(106356001)(105586002)(386003); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR08MB3360; 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; VI1PR08MB3360; 23:zdQOQJlJoa9yItBlJxtcv78i9A5aVq3tsUI1Uz4Qp?= DNNNfIicm9Z7dBhcnrQ0aWdWWMsD9daqtxvI5dNEhz9IZjbJ790uWvObcMOpV0pfqOuZDua0zZm1thruvQtXq95G04hPQXcgy9hSoXu6yW5TSkJuBCC/nYlp+tvmta3Ai1ZksnOtMRkoUt+VI8qbNxzpcgZrk59y0uGRE3bnj4n75ir1b8k/cVBWesfSAmC+zp182MhzPaPhaKsQLyMmLO14a6tYgWGSkxjO81rDKG6r1TTClgPeqzUOo0PBrlBHzwORqVTzQ1GlZyk76Q2OHazMuxWKa102DtswYczt0jCc4i9ElGvwf9wTeScuNW1wLMUATqZDqBIHFijwN4GDjAKXL3sa1Ftp1c8vFfp+wZKrb+SZ6EyUmg1eTVaijD6UKpzk5foTbhqB/PmcMbxzrDAzoOKCKe9wVpxDgQV1Nql01zVOVrAwgiwI7A9J87wbW8rpPMMxtatGi5MyORD+HRU29ivfqJIec6T5bFnkf3QPpJOFTkOYZAvq+GpvBv4cw40g4UwAWpIDkAAg3KskcWZTF/5t0G5eeAk+dBEHh7ufMIqFwEs3+6HnDXx+rOYZOt0LBpKs0U8HMoiaEcoX920hdEpEWqdlGoattK8lB0RxYeqHFiCqKHNpAE12tiWBZylKVpK+gbYeU+Zo4WUYmgU9zssWKLd/QmLaqlcbsdBZuvcsdLzG1De4WU0lyU2WHLr5rUzVni3YqnhJPdPBKEeQ07spxFQUzEB7rxIv7tnz32kJKc3AwBzS/TMxH9dzvTrQonmji5pnY4hFxMcLbutwnQAEPFtaIh7Y1b+Nfy64Y+1VfBr/I9WDzW4RFmQtwhCSXmVWlGKbGul5YIQ0gWvaiq01JgNJ2w+f7p3CXMFVJy3fX/Ukpr/pUO2vf6tKfF4yBr2mSf/d2bnncwExFheCOKGF921pfmO3PvMKq1knZNaALLzU7D/4HFSPl+nVJxEa2VwF5703aVUHZ95WV9Vs13fEZ7NYO5BER/w+gqLbcdokO8ziyxpmRFXj3YtWL/65bgRvAu8+3XGUNvOsefOOsigzuNO1WVO1e+uwS7hu4PA6UWRr3fzgbuuNTKx1JtU24ryrZTlaj2wIuKO0HKPVxu8Z77oRo48iGpIUE5uxRV6AyFWs5P64vT7XMp+/e0MnWcs+kSL07LK0k3lLpy8vVj1x1f6XTWxaomH/Lt3lOd2ZFUTT82U6YZvza1XOVmFU3HnqhKpeF2g2xyvgjKN35bIbAVFpIf/KSe8jBfE1Wx5B+4YW2yiY+fdmQ/DQu0AKU6dKenHtGebbIuDMfRi X-Microsoft-Antispam-Message-Info: EN7w3OC4KeQawp7bf0zFMeW3uflyL5idFFoc6GzCiOJMBuOHIzmCXIXTA3ahbcBhEolGq1H/9WEVo5Qg0cxw8GEKfV+l0B6FzR85wPudrm0yViXXU6MjTzFQfSrpFLWoe99FYiUoGptcv+pkWHAQFqGXqkG+1HRMJuqF8qvXyzpEfRLOMGrzGkXitRG+bxIe X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB3360; 6:JssEW5Pt3KCwZM4gf2rBfkJJbnVrW6594DM0bqDpeIfKQBkBubAenhxbOTlxCUO/wvXX9iYKFlYqGuRAOeboHU1je27G99ztg44NuHSS3gvK+ZTkd2kx4cxNUvqNR0iLggNqLYeageZQHtxw9KwRY541kV6jTft1mfIpOA79oGCkFobNyElBKrFHRV0dcXpaJzHvSXYospEYYJAkLWgEiEn1PdE5lZgLlz/dSnCXZ0eUCj9xBWybGivV9HU+dxUEwdZ0U+PyR/SOvTuPHLkkVa/IBC3EwWeRDzqUaaZXevzB6tHPLS/VNbZ65y81GQlhp5ABkjMBHgMjUeRh6TSAJkVdUZk9UOzGCOmwaa0PJew5OGudqI0YRpZx3ife3NUotG6Kzu+kUQSSgRcOEYFJDot2V22xYuDqa2fUTtgE9N6NZ91QYUtveJjqwtHPuAQxfBVjQXUjw0sS5s6Y3ymBlg==; 5:GhPzlWuBhAa3truiH2Q4TJMEOLlVWvV3geqdQd0VIY+F2J+AfsSEOGs13xIgS0Kh7mRLV4JZBfexqLhYc5tzANwYpqJko/SmnhGVt0qu5u3r0RBZDkIGKthieEku0xNU3bHVEsd+fB4QFV6vmtfWnwW5ZVPaiVEnbIgpcmiVjsE=; 24:4Sh0YIw+arxqWT9X//4YJK4LKZqKuHEiPc4TGT7WqrtMdHBLOGjb+hC7IQ0+PnWXgDVESYp/rIFPxUF/c55sny1XohZxpL9Q3O3ieUxZF4U= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB3360; 7:6q6ViBrx86qxN12s37RSH/ecSCK1gzDtD6ZOmeHt6JkxkQbIB8y8LJS9EV5TzJd4ui/R0OkEtTDCKHAbwk9zmoRUCEKMc40kjnzz+dO8mlLS6zMdc8lqVzzoHTgmHAu6cixRtG1Gxvbwoz1qKOm85FVC45xc5ql69/wx0I501NThCD2a4jWCMIdqpeFRsbcUItfnL5qAPU320Dm2ZBYkFA8MG14cMkCVxShSlhY2bU54ktcz1BtbM90a8V7aCJr3; 20:AE3MnwxT5fzCe4WUhgGjABw/m67UYNvpCLS19AaUB/JxGtWQYd25qazQs8Stk/GPN7dAeKaLao0GhSfIpbBbgCnA2zeCHgYDAC5wiCcZ1JbvvcLF7Cf+CRxhBwkrS3r9jjRTfnyWiApfSqikt9Sb462MrEJkXIGBk70DkFyAAmA= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2018 15:53:59.7709 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: becc1c91-b4a6-43b1-087c-08d5d145e11c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB3360 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe0d::719 Subject: [Qemu-devel] [PATCH v4 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 v3: - patch 2 fixed: BlockdevQcow2Encryption::QCryptoBlockOptionsQCow deletion was a mistake v3: http://lists.nongnu.org/archive/html/qemu-devel/2018-05/msg06836.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 | 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, 36 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