Commit 3af78db6 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Block layer patches:

- block: Fix crash with qcow2 partial cluster COW with small cluster
  sizes (misaligned write requests with BDRV_REQ_NO_FALLBACK)
- qcow2: Fix integer overflow potentially causing corruption with huge
  requests
- vhdx: Detect truncated image files
- tools: Support help options for --object
- Various block-related replay improvements
- iotests/028: Fix for long $TEST_DIRs

# gpg: Signature made Mon 14 Oct 2019 17:02:54 BST
# gpg:                using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74  56FE 7F09 B272 C88F 2FD6

* remotes/kevin/tags/for-upstream:
  iotests: Test large write request to qcow2 file
  qcow2: Limit total allocation range to INT_MAX
  qemu-nbd: Support help options for --object
  qemu-img: Support help options for --object
  qemu-io: Support help options for --object
  vl: Split off user_creatable_print_help()
  iotests/028: Fix for long $TEST_DIRs
  block: Reject misaligned write requests with BDRV_REQ_NO_FALLBACK
  replay: add BH oneshot event for block layer
  replay: finish record/replay before closing the disks
  replay: don't drain/flush bdrv queue while RR is working
  replay: update docs for record/replay with block devices
  replay: disable default snapshot for record/replay
  block: implement bdrv_snapshot_goto for blkreplay
  block/vhdx: add check for truncated image files

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 9020e952 a1406a92

block/blkreplay.c

+8 −0
Original line number Diff line number Diff line
@@ -126,6 +126,12 @@ static int coroutine_fn blkreplay_co_flush(BlockDriverState *bs) 
    return ret;

}



static int blkreplay_snapshot_goto(BlockDriverState *bs,

                                   const char *snapshot_id)

{

    return bdrv_snapshot_goto(bs->file->bs, snapshot_id, NULL);

}



static BlockDriver bdrv_blkreplay = {

    .format_name            = "blkreplay",

    .instance_size          = 0,
@@ -140,6 +146,8 @@ static BlockDriver bdrv_blkreplay = { 
    .bdrv_co_pwrite_zeroes  = blkreplay_co_pwrite_zeroes,

    .bdrv_co_pdiscard       = blkreplay_co_pdiscard,

    .bdrv_co_flush          = blkreplay_co_flush,



    .bdrv_snapshot_goto     = blkreplay_snapshot_goto,

};



static void bdrv_blkreplay_init(void)

block/block-backend.c

+6 −3
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
#include "hw/qdev-core.h"

#include "sysemu/blockdev.h"

#include "sysemu/runstate.h"

#include "sysemu/sysemu.h"

#include "sysemu/replay.h"

#include "qapi/error.h"

#include "qapi/qapi-events-block.h"

#include "qemu/id.h"
@@ -1306,7 +1308,8 @@ BlockAIOCB *blk_abort_aio_request(BlockBackend *blk, 
    acb->blk = blk;

    acb->ret = ret;



    aio_bh_schedule_oneshot(blk_get_aio_context(blk), error_callback_bh, acb);

    replay_bh_schedule_oneshot_event(blk_get_aio_context(blk),

                                     error_callback_bh, acb);

    return &acb->common;

}
@@ -1362,7 +1365,7 @@ static BlockAIOCB *blk_aio_prwv(BlockBackend *blk, int64_t offset, int bytes, 


    acb->has_returned = true;

    if (acb->rwco.ret != NOT_DONE) {

        aio_bh_schedule_oneshot(blk_get_aio_context(blk),

        replay_bh_schedule_oneshot_event(blk_get_aio_context(blk),

                                         blk_aio_complete_bh, acb);

    }

block/io.c

+37 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include "qapi/error.h"

#include "qemu/error-report.h"

#include "qemu/main-loop.h"

#include "sysemu/replay.h"



#define NOT_DONE 0x7fffffff /* used while emulated sync operation in progress */
@@ -368,7 +369,7 @@ static void coroutine_fn bdrv_co_yield_to_drain(BlockDriverState *bs, 
    if (bs) {

        bdrv_inc_in_flight(bs);

    }

    aio_bh_schedule_oneshot(bdrv_get_aio_context(bs),

    replay_bh_schedule_oneshot_event(bdrv_get_aio_context(bs),

                                     bdrv_co_drain_bh_cb, &data);



    qemu_coroutine_yield();
@@ -600,6 +601,15 @@ void bdrv_drain_all_begin(void) 
        return;

    }



    /*

     * bdrv queue is managed by record/replay,

     * waiting for finishing the I/O requests may

     * be infinite

     */

    if (replay_events_enabled()) {

        return;

    }



    /* AIO_WAIT_WHILE() with a NULL context can only be called from the main

     * loop AioContext, so make sure we're in the main context. */

    assert(qemu_get_current_aio_context() == qemu_get_aio_context());
@@ -629,6 +639,15 @@ void bdrv_drain_all_end(void) 
    BlockDriverState *bs = NULL;

    int drained_end_counter = 0;



    /*

     * bdrv queue is managed by record/replay,

     * waiting for finishing the I/O requests may

     * be endless

     */

    if (replay_events_enabled()) {

        return;

    }



    while ((bs = bdrv_next_all_states(bs))) {

        AioContext *aio_context = bdrv_get_aio_context(bs);
@@ -2071,6 +2090,13 @@ int coroutine_fn bdrv_co_pwritev_part(BdrvChild *child, 
        return ret;

    }



    /* If the request is misaligned then we can't make it efficient */

    if ((flags & BDRV_REQ_NO_FALLBACK) &&

        !QEMU_IS_ALIGNED(offset | bytes, align))

    {

        return -ENOTSUP;

    }



    bdrv_inc_in_flight(bs);

    /*

     * Align write if necessary by performing a read-modify-write cycle.
@@ -2124,6 +2150,15 @@ int bdrv_flush_all(void) 
    BlockDriverState *bs = NULL;

    int result = 0;



    /*

     * bdrv queue is managed by record/replay,

     * creating new flush request for stopping

     * the VM may break the determinism

     */

    if (replay_events_enabled()) {

        return result;

    }



    for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {

        AioContext *aio_context = bdrv_get_aio_context(bs);

        int ret;

block/iscsi.c

+3 −2
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include "qemu/module.h"

#include "qemu/option.h"

#include "qemu/uuid.h"

#include "sysemu/replay.h"

#include "qapi/error.h"

#include "qapi/qapi-commands-misc.h"

#include "qapi/qmp/qdict.h"
@@ -280,7 +281,7 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int status, 
    }



    if (iTask->co) {

        aio_bh_schedule_oneshot(iTask->iscsilun->aio_context,

        replay_bh_schedule_oneshot_event(iTask->iscsilun->aio_context,

                                         iscsi_co_generic_bh_cb, iTask);

    } else {

        iTask->complete = 1;

block/nfs.c

+4 −2
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 
#include "qemu/option.h"

#include "qemu/uri.h"

#include "qemu/cutils.h"

#include "sysemu/sysemu.h"

#include "sysemu/replay.h"

#include "qapi/qapi-visit-block-core.h"

#include "qapi/qmp/qdict.h"

#include "qapi/qmp/qstring.h"
@@ -257,7 +259,7 @@ nfs_co_generic_cb(int ret, struct nfs_context *nfs, void *data, 
    if (task->ret < 0) {

        error_report("NFS Error: %s", nfs_get_error(nfs));

    }

    aio_bh_schedule_oneshot(task->client->aio_context,

    replay_bh_schedule_oneshot_event(task->client->aio_context,

                                     nfs_co_generic_bh_cb, task);

}