aboutsummaryrefslogtreecommitdiff
path: root/block/qcow2.c
diff options
context:
space:
mode:
authorAnton Nefedov <anton.nefedov@virtuozzo.com>2018-06-18 11:40:06 +0300
committerMarkus Armbruster <armbru@redhat.com>2018-06-22 16:33:46 +0200
commit29cd0403f19e4be928b50ce6247cee02c3dfd46b (patch)
tree20c383459b50f45cbd44e91d774315bd8a6e7633 /block/qcow2.c
parent800877bb1639d38ffaebe312a37b61c66bb10c83 (diff)
downloadqemu-29cd0403f19e4be928b50ce6247cee02c3dfd46b.zip
qemu-29cd0403f19e4be928b50ce6247cee02c3dfd46b.tar.gz
qemu-29cd0403f19e4be928b50ce6247cee02c3dfd46b.tar.bz2
qapi: remove empty flat union branches and types
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 <anton.nefedov@virtuozzo.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Message-Id: <1529311206-76847-3-git-send-email-anton.nefedov@virtuozzo.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'block/qcow2.c')
-rw-r--r--block/qcow2.c1
1 files changed, 0 insertions, 1 deletions
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;