[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/11] block: Avoid unchecked casts for AIOCBs
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 08/11] block: Avoid unchecked casts for AIOCBs |
Date: |
Fri, 7 May 2010 17:14:04 +0200 |
Use container_of for one direction and &acb->common for the other one.
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 3 ++-
block/blkdebug.c | 4 ++--
block/qcow.c | 2 +-
block/qcow2.c | 2 +-
block/vdi.c | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/block.c b/block.c
index 48305b7..6345599 100644
--- a/block.c
+++ b/block.c
@@ -2108,7 +2108,8 @@ typedef struct BlockDriverAIOCBSync {
static void bdrv_aio_cancel_em(BlockDriverAIOCB *blockacb)
{
- BlockDriverAIOCBSync *acb = (BlockDriverAIOCBSync *)blockacb;
+ BlockDriverAIOCBSync *acb =
+ container_of(blockacb, BlockDriverAIOCBSync, common);
qemu_bh_delete(acb->bh);
acb->bh = NULL;
qemu_aio_release(acb);
diff --git a/block/blkdebug.c b/block/blkdebug.c
index bb4a91a..8325f75 100644
--- a/block/blkdebug.c
+++ b/block/blkdebug.c
@@ -320,7 +320,7 @@ static void error_callback_bh(void *opaque)
static void blkdebug_aio_cancel(BlockDriverAIOCB *blockacb)
{
- BlkdebugAIOCB *acb = (BlkdebugAIOCB*) blockacb;
+ BlkdebugAIOCB *acb = container_of(blockacb, BlkdebugAIOCB, common);
qemu_aio_release(acb);
}
@@ -347,7 +347,7 @@ static BlockDriverAIOCB *inject_error(BlockDriverState *bs,
acb->bh = bh;
qemu_bh_schedule(bh);
- return (BlockDriverAIOCB*) acb;
+ return &acb->common;
}
static BlockDriverAIOCB *blkdebug_aio_readv(BlockDriverState *bs,
diff --git a/block/qcow.c b/block/qcow.c
index 2883c40..449858f 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -502,7 +502,7 @@ typedef struct QCowAIOCB {
static void qcow_aio_cancel(BlockDriverAIOCB *blockacb)
{
- QCowAIOCB *acb = (QCowAIOCB *)blockacb;
+ QCowAIOCB *acb = container_of(blockacb, QCowAIOCB, common);
if (acb->hd_aiocb)
bdrv_aio_cancel(acb->hd_aiocb);
qemu_aio_release(acb);
diff --git a/block/qcow2.c b/block/qcow2.c
index 21ed6f8..40bd32a 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -340,7 +340,7 @@ typedef struct QCowAIOCB {
static void qcow_aio_cancel(BlockDriverAIOCB *blockacb)
{
- QCowAIOCB *acb = (QCowAIOCB *)blockacb;
+ QCowAIOCB *acb = container_of(blockacb, QCowAIOCB, common);
if (acb->hd_aiocb)
bdrv_aio_cancel(acb->hd_aiocb);
qemu_aio_release(acb);
diff --git a/block/vdi.c b/block/vdi.c
index 1d257b4..2b4d2c2 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -469,7 +469,7 @@ static int vdi_is_allocated(BlockDriverState *bs, int64_t
sector_num,
static void vdi_aio_cancel(BlockDriverAIOCB *blockacb)
{
/* TODO: This code is untested. How can I get it executed? */
- VdiAIOCB *acb = (VdiAIOCB *)blockacb;
+ VdiAIOCB *acb = container_of(blockacb, VdiAIOCB, common);
logout("\n");
if (acb->hd_aiocb) {
bdrv_aio_cancel(acb->hd_aiocb);
--
1.6.6.1
- [Qemu-devel] [PULL 00/11] Block patches, Kevin Wolf, 2010/05/07
- [Qemu-devel] [PATCH 01/11] block: Remove semicolon in BDRV_SECTOR_MASK macro, Kevin Wolf, 2010/05/07
- [Qemu-devel] [PATCH 02/11] qemu-nbd: Improve error reporting, Kevin Wolf, 2010/05/07
- [Qemu-devel] [PATCH 04/11] cloop: use qemu block API, Kevin Wolf, 2010/05/07
- [Qemu-devel] [PATCH 03/11] cloop: use pread, Kevin Wolf, 2010/05/07
- [Qemu-devel] [PATCH 06/11] bochs: use pread, Kevin Wolf, 2010/05/07
- [Qemu-devel] [PATCH 08/11] block: Avoid unchecked casts for AIOCBs,
Kevin Wolf <=
- [Qemu-devel] [PATCH 05/11] ide: Fix ide_dma_cancel, Kevin Wolf, 2010/05/07
- [Qemu-devel] [PATCH 09/11] block: Fix protocol detection for Windows devices, Kevin Wolf, 2010/05/07
- [Qemu-devel] [PATCH 07/11] bochs: use qemu block API, Kevin Wolf, 2010/05/07
- [Qemu-devel] [PATCH 11/11] block/vdi: Allow disk images of size 0, Kevin Wolf, 2010/05/07
- [Qemu-devel] [PATCH 10/11] block: Fix bdrv_commit, Kevin Wolf, 2010/05/07