From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Anton Nefedov Date: Wed, 13 Jun 2018 18:53:46 +0300 Message-Id: <1528905228-25694-1-git-send-email-anton.nefedov@virtuozzo.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v4 0/2] qapi: allow empty branches in flat unions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: eblake@redhat.com, armbru@redhat.com, mdroth@linux.vnet.ibm.com, Anton Nefedov 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 -- 2.7.4