[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 50/65] block: Lift some BDS functions to the BlockBac
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 50/65] block: Lift some BDS functions to the BlockBackend |
Date: |
Fri, 13 Feb 2015 16:24:46 +0000 |
From: Max Reitz <address@hidden>
Create the blk_* counterparts for the following bdrv_* functions (which
make sense to call on the BlockBackend level):
- bdrv_co_write_zeroes()
- bdrv_write_compressed()
- bdrv_truncate()
- bdrv_nb_sectors()
- bdrv_discard()
- bdrv_load_vmstate()
- bdrv_save_vmstate()
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/block-backend.c | 38 ++++++++++++++++++++++++++++++++++++++
include/sysemu/block-backend.h | 10 ++++++++++
2 files changed, 48 insertions(+)
diff --git a/block/block-backend.c b/block/block-backend.c
index c28e240..7dc985c 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -440,6 +440,11 @@ void blk_get_geometry(BlockBackend *blk, uint64_t
*nb_sectors_ptr)
bdrv_get_geometry(blk->bs, nb_sectors_ptr);
}
+int64_t blk_nb_sectors(BlockBackend *blk)
+{
+ return bdrv_nb_sectors(blk->bs);
+}
+
BlockAIOCB *blk_aio_readv(BlockBackend *blk, int64_t sector_num,
QEMUIOVector *iov, int nb_sectors,
BlockCompletionFunc *cb, void *opaque)
@@ -668,3 +673,36 @@ void *blk_aio_get(const AIOCBInfo *aiocb_info,
BlockBackend *blk,
{
return qemu_aio_get(aiocb_info, blk_bs(blk), cb, opaque);
}
+
+int coroutine_fn blk_co_write_zeroes(BlockBackend *blk, int64_t sector_num,
+ int nb_sectors, BdrvRequestFlags flags)
+{
+ return bdrv_co_write_zeroes(blk->bs, sector_num, nb_sectors, flags);
+}
+
+int blk_write_compressed(BlockBackend *blk, int64_t sector_num,
+ const uint8_t *buf, int nb_sectors)
+{
+ return bdrv_write_compressed(blk->bs, sector_num, buf, nb_sectors);
+}
+
+int blk_truncate(BlockBackend *blk, int64_t offset)
+{
+ return bdrv_truncate(blk->bs, offset);
+}
+
+int blk_discard(BlockBackend *blk, int64_t sector_num, int nb_sectors)
+{
+ return bdrv_discard(blk->bs, sector_num, nb_sectors);
+}
+
+int blk_save_vmstate(BlockBackend *blk, const uint8_t *buf,
+ int64_t pos, int size)
+{
+ return bdrv_save_vmstate(blk->bs, buf, pos, size);
+}
+
+int blk_load_vmstate(BlockBackend *blk, uint8_t *buf, int64_t pos, int size)
+{
+ return bdrv_load_vmstate(blk->bs, buf, pos, size);
+}
diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
index aab12b9..4ef0407 100644
--- a/include/sysemu/block-backend.h
+++ b/include/sysemu/block-backend.h
@@ -91,6 +91,7 @@ int blk_pread(BlockBackend *blk, int64_t offset, void *buf,
int count);
int blk_pwrite(BlockBackend *blk, int64_t offset, const void *buf, int count);
int64_t blk_getlength(BlockBackend *blk);
void blk_get_geometry(BlockBackend *blk, uint64_t *nb_sectors_ptr);
+int64_t blk_nb_sectors(BlockBackend *blk);
BlockAIOCB *blk_aio_readv(BlockBackend *blk, int64_t sector_num,
QEMUIOVector *iov, int nb_sectors,
BlockCompletionFunc *cb, void *opaque);
@@ -151,5 +152,14 @@ BlockAcctStats *blk_get_stats(BlockBackend *blk);
void *blk_aio_get(const AIOCBInfo *aiocb_info, BlockBackend *blk,
BlockCompletionFunc *cb, void *opaque);
+int coroutine_fn blk_co_write_zeroes(BlockBackend *blk, int64_t sector_num,
+ int nb_sectors, BdrvRequestFlags flags);
+int blk_write_compressed(BlockBackend *blk, int64_t sector_num,
+ const uint8_t *buf, int nb_sectors);
+int blk_truncate(BlockBackend *blk, int64_t offset);
+int blk_discard(BlockBackend *blk, int64_t sector_num, int nb_sectors);
+int blk_save_vmstate(BlockBackend *blk, const uint8_t *buf,
+ int64_t pos, int size);
+int blk_load_vmstate(BlockBackend *blk, uint8_t *buf, int64_t pos, int size);
#endif
--
2.1.0
- [Qemu-devel] [PULL 38/65] qtest/ahci: Adding simple dma read-write test, (continued)
- [Qemu-devel] [PULL 38/65] qtest/ahci: Adding simple dma read-write test, Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 35/65] libqos/ahci: add ahci_io, Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 41/65] block: vmdk - fixed sizeof() error, Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 39/65] nbd: fix the co_queue multi-adding bug, Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 43/65] qemu-io: Account IO by aio_read and aio_write, Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 44/65] qtest: Add scripts/qtest.py, Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 45/65] qemu-iotests: Add VM method qtest() to iotests.py, Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 42/65] qtest: Fix deadloop by running main loop AIO context's timers, Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 46/65] qemu-iotests: Allow caller to disable underscore convertion for qmp, Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 48/65] qemu-img: Fix qemu-img convert -n, Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 50/65] block: Lift some BDS functions to the BlockBackend,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 49/65] iotests: Add test for qemu-img convert to NBD, Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 51/65] block: Add blk_new_open(), Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 47/65] qemu-iotests: Add 093 for IO throttling, Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 52/65] block: Add Error parameter to bdrv_find_protocol(), Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 56/65] qemu-img: Use blk_new_open() in img_open(), Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 57/65] qemu-img: Use blk_new_open() in img_rebase(), Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 53/65] iotests: Add test for driver=qcow2, format=qcow2, Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 60/65] qemu-io: Use blk_new_open() in openfile(), Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 58/65] qemu-img: Use BlockBackend as far as possible, Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 55/65] block/xen: Use blk_new_open() in blk_connect(), Stefan Hajnoczi, 2015/02/13