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

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



# gpg: Signature made Mon 07 Aug 2017 12:03:54 BST
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/tracing-pull-request:
  block: move trace probes into bdrv_co_preadv|pwritev

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e59b1c5f f42cf447

block/io.c

+4 −4
Original line number Diff line number Diff line
@@ -1135,6 +1135,8 @@ int coroutine_fn bdrv_co_preadv(BdrvChild *child, 
    bool use_local_qiov = false;

    int ret;



    trace_bdrv_co_preadv(child->bs, offset, bytes, flags);



    if (!drv) {

        return -ENOMEDIUM;

    }
@@ -1207,8 +1209,6 @@ static int coroutine_fn bdrv_co_do_readv(BdrvChild *child, 
int coroutine_fn bdrv_co_readv(BdrvChild *child, int64_t sector_num,

                               int nb_sectors, QEMUIOVector *qiov)

{

    trace_bdrv_co_readv(child->bs, sector_num, nb_sectors);



    return bdrv_co_do_readv(child, sector_num, nb_sectors, qiov, 0);

}
@@ -1526,6 +1526,8 @@ int coroutine_fn bdrv_co_pwritev(BdrvChild *child, 
    bool use_local_qiov = false;

    int ret;



    trace_bdrv_co_pwritev(child->bs, offset, bytes, flags);



    if (!bs->drv) {

        return -ENOMEDIUM;

    }
@@ -1660,8 +1662,6 @@ static int coroutine_fn bdrv_co_do_writev(BdrvChild *child, 
int coroutine_fn bdrv_co_writev(BdrvChild *child, int64_t sector_num,

    int nb_sectors, QEMUIOVector *qiov)

{

    trace_bdrv_co_writev(child->bs, sector_num, nb_sectors);



    return bdrv_co_do_writev(child, sector_num, nb_sectors, qiov, 0);

}

block/trace-events

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ blk_co_preadv(void *blk, void *bs, int64_t offset, unsigned int bytes, int flags 
blk_co_pwritev(void *blk, void *bs, int64_t offset, unsigned int bytes, int flags) "blk %p bs %p offset %"PRId64" bytes %u flags 0x%x"



# block/io.c

bdrv_co_readv(void *bs, int64_t sector_num, int nb_sector) "bs %p sector_num %"PRId64" nb_sectors %d"

bdrv_co_writev(void *bs, int64_t sector_num, int nb_sector) "bs %p sector_num %"PRId64" nb_sectors %d"

bdrv_co_preadv(void *bs, int64_t offset, int64_t nbytes, unsigned int flags) "bs %p offset %"PRId64" nbytes %"PRId64" flags 0x%x"

bdrv_co_pwritev(void *bs, int64_t offset, int64_t nbytes, unsigned int flags) "bs %p offset %"PRId64" nbytes %"PRId64" flags 0x%x"

bdrv_co_pwrite_zeroes(void *bs, int64_t offset, int count, int flags) "bs %p offset %"PRId64" count %d flags 0x%x"

bdrv_co_do_copy_on_readv(void *bs, int64_t offset, unsigned int bytes, int64_t cluster_offset, unsigned int cluster_bytes) "bs %p offset %"PRId64" bytes %u cluster_offset %"PRId64" cluster_bytes %u"