From patchwork Wed Dec 2 12:04:04 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 40012 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6BFCEB7BDB for ; Thu, 3 Dec 2009 00:12:42 +1100 (EST) Received: from localhost ([127.0.0.1]:59280 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFp0Z-0003Er-Dt for incoming@patchwork.ozlabs.org; Wed, 02 Dec 2009 08:12:39 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFnxj-0004Mj-Cz for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:39 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFnxb-0004JX-FD for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:35 -0500 Received: from [199.232.76.173] (port=42909 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFnxb-0004JR-6V for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:10871) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFnxa-0004BR-MR for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:30 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nB2C5Tj7029694 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 2 Dec 2009 07:05:30 -0500 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nB2C5IL4029769; Wed, 2 Dec 2009 07:05:28 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 2 Dec 2009 13:04:04 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: mst@redhat.com Subject: [Qemu-devel] [PATCH 06/41] virtio: Use DO_UPCAST instead of a cast X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org virtio_common_init() creates a struct with the right size, DO_UPCAST is the appropiate thing here Signed-off-by: Juan Quintela --- hw/virtio-balloon.c | 4 ++-- hw/virtio-blk.c | 8 ++++---- hw/virtio-console.c | 3 ++- hw/virtio-net.c | 8 ++++---- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c index 2310ab0..6f60fb1 100644 --- a/hw/virtio-balloon.c +++ b/hw/virtio-balloon.c @@ -167,11 +167,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 39ebc37..918be74 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -487,11 +487,11 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, DriveInfo *dinfo) char *ps = (char *)drive_get_serial(dinfo->bdrv); size_t size = strlen(ps) ? sizeof(struct virtio_blk_config) : offsetof(struct virtio_blk_config, _blk_size); + VirtIODevice *vdev = virtio_common_init("virtio-blk", VIRTIO_ID_BLOCK, + size, + sizeof(VirtIOBlock)); - s = (VirtIOBlock *)virtio_common_init("virtio-blk", VIRTIO_ID_BLOCK, - size, - sizeof(VirtIOBlock)); - + s = DO_UPCAST(VirtIOBlock, vdev, vdev); s->config_size = size; s->vdev.get_config = virtio_blk_update_config; s->vdev.get_features = virtio_blk_get_features; diff --git a/hw/virtio-console.c b/hw/virtio-console.c index 9f1a602..57f5e9d 100644 --- a/hw/virtio-console.c +++ b/hw/virtio-console.c @@ -121,9 +121,10 @@ static int virtio_console_load(QEMUFile *f, void *opaque, int version_id) VirtIODevice *virtio_console_init(DeviceState *dev) { VirtIOConsole *s; - s = (VirtIOConsole *)virtio_common_init("virtio-console", + VirtIODevice *vdev = virtio_common_init("virtio-console", VIRTIO_ID_CONSOLE, 0, sizeof(VirtIOConsole)); + s = DO_UPCAST(VirtIOConsole, vdev, vdev); s->vdev.get_features = virtio_console_get_features; s->ivq = virtio_add_queue(&s->vdev, 128, virtio_console_handle_input); diff --git a/hw/virtio-net.c b/hw/virtio-net.c index f518d78..1b8ce14 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -817,11 +817,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;