From patchwork Wed Jun 13 15:53:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Nefedov X-Patchwork-Id: 928956 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="KMPfucVL"; 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 415WXx06Yxz9s2g for ; Thu, 14 Jun 2018 01:54:57 +1000 (AEST) Received: from localhost ([::1]:35296 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fT86o-0007ZM-Gw for incoming@patchwork.ozlabs.org; Wed, 13 Jun 2018 11:54:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fT864-0007VB-5W 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 1fT861-0000mZ-4V 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 1fT860-0000d6-RA for qemu-devel@nongnu.org; Wed, 13 Jun 2018 11:54:05 -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=7ezm76D8pXDOBwO0N5y6zrrUu1YgJC7GrENe67Hz0Xg=; b=KMPfucVLB5xTofOdjWeAxHnahQxGP7XOE5469INq5e4Vdj2WpLKkYn9jlyFDncU2pe3VTCRbFhlXx2xKqxoUDU23kDF04dNdOGSDOOCwchB7PgLglzaFgLOBXCN94x6uWMayywclw+YYYXFHgFGJPA/g6BwGaZTvcMDBUFBdapk= 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:54:02 +0000 From: Anton Nefedov To: qemu-devel@nongnu.org Date: Wed, 13 Jun 2018 18:53:48 +0300 Message-Id: <1528905228-25694-3-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1528905228-25694-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1528905228-25694-1-git-send-email-anton.nefedov@virtuozzo.com> 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: 29955a51-9ccb-4fcf-9b74-08d5d145e2ba 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:OE//1ByGww9gMqdJvqKTm5A+wN6Z2NvnE3EyOGo0Xf04VWSXmPUAXh3UB4JasASeKV7SNOCXorryWKt+OA6DWTpjmfv/OGs4vL+ayd3tial+mfmkCkPE0YTRCJEpg17Alfofixtcff3OvWKT0ygCUUn3zWfXhcqjnglcFLFB+4a89921b0KJPhQ6ReN+V51yK/nfYWdTG9PWBz8jLdsqvDWH3sx7ytyXt51gevdEUila/Gpirmu+Ll9auChSx5uM; 25:lxAW2kBGdD2D4X1FFFa/+ORGPVoSM06xEHUOkKINaOF2urfj7iCIkFlVcjo3U9N75EV/LLxwxJowsNI3/ok9BoSNUh9tBvUHvUiNMBJF0YmLBfv3JhVQtfH5S3hVGoBBUDANd9idQTUhg76YZhHhhaSCBqpSn/1H+LKR0dQkprXuzMdyBKOnwLYk4+AU9FcAZs7RQX/QzuR1CtWqb7iDqox4RjWh/n7y3D5z7F1Q8EuobthR5X+ShALP8Tj0Xm8QODdWLyfm4CFQ5vbZP6rpERMgr3+JcJMGY23abVNJCZeVLBOd7z4RrgTTaXyMwWSburkiYwUkervySa7GISac2A==; 31:cyG6WFqQuh4VLl0i11lFqHjoKqeNgOAYKVBmtu18zpp826IQSqjzPuxupXM9yvlYtRNr+HJ+to1J8qEbFabfJ6daa3WcO9uQYaSHKIKH0/oRAqzxJoj04XcBYLB98b1ISm69ofXCZtW2P8zGRu6KyPiXnqEwRktHXqNBqpkUwnQz1E0rNV4fkZwhEUaSgoHDvmUB8SNJSjK3lSAJCkQiwWbQ8PlHxDkD9FfmW2bUjX4= X-MS-TrafficTypeDiagnostic: VI1PR08MB3360: X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB3360; 20:n3+euqQbAT4FBo7py05bdF/1vOKEOUHfzOrX+ruZeUCm1KjDAkbo566ceYpP00HI7ZnJpasnK/QZi3DehNPzIwfONMzL+i34rBclQyCI3LXsq/TYh55TPqJQFGfBqUcZCUlmD0ApmDIMjGHDooxghu1uCpPq3JMcFbhr5SC3WY4cjuciDkItwXNRPaNa322LFZklsbRNDTQ8CB9wEhrD7M7cYGi5zBTU1rh45EstIhazNwYJEnRu6bQCQtgxdWheFafXlyCzsZnfAWPHkc1mc2jZveeFKbPeLNB7hFvcNMyED+bdbbfVB83CsY1C60R+81XDzqoiqb0YkhIu+hI8ibIu+d5iARBcVo+QPohZczBcR49/sl1LKNfUllFAUwwFtYDs8cbxuQSFcs5HSocrdsQrXNBYqw8/ViSCnCkVuq58Tq0vcBX/9BXhWoWklRQ/Xq4A16HH00W7MBZ6qq47Q/o4hT3N1vLpIR8OA+7r3/l/sNs4z7iB7w8pRhh3YA9r; 4:X+3tP3MbY4lsdbB1u7Vz+dFOSyqLcH8Emj521IP4Dr6DW2eJ/uEd8F71ac7ir6pvaxlp0Zt+eNcWvAN3PQdefAWpzt4lvTLgOVtfwmXlkmfJJRVYaHRIjspphbYrZddXKDgTE5O2rWuib/zvQrIkys7aPgqsHk4GIWAD+n0+ov3Rf6jKJq2Yq2DY4bpDL7CNIxNiOBoirPNwVzgFWQeSPoBSjgNJ0Q4a0ntjSRK8wh4Cg2k/ikYMc9vmIoelJCsiOGbd0cw0jP8tAaqZmCa79w== 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)(446003)(97736004)(956004)(11346002)(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)(76176011)(48376002)(6506007)(16526019)(107886003)(53936002)(4326008)(51416003)(25786009)(186003)(6486002)(50466002)(53416004)(52116002)(2361001)(59450400001)(106356001)(105586002)(386003)(357404004); 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:0QJRT34APCy0pQHIIZlXPbwy2dh87Qi2kK6cxI4Xl?= OtpDiTowZeWTqHD3ZkQT1VnEzhDUjXYIj090R/Fngf4GchwXs+tLy2KB9YlPInJtjVyGajy2QwzdXb3dvjZjYQMZyCOf956XlHz1ppDEdesQ+u+DIDZUhtCPZfUryU7P9ip9p9Lb3PXJT2oaWc+w8hwmsE4RtB87KrtSGwQ+UoEDW/6k4jGTfLeuITtI7CeMOjudHExBRsi/f+fArIwjR/zVZFaksfosY5MtTEk40tuKTfbNfiUkzuVARNLfrrHPiZHBiooe7qrsC+CJsaBKaiLsqK2/wo6BWQP1OFikpd35LRYjS3tFkkjldiUOYpflU38Vf9amxUzsfbKPpW8EeM7W/PKcrenykWAAKl3nj5mroQgZ+1UYfb7Z3q495T1QhdVP/4ke4O20fMaIZ3sm+pr31L0VEcbC1y60SPy0kF8M5YUIb2+4jhS0OsVNXf+zG86B4kheSa6+qNa4GEIpW1wC/PER7gs8IijOAy6dX4+zgr4tINbgmrEVOYOFKx/X2LL5l7VFwhjnBU9HITXrVZ1h0m07gCHQxGI247OkSuuiatN0GsCdUukXswVoT+7VRGQBfjWljJiKGOciLJYffiz6HocLQP7lMFuzYYHCt1EctXjqeohFrvYllOjtZCfJI9qI1HG8tkvpkNIZm3h40n0czpOb10ZAgj4/R6sZjRjsHRaAIFWC7EbU8pyhjyb5rqWQYFO371DyjsqL/OmjpTz0KOkKopXdgcQtDoJ5F+ZSLh9VZUcA8eRzhqScK60MQ9JQTlO1AU7qxD8zTLrgquHIBNB2d8FCHHhKKipVWV9ZVo4nFAwXPXHaZIDuGnSDL79rNy8jTvPDEiNueo2ZEzW3Xl/j0SIruF/ve5ppP6eYuXhGboEIiozZvumvFAUQeWdrRgv4tsRrTfQb9rnJbBYYEteSVucMZxEdhAK2Fx7pjA3lkCmerJguPZtJjxetHbd1cPmOTwR9L/m4iP9opyGCMEv4XoiNk8/ayzWF+sJ/5s3NZyLQdvRO9c6Pz+UroOLLPIpaVg57zw+fwW3FPt1TBEur0yVE2baBnH/SVsZGSqm8tWL7SbErjRpkKFtXhHt/8942QTTbOqixGK6ggZXSaIiQHRxyAy73D89jHvVtIwqs+wLKXVvLxyeOxALIXbumGHkuvxN5TvCsjeNnb3BhY+td2/2ITEj6+efJm9we+YIHKBvysGqK9y85ANtyKtLV7Gl0qV6oLSGhRb2iYICOTMZWFbO8IQ+0bZnQSA8w/kys3okGEhdCbq4JZnn3L6A9M9RZH+yKyRCAHXLgbXPizf68OO9XfDIWxt2qL/+rVjXHIcb9TnCIap5pQbUjfE= X-Microsoft-Antispam-Message-Info: US5sUfpv2uAinh1E0NTmwp7YuuArxez/tYgW+pCOUMgw1l0Fxi9GwAT22L3a3Jq86Gq+zKeXStAwGuxztZ9v/URGn66z12/10e83qD6rKKIrP7oLaUA2xeNp0W9nG3m4lOzrMfUKAutzFs0k11ORltlUX0AW4dKrJAFbn7vDj4UnGz9kpJmXzBPqsf1oH+84 X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB3360; 6:/3RqWfIoat6sqapb+36Uh/8bOldepWPoWr5AmQaZpPFH7Rv6NY8nV+sWEQ2/j8aRYREHxZkckQqUlbbZZHU9U6BU3/cbaPSC/y+7rpSZ8Ncn3tWhJPeP/oKUrvKHSJlTCMm0684YgHey+uNF7iCEZCl4dYKMJQua3m4JKWPlNabgZ+96YXJUkKwGPN6YHh4gyim1DXmUktRPkXv2SPiDEdDguBkgLplJmzCAxVT94NLk8L/D7k7zK506cto8hXVD7w82szh8r7DiQqW8Ov0dPTgEHX0vXghwbHAI4MMVlOeHq1SCYEBc80fe+HQukTReuzDeWPRDTIDk54jc8ixIjwB7dY6NvcQoljBVjhoeqWJA+5QuI4B/fpnvCRKdpUSGdVEocT8mSgM90erynuPsv2UMAURsmkMBMLOA5QZOCjwvo8SmaiWVT7nVLgdScu+dagOwa8VvSuJF98lNF/ZsXw==; 5:UtktCkWusG82VPcURPSxFf4jY+8XJ5LFWHUiEm6WqEmXuhC2F9Z/D+Y3grLGQFh02qWHtLRCC9hfYLiMCnfxq1QtVUdjUdtIc4UQtoC3EVNR1gReShQn+JhLtsaMChG2b/3YhuZDsMA4OkQS6/9Glu7lAitoBHafSJ7qPF+GbdY=; 24:TywMhnKLPpCWFA5LQ77sIUn62oRjasttdeGat1J7uow26EFPiWlQ3jEHLkGtZ2lbFfllyP6RmaG+tTj3GfO/vfTRUHNo/Rlyr7ziQdoCK+0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR08MB3360; 7:1AN3nGXjoGkJeZWfDJUEQJKJZndk70G2miTiMFz8by0thkbWJUvjIUQOfbHAW5DWKSrQC8vsZvpfcHk5HiGMMjN0TDQQlBA+mkr3EVTlmKz56Rd4pKLeif2G3HVuwHpcNFqvP9wZ4zjWfKU6HcrGnzos2NSliGBrEqyp4CDVd2pz5S9MO7y12mVhE4p+lFFwNQJTxtFWEmwf8Izc4DM3qa8htN4caCAzn7PpxCGR7ZCrHpJB92X8lmxfpFDU3m+v; 20:Okw6U5GXBEMwJVul6Xieb5sBvnC2dNq7ZPNqy7kq6WqJGgWGxbWJBz7ukmVIkVQy5kXyKO3l3EVXFvqJRfilEDN16b1OWm+s10EdHFu8UVwXxu57JKpd06k5I6caayiWN6H+0453RpZ2MSYrE9zVvcENeBDl6zr0le6RdEEiUus= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2018 15:54:02.4868 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 29955a51-9ccb-4fcf-9b74-08d5d145e2ba 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 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: Markus Armbruster --- qapi/block-core.json | 52 +++------------------------------------------------- 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, 7 insertions(+), 138 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index fff23fc..b3e94d8 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: @@ -2853,16 +2852,6 @@ 'hash': 'str' }} ## -# @SshHostKeyDummy: -# -# For those union branches that don't need additional fields. -# -# Since: 2.12 -## -{ 'struct': 'SshHostKeyDummy', - 'data': {} } - -## # @SshHostKeyCheck: # # Since: 2.12 @@ -2870,9 +2859,7 @@ { 'union': 'SshHostKeyCheck', 'base': { 'mode': 'SshHostKeyCheckMode' }, 'discriminator': 'mode', - 'data': { 'none': 'SshHostKeyDummy', - 'hash': 'SshHostKeyHash', - 'known_hosts': 'SshHostKeyDummy' } } + 'data': { 'hash': 'SshHostKeyHash' } } ## # @BlockdevOptionsSsh: @@ -4032,15 +4019,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. @@ -4054,44 +4032,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 f83a63a..39f4dc1 100644 --- a/qapi/misc.json +++ b/qapi/misc.json @@ -395,8 +395,7 @@ 'mips': 'CpuInfoMIPS', 'tricore': 'CpuInfoTricore', 's390': 'CpuInfoS390', - 'riscv': 'CpuInfoRISCV', - 'other': 'CpuInfoOther' } } + 'riscv': 'CpuInfoRISCV' } } ## # @CpuInfoX86: @@ -467,16 +466,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 @@ -577,38 +566,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 6b7d93c..c86f351 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. @@ -477,7 +467,6 @@ 'base': { 'id': 'str', 'type': 'NetClientDriver' }, 'discriminator': 'type', 'data': { - 'none': 'NetdevNoneOptions', 'nic': 'NetLegacyNicOptions', 'user': 'NetdevUserOptions', 'tap': 'NetdevTapOptions', @@ -530,7 +519,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 6fa5e1d..b44e100 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -4169,7 +4169,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) {