Commit 6d0ceb80 authored by Pavel Dovgalyuk's avatar Pavel Dovgalyuk Committed by Paolo Bonzini
Browse files

replay: allow replay stopping and restarting 



This patch fixes bug with stopping and restarting replay
through monitor.

Signed-off-by: default avatarPavel Dovgalyuk <pavel.dovgaluk@ispras.ru>
Message-Id: <20160926080815.6992.71818.stgit@PASHA-ISP>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 306e196f

block/blkreplay.c

+5 −10
Original line number Diff line number Diff line
@@ -20,11 +20,6 @@ typedef struct Request { 
    QEMUBH *bh;

} Request;



/* Next request id.

   This counter is global, because requests from different

   block devices should not get overlapping ids. */

static uint64_t request_id;



static int blkreplay_open(BlockDriverState *bs, QDict *options, int flags,

                          Error **errp)

{
@@ -84,7 +79,7 @@ static void block_request_create(uint64_t reqid, BlockDriverState *bs, 
static int coroutine_fn blkreplay_co_preadv(BlockDriverState *bs,

    uint64_t offset, uint64_t bytes, QEMUIOVector *qiov, int flags)

{

    uint64_t reqid = request_id++;

    uint64_t reqid = blkreplay_next_id();

    int ret = bdrv_co_preadv(bs->file, offset, bytes, qiov, flags);

    block_request_create(reqid, bs, qemu_coroutine_self());

    qemu_coroutine_yield();
@@ -95,7 +90,7 @@ static int coroutine_fn blkreplay_co_preadv(BlockDriverState *bs, 
static int coroutine_fn blkreplay_co_pwritev(BlockDriverState *bs,

    uint64_t offset, uint64_t bytes, QEMUIOVector *qiov, int flags)

{

    uint64_t reqid = request_id++;

    uint64_t reqid = blkreplay_next_id();

    int ret = bdrv_co_pwritev(bs->file, offset, bytes, qiov, flags);

    block_request_create(reqid, bs, qemu_coroutine_self());

    qemu_coroutine_yield();
@@ -106,7 +101,7 @@ static int coroutine_fn blkreplay_co_pwritev(BlockDriverState *bs, 
static int coroutine_fn blkreplay_co_pwrite_zeroes(BlockDriverState *bs,

    int64_t offset, int count, BdrvRequestFlags flags)

{

    uint64_t reqid = request_id++;

    uint64_t reqid = blkreplay_next_id();

    int ret = bdrv_co_pwrite_zeroes(bs->file, offset, count, flags);

    block_request_create(reqid, bs, qemu_coroutine_self());

    qemu_coroutine_yield();
@@ -117,7 +112,7 @@ static int coroutine_fn blkreplay_co_pwrite_zeroes(BlockDriverState *bs, 
static int coroutine_fn blkreplay_co_pdiscard(BlockDriverState *bs,

                                              int64_t offset, int count)

{

    uint64_t reqid = request_id++;

    uint64_t reqid = blkreplay_next_id();

    int ret = bdrv_co_pdiscard(bs->file->bs, offset, count);

    block_request_create(reqid, bs, qemu_coroutine_self());

    qemu_coroutine_yield();
@@ -127,7 +122,7 @@ static int coroutine_fn blkreplay_co_pdiscard(BlockDriverState *bs, 


static int coroutine_fn blkreplay_co_flush(BlockDriverState *bs)

{

    uint64_t reqid = request_id++;

    uint64_t reqid = blkreplay_next_id();

    int ret = bdrv_co_flush(bs->file->bs);

    block_request_create(reqid, bs, qemu_coroutine_self());

    qemu_coroutine_yield();

cpus.c

+1 −0
Original line number Diff line number Diff line
@@ -750,6 +750,7 @@ static int do_vm_stop(RunState state) 
    }



    bdrv_drain_all();

    replay_disable_events();

    ret = blk_flush_all();



    return ret;

include/sysemu/replay.h

+4 −0
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ bool replay_checkpoint(ReplayCheckpoint checkpoint); 


/*! Disables storing events in the queue */

void replay_disable_events(void);

/*! Enables storing events in the queue */

void replay_enable_events(void);

/*! Returns true when saving events is enabled */

bool replay_events_enabled(void);

/*! Adds bottom half event to the queue */
@@ -115,6 +117,8 @@ void replay_input_event(QemuConsole *src, InputEvent *evt); 
void replay_input_sync_event(void);

/*! Adds block layer event to the queue */

void replay_block_event(QEMUBH *bh, uint64_t id);

/*! Returns ID for the next block event */

uint64_t blkreplay_next_id(void);



/* Character device */

replay/replay-events.c

+8 −0
Original line number Diff line number Diff line
@@ -309,3 +309,11 @@ bool replay_events_enabled(void) 
{

    return events_enabled;

}



uint64_t blkreplay_next_id(void)

{

    if (replay_events_enabled()) {

        return replay_state.block_request_id++;

    }

    return 0;

}

replay/replay-internal.h

+4 −2
Original line number Diff line number Diff line
@@ -68,6 +68,10 @@ typedef struct ReplayState { 
    unsigned int has_unread_data;

    /*! Temporary variable for saving current log offset. */

    uint64_t file_offset;

    /*! Next block operation id.

        This counter is global, because requests from different

        block devices should not get overlapping ids. */

    uint64_t block_request_id;

} ReplayState;

extern ReplayState replay_state;
@@ -123,8 +127,6 @@ void replay_read_next_clock(unsigned int kind); 
void replay_init_events(void);

/*! Clears internal data structures for events handling */

void replay_finish_events(void);

/*! Enables storing events in the queue */

void replay_enable_events(void);

/*! Flushes events queue */

void replay_flush_events(void);

/*! Clears events list before loading new VM state */