From patchwork Mon Jun 18 08:40:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Nefedov X-Patchwork-Id: 930744 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="D/3wVE4G"; 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 418PhJ5KQdz9s0W for ; Mon, 18 Jun 2018 18:41:20 +1000 (AEST) Received: from localhost ([::1]:33465 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUpiw-0005cv-FJ for incoming@patchwork.ozlabs.org; Mon, 18 Jun 2018 04:41:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59757) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUpiA-0005ZV-PZ for qemu-devel@nongnu.org; Mon, 18 Jun 2018 04:40:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fUpi8-0000K5-QI for qemu-devel@nongnu.org; Mon, 18 Jun 2018 04:40:30 -0400 Received: from mail-db5eur01on0097.outbound.protection.outlook.com ([104.47.2.97]:43712 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 1fUpi8-0000FC-Eg for qemu-devel@nongnu.org; Mon, 18 Jun 2018 04:40:28 -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=CFpEbwjmT2HYWe6FYW1K3WdGoilAFc101GjIonRSk/o=; b=D/3wVE4G4rbVe056d0ARaG707iXIG6v7iR1j/6GZGgkWCgzXJ2q1mXcOiHly3TAhH13keX0CaHCbAbPZ8P9E6v2msrjMSc1fsuSsgUAqdDW5RssJ1EANgsR1rqDrsS8u9L+OFBz0F614xqeszTkdoYx39gsw6e1sqEMHzXX8d18= Received: from xantnef-ws.sw.ru (195.214.232.6) by AM6PR08MB3351.eurprd08.prod.outlook.com (2603:10a6:209:48::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.19; Mon, 18 Jun 2018 08:40:23 +0000 From: Anton Nefedov To: qemu-devel@nongnu.org Date: Mon, 18 Jun 2018 11:40:06 +0300 Message-Id: <1529311206-76847-3-git-send-email-anton.nefedov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529311206-76847-1-git-send-email-anton.nefedov@virtuozzo.com> References: <1529311206-76847-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR0802CA0006.eurprd08.prod.outlook.com (2603:10a6:3:bd::16) To AM6PR08MB3351.eurprd08.prod.outlook.com (2603:10a6:209:48::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 96359349-5ee7-4d1b-3884-08d5d4f72255 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(5600026)(711020)(2017052603328)(7153060)(7193020); SRVR:AM6PR08MB3351; X-Microsoft-Exchange-Diagnostics: 1; AM6PR08MB3351; 3:jALq8trLjzB4Ukv60UPLLfRk1X19djJcIqxWjd/N48+/tmTtjkK1VmBSezL9ctiSmpUkCzRPGJn9F+CWdpJcg8u6w/n4BpoT1nMvRbCdjkKSZkM3m1uEU4s6QGLQyChz8bYAF4zeKPdQp9ANPb+yxVEW7K3QjzgnoqHSO51nEogEVseJaa7tQ7AVj5A9D56EOtKtjgEFfjCYl1bGsxU1KkcWhzsyPDJG9c3ezusk3X40YJ/Dnt2QIwXfjphXvhWH; 25:THUkvqS4X1nRuFqoLiiSCvMEu9IHGRKJYYb40pPDQHeSkxDniLuL66BGV/pg2gKNiiFFXHuZgq/zCEXuY3UmNTRE8mw+JjZR+c5kGEaeheOedaCKK/wgrWGz7YLA94I+dSDnsk5RCXyHCJ9EpRubANyts7m+p8SLil/JzNyQW1Jslcx/g1yrggZQF/BvWSkM+42nFJD1+fR6qvNBjS6cHkUhhLIOrmcrTLPaN/t3AdUHOB7DocG193FcuFs67oVG+nc2gli+hyLgCXZYXtPw7TRgHQ7RO42VZzPbjQy/jlbsSiZZOcTfSFj1inZJaDCBg75kucpqbrF46Zlyp+Qsng==; 31:9qZfXQRQpagUH1EFkY4/q9tfyxDtZkjYeSVvBYkXZuWzc/gPn53+sHEj0vQjo+5LslJRpkndN9ThGlx9K4XnqTHPtRhBAiY/SjW/fTIovEe5Qvmo8ndvr/mzX1Y3Z8HTwBqy8QShNV4zEXuyXj6pvWw1rFTyVWSCe8MNE8Qu1PSnGI722pYHNrRUozUpLDHahEh5SMnD/m1uWGcWz6Ysdr4qldsD/5SYkKVNBgAjXvk= X-MS-TrafficTypeDiagnostic: AM6PR08MB3351: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; X-Microsoft-Exchange-Diagnostics: 1; AM6PR08MB3351; 20:iF7C3AHB8PYxXlHKOn8A7NycozdIU7WHB2bsrZ87kchWefD4kNIcNZWKIImQYOXSMddBN0oBXTM1sNEW4h8sepPkH/ACTBm4P/WC0IdHY5K8xVq80p/ffYRzD0hX43hkHaOizGB8FosFBaGmaLJMly6sdftQZ5Bn60F6cXqUbtnAqEmlCoo/NWu9JMhAvx+nOxsaTwyXi1H4GduHo0E6AIEIts8jZBII17HEvzE8LopJhrxlaI00YRIPDWotWmSTqUeIzy4KoEaAMAIsmpXwIb/8MXurRW3t9e4ts7sh++2bEVwR5tXEzS1CA/iMycTJqZ3VYlsRbDEuBWGhNU94Bp5fkTLw5TBrFpa5vf8u42AJlAz8WvAXCSk6lAaWPE/WHtV4v7nAJkMs/fEVc07LbOGlISBdQWd4jWg6soUatvJQMytcnIF6s8pTJJxBBMUbeokfti05n2iIDfnqi7jPSTjQJMclw8IBrkrhrN+XphgxNNmarU3KhZsz3wHKeP7O; 4:2/BGrUGcOYXf84p4+HWj0RSuizfkg6C0E1ToXC4LM7q5HLTxKJ8x3+ylJQoJTIB0sf9aG0r5zNrayhQfXXAVQnEmuuKeRXmPnck+j4Jsb5rBx0xHEiyhmMtQYeWu8+f+uzULutrAYspL3F6Fl9lBptgA9Yd+vBOdTtH8IbG6Td1HFCR+DQQvzrLHqfL9AUPtb98QmN3LGFk2Z7LRBuvpwQMROMMgjiFlx5+p7BWmvYMmY5TMlrIMOqXMDnipVZcN57NGZyZDYaEH4gtkehudTQ== 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)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:AM6PR08MB3351; BCL:0; PCL:0; RULEID:; SRVR:AM6PR08MB3351; X-Forefront-PRVS: 0707248B64 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39840400004)(376002)(346002)(396003)(39380400002)(189003)(199004)(16526019)(316002)(106356001)(11346002)(48376002)(956004)(2616005)(6512007)(2351001)(476003)(53416004)(8936002)(6486002)(4326008)(305945005)(97736004)(186003)(86362001)(26005)(25786009)(50226002)(16586007)(69596002)(6116002)(3846002)(2906002)(55236004)(6666003)(47776003)(6506007)(105586002)(386003)(81166006)(66066001)(478600001)(107886003)(81156014)(44832011)(51416003)(50466002)(53936002)(6916009)(486006)(59450400001)(68736007)(8676002)(5660300001)(446003)(2361001)(36756003)(76176011)(52116002)(7736002)(357404004); DIR:OUT; SFP:1102; SCL:1; SRVR:AM6PR08MB3351; H:xantnef-ws.sw.ru; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM6PR08MB3351; 23:2JUAbSXDZSDzHNs5s64fFb/rnJre0eJ4ZEOC/g1Sp?= w0wW3ZYLAjGBDTH8OoQh0seBp8kOzdg7lXPzh38MtiCw1V5+wPWN0I50o81iZo1yuenUPfmjv1EFH+z8q4ZG3fCwSjcDvcVCEM4AYRi9PLePXaJikSWVuXuO7NbnIDeDyqmLRIOflUzZU7LCRCg6LjsM177D70c82Tznn8WvII1To8v/Z5tPOh6boeAJ0tCqxcJKYBkJEvXUo3PELDBa0BQgEKcMJGfafVho7Oz8AKP52qHhSdKTSep40ZOkKfSSXne64SlQdh52wSbf+sUrtnHZkoFwCtvNi5eY6nNv6yfd9U9+VVeV5b9DiEwDQBn4GnO2zYVpcemo3eLx1oYg2iCgC5r0axwlLB8ICsfOewzsNBmbjFYLtQpcTvWkG4vUY3CODIIbeUl2bUNmxZUsHC+uCUH4kZ7/55x7/QmIBwcLBIEqBTrTWt0ERkObSojzJPQzVdbL6MNI0NCdo/Aut31hASRBEnEDbW8+KwjyFhba/vEbL640yEtbYeuDtLpARmBLi8ncUWsyHnBpXJ0E4Ze5K7fwpNPskeV/ZhQNNfLMedfTXzaoKPkbZHr5B4572QEmMQgshONs2mkbjiMgvVYe1AV3icOOitw+xbsGKMXdktXlZe+28Cll0MpWOzy0+VrKkd/DK+5arYNncvv0OCNutMTPADIDBwG5Ja2ygxOVKIkYFVXtXOVot0lDw8DHVMYD+2BO6cMKvesTGyQht0VdrqTBB6tAl/27c5oDH332lVGSIkvG2Ylr7ZUvMHeW/rAYm0dxialVB1X/kwqlO72CpwLWJOsI23qTfCzElZsEjp8KP7rsGWKOLt0TSfbT5iykuTrm/r9cqtW9mZrpMBOqSDX4WjkJFdJA6neJNcH8nFs88zP07b0S6eL8mlp7jQxPvslZsVe1OpOl7qwGz7dQElY7jSCSa52oT+0GUco4SdHqopZJ4nn6IBzkOpRhlNXXHXhQR6xwglW5JdLpPhwEPHSBdInOwFQZa2obA5F0gJBK6E0YGt2vyeZc+8iawvaNblns2H3Hvqedrdm9FLu3RRJMwYChVKTHC+lwjZ/pXMppZHMTDlhPZb3xI9cdh0sEUdReplbM5nxUtsW8qrvtwEYCIkQhPnGiYYT/ifeobouyrU/eQ+kgppV77bZIzxXkgpHL9Sy0ooxbzqBsCa2xIs+jGsIkTK9D8C2dwxEusPSpTXdCogLzDKAcXePuxTFZyC8GFAgbErvOsTgb2tq44hLHFmc0po8RX+NSRNhZIKajYGc5DIBfO5Q5nUNgp5Y2lNCqBLx12WCzDOpk5jU/siXPMq3yoNvS5cjnwhra7xP5q4k2eB0G8y8Ibht9Us= X-Microsoft-Antispam-Message-Info: B+Qeu2myxgKHwjt3qHULOGQXbR33L6TNaeyTr/7F5Zchx93APA2kcINU2PeqmaMy2vubKIdI5i6Fvmsl5jfn32M3Ui5ZFurqPMRPqQJFKwhN2FGivY+6LXRpCei4EfBHy4N2+nF5wjic3R3mq1y5gbMVBJ7ottjPdsTq2t59dncfxOozqNO7NUojot61lodTfdV6AArNJBHwpj6OLp+lI8RlACgbfggYn923qJeqX5r3wfYEaxHljcGtfjVGUgxqby7c1ceUKIESCpaLmy22qiQZ6rLmBbwiRXM9p9eKi1Ow1GgW+WbF57NT77LEI/LL09qkL0D5kcUz6rLQmTUXCw== X-Microsoft-Exchange-Diagnostics: 1; AM6PR08MB3351; 6:L27VRK3fidXycCnPMblnkx2x4HraLKlrBBPcwEZW8EaQjW0VTKCclTXuSZMInnnP/akfY/X8UY5RO8weRVaSLL13cIWnemCtNppwlW3U/LyLxLgKnRvi4sHN9V45FFlKk4O7on7sM4s5sJc0PvRWnhUtlvkari0T3kjLJ6uItYwqJvZuKDfbVupnARyGPm04/ywycn5OSHnGpeEXag21vfv2LPOEDrIFatd+/FCla5GCBgpOz7YzGAXJ68PtCFsfhz9DPA5SAPoTjQFv6yKob2I9FdA1f5HpY+Nx6V/Gs5Xda34F5FhKA0RDoOQCJfiJ3w0urEgMZgo7ZBWwE/1RWrm56dY7aNrFYKMgsjOyqRmTvbqXv/AEPfdMWhvDYMZtVuXSMoi/AZkW0DRJfsJ8uKZkE3iBQPjYPQ5WrN24kjC3FJp1ZXe5eWtA4V/fzNf3kuJ2RALRq6l0rqgK1aqXrw==; 5:P2YV18uL8u4kr/5EEwoXJvQBkPC0nSjY97wjNEDO/tB2BMGwfGwMFukc0LtQuaXCxiCjwr1k3OoY68DdianQbIxIW2nihEzopv8o6bbLSj057M/VAbyUC4+bdAgwTPkr3pEbqXAqvqLfDUKc2lfh8TxeGyUmkb9bra92zFFtrkw=; 24:5mM+Gy+v9fYbKlhuAR9qLGIrn6ECLn39gxfmza4x8GF1Ub1LnLyYJjP21G6MrwdhqcNRKSdolr2VNvUss1UaSp6rwCJ6Dv4S7GszRXqcpxE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM6PR08MB3351; 7:D4FOmEdWLHSAziy2CMAKngPIpRbZClKcNcHr3EQoiaZBQavGYgGjin3RlsbcuhOVn6tGbSYxOhpxlSgqw4GQP7KYrUBiv2d54mIHj+mIxKhlUVXcbt2j816Yka7z2RSaxrC4YIhgO+se6En7idMirMPaId8isjFHNsT7pEg4PvoAfhowi+tO8X49vetp/uDz3HrgNBNDL/mBY5C9QNsj0vsuu9EGjV+y4vTMbxb2F6jf/8RgigbxWXFAxFmSwtMl; 20:1e74QcyGpybRgPf47s9kIfZmRhfQDGzkpI9zN84zuPo7leiZT9eG9iGXKq7X5rsZoe/e6+oRSkjKZQN3UK/VsBwaEEa61Nu9PvxuIWyqcO6M1KpQHu6srL0IM5kWAYz/+avann362Zm9Oo9nSYTOg8wx41KWkHuKOSMZ6GPXT54= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2018 08:40:23.6881 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 96359349-5ee7-4d1b-3884-08d5d4f72255 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3351 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.2.97 Subject: [Qemu-devel] [PATCH v5 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 ab629d1..23c88f5 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: @@ -4051,15 +4038,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. @@ -4073,44 +4051,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 945132f..a3a3aa2 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -4166,7 +4166,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) {