Message ID | 006fb499a66db0f303f9f39eff321dcca287a9a9.1268765204.git.quintela@redhat.com |
---|---|
State | New |
Headers | show |
On Tue, Mar 16, 2010 at 07:51:21PM +0100, Juan Quintela wrote: > virtio_common_init() creates a struct with the right size, DO_UPCAST > is the appropiate thing here > > Signed-off-by: Juan Quintela <quintela@redhat.com> Sent a replacement patch for this. > --- > hw/virtio-balloon.c | 4 ++-- > hw/virtio-blk.c | 7 ++++--- > hw/virtio-net.c | 8 ++++---- > 3 files changed, 10 insertions(+), 9 deletions(-) > > diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c > index 71d009f..ca7f969 100644 > --- a/hw/virtio-balloon.c > +++ b/hw/virtio-balloon.c > @@ -284,11 +284,11 @@ static int virtio_balloon_load(QEMUFile *f, void *opaque, int version_id) > VirtIODevice *virtio_balloon_init(DeviceState *dev) > { > VirtIOBalloon *s; > - > - s = (VirtIOBalloon *)virtio_common_init("virtio-balloon", > + VirtIODevice *vdev = virtio_common_init("virtio-balloon", > VIRTIO_ID_BALLOON, > 8, sizeof(VirtIOBalloon)); > > + s = DO_UPCAST(VirtIOBalloon, vdev, vdev); > s->vdev.get_config = virtio_balloon_get_config; > s->vdev.set_config = virtio_balloon_set_config; > s->vdev.get_features = virtio_balloon_get_features; > diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c > index ce8b604..672a07b 100644 > --- a/hw/virtio-blk.c > +++ b/hw/virtio-blk.c > @@ -464,9 +464,10 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf) > int cylinders, heads, secs; > static int virtio_blk_id; > > - s = (VirtIOBlock *)virtio_common_init("virtio-blk", VIRTIO_ID_BLOCK, > - sizeof(struct virtio_blk_config), > - sizeof(VirtIOBlock)); > + VirtIODevice *vdev = virtio_common_init("virtio-blk", VIRTIO_ID_BLOCK, > + sizeof(struct virtio_blk_config), > + sizeof(VirtIOBlock)); > + s = DO_UPCAST(VirtIOBlock, vdev, vdev); > > s->vdev.get_config = virtio_blk_update_config; > s->vdev.get_features = virtio_blk_get_features; > diff --git a/hw/virtio-net.c b/hw/virtio-net.c > index c0537c8..2761a1a 100644 > --- a/hw/virtio-net.c > +++ b/hw/virtio-net.c > @@ -829,11 +829,11 @@ VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf) > { > VirtIONet *n; > static int virtio_net_id; > + VirtIODevice *vdev = virtio_common_init("virtio-net", VIRTIO_ID_NET, > + sizeof(struct virtio_net_config), > + sizeof(VirtIONet)); > > - n = (VirtIONet *)virtio_common_init("virtio-net", VIRTIO_ID_NET, > - sizeof(struct virtio_net_config), > - sizeof(VirtIONet)); > - > + n = DO_UPCAST(VirtIONet, vdev, vdev); > n->vdev.get_config = virtio_net_get_config; > n->vdev.set_config = virtio_net_set_config; > n->vdev.get_features = virtio_net_get_features; > -- > 1.6.6.1 > >
diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c index 71d009f..ca7f969 100644 --- a/hw/virtio-balloon.c +++ b/hw/virtio-balloon.c @@ -284,11 +284,11 @@ static int virtio_balloon_load(QEMUFile *f, void *opaque, int version_id) VirtIODevice *virtio_balloon_init(DeviceState *dev) { VirtIOBalloon *s; - - s = (VirtIOBalloon *)virtio_common_init("virtio-balloon", + VirtIODevice *vdev = virtio_common_init("virtio-balloon", VIRTIO_ID_BALLOON, 8, sizeof(VirtIOBalloon)); + s = DO_UPCAST(VirtIOBalloon, vdev, vdev); s->vdev.get_config = virtio_balloon_get_config; s->vdev.set_config = virtio_balloon_set_config; s->vdev.get_features = virtio_balloon_get_features; diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index ce8b604..672a07b 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -464,9 +464,10 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf) int cylinders, heads, secs; static int virtio_blk_id; - s = (VirtIOBlock *)virtio_common_init("virtio-blk", VIRTIO_ID_BLOCK, - sizeof(struct virtio_blk_config), - sizeof(VirtIOBlock)); + VirtIODevice *vdev = virtio_common_init("virtio-blk", VIRTIO_ID_BLOCK, + sizeof(struct virtio_blk_config), + sizeof(VirtIOBlock)); + s = DO_UPCAST(VirtIOBlock, vdev, vdev); s->vdev.get_config = virtio_blk_update_config; s->vdev.get_features = virtio_blk_get_features; diff --git a/hw/virtio-net.c b/hw/virtio-net.c index c0537c8..2761a1a 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -829,11 +829,11 @@ VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf) { VirtIONet *n; static int virtio_net_id; + VirtIODevice *vdev = virtio_common_init("virtio-net", VIRTIO_ID_NET, + sizeof(struct virtio_net_config), + sizeof(VirtIONet)); - n = (VirtIONet *)virtio_common_init("virtio-net", VIRTIO_ID_NET, - sizeof(struct virtio_net_config), - sizeof(VirtIONet)); - + n = DO_UPCAST(VirtIONet, vdev, vdev); n->vdev.get_config = virtio_net_get_config; n->vdev.set_config = virtio_net_set_config; n->vdev.get_features = virtio_net_get_features;
virtio_common_init() creates a struct with the right size, DO_UPCAST is the appropiate thing here Signed-off-by: Juan Quintela <quintela@redhat.com> --- hw/virtio-balloon.c | 4 ++-- hw/virtio-blk.c | 7 ++++--- hw/virtio-net.c | 8 ++++---- 3 files changed, 10 insertions(+), 9 deletions(-)