| Message ID | 69d2ef28bfc973f54c204f53d405f29e2bd65020.1268765204.git.quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Mar 16, 2010 at 07:51:18PM +0100, Juan Quintela wrote: > Signed-off-by: Juan Quintela <quintela@redhat.com> Sent a replacement patch for this. > --- > hw/virtio-balloon.c | 11 +++-------- > 1 files changed, 3 insertions(+), 8 deletions(-) > > diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c > index 086d9d1..71d009f 100644 > --- a/hw/virtio-balloon.c > +++ b/hw/virtio-balloon.c > @@ -41,11 +41,6 @@ typedef struct VirtIOBalloon > void *stats_opaque_callback_data; > } VirtIOBalloon; > > -static VirtIOBalloon *to_virtio_balloon(VirtIODevice *vdev) > -{ > - return (VirtIOBalloon *)vdev; > -} > - > static void balloon_page(void *addr, int deflate) > { > #if defined(__linux__) > @@ -120,7 +115,7 @@ static size_t memcpy_from_iovector(void *data, size_t offset, size_t size, > > static void virtio_balloon_handle_output(VirtIODevice *vdev, VirtQueue *vq) > { > - VirtIOBalloon *s = to_virtio_balloon(vdev); > + VirtIOBalloon *s = DO_UPCAST(VirtIOBalloon, vdev, vdev); > VirtQueueElement elem; > > while (virtqueue_pop(vq, &elem)) { > @@ -196,7 +191,7 @@ static void virtio_balloon_receive_stats(VirtIODevice *vdev, VirtQueue *vq) > > static void virtio_balloon_get_config(VirtIODevice *vdev, uint8_t *config_data) > { > - VirtIOBalloon *dev = to_virtio_balloon(vdev); > + VirtIOBalloon *dev = DO_UPCAST(VirtIOBalloon, vdev, vdev); > struct virtio_balloon_config config; > > config.num_pages = cpu_to_le32(dev->num_pages); > @@ -208,7 +203,7 @@ static void virtio_balloon_get_config(VirtIODevice *vdev, uint8_t *config_data) > static void virtio_balloon_set_config(VirtIODevice *vdev, > const uint8_t *config_data) > { > - VirtIOBalloon *dev = to_virtio_balloon(vdev); > + VirtIOBalloon *dev = DO_UPCAST(VirtIOBalloon, vdev, vdev); > struct virtio_balloon_config config; > memcpy(&config, config_data, 8); > dev->actual = config.actual; > -- > 1.6.6.1 > >
diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c index 086d9d1..71d009f 100644 --- a/hw/virtio-balloon.c +++ b/hw/virtio-balloon.c @@ -41,11 +41,6 @@ typedef struct VirtIOBalloon void *stats_opaque_callback_data; } VirtIOBalloon; -static VirtIOBalloon *to_virtio_balloon(VirtIODevice *vdev) -{ - return (VirtIOBalloon *)vdev; -} - static void balloon_page(void *addr, int deflate) { #if defined(__linux__) @@ -120,7 +115,7 @@ static size_t memcpy_from_iovector(void *data, size_t offset, size_t size, static void virtio_balloon_handle_output(VirtIODevice *vdev, VirtQueue *vq) { - VirtIOBalloon *s = to_virtio_balloon(vdev); + VirtIOBalloon *s = DO_UPCAST(VirtIOBalloon, vdev, vdev); VirtQueueElement elem; while (virtqueue_pop(vq, &elem)) { @@ -196,7 +191,7 @@ static void virtio_balloon_receive_stats(VirtIODevice *vdev, VirtQueue *vq) static void virtio_balloon_get_config(VirtIODevice *vdev, uint8_t *config_data) { - VirtIOBalloon *dev = to_virtio_balloon(vdev); + VirtIOBalloon *dev = DO_UPCAST(VirtIOBalloon, vdev, vdev); struct virtio_balloon_config config; config.num_pages = cpu_to_le32(dev->num_pages); @@ -208,7 +203,7 @@ static void virtio_balloon_get_config(VirtIODevice *vdev, uint8_t *config_data) static void virtio_balloon_set_config(VirtIODevice *vdev, const uint8_t *config_data) { - VirtIOBalloon *dev = to_virtio_balloon(vdev); + VirtIOBalloon *dev = DO_UPCAST(VirtIOBalloon, vdev, vdev); struct virtio_balloon_config config; memcpy(&config, config_data, 8); dev->actual = config.actual;
Signed-off-by: Juan Quintela <quintela@redhat.com> --- hw/virtio-balloon.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-)