Commit 8f4699d8 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging 



Block patches

# gpg: Signature made Mon 20 Oct 2014 13:04:09 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"

* remotes/kevin/tags/for-upstream: (28 commits)
  block: Make device model's references to BlockBackend strong
  block: Lift device model API into BlockBackend
  blockdev: Convert qmp_eject(), qmp_change_blockdev() to BlockBackend
  block/qapi: Convert qmp_query_block() to BlockBackend
  blockdev: Fix blockdev-add not to create DriveInfo
  blockdev: Drop superfluous DriveInfo member id
  pc87312: Drop unused members of PC87312State
  ide: Complete conversion from BlockDriverState to BlockBackend
  hw: Convert from BlockDriverState to BlockBackend, mostly
  virtio-blk: Rename VirtIOBlkConf variables to conf
  virtio-blk: Drop redundant VirtIOBlock member conf
  block: Rename BlockDriverCompletionFunc to BlockCompletionFunc
  block: Rename BlockDriverAIOCB* to BlockAIOCB*
  block: Eliminate DriveInfo member bdrv, use blk_by_legacy_dinfo()
  block: Merge BlockBackend and BlockDriverState name spaces
  block: Eliminate BlockDriverState member device_name[]
  block: Eliminate bdrv_iterate(), use bdrv_next()
  blockdev: Eliminate drive_del()
  block: Make BlockBackend own its BlockDriverState
  block: Code motion to get rid of stubs/blockdev.c
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 895b810c 84ebe375

block-migration.c

+23 −21
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@ 
 */



#include "qemu-common.h"

#include "block/block_int.h"

#include "block/block.h"

#include "qemu/error-report.h"

#include "qemu/main-loop.h"

#include "hw/hw.h"

#include "qemu/queue.h"

#include "qemu/timer.h"
@@ -70,7 +72,7 @@ typedef struct BlkMigBlock { 
    int nr_sectors;

    struct iovec iov;

    QEMUIOVector qiov;

    BlockDriverAIOCB *aiocb;

    BlockAIOCB *aiocb;



    /* Protected by block migration lock.  */

    int ret;
@@ -130,9 +132,9 @@ static void blk_send(QEMUFile *f, BlkMigBlock * blk) 
                     | flags);



    /* device name */

    len = strlen(blk->bmds->bs->device_name);

    len = strlen(bdrv_get_device_name(blk->bmds->bs));

    qemu_put_byte(f, len);

    qemu_put_buffer(f, (uint8_t *)blk->bmds->bs->device_name, len);

    qemu_put_buffer(f, (uint8_t *)bdrv_get_device_name(blk->bmds->bs), len);



    /* if a block is zero we need to flush here since the network

     * bandwidth is now a lot higher than the storage device bandwidth.
@@ -343,12 +345,25 @@ static void unset_dirty_tracking(void) 
    }

}



static void init_blk_migration_it(void *opaque, BlockDriverState *bs)

static void init_blk_migration(QEMUFile *f)

{

    BlockDriverState *bs;

    BlkMigDevState *bmds;

    int64_t sectors;



    if (!bdrv_is_read_only(bs)) {

    block_mig_state.submitted = 0;

    block_mig_state.read_done = 0;

    block_mig_state.transferred = 0;

    block_mig_state.total_sector_sum = 0;

    block_mig_state.prev_progress = -1;

    block_mig_state.bulk_completed = 0;

    block_mig_state.zero_blocks = migrate_zero_blocks();



    for (bs = bdrv_next(NULL); bs; bs = bdrv_next(bs)) {

        if (bdrv_is_read_only(bs)) {

            continue;

        }



        sectors = bdrv_nb_sectors(bs);

        if (sectors <= 0) {

            return;
@@ -369,28 +384,15 @@ static void init_blk_migration_it(void *opaque, BlockDriverState *bs) 


        if (bmds->shared_base) {

            DPRINTF("Start migration for %s with shared base image\n",

                    bs->device_name);

                    bdrv_get_device_name(bs));

        } else {

            DPRINTF("Start full migration for %s\n", bs->device_name);

            DPRINTF("Start full migration for %s\n", bdrv_get_device_name(bs));

        }



        QSIMPLEQ_INSERT_TAIL(&block_mig_state.bmds_list, bmds, entry);

    }

}



static void init_blk_migration(QEMUFile *f)

{

    block_mig_state.submitted = 0;

    block_mig_state.read_done = 0;

    block_mig_state.transferred = 0;

    block_mig_state.total_sector_sum = 0;

    block_mig_state.prev_progress = -1;

    block_mig_state.bulk_completed = 0;

    block_mig_state.zero_blocks = migrate_zero_blocks();



    bdrv_iterate(init_blk_migration_it, NULL);

}



/* Called with no lock taken.  */



