Commit 82e8a788 authored by Eric Blake's avatar Eric Blake Committed by Stefan Hajnoczi
Browse files

qcow2: Switch .bdrv_co_discard() to byte-based 



Another step towards killing off sector-based block APIs.

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-id: 1468624988-423-15-git-send-email-eblake@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 447e57c3

block/qcow2.c

+5 −5
Original line number Diff line number Diff line
@@ -2479,15 +2479,15 @@ static coroutine_fn int qcow2_co_pwrite_zeroes(BlockDriverState *bs, 
    return ret;

}



static coroutine_fn int qcow2_co_discard(BlockDriverState *bs,

    int64_t sector_num, int nb_sectors)

static coroutine_fn int qcow2_co_pdiscard(BlockDriverState *bs,

                                          int64_t offset, int count)

{

    int ret;

    BDRVQcow2State *s = bs->opaque;



    qemu_co_mutex_lock(&s->lock);

    ret = qcow2_discard_clusters(bs, sector_num << BDRV_SECTOR_BITS,

        nb_sectors, QCOW2_DISCARD_REQUEST, false);

    ret = qcow2_discard_clusters(bs, offset, count >> BDRV_SECTOR_BITS,

                                 QCOW2_DISCARD_REQUEST, false);

    qemu_co_mutex_unlock(&s->lock);

    return ret;

}
@@ -3410,7 +3410,7 @@ BlockDriver bdrv_qcow2 = { 
    .bdrv_co_flush_to_os    = qcow2_co_flush_to_os,



    .bdrv_co_pwrite_zeroes  = qcow2_co_pwrite_zeroes,

    .bdrv_co_discard        = qcow2_co_discard,

    .bdrv_co_pdiscard       = qcow2_co_pdiscard,

    .bdrv_truncate          = qcow2_truncate,

    .bdrv_write_compressed  = qcow2_write_compressed,

    .bdrv_make_empty        = qcow2_make_empty,