Commit a126050a authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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



Block patches for 1.7.0-rc0 (v2)

# gpg: Signature made Thu 31 Oct 2013 04:44:39 PM CET using RSA key ID C88F2FD6
# gpg: Can't check signature: public key not found

* kwolf/tags/for-anthony: (30 commits)
  vmdk: Implment bdrv_get_specific_info
  qapi: Add optional field 'compressed' to ImageInfo
  qemu-iotests: prefill some data to test image
  sheepdog: check simultaneous create in resend_aioreq
  sheepdog: cancel aio requests if possible
  sheepdog: make add_aio_request and send_aioreq void functions
  sheepdog: try to reconnect to sheepdog after network error
  coroutine: add co_aio_sleep_ns() to allow sleep in block drivers
  sheepdog: reload inode outside of resend_aioreq
  sheepdog: handle vdi objects in resend_aio_req
  sheepdog: check return values of qemu_co_recv/send correctly
  qemu-iotests: Test case for backing file deletion
  qemu-iotests: drop duplicated "create_image"
  qemu-iotests: Fix 051 reference output
  block: Avoid unecessary drv->bdrv_getlength() calls
  block: Disable BDRV_O_COPY_ON_READ for the backing file
  ahci: fix win7 hang on boot
  sheepdog: pass copy_policy in the request
  sheepdog: explicitly set copies as type uint8_t
  block: Don't copy backing file name on error
  ...

Message-id: 1383064269-27720-1-git-send-email-kwolf@redhat.com
Signed-off-by: default avatarAnthony Liguori <anthony@codemonkey.ws>
parents ef5cfe5b f4c129a3

block.c

+8 −6
Original line number Diff line number Diff line
@@ -999,13 +999,12 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp) 
    }



    /* backing files always opened read-only */

    back_flags = bs->open_flags & ~(BDRV_O_RDWR | BDRV_O_SNAPSHOT);

    back_flags = bs->open_flags & ~(BDRV_O_RDWR | BDRV_O_SNAPSHOT |

                                    BDRV_O_COPY_ON_READ);



    ret = bdrv_open(bs->backing_hd,

                    *backing_filename ? backing_filename : NULL, options,

                    back_flags, back_drv, &local_err);

    pstrcpy(bs->backing_file, sizeof(bs->backing_file),

            bs->backing_hd->file->filename);

    if (ret < 0) {

        bdrv_unref(bs->backing_hd);

        bs->backing_hd = NULL;
@@ -1013,6 +1012,8 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict *options, Error **errp) 
        error_propagate(errp, local_err);

        return ret;

    }

    pstrcpy(bs->backing_file, sizeof(bs->backing_file),

            bs->backing_hd->file->filename);

    return 0;

}
@@ -2868,9 +2869,10 @@ int64_t bdrv_getlength(BlockDriverState *bs) 
    if (!drv)

        return -ENOMEDIUM;



    if (bdrv_dev_has_removable_media(bs)) {

        if (drv->bdrv_getlength) {

            return drv->bdrv_getlength(bs);

    if (drv->has_variable_length) {

        int ret = refresh_total_sectors(bs, bs->total_sectors);

        if (ret < 0) {

            return ret;

        }

    }

    return bs->total_sectors * BDRV_SECTOR_SIZE;

block/qcow2.c

+19 −0
Original line number Diff line number Diff line
@@ -1584,6 +1584,16 @@ static int qcow2_create2(const char *filename, int64_t total_size, 
        }

    }



    bdrv_close(bs);



    /* Reopen the image without BDRV_O_NO_FLUSH to flush it before returning */

    ret = bdrv_open(bs, filename, NULL,

                    BDRV_O_RDWR | BDRV_O_CACHE_WB, drv, &local_err);

    if (error_is_set(&local_err)) {

        error_propagate(errp, local_err);

        goto out;

    }



    ret = 0;

out:

    bdrv_unref(bs);
@@ -1939,13 +1949,22 @@ static int qcow2_save_vmstate(BlockDriverState *bs, QEMUIOVector *qiov, 
                              int64_t pos)

{

    BDRVQcowState *s = bs->opaque;

    int64_t total_sectors = bs->total_sectors;

    int growable = bs->growable;

    bool zero_beyond_eof = bs->zero_beyond_eof;

    int ret;



    BLKDBG_EVENT(bs->file, BLKDBG_VMSTATE_SAVE);

    bs->growable = 1;

    bs->zero_beyond_eof = false;

    ret = bdrv_pwritev(bs, qcow2_vm_state_offset(s) + pos, qiov);

    bs->growable = growable;

    bs->zero_beyond_eof = zero_beyond_eof;



    /* bdrv_co_do_writev will have increased the total_sectors value to include

     * the VM state - the VM state is however not an actual part of the block

     * device, therefore, we need to restore the old value. */

    bs->total_sectors = total_sectors;



    return ret;

}

block/raw-posix.c

+6 −3
Original line number Diff line number Diff line
@@ -1716,6 +1716,7 @@ static BlockDriver bdrv_host_floppy = { 


    .bdrv_truncate      = raw_truncate,

    .bdrv_getlength      = raw_getlength,

    .has_variable_length = true,

    .bdrv_get_allocated_file_size

                        = raw_get_allocated_file_size,
@@ -1825,6 +1826,7 @@ static BlockDriver bdrv_host_cdrom = { 


    .bdrv_truncate      = raw_truncate,

    .bdrv_getlength      = raw_getlength,

    .has_variable_length = true,

    .bdrv_get_allocated_file_size

                        = raw_get_allocated_file_size,
@@ -1952,6 +1954,7 @@ static BlockDriver bdrv_host_cdrom = { 


    .bdrv_truncate      = raw_truncate,

    .bdrv_getlength      = raw_getlength,

    .has_variable_length = true,

    .bdrv_get_allocated_file_size

                        = raw_get_allocated_file_size,

block/raw-win32.c

+3 −1
Original line number Diff line number Diff line
@@ -617,6 +617,8 @@ static BlockDriver bdrv_host_device = { 
    .bdrv_aio_flush     = raw_aio_flush,



    .bdrv_getlength      = raw_getlength,

    .has_variable_length = true,



    .bdrv_get_allocated_file_size

                        = raw_get_allocated_file_size,

};

block/raw_bsd.c

+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ static BlockDriver bdrv_raw = { 
    .bdrv_co_get_block_status = &raw_co_get_block_status,

    .bdrv_truncate        = &raw_truncate,

    .bdrv_getlength       = &raw_getlength,

    .has_variable_length  = true,

    .bdrv_get_info        = &raw_get_info,

    .bdrv_is_inserted     = &raw_is_inserted,

    .bdrv_media_changed   = &raw_media_changed,