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

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



# By Max Reitz (11) and others
# Via Kevin Wolf
* kwolf/for-anthony: (26 commits)
  qemu-iotests: Overlapping cluster allocations
  qcow2_check: Mark image consistent
  qcow2-refcount: Repair shared refcount blocks
  qcow2-refcount: Repair OFLAG_COPIED errors
  qcow2-refcount: Move OFLAG_COPIED checks
  qcow2: Employ metadata overlap checks
  qcow2: Metadata overlap checks
  qcow2: Add corrupt bit
  qemu-iotests: Snapshotting zero clusters
  qcow2-refcount: Snapshot update for zero clusters
  option: Add assigned flag to QEMUOptionParameter
  gluster: Abort on AIO completion failure
  block: Remove old raw driver
  switch raw block driver from "raw.o" to "raw_bsd.o"
  raw_bsd: register bdrv_raw
  raw_bsd: add raw_create_options
  raw_bsd: introduce "special members"
  raw_bsd: add raw_create()
  raw_bsd: emit debug events in bdrv_co_readv() and bdrv_co_writev()
  add skeleton for BSD licensed "raw" BlockDriver
  ...

Message-id: 1378111792-20436-1-git-send-email-kwolf@redhat.com
Signed-off-by: default avatarAnthony Liguori <anthony@codemonkey.ws>
parents 5a93d5c2 ca0eca91

block.c

+0 −1
Original line number Diff line number Diff line
@@ -743,7 +743,6 @@ static int bdrv_open_common(BlockDriverState *bs, BlockDriverState *file, 
            ret = -EINVAL;

            goto free_and_fail;

        }

        assert(file != NULL);

        bs->file = file;

        ret = drv->bdrv_open(bs, options, open_flags);

    }

block/Makefile.objs

+1 −1
Original line number Diff line number Diff line 
block-obj-y += raw.o cow.o qcow.o vdi.o vmdk.o cloop.o dmg.o bochs.o vpc.o vvfat.o

block-obj-y += raw_bsd.o cow.o qcow.o vdi.o vmdk.o cloop.o dmg.o bochs.o vpc.o vvfat.o

block-obj-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o qcow2-cache.o

block-obj-y += qed.o qed-gencb.o qed-l2-cache.o qed-table.o qed-cluster.o

block-obj-y += qed-check.o

block/blkdebug.c

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ static const char *event_names[BLKDBG_EVENT_MAX] = { 


    [BLKDBG_REFTABLE_LOAD]                  = "reftable_load",

    [BLKDBG_REFTABLE_GROW]                  = "reftable_grow",

    [BLKDBG_REFTABLE_UPDATE]                = "reftable_update",



    [BLKDBG_REFBLOCK_LOAD]                  = "refblock_load",

    [BLKDBG_REFBLOCK_UPDATE]                = "refblock_update",

block/gluster.c

+2 −13
Original line number Diff line number Diff line
@@ -427,20 +427,9 @@ static void gluster_finish_aiocb(struct glfs_fd *fd, ssize_t ret, void *arg) 
        /*

         * Gluster AIO callback thread failed to notify the waiting

         * QEMU thread about IO completion.

         *

         * Complete this IO request and make the disk inaccessible for

         * subsequent reads and writes.

         */

        error_report("Gluster failed to notify QEMU about IO completion");



        qemu_mutex_lock_iothread(); /* We are in gluster thread context */

        acb->common.cb(acb->common.opaque, -EIO);

        qemu_aio_release(acb);

        close(s->fds[GLUSTER_FD_READ]);

        close(s->fds[GLUSTER_FD_WRITE]);

        qemu_aio_set_fd_handler(s->fds[GLUSTER_FD_READ], NULL, NULL, NULL);

        bs->drv = NULL; /* Make the disk inaccessible */

        qemu_mutex_unlock_iothread();

        error_report("Gluster AIO completion failed: %s", strerror(errno));

        abort();

    }

}

block/qcow2-cache.c

+17 −0
Original line number Diff line number Diff line
@@ -114,6 +114,23 @@ static int qcow2_cache_entry_flush(BlockDriverState *bs, Qcow2Cache *c, int i) 
        return ret;

    }



    if (c == s->refcount_block_cache) {

        ret = qcow2_pre_write_overlap_check(bs,

                QCOW2_OL_DEFAULT & ~QCOW2_OL_REFCOUNT_BLOCK,

                c->entries[i].offset, s->cluster_size);

    } else if (c == s->l2_table_cache) {

        ret = qcow2_pre_write_overlap_check(bs,

                QCOW2_OL_DEFAULT & ~QCOW2_OL_ACTIVE_L2,

                c->entries[i].offset, s->cluster_size);

    } else {

        ret = qcow2_pre_write_overlap_check(bs, QCOW2_OL_DEFAULT,

                c->entries[i].offset, s->cluster_size);

    }



    if (ret < 0) {

        return ret;

    }



    if (c == s->refcount_block_cache) {

        BLKDBG_EVENT(bs->file, BLKDBG_REFBLOCK_UPDATE_PART);

    } else if (c == s->l2_table_cache) {