Message ID | 1325322388-4825-1-git-send-email-wdongxu@linux.vnet.ibm.com |
---|---|
State | New |
Headers | show |
On Sat, Dec 31, 2011 at 9:06 AM, Dong Xu Wang <wdongxu@linux.vnet.ibm.com> wrote: > +int bdrv_is_dirty(BlockDriverState *bs) bool would be nicer instead of int. Traditionally we used int but C99 has been around for a long time now and it's more appropriate. > diff --git a/qemu-img.c b/qemu-img.c > index 01cc0d3..a79c274 100644 > --- a/qemu-img.c > +++ b/qemu-img.c > @@ -1153,6 +1153,9 @@ static int img_info(int argc, char **argv) > if (bdrv_is_encrypted(bs)) { > printf("encrypted: yes\n"); > } > + if (bdrv_is_dirty(bs)) { > + printf("dirty,need check: yes\n"); > + } I suggest avoiding the comma and just saying "needs check: yes\n".
Am 11.01.2012 15:35, schrieb Stefan Hajnoczi: > On Sat, Dec 31, 2011 at 9:06 AM, Dong Xu Wang > <wdongxu@linux.vnet.ibm.com> wrote: >> +int bdrv_is_dirty(BlockDriverState *bs) > > bool would be nicer instead of int. Traditionally we used int but C99 > has been around for a long time now and it's more appropriate. > >> diff --git a/qemu-img.c b/qemu-img.c >> index 01cc0d3..a79c274 100644 >> --- a/qemu-img.c >> +++ b/qemu-img.c >> @@ -1153,6 +1153,9 @@ static int img_info(int argc, char **argv) >> if (bdrv_is_encrypted(bs)) { >> printf("encrypted: yes\n"); >> } >> + if (bdrv_is_dirty(bs)) { >> + printf("dirty,need check: yes\n"); >> + } > > I suggest avoiding the comma and just saying "needs check: yes\n". In fact I would reverse the logic and make it something like "cleanly shut down: no", it will better describe the situation when the VM is still running. Same for the function names, "dirty" could mean anything. Kevin
diff --git a/block.c b/block.c index 3f072f6..24fd774 100644 --- a/block.c +++ b/block.c @@ -186,6 +186,20 @@ static void bdrv_io_limits_intercept(BlockDriverState *bs, qemu_co_queue_next(&bs->throttled_reqs); } +/* check if the image is dirty */ +int bdrv_is_dirty(BlockDriverState *bs) +{ + BlockDriver *drv = bs->drv; + + if (!drv) { + return 0; + } + if (!drv->bdrv_is_dirty) { + return 0; + } + return drv->bdrv_is_dirty(bs); +} + /* check if the path starts with "<protocol>:" */ static int path_has_protocol(const char *path) { diff --git a/block.h b/block.h index 3bd4398..e3f3b55 100644 --- a/block.h +++ b/block.h @@ -104,6 +104,8 @@ void bdrv_io_limits_enable(BlockDriverState *bs); void bdrv_io_limits_disable(BlockDriverState *bs); bool bdrv_io_limits_enabled(BlockDriverState *bs); +int bdrv_is_dirty(BlockDriverState *bs); + void bdrv_init(void); void bdrv_init_with_whitelist(void); BlockDriver *bdrv_find_protocol(const char *filename); diff --git a/block_int.h b/block_int.h index 311bd2a..46afffb 100644 --- a/block_int.h +++ b/block_int.h @@ -84,6 +84,7 @@ struct BlockDriver { int (*bdrv_create)(const char *filename, QEMUOptionParameter *options); int (*bdrv_set_key)(BlockDriverState *bs, const char *key); int (*bdrv_make_empty)(BlockDriverState *bs); + int (*bdrv_is_dirty)(BlockDriverState *bs); /* aio */ BlockDriverAIOCB *(*bdrv_aio_readv)(BlockDriverState *bs, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, diff --git a/qemu-img.c b/qemu-img.c index 01cc0d3..a79c274 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1153,6 +1153,9 @@ static int img_info(int argc, char **argv) if (bdrv_is_encrypted(bs)) { printf("encrypted: yes\n"); } + if (bdrv_is_dirty(bs)) { + printf("dirty,need check: yes\n"); + } if (bdrv_get_info(bs, &bdi) >= 0) { if (bdi.cluster_size != 0) { printf("cluster_size: %d\n", bdi.cluster_size);