[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Re: [PATCH 5/9] virtio: Use DO_UPCAST instead of a cast
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] Re: [PATCH 5/9] virtio: Use DO_UPCAST instead of a cast |
Date: |
Thu, 18 Mar 2010 09:30:18 +0200 |
User-agent: |
Mutt/1.5.19 (2009-01-05) |
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 <address@hidden>
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
>
>
- [Qemu-devel] [PATCH 0/9] Virtio cleanups, Juan Quintela, 2010/03/16
- [Qemu-devel] [PATCH 1/9] qemu/pci: document msix_entries_nr field, Juan Quintela, 2010/03/16
- [Qemu-devel] [PATCH 2/9] virtio: Teach virtio-balloon about DO_UPCAST, Juan Quintela, 2010/03/16
- [Qemu-devel] [PATCH 3/9] virtio: Teach virtio-blk about DO_UPCAST, Juan Quintela, 2010/03/16
- [Qemu-devel] [PATCH 5/9] virtio: Use DO_UPCAST instead of a cast, Juan Quintela, 2010/03/16
- [Qemu-devel] Re: [PATCH 5/9] virtio: Use DO_UPCAST instead of a cast,
Michael S. Tsirkin <=
- [Qemu-devel] [PATCH 7/9] QLIST: Introduce QLIST_COPY_HEAD, Juan Quintela, 2010/03/16
- [Qemu-devel] [PATCH 6/9] virtio-pci: Remove duplicate test, Juan Quintela, 2010/03/16
- [Qemu-devel] Re: [PATCH 6/9] virtio-pci: Remove duplicate test, Michael S. Tsirkin, 2010/03/18
- [Qemu-devel] Re: [PATCH 6/9] virtio-pci: Remove duplicate test, Juan Quintela, 2010/03/18
- [Qemu-devel] Re: [PATCH 6/9] virtio-pci: Remove duplicate test, Michael S. Tsirkin, 2010/03/18
- [Qemu-devel] Re: [PATCH 6/9] virtio-pci: Remove duplicate test, Juan Quintela, 2010/03/18
- [Qemu-devel] Re: [PATCH 6/9] virtio-pci: Remove duplicate test, Michael S. Tsirkin, 2010/03/18
- [Qemu-devel] Re: [PATCH 6/9] virtio-pci: Remove duplicate test, Juan Quintela, 2010/03/18
- [Qemu-devel] Re: [PATCH 6/9] virtio-pci: Remove duplicate test, Michael S. Tsirkin, 2010/03/18
- [Qemu-devel] Re: [PATCH 6/9] virtio-pci: Remove duplicate test, Juan Quintela, 2010/03/18