Commit 53810bab authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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

* kwolf/for-anthony:
  qemu-iotests: skip 039 with ./check -nocache
  block: add BLOCK_O_CHECK for qemu-img check
  qcow2: mark image clean after repair succeeds
  qed: mark image clean after repair succeeds
  blockdev: flip default cache mode from writethrough to writeback
  virtio-blk: disable write cache if not negotiated
  virtio-blk: support VIRTIO_BLK_F_CONFIG_WCE
  qemu-iotests: Save some sed processes
  ahci: Fix sglist memleak in ahci_dma_rw_buf()
  ahci: Fix ahci cdrom read corruptions for reads > 128k
  virtio-blk: fix use-after-free while handling scsi commands
parents 31294261 166f3c7b

block.h

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ typedef struct BlockDevOps { 
#define BDRV_O_NO_FLUSH    0x0200 /* disable flushing on this disk */

#define BDRV_O_COPY_ON_READ 0x0400 /* copy read backing sectors into image */

#define BDRV_O_INCOMING    0x0800  /* consistency hint for incoming migration */

#define BDRV_O_CHECK       0x1000  /* open solely for consistency check */



#define BDRV_O_CACHE_MASK  (BDRV_O_NOCACHE | BDRV_O_CACHE_WB | BDRV_O_NO_FLUSH)

block/qcow2.c

+17 −15
Original line number Diff line number Diff line
@@ -270,6 +270,20 @@ static int qcow2_mark_clean(BlockDriverState *bs) 
    return 0;

}



static int qcow2_check(BlockDriverState *bs, BdrvCheckResult *result,

                       BdrvCheckMode fix)

{

    int ret = qcow2_check_refcounts(bs, result, fix);

    if (ret < 0) {

        return ret;

    }



    if (fix && result->check_errors == 0 && result->corruptions == 0) {

        return qcow2_mark_clean(bs);

    }

    return ret;

}



static int qcow2_open(BlockDriverState *bs, int flags)

{

    BDRVQcowState *s = bs->opaque;
@@ -470,16 +484,11 @@ static int qcow2_open(BlockDriverState *bs, int flags) 
    qemu_co_mutex_init(&s->lock);



    /* Repair image if dirty */

    if ((s->incompatible_features & QCOW2_INCOMPAT_DIRTY) &&

        !bs->read_only) {

    if (!(flags & BDRV_O_CHECK) && !bs->read_only &&

        (s->incompatible_features & QCOW2_INCOMPAT_DIRTY)) {

        BdrvCheckResult result = {0};



        ret = qcow2_check_refcounts(bs, &result, BDRV_FIX_ERRORS);

        if (ret < 0) {

            goto fail;

        }



        ret = qcow2_mark_clean(bs);

        ret = qcow2_check(bs, &result, BDRV_FIX_ERRORS);

        if (ret < 0) {

            goto fail;

        }
@@ -1568,13 +1577,6 @@ static int qcow2_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) 
    return 0;

}





static int qcow2_check(BlockDriverState *bs, BdrvCheckResult *result,

                       BdrvCheckMode fix)

{

    return qcow2_check_refcounts(bs, result, fix);

}



#if 0

static void dump_refcounts(BlockDriverState *bs)

{

block/qed-check.c

+26 −0
Original line number Diff line number Diff line
@@ -194,6 +194,28 @@ static void qed_check_for_leaks(QEDCheck *check) 
    }

}



/**

 * Mark an image clean once it passes check or has been repaired

 */

static void qed_check_mark_clean(BDRVQEDState *s, BdrvCheckResult *result)

{

    /* Skip if there were unfixable corruptions or I/O errors */

    if (result->corruptions > 0 || result->check_errors > 0) {

        return;

    }



    /* Skip if image is already marked clean */

    if (!(s->header.features & QED_F_NEED_CHECK)) {

        return;

    }



    /* Ensure fixes reach storage before clearing check bit */

    bdrv_flush(s->bs);



    s->header.features &= ~QED_F_NEED_CHECK;

    qed_write_header_sync(s);

}



int qed_check(BDRVQEDState *s, BdrvCheckResult *result, bool fix)

{

    QEDCheck check = {
@@ -215,6 +237,10 @@ int qed_check(BDRVQEDState *s, BdrvCheckResult *result, bool fix) 
    if (ret == 0) {

        /* Only check for leaks if entire image was scanned successfully */

        qed_check_for_leaks(&check);



        if (fix) {

            qed_check_mark_clean(s, result);

        }

    }



    g_free(check.used_clusters);

block/qed.c

+2 −9
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static void qed_header_cpu_to_le(const QEDHeader *cpu, QEDHeader *le) 
    le->backing_filename_size = cpu_to_le32(cpu->backing_filename_size);

}



static int qed_write_header_sync(BDRVQEDState *s)

int qed_write_header_sync(BDRVQEDState *s)

{

    QEDHeader le;

    int ret;
@@ -477,7 +477,7 @@ static int bdrv_qed_open(BlockDriverState *bs, int flags) 
    }



    /* If image was not closed cleanly, check consistency */

    if (s->header.features & QED_F_NEED_CHECK) {

    if (!(flags & BDRV_O_CHECK) && (s->header.features & QED_F_NEED_CHECK)) {

        /* Read-only images cannot be fixed.  There is no risk of corruption

         * since write operations are not possible.  Therefore, allow

         * potentially inconsistent images to be opened read-only.  This can
@@ -491,13 +491,6 @@ static int bdrv_qed_open(BlockDriverState *bs, int flags) 
            if (ret) {

                goto out;

            }

            if (!result.corruptions && !result.check_errors) {

                /* Ensure fixes reach storage before clearing check bit */

                bdrv_flush(s->bs);



                s->header.features &= ~QED_F_NEED_CHECK;

                qed_write_header_sync(s);

            }

        }

    }

block/qed.h

+5 −0
Original line number Diff line number Diff line
@@ -210,6 +210,11 @@ typedef struct { 
void *gencb_alloc(size_t len, BlockDriverCompletionFunc *cb, void *opaque);

void gencb_complete(void *opaque, int ret);



/**

 * Header functions

 */

int qed_write_header_sync(BDRVQEDState *s);



/**

 * L2 cache functions

 */