Commit 964737ea authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'stefanha/block' into staging 



# By Paolo Bonzini (21) and others
# Via Stefan Hajnoczi
* stefanha/block: (42 commits)
  qemu-iotests: Fixed test case 026
  qemu-iotests: Whitespace cleanup
  dataplane: Fix startup race.
  block: look for zero blocks in bs->file
  block: add default get_block_status implementation for protocols
  raw-posix: report unwritten extents as zero
  raw-posix: return get_block_status data and flags
  docs, qapi: document qemu-img map
  qemu-img: add a "map" subcommand
  block: return BDRV_BLOCK_ZERO past end of backing file
  block: use bdrv_has_zero_init to return BDRV_BLOCK_ZERO
  block: return get_block_status data and flags for formats
  block: define get_block_status return value
  block: introduce bdrv_get_block_status API
  block: make bdrv_has_zero_init return false for copy-on-write-images
  qemu-img: always probe the input image for allocated sectors
  block: expect errors from bdrv_co_is_allocated
  block: remove bdrv_is_allocated_above/bdrv_co_is_allocated_above distinction
  block: do not use ->total_sectors in bdrv_co_is_allocated
  block: make bdrv_co_is_allocated static
  ...

Message-id: 1378481953-23099-1-git-send-email-stefanha@redhat.com
Signed-off-by: default avatarAnthony Liguori <anthony@codemonkey.ws>
parents ce2b6941 8f94b077

QMP/qmp-events.txt

+22 −0
Original line number Diff line number Diff line
@@ -18,6 +18,28 @@ Example: 
    "data": { "actual": 944766976 },

    "timestamp": { "seconds": 1267020223, "microseconds": 435656 } }



BLOCK_IMAGE_CORRUPTED

---------------------



Emitted when a disk image is being marked corrupt.



Data:



- "device": Device name (json-string)

- "msg":    Informative message (e.g., reason for the corruption) (json-string)

- "offset": If the corruption resulted from an image access, this is the access

            offset into the image (json-int)

- "size":   If the corruption resulted from an image access, this is the access

            size (json-int)



Example:



{ "event": "BLOCK_IMAGE_CORRUPTED",

    "data": { "device": "ide0-hd0",

        "msg": "Prevented active L1 table overwrite", "offset": 196608,

        "size": 65536 },

    "timestamp": { "seconds": 1378126126, "microseconds": 966463 } }



BLOCK_IO_ERROR

--------------

block-migration.c

+2 −2
Original line number Diff line number Diff line
@@ -336,8 +336,8 @@ static void init_blk_migration_it(void *opaque, BlockDriverState *bs) 
        bmds->completed_sectors = 0;

        bmds->shared_base = block_mig_state.shared_base;

        alloc_aio_bitmap(bmds);

        drive_get_ref(drive_get_by_blockdev(bs));

        bdrv_set_in_use(bs, 1);

        bdrv_ref(bs);



        block_mig_state.total_sector_sum += sectors;
@@ -575,7 +575,7 @@ static void blk_mig_cleanup(void) 
    while ((bmds = QSIMPLEQ_FIRST(&block_mig_state.bmds_list)) != NULL) {

        QSIMPLEQ_REMOVE_HEAD(&block_mig_state.bmds_list, entry);

        bdrv_set_in_use(bmds->bs, 0);

        drive_put_ref(drive_get_by_blockdev(bmds->bs));

        bdrv_unref(bmds->bs);

        g_free(bmds->aio_bitmap);

        g_free(bmds);

    }

block.c

+231 −325

File changed.

Preview size limit exceeded, changes collapsed.

block/backup.c

+3 −3
Original line number Diff line number Diff line
@@ -289,14 +289,14 @@ static void coroutine_fn backup_run(void *opaque) 
                 * backing file. */



                for (i = 0; i < BACKUP_SECTORS_PER_CLUSTER;) {

                    /* bdrv_co_is_allocated() only returns true/false based

                    /* bdrv_is_allocated() only returns true/false based

                     * on the first set of sectors it comes across that

                     * are are all in the same state.

                     * For that reason we must verify each sector in the

                     * backup cluster length.  We end up copying more than

                     * needed but at some point that is always the case. */

                    alloced =

                        bdrv_co_is_allocated(bs,

                        bdrv_is_allocated(bs,

                                start * BACKUP_SECTORS_PER_CLUSTER + i,

                                BACKUP_SECTORS_PER_CLUSTER - i, &n);

                    i += n;
@@ -338,7 +338,7 @@ static void coroutine_fn backup_run(void *opaque) 
    hbitmap_free(job->bitmap);



    bdrv_iostatus_disable(target);

    bdrv_delete(target);

    bdrv_unref(target);



    block_job_completed(&job->common, ret);

}

block/blkverify.c

+2 −2
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ static int blkverify_open(BlockDriverState *bs, QDict *options, int flags) 
    s->test_file = bdrv_new("");

    ret = bdrv_open(s->test_file, filename, NULL, flags, NULL);

    if (ret < 0) {

        bdrv_delete(s->test_file);

        bdrv_unref(s->test_file);

        s->test_file = NULL;

        goto fail;

    }
@@ -169,7 +169,7 @@ static void blkverify_close(BlockDriverState *bs) 
{

    BDRVBlkverifyState *s = bs->opaque;



    bdrv_delete(s->test_file);

    bdrv_unref(s->test_file);

    s->test_file = NULL;

}