[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] Windows Bug Check 0x101 issue
Ian Jackson writes: > This one is much better but I still have a comment ... Thank you for many comments. Actually I'm not good at qemu. How about the attached patch? > > +static void ide_flush_cb(void *opaque, int ret) > > +{ > > + IDEState *s = opaque; > > + > > + s->status = READY_STAT; > > + ide_set_irq(s); > > You need to check the return value (ret) and set an appropriate IDE > error status if the operation failed. ide_abort_command may be of > some use. This patch uses ide_abort_command(). As for the failure case, it looks too much for me. I hope someone who is expert on the IDE fixes it. Thanks, Kouya Signed-off-by: Kouya Shimura <kouya@xxxxxxxxxxxxxx> diff -r 966c04d42e94 tools/ioemu/block-qcow.c --- a/tools/ioemu/block-qcow.c Wed Mar 26 09:12:57 2008 +0000 +++ b/tools/ioemu/block-qcow.c Thu Mar 27 13:59:13 2008 +0900 @@ -725,6 +725,13 @@ static void qcow_aio_cancel(BlockDriverA qemu_aio_release(acb); } +static BlockDriverAIOCB *qcow_aio_flush(BlockDriverState *bs, + BlockDriverCompletionFunc *cb, void *opaque) +{ + BDRVQcowState *s = bs->opaque; + return bdrv_aio_flush(s->hd, cb, opaque); +} + static void qcow_close(BlockDriverState *bs) { BDRVQcowState *s = bs->opaque; @@ -899,6 +906,7 @@ BlockDriver bdrv_qcow = { .bdrv_aio_read = qcow_aio_read, .bdrv_aio_write = qcow_aio_write, .bdrv_aio_cancel = qcow_aio_cancel, + .bdrv_aio_flush = qcow_aio_flush, .aiocb_size = sizeof(QCowAIOCB), .bdrv_write_compressed = qcow_write_compressed, .bdrv_get_info = qcow_get_info, diff -r 966c04d42e94 tools/ioemu/block-qcow2.c --- a/tools/ioemu/block-qcow2.c Wed Mar 26 09:12:57 2008 +0000 +++ b/tools/ioemu/block-qcow2.c Thu Mar 27 13:59:13 2008 +0900 @@ -1007,6 +1007,13 @@ static void qcow_aio_cancel(BlockDriverA qemu_aio_release(acb); } +static BlockDriverAIOCB *qcow_aio_flush(BlockDriverState *bs, + BlockDriverCompletionFunc *cb, void *opaque) +{ + BDRVQcowState *s = bs->opaque; + return bdrv_aio_flush(s->hd, cb, opaque); +} + static void qcow_close(BlockDriverState *bs) { BDRVQcowState *s = bs->opaque; @@ -2235,6 +2242,7 @@ BlockDriver bdrv_qcow2 = { .bdrv_aio_read = qcow_aio_read, .bdrv_aio_write = qcow_aio_write, .bdrv_aio_cancel = qcow_aio_cancel, + .bdrv_aio_flush = qcow_aio_flush, .aiocb_size = sizeof(QCowAIOCB), .bdrv_write_compressed = qcow_write_compressed, diff -r 966c04d42e94 tools/ioemu/block-raw.c --- a/tools/ioemu/block-raw.c Wed Mar 26 09:12:57 2008 +0000 +++ b/tools/ioemu/block-raw.c Thu Mar 27 13:59:13 2008 +0900 @@ -496,6 +496,21 @@ static void raw_aio_cancel(BlockDriverAI pacb = &acb->next; } } + +static BlockDriverAIOCB *raw_aio_flush(BlockDriverState *bs, + BlockDriverCompletionFunc *cb, void *opaque) +{ + RawAIOCB *acb; + + acb = raw_aio_setup(bs, 0, NULL, 0, cb, opaque); + if (!acb) + return NULL; + if (aio_fsync(O_SYNC, &acb->aiocb) < 0) { + qemu_aio_release(acb); + return NULL; + } + return &acb->common; +} #endif static void raw_close(BlockDriverState *bs) @@ -621,6 +636,7 @@ BlockDriver bdrv_raw = { .bdrv_aio_read = raw_aio_read, .bdrv_aio_write = raw_aio_write, .bdrv_aio_cancel = raw_aio_cancel, + .bdrv_aio_flush = raw_aio_flush, .aiocb_size = sizeof(RawAIOCB), #endif .protocol_name = "file", @@ -959,6 +975,7 @@ BlockDriver bdrv_host_device = { .bdrv_aio_read = raw_aio_read, .bdrv_aio_write = raw_aio_write, .bdrv_aio_cancel = raw_aio_cancel, + .bdrv_aio_flush = raw_aio_flush, .aiocb_size = sizeof(RawAIOCB), #endif .bdrv_pread = raw_pread, diff -r 966c04d42e94 tools/ioemu/block.c --- a/tools/ioemu/block.c Wed Mar 26 09:12:57 2008 +0000 +++ b/tools/ioemu/block.c Thu Mar 27 13:59:13 2008 +0900 @@ -48,6 +48,8 @@ static BlockDriverAIOCB *bdrv_aio_write_ int64_t sector_num, const uint8_t *buf, int nb_sectors, BlockDriverCompletionFunc *cb, void *opaque); static void bdrv_aio_cancel_em(BlockDriverAIOCB *acb); +static BlockDriverAIOCB *bdrv_aio_flush_em(BlockDriverState *bs, + BlockDriverCompletionFunc *cb, void *opaque); static int bdrv_read_em(BlockDriverState *bs, int64_t sector_num, uint8_t *buf, int nb_sectors); static int bdrv_write_em(BlockDriverState *bs, int64_t sector_num, @@ -155,6 +157,8 @@ void bdrv_register(BlockDriver *bdrv) bdrv->bdrv_read = bdrv_read_em; bdrv->bdrv_write = bdrv_write_em; } + if (!bdrv->bdrv_aio_flush) + bdrv->bdrv_aio_flush = bdrv_aio_flush_em; bdrv->next = first_drv; first_drv = bdrv; } @@ -1138,6 +1142,17 @@ void bdrv_aio_cancel(BlockDriverAIOCB *a drv->bdrv_aio_cancel(acb); } +BlockDriverAIOCB *bdrv_aio_flush(BlockDriverState *bs, + BlockDriverCompletionFunc *cb, void *opaque) +{ + BlockDriver *drv = bs->drv; + + if (!drv) + return NULL; + + return drv->bdrv_aio_flush(bs, cb, opaque); +} + /**************************************************************/ /* async block device emulation */ @@ -1213,6 +1228,14 @@ static void bdrv_aio_cancel_em(BlockDriv qemu_aio_release(acb); } #endif /* !QEMU_TOOL */ + +static BlockDriverAIOCB *bdrv_aio_flush_em(BlockDriverState *bs, + BlockDriverCompletionFunc *cb, void *opaque) +{ + bdrv_flush(bs); + cb(opaque, 0); + return NULL; +} /**************************************************************/ /* sync block device emulation */ diff -r 966c04d42e94 tools/ioemu/block_int.h --- a/tools/ioemu/block_int.h Wed Mar 26 09:12:57 2008 +0000 +++ b/tools/ioemu/block_int.h Thu Mar 27 13:59:13 2008 +0900 @@ -49,6 +49,8 @@ struct BlockDriver { int64_t sector_num, const uint8_t *buf, int nb_sectors, BlockDriverCompletionFunc *cb, void *opaque); void (*bdrv_aio_cancel)(BlockDriverAIOCB *acb); + BlockDriverAIOCB *(*bdrv_aio_flush)(BlockDriverState *bs, + BlockDriverCompletionFunc *cb, void *opaque); int aiocb_size; const char *protocol_name; diff -r 966c04d42e94 tools/ioemu/hw/ide.c --- a/tools/ioemu/hw/ide.c Wed Mar 26 09:12:57 2008 +0000 +++ b/tools/ioemu/hw/ide.c Thu Mar 27 13:59:13 2008 +0900 @@ -1072,6 +1072,17 @@ static void ide_sector_write_dma(IDEStat ide_dma_start(s, ide_write_dma_cb); } +static void ide_flush_cb(void *opaque, int ret) +{ + IDEState *s = opaque; + + if (ret) + ide_abort_command(s); + else + s->status = READY_STAT; + ide_set_irq(s); +} + static void ide_atapi_cmd_ok(IDEState *s) { s->error = 0; @@ -1976,9 +1987,12 @@ static void ide_ioport_write(void *opaqu break; case WIN_FLUSH_CACHE: case WIN_FLUSH_CACHE_EXT: - if (s->bs) - bdrv_flush(s->bs); - s->status = READY_STAT; + if (s->bs) { + s->status = BUSY_STAT; + bdrv_aio_flush(s->bs, ide_flush_cb, s); + break; + } + s->status = READY_STAT; ide_set_irq(s); break; case WIN_IDLEIMMEDIATE: diff -r 966c04d42e94 tools/ioemu/vl.h --- a/tools/ioemu/vl.h Wed Mar 26 09:12:57 2008 +0000 +++ b/tools/ioemu/vl.h Thu Mar 27 13:59:13 2008 +0900 @@ -653,6 +653,8 @@ BlockDriverAIOCB *bdrv_aio_write(BlockDr const uint8_t *buf, int nb_sectors, BlockDriverCompletionFunc *cb, void *opaque); void bdrv_aio_cancel(BlockDriverAIOCB *acb); +BlockDriverAIOCB *bdrv_aio_flush(BlockDriverState *bs, + BlockDriverCompletionFunc *cb, void *opaque); void qemu_aio_init(void); void qemu_aio_poll(void); _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-devel
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |