From patchwork Wed May 30 16:37:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Nefedov X-Patchwork-Id: 922889 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="VHlGUlJn"; 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 40wxDD0fFhz9s0q for ; Thu, 31 May 2018 02:40:44 +1000 (AEST) Received: from localhost ([::1]:39702 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fO49R-0004WD-RE for incoming@patchwork.ozlabs.org; Wed, 30 May 2018 12:40:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40159) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fO46t-0002ZW-2z for qemu-devel@nongnu.org; Wed, 30 May 2018 12:38:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fO46o-0002dS-TG for qemu-devel@nongnu.org; Wed, 30 May 2018 12:38:03 -0400 Received: from mail-ve1eur02on0722.outbound.protection.outlook.com ([2a01:111:f400:fe06::722]:44960 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 1fO46o-0002d1-Ew for qemu-devel@nongnu.org; Wed, 30 May 2018 12:37:58 -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=3MuVM25hu9AwE3EsZmpM/m09FeeBUqN6Wcz3KzeO/FI=; b=VHlGUlJnyYA+nenOpzWKq9jGDZdPZWbobUo74iY+AeZrDO5S9iL6d4YIW4ILLtwJ3zsTy9OPWZ/0qQ+gXyjKpURiEigBIIf3/i/F5UF1fUH/ufnU5qxDvfdXeOp+PcelKe35mCxisws2CO6yrs/y542rMWNL035QjStBxpcpACs= 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:55 +0000 From: Anton Nefedov To: qemu-devel@nongnu.org Date: Wed, 30 May 2018 19:37:32 +0300 Message-Id: <1527698252-86258-3-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1527698252-86258-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1527698252-86258-1-git-send-email-anton.nefedov@virtuozzo.com> 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:xXawtPDteMzGZXTmRAHQ4Dz0orU6gWxOuZ98nyiG+jM3RmpfqHf44aZ+4aZiF0aTu9skkcF1lerhTngqVJY7gPDNvJxFRUf4Ux609czm2MbNG802EXGzbiQr7QURJG1iNa4IPXTyBVS1+Sui3UMq+RvRrjSS8XZfh5EuxryEDWFIa9NqfXJ+HEEDJvUL9cmxUT2fkkcFNnY+wPmPVqxahBo9+cG5oDSMmDDMibg+KE24g1mHOMfu/6ibh125qia3; 25:OdBgckeANkcEf2APHLFHaxZBARWwNbbJx6qOdlzAaaExEdMaQdBxXmNO3WweNzoAYN6gL+0Ft8JG+sYVgyRoVwJJfmrW3OgHR4QhOkGpjq77NEU92Rl9iMeZsbG6eLUGUt+8iJ0YFb6z110IFlc78BzFT+OnJdOOQ320je4eejVk4aIVF6tL3mtNdwJZPWmAXEc+/bdQmZ3u1qrIvYlbgxVVJq53xMszrdkPRKFsUBgXKeGtn4Oyl4sGAvvG0UcBEbYIebDXvwF+pooyggMXN/MG62g/KOUc6rvYOE6oWrmUwK4ZNBoPgZzaBVfvwkg3esjEb6zRw5SsrMELEKpzcQ==; 31:4shSxLU72ZgrXm+sxG9z9WrodO0Ks3JmP7eKER067UXVbNW2yvuL8t6nqUzY1QGAr/+U/uCegIYM+KSb4iuJ+9I7H4PckLo06BbYjeaEv962EC2e9TC/qmoZHscrShmqD52EHUydoZ4tnVPHGkeJ9nQWrrq9Ym4KjDz6SnK/+Yeh13TWipOuQlevT+7OdGsgXZoHY6I1UTLDGjdlInS3E6dWLxi8gYi+WbfDUyR0csE= X-MS-TrafficTypeDiagnostic: AM0PR08MB3346: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3346; 20:1NekvX7Tsakc/OK4ZPFYmdK2NbtlrTvGU/+czCfK5KsIa3TCAplpCFgU39Bdt+lxAexjAmp781jwRKRHKvDf1hgnX6MVfxeJ5Y3+ZDsRzPuqbq8K/sFfdx8ienWuKuIawaEqMPLH8QLIsWQ1FMEEyyZHGEKyQ5ulsZYvsq2M3bAm2frj+D4sr/wNZhJ1uNRQ31mWbFm/oDA3g5Ls4jibS0o2tMJZfhQwPggSUhI3sQbGmLsp9dSOnFbN8QGaY7rfY4cyetdfJltvH2Sjw0dEUNxg+sqoDkf4BKuICVmFjwLu/VknAIIbIjjMgpgZTFRYtnGbDfSBPwHb6gMtYnytZeUafhD5o/o4Wrp2cXNF74gFjPm1VO16nDnmaVgN6bzTJcq//irItARwhSfrFt+M+zZiAToc35sXvXL8pgmk8Cwdtwj6RVLk5eVsld7FZ+ihQYyuFZKNUN/q9anL7r70F+LvUX2BjpHDy3b969pw1/7NLwJa4YYlG8mw9d8nlKIS; 4:5i/GAga9UYlWU4gDCZ+fhTKM4QOyrayS4Lg7K/9PpP/7YxvHvijW8S/zFZVHME8wwOIW1dnI+bUIb9XaLj4cj4VOmRHHCvcDTeZYsmuUA5SHugSfi0tJnUGF+FpkvYu2DNBxix4QvoOKG99rVUH5lW2vlXbJoVUUUfhy+OsREmwBqDYKBzA8kJuM3nY/jiCDlQ/MdYcPOjsCXXd+aDAvM9AaCSwrf4tzPOEvAlNWFlivJKHwK4tFS2Kox/v2F8lK8BH6mq5ANyj6N6k9MQLtMA== 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)(575784001)(36756003)(44832011)(52116002)(6512007)(48376002)(6506007)(386003)(59450400001)(486006)(2906002)(69596002)(956004)(11346002)(2361001)(2351001)(47776003)(51416003)(476003)(25786009)(55236004)(50466002)(16586007)(2616005)(446003)(76176011)(357404004); 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:Ji+3ibKsdEZkt6jJXFEPLIPVdEe0NkQy5rEKcduYy?= lqawWzKlw7EhUiI2yKQscfNZ4SbcZI+Gx18arPvCYbyS2TUaDjA3dbUoA3NFxWm74rotqfmkIR5xCBDv8oOSbjq24KtofcaQ55vFp/wOchDlIE/FLDth7FVP5dxbFvc3DdU9QNwVK/LawkQDNEtNKnJKwm7b4sJqaEfH5bK6iEM/uDs/4TgwEvC/uj3MI1//9HyypNeIbRSpRZLi93iHSVKXWUVm7zSuvpdQ9sJzCXtOeKeTmEespjz/OJ42nLUdbzCAfNH53RfsQ8zt8ilnfkRss8ldXpmfEYugtJ8yNJB4ttfePZMmmjyS4o5YuUvnXeIWp7L0h4b3DokW0NP4Wzm1ysX/5Yw69Xg0LzhPecCkrsHFmW1po6jiQXEg8GQcWUEHU6mTV6y5X9guS0uNOo0KkiFGEuC0vlvYfhUYS598Ti/4D1VkVBdQ7B0hzE7Sc4kpHp2OOuU574GNTLRDfp6u9Q0VXC+y2DPiljufDE/8Z+VdbvAAKIcXud36N+PHsVLqGb07+J5zK3Rriwm2JAxm1yETtYh4/Id7QprSYqBI26K9kaVqUNNqYhQligmHbgWdL3qcOaoiFOb1qodpaC0K6KB65iCgr/XdfmM8pmZ2ukppMYyX/2FUJuddeZTSEfhycY8OTvSNEWcDo81TKbyT93nXk8PyCtuec0M04Sa3UCfaSw+hzZAEJTaBuAwDs0wm1PCUzRHc8sleRoEy41vVIQLFLIxXz/YkC0g6Q8MIpfuHw7xR4vFoWOCVog2T6BWKsaPY+ySxMUDTPDMiYwrtmrq0kDZJQDvSCJw6mEd3cIl89Tni10srxkF+ga8u3GVbUB87T/BxjA2o6LjwrfK6k1xYFz8R5dM3hu3xWtRCZWmR5zqSqYC/JzAgx6pEa7tzzwnF61uNU+aXGpVczQxSGSV3zIQ2loV5swZnOsFrjObMofAUXL04GHWrv1ScMs4aVNTHEQyt0674vv1JVC+zjG/Xcy1Qu8299TmO6qUqPf6/Bj4r/X297VbXnvx4H0tK2gjexW1EbXAQyr40oI2q13bAdhJayAY3IN/C9TVmbfgh09gMuVV2G3YLR4+jtnwl/d5ecvZT1rXAMKcwyFgVS3j3AUEcpxgAs6ASDmQ8sUqAIynn8R18kyta+bEkMvCpWFazjS0v+wWEkJ6aVjTXDk7rVXcNu5sTwdOhAmwL4QKFwYFjVtIWsRYWDzTs9vQeMGaIf560npSArWRjx/DuObPspiStFOeE2aBTJ11TsN4ReE2kcwNCVFHFuSNPWnMbgnN+yR0+tKLo0xjMznLuMTOYuNCOmG3SGtQ+HNC1X9qo2afkLGCdwQf88bduySa2XqSuE9HmFO6L8epKRE3 X-Microsoft-Antispam-Message-Info: PbPRyNskz9yQ/F6oOlXI4mu4e5f0mbnwohNyf1veBxzB1K18TuwVcaFWafrCdgXpXIUQMUkqgCzOSLLHVB+vYNbtRh4/z0w3iuMRgfOHid3i/0NEio6pAoP3y3bus7f2jPECH70qx+GrvvHiL/6zCw4n0KmjQqaForks1dgqY6kpISHl2Lf+SnW8MUFiK3Ii X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3346; 6:whh4BDU712E64260eufTmfm5/Hm9Jt90N+/EoKEunk78yK3a4BVjmtzXZkeGDZnLaOO3tzBjRxloFe32zoD32HUuMUDk0g/O/SkrufXjdj9bmKdMgKPXmjrxwO05A7cm68SU0CD85pPEAdNRiMJvgO9CYLN0uEy+uZw6ZTPbcssEBxAF3MgdQdthRC4FR1D4qZld5ju9ZNPPBJZ+/726CpqAVlV9Azt63hfaYb1eNXvaR/CbZf3VUYe0pxkI456G+o6F1zzWEFQqfxtefG3O01eTSPeGfGcBkhwUl6edlfAq+HM+mWj8Anj+botHtir+QACRGExGNa8y41HtwmOop8nY9D2aezlX8JxiGSM0lAdOX0ZIgNgEUQtmiLgA+Q+FX4HSGZRGv+F3rchz5fuK8F8xFigh9mUVGpYFEr/WH5IuTYFe+I0va3KNHkMyF/C5K8KWxgkM71AZFhLevJWrwA==; 5:uMH2cI8sMvwqsjR56EdjgYGVQX7e/VLB7V3L9D5Mrj/Bjlmgz7W3E/4tj1Ysrf9OhX3g0C4yEzXHTAkA38iV63W3eH4au0w7uHnZvHacnQB/00MuuKgtfMr4HwDZs8nNFVz7zeysavApIXkvGhLouwWYefczendnZy2Ou54969g=; 24:9gSU1e78Fy9wVO9Bcvv4AOQGbP4hU134uQQq/G8F8cG32oXI7wiEMK2CtlcWhmL1r/t7IPa9nv+OfvPxGt4pVzbGMYAvVL30wAAMbO+GU0E= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3346; 7:zQ+x8SpCukAyIQM7gkOhFPgKKH6jZntrKX8N8XoaQNYdmei0H+zyfZjl+rvvq8M5YbbjzUhmHcBQWa8S8hLVOPYNIoHNodVyII4ucVHcZpFfwiZm7T/98uRCNIwLveE6f1zMYVT7Dv/lQ2UuCBO6VUcY8pi+w9VUap5kFsrONObhPOVDtW5/w41F2n5dHOPbLjafGt50clZzibnofWB1C3tsZh5AAkFWhOol1I7EHqn4+EFwQXiIpAmNqvLoFpFQ; 20:HeQOXJpfzvsNLZTh/DJAmDtzW7AIuzAbAYY3JwY5NQK1S2pmRH/1jEr1yMVXsTbAdkrrFHx0RWQ23lLAPVV9N93+KmFo3PinPh+eD72bfltr1alsGaEjsf5HRDeRpG2Ccvkl/XfO7/NLKoWLM92zbbkSNPqTly9vQjBxKbxjL5o= X-MS-Office365-Filtering-Correlation-Id: 639feb70-3a2b-45dc-43e3-08d5c64bb291 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 May 2018 16:37:55.9129 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 639feb70-3a2b-45dc-43e3-08d5c64bb291 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::722 Subject: [Qemu-devel] [PATCH v3 2/2] qapi: remove empty flat union branches and types 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" Flat unions may now have uncovered branches, so it is possible to get rid of empty types defined for that purpose only. Signed-off-by: Anton Nefedov Reviewed-by: Eric Blake --- 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 -- 7 files changed, 8 insertions(+), 140 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index ad66ad6..d0b95f0 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -52,8 +52,7 @@ { 'union': 'ImageInfoSpecificQCow2Encryption', 'base': 'ImageInfoSpecificQCow2EncryptionBase', 'discriminator': 'format', - 'data': { 'aes': 'QCryptoBlockInfoQCow', - 'luks': 'QCryptoBlockInfoLUKS' } } + 'data': { 'luks': 'QCryptoBlockInfoLUKS' } } ## # @ImageInfoSpecificQCow2: @@ -2671,8 +2670,7 @@ { 'union': 'BlockdevQcow2Encryption', 'base': { 'format': 'BlockdevQcow2EncryptionFormat' }, 'discriminator': 'format', - 'data': { 'aes': 'QCryptoBlockOptionsQCow', - 'luks': 'QCryptoBlockOptionsLUKS'} } + 'data': { 'luks': 'QCryptoBlockOptionsLUKS'} } ## # @BlockdevOptionsQcow2: @@ -2769,16 +2767,6 @@ 'hash': 'str' }} ## -# @SshHostKeyDummy: -# -# For those union branches that don't need additional fields. -# -# Since: 2.12 -## -{ 'struct': 'SshHostKeyDummy', - 'data': {} } - -## # @SshHostKeyCheck: # # Since: 2.12 @@ -2786,9 +2774,7 @@ { 'union': 'SshHostKeyCheck', 'base': { 'mode': 'SshHostKeyCheckMode' }, 'discriminator': 'mode', - 'data': { 'none': 'SshHostKeyDummy', - 'hash': 'SshHostKeyHash', - 'known_hosts': 'SshHostKeyDummy' } } + 'data': { 'hash': 'SshHostKeyHash' } } ## # @BlockdevOptionsSsh: @@ -3948,15 +3934,6 @@ '*force-size': 'bool' } } ## -# @BlockdevCreateNotSupported: -# -# This is used for all drivers that don't support creating images. -# -# Since: 2.12 -## -{ 'struct': 'BlockdevCreateNotSupported', 'data': {}} - -## # @BlockdevCreateOptions: # # Options for creating an image format on a given node. @@ -3970,44 +3947,20 @@ 'driver': 'BlockdevDriver' }, 'discriminator': 'driver', 'data': { - 'blkdebug': 'BlockdevCreateNotSupported', - 'blkverify': 'BlockdevCreateNotSupported', - 'bochs': 'BlockdevCreateNotSupported', - 'cloop': 'BlockdevCreateNotSupported', - 'copy-on-read': 'BlockdevCreateNotSupported', - 'dmg': 'BlockdevCreateNotSupported', 'file': 'BlockdevCreateOptionsFile', - 'ftp': 'BlockdevCreateNotSupported', - 'ftps': 'BlockdevCreateNotSupported', 'gluster': 'BlockdevCreateOptionsGluster', - 'host_cdrom': 'BlockdevCreateNotSupported', - 'host_device': 'BlockdevCreateNotSupported', - 'http': 'BlockdevCreateNotSupported', - 'https': 'BlockdevCreateNotSupported', - 'iscsi': 'BlockdevCreateNotSupported', 'luks': 'BlockdevCreateOptionsLUKS', - 'nbd': 'BlockdevCreateNotSupported', 'nfs': 'BlockdevCreateOptionsNfs', - 'null-aio': 'BlockdevCreateNotSupported', - 'null-co': 'BlockdevCreateNotSupported', - 'nvme': 'BlockdevCreateNotSupported', 'parallels': 'BlockdevCreateOptionsParallels', 'qcow': 'BlockdevCreateOptionsQcow', 'qcow2': 'BlockdevCreateOptionsQcow2', 'qed': 'BlockdevCreateOptionsQed', - 'quorum': 'BlockdevCreateNotSupported', - 'raw': 'BlockdevCreateNotSupported', 'rbd': 'BlockdevCreateOptionsRbd', - 'replication': 'BlockdevCreateNotSupported', 'sheepdog': 'BlockdevCreateOptionsSheepdog', 'ssh': 'BlockdevCreateOptionsSsh', - 'throttle': 'BlockdevCreateNotSupported', 'vdi': 'BlockdevCreateOptionsVdi', 'vhdx': 'BlockdevCreateOptionsVhdx', - 'vmdk': 'BlockdevCreateNotSupported', - 'vpc': 'BlockdevCreateOptionsVpc', - 'vvfat': 'BlockdevCreateNotSupported', - 'vxhs': 'BlockdevCreateNotSupported' + 'vpc': 'BlockdevCreateOptionsVpc' } } ## diff --git a/qapi/crypto.json b/qapi/crypto.json index 288bc05..a51b434 100644 --- a/qapi/crypto.json +++ b/qapi/crypto.json @@ -297,16 +297,6 @@ 'uuid': 'str', 'slots': [ 'QCryptoBlockInfoLUKSSlot' ] }} -## -# @QCryptoBlockInfoQCow: -# -# Information about the QCow block encryption options -# -# Since: 2.7 -## -{ 'struct': 'QCryptoBlockInfoQCow', - 'data': { }} - ## # @QCryptoBlockInfo: @@ -318,5 +308,4 @@ { 'union': 'QCryptoBlockInfo', 'base': 'QCryptoBlockInfoBase', 'discriminator': 'format', - 'data': { 'qcow': 'QCryptoBlockInfoQCow', - 'luks': 'QCryptoBlockInfoLUKS' } } + 'data': { 'luks': 'QCryptoBlockInfoLUKS' } } diff --git a/qapi/misc.json b/qapi/misc.json index 99bcaac..a46e55c 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -393,8 +393,7 @@ 'mips': 'CpuInfoMIPS', 'tricore': 'CpuInfoTricore', 's390': 'CpuInfoS390', - 'riscv': 'CpuInfoRISCV', - 'other': 'CpuInfoOther' } } + 'riscv': 'CpuInfoRISCV' } } ## # @CpuInfoX86: @@ -465,16 +464,6 @@ { 'struct': 'CpuInfoRISCV', 'data': { 'pc': 'int' } } ## -# @CpuInfoOther: -# -# No additional information is available about the virtual CPU -# -# Since: 2.6 -# -## -{ 'struct': 'CpuInfoOther', 'data': { } } - -## # @CpuS390State: # # An enumeration of cpu states that can be assumed by a virtual @@ -575,38 +564,7 @@ 'arch' : 'CpuInfoArch', 'target' : 'SysEmuTarget' }, 'discriminator' : 'target', - 'data' : { 'aarch64' : 'CpuInfoOther', - 'alpha' : 'CpuInfoOther', - 'arm' : 'CpuInfoOther', - 'cris' : 'CpuInfoOther', - 'hppa' : 'CpuInfoOther', - 'i386' : 'CpuInfoOther', - 'lm32' : 'CpuInfoOther', - 'm68k' : 'CpuInfoOther', - 'microblaze' : 'CpuInfoOther', - 'microblazeel' : 'CpuInfoOther', - 'mips' : 'CpuInfoOther', - 'mips64' : 'CpuInfoOther', - 'mips64el' : 'CpuInfoOther', - 'mipsel' : 'CpuInfoOther', - 'moxie' : 'CpuInfoOther', - 'nios2' : 'CpuInfoOther', - 'or1k' : 'CpuInfoOther', - 'ppc' : 'CpuInfoOther', - 'ppc64' : 'CpuInfoOther', - 'ppcemb' : 'CpuInfoOther', - 'riscv32' : 'CpuInfoOther', - 'riscv64' : 'CpuInfoOther', - 's390x' : 'CpuInfoS390', - 'sh4' : 'CpuInfoOther', - 'sh4eb' : 'CpuInfoOther', - 'sparc' : 'CpuInfoOther', - 'sparc64' : 'CpuInfoOther', - 'tricore' : 'CpuInfoOther', - 'unicore32' : 'CpuInfoOther', - 'x86_64' : 'CpuInfoOther', - 'xtensa' : 'CpuInfoOther', - 'xtensaeb' : 'CpuInfoOther' } } + 'data' : { 's390x' : 'CpuInfoS390' } } ## # @query-cpus-fast: diff --git a/qapi/net.json b/qapi/net.json index 5c1dc48..3a43950 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -89,16 +89,6 @@ { 'command': 'netdev_del', 'data': {'id': 'str'} } ## -# @NetdevNoneOptions: -# -# Use it alone to have zero network devices. -# -# Since: 1.2 -## -{ 'struct': 'NetdevNoneOptions', - 'data': { } } - -## # @NetLegacyNicOptions: # # Create a new Network Interface Card. @@ -473,7 +463,6 @@ 'base': { 'id': 'str', 'type': 'NetClientDriver' }, 'discriminator': 'type', 'data': { - 'none': 'NetdevNoneOptions', 'nic': 'NetLegacyNicOptions', 'user': 'NetdevUserOptions', 'tap': 'NetdevTapOptions', @@ -526,7 +515,6 @@ 'base': { 'type': 'NetLegacyOptionsType' }, 'discriminator': 'type', 'data': { - 'none': 'NetdevNoneOptions', 'nic': 'NetLegacyNicOptions', 'user': 'NetdevUserOptions', 'tap': 'NetdevTapOptions', diff --git a/qapi/ui.json b/qapi/ui.json index fc18a05..f48d2a0 100644 --- a/qapi/ui.json +++ b/qapi/ui.json @@ -996,17 +996,6 @@ ## -# @DisplayNoOpts: -# -# Empty struct for displays without config options. -# -# Since: 2.12 -# -## -{ 'struct' : 'DisplayNoOpts', - 'data' : { } } - -## # @DisplayGTK: # # GTK display options. @@ -1068,10 +1057,4 @@ '*window-close' : 'bool', '*gl' : 'DisplayGLMode' }, 'discriminator' : 'type', - 'data' : { 'default' : 'DisplayNoOpts', - 'none' : 'DisplayNoOpts', - 'gtk' : 'DisplayGTK', - 'sdl' : 'DisplayNoOpts', - 'egl-headless' : 'DisplayNoOpts', - 'curses' : 'DisplayNoOpts', - 'cocoa' : 'DisplayNoOpts' } } + 'data' : { 'gtk' : 'DisplayGTK' } } diff --git a/block/qcow2.c b/block/qcow2.c index 6d53247..389d96d 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -4003,7 +4003,6 @@ static ImageInfoSpecific *qcow2_get_specific_info(BlockDriverState *bs) switch (encrypt_info->format) { case Q_CRYPTO_BLOCK_FORMAT_QCOW: qencrypt->format = BLOCKDEV_QCOW2_ENCRYPTION_FORMAT_AES; - qencrypt->u.aes = encrypt_info->u.qcow; break; case Q_CRYPTO_BLOCK_FORMAT_LUKS: qencrypt->format = BLOCKDEV_QCOW2_ENCRYPTION_FORMAT_LUKS; diff --git a/cpus.c b/cpus.c index d1f1629..19c5d37 100644 --- a/cpus.c +++ b/cpus.c @@ -2273,8 +2273,6 @@ CpuInfoFastList *qmp_query_cpus_fast(Error **errp) info->value->target = target; if (target == SYS_EMU_TARGET_S390X) { cpustate_to_cpuinfo_s390(&info->value->u.s390x, cpu); - } else { - /* do nothing for @CpuInfoOther */ } if (!cur_item) {