From patchwork Wed Dec 2 12:04:00 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [02/41] virtio: Teach virtio-blk about DO_UPCAST Date: Wed, 02 Dec 2009 02:04:00 -0000 From: Juan Quintela X-Patchwork-Id: 40007 Message-Id: To: qemu-devel@nongnu.org Cc: mst@redhat.com Signed-off-by: Juan Quintela --- hw/virtio-blk.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 42b766f..39ebc37 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -30,11 +30,6 @@ typedef struct VirtIOBlock size_t config_size; } VirtIOBlock; -static VirtIOBlock *to_virtio_blk(VirtIODevice *vdev) -{ - return (VirtIOBlock *)vdev; -} - /* store identify data in little endian format */ static inline void put_le16(uint16_t *p, unsigned int v) @@ -319,7 +314,7 @@ static void virtio_blk_handle_read(VirtIOBlockReq *req) static void virtio_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq) { - VirtIOBlock *s = to_virtio_blk(vdev); + VirtIOBlock *s = DO_UPCAST(VirtIOBlock, vdev, vdev); VirtIOBlockReq *req; BlockRequest blkreq[32]; int num_writes = 0; @@ -409,7 +404,7 @@ static void virtio_blk_reset(VirtIODevice *vdev) */ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config) { - VirtIOBlock *s = to_virtio_blk(vdev); + VirtIOBlock *s = DO_UPCAST(VirtIOBlock, vdev, vdev); struct virtio_blk_config blkcfg; uint64_t capacity; int cylinders, heads, secs; @@ -431,7 +426,7 @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config) static uint32_t virtio_blk_get_features(VirtIODevice *vdev) { - VirtIOBlock *s = to_virtio_blk(vdev); + VirtIOBlock *s = DO_UPCAST(VirtIOBlock, vdev, vdev); uint32_t features = 0; features |= (1 << VIRTIO_BLK_F_SEG_MAX);