[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 2/9] block: add .bdrv_co_is_allocated()
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH v2 2/9] block: add .bdrv_co_is_allocated() |
Date: |
Mon, 14 Nov 2011 12:44:19 +0000 |
This patch adds the .bdrv_co_is_allocated() interface which is identical
to .bdrv_is_allocated() but runs in coroutine context. Running in
coroutine context implies that other coroutines might be performing I/O
at the same time. Therefore it must be safe to run while the following
BlockDriver functions are in-flight:
.bdrv_co_readv()
.bdrv_co_writev()
.bdrv_co_flush()
.bdrv_co_is_allocated()
The new .bdrv_co_is_allocated() interface is useful because it can be
used when a VM is running, whereas .bdrv_is_allocated() is a synchronous
interface that does not cope with parallel requests.
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block.c | 37 +++++++++++++++++++++++++++++++++++++
block_int.h | 2 ++
2 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/block.c b/block.c
index ab68e53..69989b0 100644
--- a/block.c
+++ b/block.c
@@ -1887,6 +1887,26 @@ int bdrv_has_zero_init(BlockDriverState *bs)
return 1;
}
+typedef struct BdrvCoIsAllocatedData {
+ BlockDriverState *bs;
+ int64_t sector_num;
+ int nb_sectors;
+ int *pnum;
+ int ret;
+ bool done;
+} BdrvCoIsAllocatedData;
+
+/* Coroutine wrapper for bdrv_is_allocated() */
+static void coroutine_fn bdrv_is_allocated_co_entry(void *opaque)
+{
+ BdrvCoIsAllocatedData *data = opaque;
+ BlockDriverState *bs = data->bs;
+
+ data->ret = bs->drv->bdrv_co_is_allocated(bs, data->sector_num,
+ data->nb_sectors, data->pnum);
+ data->done = true;
+}
+
/*
* Returns true iff the specified sector is present in the disk image. Drivers
* not implementing the functionality are assumed to not support backing files,
@@ -1902,6 +1922,23 @@ int bdrv_is_allocated(BlockDriverState *bs, int64_t
sector_num, int nb_sectors,
int *pnum)
{
int64_t n;
+ if (bs->drv->bdrv_co_is_allocated) {
+ Coroutine *co;
+ BdrvCoIsAllocatedData data = {
+ .bs = bs,
+ .sector_num = sector_num,
+ .nb_sectors = nb_sectors,
+ .pnum = pnum,
+ .done = false,
+ };
+
+ co = qemu_coroutine_create(bdrv_is_allocated_co_entry);
+ qemu_coroutine_enter(co, &data);
+ while (!data.done) {
+ qemu_aio_wait();
+ }
+ return data.ret;
+ }
if (!bs->drv->bdrv_is_allocated) {
if (sector_num >= bs->total_sectors) {
*pnum = 0;
diff --git a/block_int.h b/block_int.h
index b537d5a..01f73ba 100644
--- a/block_int.h
+++ b/block_int.h
@@ -103,6 +103,8 @@ struct BlockDriver {
int64_t sector_num, int nb_sectors, QEMUIOVector *qiov);
int coroutine_fn (*bdrv_co_discard)(BlockDriverState *bs,
int64_t sector_num, int nb_sectors);
+ int coroutine_fn (*bdrv_co_is_allocated)(BlockDriverState *bs,
+ int64_t sector_num, int nb_sectors, int *pnum);
/*
* Flushes all data that was already written to the OS all the way down to
--
1.7.7.1
- [Qemu-devel] [PATCH v2 0/9] block: replace .bdrv_is_allocated() with .bdrv_co_is_allocated(), Stefan Hajnoczi, 2011/11/14
- [Qemu-devel] [PATCH v2 3/9] qed: convert to .bdrv_co_is_allocated(), Stefan Hajnoczi, 2011/11/14
- [Qemu-devel] [PATCH v2 2/9] block: add .bdrv_co_is_allocated(),
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH v2 9/9] block: add bdrv_co_is_allocated() interface, Stefan Hajnoczi, 2011/11/14
- [Qemu-devel] [PATCH v2 5/9] vvfat: convert to .bdrv_co_is_allocated(), Stefan Hajnoczi, 2011/11/14
- [Qemu-devel] [PATCH v2 6/9] vdi: convert to .bdrv_co_is_allocated(), Stefan Hajnoczi, 2011/11/14
- [Qemu-devel] [PATCH v2 4/9] block: convert qcow2, qcow2, and vmdk to .bdrv_co_is_allocated(), Stefan Hajnoczi, 2011/11/14
- [Qemu-devel] [PATCH v2 1/9] block: use public bdrv_is_allocated() interface, Stefan Hajnoczi, 2011/11/14
- [Qemu-devel] [PATCH v2 8/9] block: drop .bdrv_is_allocated() interface, Stefan Hajnoczi, 2011/11/14
- [Qemu-devel] [PATCH v2 7/9] cow: convert to .bdrv_co_is_allocated(), Stefan Hajnoczi, 2011/11/14
- Re: [Qemu-devel] [PATCH v2 0/9] block: replace .bdrv_is_allocated() with .bdrv_co_is_allocated(), Kevin Wolf, 2011/11/23