Commit 12a95f32 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

Merge remote-tracking branch 'kwolf/tags/for-upstream' into staging 



Block layer patches

# gpg: Signature made Fri 28 Apr 2017 09:20:17 PM BST
# gpg:                using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* kwolf/tags/for-upstream: (34 commits)
  progress: Show current progress on SIGINFO
  iotests: fix exclusion option
  iotests: clarify help text
  qemu-img: use blk_co_pwrite_zeroes for zero sectors when compressed
  qemu-img: improve convert_iteration_sectors()
  block: assert no image modification under BDRV_O_INACTIVE
  block: fix obvious coding style mistakes in block_int.h
  qcow2: Allow discard of final unaligned cluster
  block: Add .bdrv_truncate() error messages
  block: Add errp to BD.bdrv_truncate()
  block: Add errp to b{lk,drv}_truncate()
  block/vhdx: Make vhdx_create() always set errp
  qemu-img: Document backing options
  qemu-img/convert: Move bs_n > 1 && -B check down
  qemu-img/convert: Use @opts for one thing only
  block: fix alignment calculations in bdrv_co_do_zero_pwritev
  block: Do not unref bs->file on error in BD's open
  iotests: 109: Filter out "len" of failed jobs
  iotests: Fix typo in 026
  Issue a deprecation warning if the user specifies the "-hdachs" option.
  ...

Message-id: 1493411622-5343-1-git-send-email-kwolf@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents e619b147 5fc0fe38

block.c

+15 −11
Original line number Diff line number Diff line
@@ -1204,7 +1204,7 @@ static int bdrv_open_common(BlockDriverState *bs, BlockBackend *file, 
        filename = qdict_get_try_str(options, "filename");

    }



    if (drv->bdrv_needs_filename && !filename) {

    if (drv->bdrv_needs_filename && (!filename || !filename[0])) {

        error_setg(errp, "The '%s' block driver requires a file name",

                   drv->format_name);

        ret = -EINVAL;
@@ -3307,26 +3307,30 @@ exit: 
/**

 * Truncate file to 'offset' bytes (needed only for file protocols)

 */

int bdrv_truncate(BdrvChild *child, int64_t offset)

int bdrv_truncate(BdrvChild *child, int64_t offset, Error **errp)

{

    BlockDriverState *bs = child->bs;

    BlockDriver *drv = bs->drv;

    int ret;



    /* FIXME: Some format block drivers use this function instead of implicitly

     *        growing their file by writing beyond its end.

     *        See bdrv_aligned_pwritev() for an explanation why we currently

     *        cannot assert this permission in that case. */

    // assert(child->perm & BLK_PERM_RESIZE);

    assert(child->perm & BLK_PERM_RESIZE);



    if (!drv)

    if (!drv) {

        error_setg(errp, "No medium inserted");

        return -ENOMEDIUM;

    if (!drv->bdrv_truncate)

    }

    if (!drv->bdrv_truncate) {

        error_setg(errp, "Image format driver does not support resize");

        return -ENOTSUP;

    if (bs->read_only)

    }

    if (bs->read_only) {

        error_setg(errp, "Image is read-only");

        return -EACCES;

    }



    assert(!(bs->open_flags & BDRV_O_INACTIVE));



    ret = drv->bdrv_truncate(bs, offset);

    ret = drv->bdrv_truncate(bs, offset, errp);

    if (ret == 0) {

        ret = refresh_total_sectors(bs, offset >> BDRV_SECTOR_BITS);

        bdrv_dirty_bitmap_truncate(bs);

block/blkdebug.c

+3 −5
Original line number Diff line number Diff line
@@ -389,14 +389,12 @@ static int blkdebug_open(BlockDriverState *bs, QDict *options, int flags, 
    } else if (align) {

        error_setg(errp, "Invalid alignment");

        ret = -EINVAL;

        goto fail_unref;

        goto out;

    }



    ret = 0;

    goto out;



fail_unref:

    bdrv_unref_child(bs, bs->file);

out:

    if (ret < 0) {

        g_free(s->config_file);
@@ -661,9 +659,9 @@ static int64_t blkdebug_getlength(BlockDriverState *bs) 
    return bdrv_getlength(bs->file->bs);

}



static int blkdebug_truncate(BlockDriverState *bs, int64_t offset)

static int blkdebug_truncate(BlockDriverState *bs, int64_t offset, Error **errp)

{

    return bdrv_truncate(bs->file, offset);

    return bdrv_truncate(bs->file, offset, errp);

}



static void blkdebug_refresh_filename(BlockDriverState *bs, QDict *options)

block/blkreplay.c

+0 −3
Original line number Diff line number Diff line
@@ -37,9 +37,6 @@ static int blkreplay_open(BlockDriverState *bs, QDict *options, int flags, 


    ret = 0;

fail:

    if (ret < 0) {

        bdrv_unref_child(bs, bs->file);

    }

    return ret;

}

block/blkverify.c

+0 −3
Original line number Diff line number Diff line
@@ -142,9 +142,6 @@ static int blkverify_open(BlockDriverState *bs, QDict *options, int flags, 


    ret = 0;

fail:

    if (ret < 0) {

        bdrv_unref_child(bs, bs->file);

    }

    qemu_opts_del(opts);

    return ret;

}

block/block-backend.c

+4 −3
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ void monitor_remove_blk(BlockBackend *blk) 
 * Return @blk's name, a non-null string.

 * Returns an empty string iff @blk is not referenced by the monitor.

 */

const char *blk_name(BlockBackend *blk)

const char *blk_name(const BlockBackend *blk)

{

    return blk->name ?: "";

}
@@ -1746,13 +1746,14 @@ int blk_pwrite_compressed(BlockBackend *blk, int64_t offset, const void *buf, 
                   BDRV_REQ_WRITE_COMPRESSED);

}



int blk_truncate(BlockBackend *blk, int64_t offset)

int blk_truncate(BlockBackend *blk, int64_t offset, Error **errp)

{

    if (!blk_is_available(blk)) {

        error_setg(errp, "No medium inserted");

        return -ENOMEDIUM;

    }



    return bdrv_truncate(blk->root, offset);

    return bdrv_truncate(blk->root, offset, errp);

}



static void blk_pdiscard_entry(void *opaque)