Commit 16121fa3 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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

# By Stefan Hajnoczi (4) and others
# Via Stefan Hajnoczi
* stefanha/block:
  virtio-blk: do not relay a previous driver's WCE configuration to the current
  blockdev: do not default cache.no-flush to true
  block: don't lose data from last incomplete sector
  qcow2: Correct snapshots size for overlap check
  coroutine: fix /perf/nesting coroutine benchmark
  coroutine: add qemu_coroutine_yield benchmark
  qemu-timer: do not take the lock in timer_pending
  qemu-timer: make qemu_timer_mod_ns() and qemu_timer_del() thread-safe
  qemu-timer: drop outdated signal safety comments
  osdep: warn if open(O_DIRECT) on fails with EINVAL
  libcacard: link against qemu-error.o for error_report()

Message-id: 1379698931-946-1-git-send-email-stefanha@redhat.com
parents 2e6ae666 ef5bc962

block.c

+1 −1
Original line number Diff line number Diff line
@@ -2669,7 +2669,7 @@ static int coroutine_fn bdrv_co_do_readv(BlockDriverState *bs, 
            goto out;

        }



        total_sectors = len >> BDRV_SECTOR_BITS;

        total_sectors = (len + BDRV_SECTOR_SIZE - 1) >> BDRV_SECTOR_BITS;

        max_nb_sectors = MAX(0, total_sectors - sector_num);

        if (max_nb_sectors > 0) {

            ret = drv->bdrv_co_readv(bs, sector_num,

block/qcow2-snapshot.c

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static int qcow2_write_snapshots(BlockDriverState *bs) 
    /* The snapshot list position has not yet been updated, so these clusters

     * must indeed be completely free */

    ret = qcow2_pre_write_overlap_check(bs, QCOW2_OL_DEFAULT, offset,

                                        s->snapshots_size);

                                        snapshots_size);

    if (ret < 0) {

        return ret;

    }

blockdev.c

+1 −1
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ static DriveInfo *blockdev_init(QemuOpts *all_opts, 
    if (qemu_opt_get_bool(opts, "cache.direct", false)) {

        bdrv_flags |= BDRV_O_NOCACHE;

    }

    if (qemu_opt_get_bool(opts, "cache.no-flush", true)) {

    if (qemu_opt_get_bool(opts, "cache.no-flush", false)) {

        bdrv_flags |= BDRV_O_NO_FLUSH;

    }

hw/block/virtio-blk.c

+22 −2
Original line number Diff line number Diff line
@@ -460,9 +460,9 @@ static void virtio_blk_dma_restart_cb(void *opaque, int running, 


static void virtio_blk_reset(VirtIODevice *vdev)

{

#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE

    VirtIOBlock *s = VIRTIO_BLK(vdev);



#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE

    if (s->dataplane) {

        virtio_blk_data_plane_stop(s->dataplane);

    }
@@ -473,6 +473,7 @@ static void virtio_blk_reset(VirtIODevice *vdev) 
     * are per-device request lists.

     */

    bdrv_drain_all();

    bdrv_set_enable_write_cache(s->bs, s->original_wce);

}



/* coalesce internal state, copy to pci i/o region 0
@@ -564,8 +565,26 @@ static void virtio_blk_set_status(VirtIODevice *vdev, uint8_t status) 
    }



    features = vdev->guest_features;



    /* A guest that supports VIRTIO_BLK_F_CONFIG_WCE must be able to send

     * cache flushes.  Thus, the "auto writethrough" behavior is never

     * necessary for guests that support the VIRTIO_BLK_F_CONFIG_WCE feature.

     * Leaving it enabled would break the following sequence:

     *

     *     Guest started with "-drive cache=writethrough"

     *     Guest sets status to 0

     *     Guest sets DRIVER bit in status field

     *     Guest reads host features (WCE=0, CONFIG_WCE=1)

     *     Guest writes guest features (WCE=0, CONFIG_WCE=1)

     *     Guest writes 1 to the WCE configuration field (writeback mode)

     *     Guest sets DRIVER_OK bit in status field

     *

     * s->bs would erroneously be placed in writethrough mode.

     */

    if (!(features & (1 << VIRTIO_BLK_F_CONFIG_WCE))) {

        bdrv_set_enable_write_cache(s->bs, !!(features & (1 << VIRTIO_BLK_F_WCE)));

    }

}



static void virtio_blk_save(QEMUFile *f, void *opaque)

{
@@ -674,6 +693,7 @@ static int virtio_blk_device_init(VirtIODevice *vdev) 
    }



    blkconf_serial(&blk->conf, &blk->serial);

    s->original_wce = bdrv_enable_write_cache(blk->conf.bs);

    if (blkconf_geometry(&blk->conf, NULL, 65535, 255, 255) < 0) {

        return -1;

    }

include/hw/virtio/virtio-blk.h

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ typedef struct VirtIOBlock { 
    BlockConf *conf;

    VirtIOBlkConf blk;

    unsigned short sector_mask;

    bool original_wce;

    VMChangeStateEntry *change;

#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE

    Notifier migration_state_notifier;