OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

virtio-blk: cleanup: QOM cast 

Use QOM casts inside virtio-blk.

Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1363624648-16906-11-git-send-email-fred.konrad@greensocs.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
KONRAD Frederic 2013-03-18 17:37:27 +01:00 committed by Anthony Liguori
parent 05ff686536
commit 1cc91b7df6
2 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hw/virtio-blk.c
View File

@ -23,14 +23,6 @@
#endif #endif
#include "hw/virtio-bus.h" #include "hw/virtio-bus.h"
/*
* Moving to QOM later in this series.
*/
static VirtIOBlock *to_virtio_blk(VirtIODevice *vdev)
{
return (VirtIOBlock *)vdev;
}
typedef struct VirtIOBlockReq typedef struct VirtIOBlockReq
{ {
VirtIOBlock *dev; VirtIOBlock *dev;
@ -46,12 +38,13 @@ typedef struct VirtIOBlockReq
static void virtio_blk_req_complete(VirtIOBlockReq *req, int status) static void virtio_blk_req_complete(VirtIOBlockReq *req, int status)
{ {
VirtIOBlock *s = req->dev; VirtIOBlock *s = req->dev;
VirtIODevice *vdev = VIRTIO_DEVICE(s);
trace_virtio_blk_req_complete(req, status); trace_virtio_blk_req_complete(req, status);
stb_p(&req->in->status, status); stb_p(&req->in->status, status);
virtqueue_push(s->vq, &req->elem, req->qiov.size + sizeof(*req->in)); virtqueue_push(s->vq, &req->elem, req->qiov.size + sizeof(*req->in));
virtio_notify(&s->vdev, s->vq); virtio_notify(vdev, s->vq);
} }
static int virtio_blk_handle_rw_error(VirtIOBlockReq *req, int error, static int virtio_blk_handle_rw_error(VirtIOBlockReq *req, int error,
@ -396,7 +389,7 @@ static void virtio_blk_handle_request(VirtIOBlockReq *req,
static void virtio_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq) static void virtio_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq)
{ {
VirtIOBlock *s = to_virtio_blk(vdev); VirtIOBlock *s = VIRTIO_BLK(vdev);
VirtIOBlockReq *req; VirtIOBlockReq *req;
MultiReqBuffer mrb = { MultiReqBuffer mrb = {
.num_writes = 0, .num_writes = 0,
@ -464,7 +457,7 @@ static void virtio_blk_dma_restart_cb(void *opaque, int running,
static void virtio_blk_reset(VirtIODevice *vdev) static void virtio_blk_reset(VirtIODevice *vdev)
{ {
#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE #ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
VirtIOBlock *s = to_virtio_blk(vdev); VirtIOBlock *s = VIRTIO_BLK(vdev);
if (s->dataplane) { if (s->dataplane) {
virtio_blk_data_plane_stop(s->dataplane); virtio_blk_data_plane_stop(s->dataplane);
@ -482,7 +475,7 @@ static void virtio_blk_reset(VirtIODevice *vdev)
*/ */
static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config) static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config)
{ {
VirtIOBlock *s = to_virtio_blk(vdev); VirtIOBlock *s = VIRTIO_BLK(vdev);
struct virtio_blk_config blkcfg; struct virtio_blk_config blkcfg;
uint64_t capacity; uint64_t capacity;
int blk_size = s->conf->logical_block_size; int blk_size = s->conf->logical_block_size;
@ -521,7 +514,7 @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config)
static void virtio_blk_set_config(VirtIODevice *vdev, const uint8_t *config) static void virtio_blk_set_config(VirtIODevice *vdev, const uint8_t *config)
{ {
VirtIOBlock *s = to_virtio_blk(vdev); VirtIOBlock *s = VIRTIO_BLK(vdev);
struct virtio_blk_config blkcfg; struct virtio_blk_config blkcfg;
memcpy(&blkcfg, config, sizeof(blkcfg)); memcpy(&blkcfg, config, sizeof(blkcfg));
@ -530,7 +523,7 @@ static void virtio_blk_set_config(VirtIODevice *vdev, const uint8_t *config)
static uint32_t virtio_blk_get_features(VirtIODevice *vdev, uint32_t features) static uint32_t virtio_blk_get_features(VirtIODevice *vdev, uint32_t features)
{ {
VirtIOBlock *s = to_virtio_blk(vdev); VirtIOBlock *s = VIRTIO_BLK(vdev);
features |= (1 << VIRTIO_BLK_F_SEG_MAX); features |= (1 << VIRTIO_BLK_F_SEG_MAX);
features |= (1 << VIRTIO_BLK_F_GEOMETRY); features |= (1 << VIRTIO_BLK_F_GEOMETRY);
@ -552,7 +545,7 @@ static uint32_t virtio_blk_get_features(VirtIODevice *vdev, uint32_t features)
static void virtio_blk_set_status(VirtIODevice *vdev, uint8_t status) static void virtio_blk_set_status(VirtIODevice *vdev, uint8_t status)
{ {
VirtIOBlock *s = to_virtio_blk(vdev); VirtIOBlock *s = VIRTIO_BLK(vdev);
uint32_t features; uint32_t features;
#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE #ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
@ -573,9 +566,10 @@ static void virtio_blk_set_status(VirtIODevice *vdev, uint8_t status)
static void virtio_blk_save(QEMUFile *f, void *opaque) static void virtio_blk_save(QEMUFile *f, void *opaque)
{ {
VirtIOBlock *s = opaque; VirtIOBlock *s = opaque;
VirtIODevice *vdev = VIRTIO_DEVICE(s);
VirtIOBlockReq *req = s->rq; VirtIOBlockReq *req = s->rq;
virtio_save(&s->vdev, f); virtio_save(vdev, f);
while (req) { while (req) {
qemu_put_sbyte(f, 1); qemu_put_sbyte(f, 1);
@ -588,12 +582,13 @@ static void virtio_blk_save(QEMUFile *f, void *opaque)
static int virtio_blk_load(QEMUFile *f, void *opaque, int version_id) static int virtio_blk_load(QEMUFile *f, void *opaque, int version_id)
{ {
VirtIOBlock *s = opaque; VirtIOBlock *s = opaque;
VirtIODevice *vdev = VIRTIO_DEVICE(s);
int ret; int ret;
if (version_id != 2) if (version_id != 2)
return -EINVAL; return -EINVAL;
ret = virtio_load(&s->vdev, f); ret = virtio_load(vdev, f);
if (ret) { if (ret) {
return ret; return ret;
} }
@ -615,9 +610,9 @@ static int virtio_blk_load(QEMUFile *f, void *opaque, int version_id)
static void virtio_blk_resize(void *opaque) static void virtio_blk_resize(void *opaque)
{ {
VirtIOBlock *s = opaque; VirtIODevice *vdev = VIRTIO_DEVICE(opaque);
virtio_notify_config(&s->vdev); virtio_notify_config(vdev);
} }
static const BlockDevOps virtio_block_ops = { static const BlockDevOps virtio_block_ops = {

2
hw/virtio-blk.h
View File

@ -116,7 +116,7 @@ struct VirtIOBlkConf
}; };
typedef struct VirtIOBlock { typedef struct VirtIOBlock {
VirtIODevice vdev; VirtIODevice parent_obj;
BlockDriverState *bs; BlockDriverState *bs;
VirtQueue *vq; VirtQueue *vq;
void *rq; void *rq;