static int blk_mig_save_bulked_block(QEMUFile *f)

block.c

+137 −253

File changed.

Preview size limit exceeded, changes collapsed.

block/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ block-obj-y += qed-check.o 
block-obj-$(CONFIG_VHDX) += vhdx.o vhdx-endian.o vhdx-log.o

block-obj-$(CONFIG_QUORUM) += quorum.o

block-obj-y += parallels.o blkdebug.o blkverify.o

block-obj-y += snapshot.o qapi.o

block-obj-y += block-backend.o snapshot.o qapi.o

block-obj-$(CONFIG_WIN32) += raw-win32.o win32-aio.o

block-obj-$(CONFIG_POSIX) += raw-posix.o

block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o

block/archipelago.c

+14 −14
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ typedef enum { 
} ARCHIPCmd;



typedef struct ArchipelagoAIOCB {

    BlockDriverAIOCB common;

    BlockAIOCB common;

    QEMUBH *bh;

    struct BDRVArchipelagoState *s;

    QEMUIOVector *qiov;
@@ -856,11 +856,11 @@ err_exit: 
    return ret;

}



static BlockDriverAIOCB *qemu_archipelago_aio_rw(BlockDriverState *bs,

static BlockAIOCB *qemu_archipelago_aio_rw(BlockDriverState *bs,

                                           int64_t sector_num,

                                           QEMUIOVector *qiov,

                                           int nb_sectors,

                                                 BlockDriverCompletionFunc *cb,

                                           BlockCompletionFunc *cb,

                                           void *opaque,

                                           int op)

{
@@ -894,17 +894,17 @@ err_exit: 
    return NULL;

}



static BlockDriverAIOCB *qemu_archipelago_aio_readv(BlockDriverState *bs,

static BlockAIOCB *qemu_archipelago_aio_readv(BlockDriverState *bs,

        int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,

        BlockDriverCompletionFunc *cb, void *opaque)

        BlockCompletionFunc *cb, void *opaque)

{

    return qemu_archipelago_aio_rw(bs, sector_num, qiov, nb_sectors, cb,

                                   opaque, ARCHIP_OP_READ);

}



static BlockDriverAIOCB *qemu_archipelago_aio_writev(BlockDriverState *bs,

static BlockAIOCB *qemu_archipelago_aio_writev(BlockDriverState *bs,

        int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,

        BlockDriverCompletionFunc *cb, void *opaque)

        BlockCompletionFunc *cb, void *opaque)

{

    return qemu_archipelago_aio_rw(bs, sector_num, qiov, nb_sectors, cb,

                                   opaque, ARCHIP_OP_WRITE);
@@ -1052,8 +1052,8 @@ static QemuOptsList qemu_archipelago_create_opts = { 
    }

};



static BlockDriverAIOCB *qemu_archipelago_aio_flush(BlockDriverState *bs,

        BlockDriverCompletionFunc *cb, void *opaque)

static BlockAIOCB *qemu_archipelago_aio_flush(BlockDriverState *bs,

        BlockCompletionFunc *cb, void *opaque)

{

    return qemu_archipelago_aio_rw(bs, 0, NULL, 0, cb, opaque,

                                   ARCHIP_OP_FLUSH);

block/backup.c

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ void backup_start(BlockDriverState *bs, BlockDriverState *target, 
                  int64_t speed, MirrorSyncMode sync_mode,

                  BlockdevOnError on_source_error,

                  BlockdevOnError on_target_error,

                  BlockDriverCompletionFunc *cb, void *opaque,

                  BlockCompletionFunc *cb, void *opaque,

                  Error **errp)

{

    int64_t len;