From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nrbrd-0002CW-4p for qemu-devel@nongnu.org; Tue, 16 Mar 2010 14:51:37 -0400 Received: from [199.232.76.173] (port=42491 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nrbrc-0002BH-0R for qemu-devel@nongnu.org; Tue, 16 Mar 2010 14:51:36 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nrbra-0000Am-3Q for qemu-devel@nongnu.org; Tue, 16 Mar 2010 14:51:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47584) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NrbrZ-0000AA-2M for qemu-devel@nongnu.org; Tue, 16 Mar 2010 14:51:33 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2GIpTbf026229 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 16 Mar 2010 14:51:29 -0400 From: Juan Quintela Date: Tue, 16 Mar 2010 19:51:18 +0100 Message-Id: <69d2ef28bfc973f54c204f53d405f29e2bd65020.1268765204.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 2/9] virtio: Teach virtio-balloon about DO_UPCAST List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Juan Quintela --- 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