[Qemu-devel] [PATCH 1/1] qcow2: insert assert into qcow2_get_specific_info()

[Qemu-devel] [PATCH 1/1] qcow2: insert assert into qcow2_get_specific_info()

[Denis V. Lunev]

s->qcow_version is always set to 2 or 3. Let's assert if this is wrong.

Signed-off-by: Denis V. Lunev <den@openvz.org>
CC: Roman Kagan <rkagan@virtuozzo.com>
CC: Max Reitz <mreitz@redhat.com>
CC: Kevin Wolf <kwolf@redhat.com>
---
 block/qcow2.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/block/qcow2.c b/block/qcow2.c
index 88f56c8..b285014 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -2757,6 +2757,10 @@ static ImageInfoSpecific *qcow2_get_specific_info(BlockDriverState *bs)
             .has_corrupt        = true,
             .refcount_bits      = s->refcount_bits,
         };
+    } else {
+        /* if this assertion fails, this probably means a new version was
+         * added without having it covered here */
+        assert(false);
     }
 
     return spec_info;
-- 
2.1.4

Re: [Qemu-devel] [PATCH 1/1] qcow2: insert assert into qcow2_get_specific_info()

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 1235 bytes --]

[adding qemu-block in cc, per MAINTAINERS]

On 12/10/2015 02:55 AM, Denis V. Lunev wrote:
> s->qcow_version is always set to 2 or 3. Let's assert if this is wrong.
> 
> Signed-off-by: Denis V. Lunev <den@openvz.org>
> CC: Roman Kagan <rkagan@virtuozzo.com>
> CC: Max Reitz <mreitz@redhat.com>
> CC: Kevin Wolf <kwolf@redhat.com>
> ---
>  block/qcow2.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/block/qcow2.c b/block/qcow2.c
> index 88f56c8..b285014 100644
> --- a/block/qcow2.c
> +++ b/block/qcow2.c
> @@ -2757,6 +2757,10 @@ static ImageInfoSpecific *qcow2_get_specific_info(BlockDriverState *bs)
>              .has_corrupt        = true,
>              .refcount_bits      = s->refcount_bits,
>          };
> +    } else {
> +        /* if this assertion fails, this probably means a new version was
> +         * added without having it covered here */
> +        assert(false);

Only covers us if we don't turn on NDEBUG during compile; but then
again, lots of spots in the code base assume assert() will never be
crippled.

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

Re: [Qemu-devel] [PATCH 1/1] qcow2: insert assert into qcow2_get_specific_info()

[Kevin Wolf]

Am 10.12.2015 um 10:55 hat Denis V. Lunev geschrieben:
> s->qcow_version is always set to 2 or 3. Let's assert if this is wrong.
> 
> Signed-off-by: Denis V. Lunev <den@openvz.org>
> CC: Roman Kagan <rkagan@virtuozzo.com>
> CC: Max Reitz <mreitz@redhat.com>
> CC: Kevin Wolf <kwolf@redhat.com>

Thanks, applied to block-next.

Kevin