Commit d85e60e9 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2019-02-11' into staging 



nbd patches for 2019-02-11

- Add qcow2 bitmap details to 'qemu-img info'

# gpg: Signature made Mon 11 Feb 2019 20:38:32 GMT
# gpg:                using RSA key A7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full]
# gpg:                 aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" [full]
# gpg:                 aka "[jpeg image of size 6874]" [full]
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-nbd-2019-02-11:
  qcow2: list of bitmaps new test 242
  qcow2: Add list of bitmaps to ImageInfoSpecificQCow2
  bdrv_query_image_info Error parameter added
  nbd/server: Kill pointless shadowed variable

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 22c5f446 ddd113be

block.c

+3 −2
Original line number Diff line number Diff line
@@ -4462,11 +4462,12 @@ int bdrv_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) 
    return drv->bdrv_get_info(bs, bdi);

}



ImageInfoSpecific *bdrv_get_specific_info(BlockDriverState *bs)

ImageInfoSpecific *bdrv_get_specific_info(BlockDriverState *bs,

                                          Error **errp)

{

    BlockDriver *drv = bs->drv;

    if (drv && drv->bdrv_get_specific_info) {

        return drv->bdrv_get_specific_info(bs);

        return drv->bdrv_get_specific_info(bs, errp);

    }

    return NULL;

}

block/crypto.c

+3 −6
Original line number Diff line number Diff line
@@ -594,20 +594,17 @@ static int block_crypto_get_info_luks(BlockDriverState *bs, 
}



static ImageInfoSpecific *

block_crypto_get_specific_info_luks(BlockDriverState *bs)

block_crypto_get_specific_info_luks(BlockDriverState *bs, Error **errp)

{

    BlockCrypto *crypto = bs->opaque;

    ImageInfoSpecific *spec_info;

    QCryptoBlockInfo *info;



    info = qcrypto_block_get_info(crypto->block, NULL);

    info = qcrypto_block_get_info(crypto->block, errp);

    if (!info) {

        return NULL;

    }

    if (info->format != Q_CRYPTO_BLOCK_FORMAT_LUKS) {

        qapi_free_QCryptoBlockInfo(info);

        return NULL;

    }

    assert(info->format == Q_CRYPTO_BLOCK_FORMAT_LUKS);



    spec_info = g_new(ImageInfoSpecific, 1);

    spec_info->type = IMAGE_INFO_SPECIFIC_KIND_LUKS;

block/qapi.c

+6 −1
Original line number Diff line number Diff line
@@ -282,7 +282,12 @@ void bdrv_query_image_info(BlockDriverState *bs, 
        info->dirty_flag = bdi.is_dirty;

        info->has_dirty_flag = true;

    }

    info->format_specific     = bdrv_get_specific_info(bs);

    info->format_specific = bdrv_get_specific_info(bs, &err);

    if (err) {

        error_propagate(errp, err);

        qapi_free_ImageInfo(info);

        goto out;

    }

    info->has_format_specific = info->format_specific != NULL;



    backing_filename = bs->backing_file;

block/qcow2-bitmap.c

+76 −0
Original line number Diff line number Diff line
@@ -1006,6 +1006,82 @@ fail: 
    return false;

}





static Qcow2BitmapInfoFlagsList *get_bitmap_info_flags(uint32_t flags)

{

    Qcow2BitmapInfoFlagsList *list = NULL;

    Qcow2BitmapInfoFlagsList **plist = &list;

    int i;



    static const struct {

        int bme;  /* Bitmap directory entry flags */

        int info; /* The flags to report to the user */

    } map[] = {

        { BME_FLAG_IN_USE, QCOW2_BITMAP_INFO_FLAGS_IN_USE },

        { BME_FLAG_AUTO,   QCOW2_BITMAP_INFO_FLAGS_AUTO },

    };



    int map_size = ARRAY_SIZE(map);



    for (i = 0; i < map_size; ++i) {

        if (flags & map[i].bme) {

            Qcow2BitmapInfoFlagsList *entry =

                g_new0(Qcow2BitmapInfoFlagsList, 1);

            entry->value = map[i].info;

            *plist = entry;

            plist = &entry->next;

            flags &= ~map[i].bme;

        }

    }

    /* Check if the BME_* mapping above is complete */

    assert(!flags);



    return list;

}



/*

 * qcow2_get_bitmap_info_list()

 * Returns a list of QCOW2 bitmap details.

 * In case of no bitmaps, the function returns NULL and

 * the @errp parameter is not set.

 * When bitmap information can not be obtained, the function returns

 * NULL and the @errp parameter is set.

 */

Qcow2BitmapInfoList *qcow2_get_bitmap_info_list(BlockDriverState *bs,

                                                Error **errp)

{

    BDRVQcow2State *s = bs->opaque;

    Qcow2BitmapList *bm_list;

    Qcow2Bitmap *bm;

    Qcow2BitmapInfoList *list = NULL;

    Qcow2BitmapInfoList **plist = &list;



    if (s->nb_bitmaps == 0) {

        return NULL;

    }



    bm_list = bitmap_list_load(bs, s->bitmap_directory_offset,

                               s->bitmap_directory_size, errp);

    if (bm_list == NULL) {

        return NULL;

    }



    QSIMPLEQ_FOREACH(bm, bm_list, entry) {

        Qcow2BitmapInfo *info = g_new0(Qcow2BitmapInfo, 1);

        Qcow2BitmapInfoList *obj = g_new0(Qcow2BitmapInfoList, 1);

        info->granularity = 1U << bm->granularity_bits;

        info->name = g_strdup(bm->name);

        info->flags = get_bitmap_info_flags(bm->flags & ~BME_RESERVED_FLAGS);

        obj->value = info;

        *plist = obj;

        plist = &obj->next;

    }



    bitmap_list_free(bm_list);



    return list;

}



int qcow2_reopen_bitmaps_rw_hint(BlockDriverState *bs, bool *header_updated,

                                 Error **errp)

{

block/qcow2.c

+18 −3
Original line number Diff line number Diff line
@@ -4368,20 +4368,26 @@ static int qcow2_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) 
    return 0;

}



static ImageInfoSpecific *qcow2_get_specific_info(BlockDriverState *bs)

static ImageInfoSpecific *qcow2_get_specific_info(BlockDriverState *bs,

                                                  Error **errp)

{

    BDRVQcow2State *s = bs->opaque;

    ImageInfoSpecific *spec_info;

    QCryptoBlockInfo *encrypt_info = NULL;

    Error *local_err = NULL;



    if (s->crypto != NULL) {

        encrypt_info = qcrypto_block_get_info(s->crypto, &error_abort);

        encrypt_info = qcrypto_block_get_info(s->crypto, &local_err);

        if (local_err) {

            error_propagate(errp, local_err);

            return NULL;

        }

    }



    spec_info = g_new(ImageInfoSpecific, 1);

    *spec_info = (ImageInfoSpecific){

        .type  = IMAGE_INFO_SPECIFIC_KIND_QCOW2,

        .u.qcow2.data = g_new(ImageInfoSpecificQCow2, 1),

        .u.qcow2.data = g_new0(ImageInfoSpecificQCow2, 1),

    };

    if (s->qcow_version == 2) {

        *spec_info->u.qcow2.data = (ImageInfoSpecificQCow2){
@@ -4389,6 +4395,13 @@ static ImageInfoSpecific *qcow2_get_specific_info(BlockDriverState *bs) 
            .refcount_bits      = s->refcount_bits,

        };

    } else if (s->qcow_version == 3) {

        Qcow2BitmapInfoList *bitmaps;

        bitmaps = qcow2_get_bitmap_info_list(bs, &local_err);

        if (local_err) {

            error_propagate(errp, local_err);

            qapi_free_ImageInfoSpecific(spec_info);

            return NULL;

        }

        *spec_info->u.qcow2.data = (ImageInfoSpecificQCow2){

            .compat             = g_strdup("1.1"),

            .lazy_refcounts     = s->compatible_features &
@@ -4398,6 +4411,8 @@ static ImageInfoSpecific *qcow2_get_specific_info(BlockDriverState *bs) 
                                  QCOW2_INCOMPAT_CORRUPT,

            .has_corrupt        = true,

            .refcount_bits      = s->refcount_bits,

            .has_bitmaps        = !!bitmaps,

            .bitmaps            = bitmaps,

        };

    } else {

        /* if this assertion fails, this probably means a new version was