Commit d4cc1a21 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging 



Block pull request

# gpg: Signature made Tue 25 Mar 2014 14:34:45 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  mirror: fix early wake from sleep due to aio
  mirror: fix throttling delay calculation
  Fixed various typos
  qemu-img: mandate argument to 'qemu-img check --repair'
  osdep: initialize glib threads in all QEMU tools

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 839a5547 7b770c72

block/gluster.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static int parse_volume_options(GlusterConf *gconf, char *path) 
 * 'server' specifies the server where the volume file specification for

 * the given volume resides. This can be either hostname, ipv4 address

 * or ipv6 address. ipv6 address needs to be within square brackets [ ].

 * If transport type is 'unix', then 'server' field should not be specifed.

 * If transport type is 'unix', then 'server' field should not be specified.

 * The 'socket' field needs to be populated with the path to unix domain

 * socket.

 *

block/mirror.c

+23 −14
Original line number Diff line number Diff line
@@ -98,8 +98,15 @@ static void mirror_iteration_done(MirrorOp *op, int ret) 


    qemu_iovec_destroy(&op->qiov);

    g_slice_free(MirrorOp, op);



    /* Enter coroutine when it is not sleeping.  The coroutine sleeps to

     * rate-limit itself.  The coroutine will eventually resume since there is

     * a sleep timeout so don't wake it early.

     */

    if (s->common.busy) {

        qemu_coroutine_enter(s->common.co, NULL);

    }

}



static void mirror_write_complete(void *opaque, int ret)

{
@@ -139,11 +146,12 @@ static void mirror_read_complete(void *opaque, int ret) 
                    mirror_write_complete, op);

}



static void coroutine_fn mirror_iteration(MirrorBlockJob *s)

static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s)

{

    BlockDriverState *source = s->common.bs;

    int nb_sectors, sectors_per_chunk, nb_chunks;

    int64_t end, sector_num, next_chunk, next_sector, hbitmap_next_sector;

    uint64_t delay_ns;

    MirrorOp *op;



    s->sector_num = hbitmap_iter_next(&s->hbi);
@@ -231,7 +239,12 @@ static void coroutine_fn mirror_iteration(MirrorBlockJob *s) 
        nb_chunks += added_chunks;

        next_sector += added_sectors;

        next_chunk += added_chunks;

    } while (next_sector < end);

        if (!s->synced && s->common.speed) {

            delay_ns = ratelimit_calculate_delay(&s->limit, added_sectors);

        } else {

            delay_ns = 0;

        }

    } while (delay_ns == 0 && next_sector < end);



    /* Allocate a MirrorOp that is used as an AIO callback.  */

    op = g_slice_new(MirrorOp);
@@ -268,6 +281,7 @@ static void coroutine_fn mirror_iteration(MirrorBlockJob *s) 
    trace_mirror_one_iteration(s, sector_num, nb_sectors);

    bdrv_aio_readv(source, sector_num, &op->qiov, nb_sectors,

                   mirror_read_complete, op);

    return delay_ns;

}



static void mirror_free_init(MirrorBlockJob *s)
@@ -362,7 +376,7 @@ static void coroutine_fn mirror_run(void *opaque) 
    bdrv_dirty_iter_init(bs, s->dirty_bitmap, &s->hbi);

    last_pause_ns = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);

    for (;;) {

        uint64_t delay_ns;

        uint64_t delay_ns = 0;

        int64_t cnt;

        bool should_complete;
@@ -386,10 +400,12 @@ static void coroutine_fn mirror_run(void *opaque) 
                qemu_coroutine_yield();

                continue;

            } else if (cnt != 0) {

                mirror_iteration(s);

                delay_ns = mirror_iteration(s);

                if (delay_ns == 0) {

                    continue;

                }

            }

        }



        should_complete = false;

        if (s->in_flight == 0 && cnt == 0) {
@@ -432,17 +448,10 @@ static void coroutine_fn mirror_run(void *opaque) 
        }



        ret = 0;

        trace_mirror_before_sleep(s, cnt, s->synced);

        trace_mirror_before_sleep(s, cnt, s->synced, delay_ns);

        if (!s->synced) {

            /* Publish progress */

            s->common.offset = (end - cnt) * BDRV_SECTOR_SIZE;



            if (s->common.speed) {

                delay_ns = ratelimit_calculate_delay(&s->limit, sectors_per_chunk);

            } else {

                delay_ns = 0;

            }



            block_job_sleep_ns(&s->common, QEMU_CLOCK_REALTIME, delay_ns);

            if (block_job_is_cancelled(&s->common)) {

                break;

block/qcow.c

+1 −1
Original line number Diff line number Diff line
@@ -723,7 +723,7 @@ static int qcow_create(const char *filename, QEMUOptionParameter *options, 
            backing_file = NULL;

        }

        header.cluster_bits = 9; /* 512 byte cluster to avoid copying

                                    unmodifyed sectors */

                                    unmodified sectors */

        header.l2_bits = 12; /* 32 KB L2 tables */

    } else {

        header.cluster_bits = 12; /* 4 KB clusters */

block/sheepdog.c

+4 −4
Original line number Diff line number Diff line
@@ -909,9 +909,9 @@ static void co_write_request(void *opaque) 
}



/*

 * Return a socket discriptor to read/write objects.

 * Return a socket descriptor to read/write objects.

 *

 * We cannot use this discriptor for other operations because

 * We cannot use this descriptor for other operations because

 * the block driver may be on waiting response from the server.

 */

static int get_sheep_fd(BDRVSheepdogState *s)
@@ -1896,7 +1896,7 @@ static int sd_create_branch(BDRVSheepdogState *s) 


    /*

     * Even If deletion fails, we will just create extra snapshot based on

     * the workding VDI which was supposed to be deleted. So no need to

     * the working VDI which was supposed to be deleted. So no need to

     * false bail out.

     */

    deleted = sd_delete(s);
@@ -2194,7 +2194,7 @@ cleanup: 
 * We implement rollback(loadvm) operation to the specified snapshot by

 * 1) switch to the snapshot

 * 2) rely on sd_create_branch to delete working VDI and

 * 3) create a new working VDI based on the speicified snapshot

 * 3) create a new working VDI based on the specified snapshot

 */

static int sd_snapshot_goto(BlockDriverState *bs, const char *snapshot_id)

{

block/vdi.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
 * Allocation of blocks could be optimized (less writes to block map and

 * header).

 *

 * Read and write of adjacents blocks could be done in one operation

 * Read and write of adjacent blocks could be done in one operation

 * (current code uses one operation per block (1 MiB).

 *

 * The code is not thread safe (missing locks for changes in header and