Signed-off-by: Juan Quintela <quint...@redhat.com> --- 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 cfd3b41..2310ab0 100644 --- a/hw/virtio-balloon.c +++ b/hw/virtio-balloon.c @@ -32,11 +32,6 @@ typedef struct VirtIOBalloon uint32_t actual; } VirtIOBalloon; -static VirtIOBalloon *to_virtio_balloon(VirtIODevice *vdev) -{ - return (VirtIOBalloon *)vdev; -} - static void balloon_page(void *addr, int deflate) { #if defined(__linux__) @@ -75,7 +70,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)) { @@ -106,7 +101,7 @@ static void virtio_balloon_handle_output(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); @@ -118,7 +113,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.5.2