From patchwork Tue Mar 16 18:51:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 47893 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 53616B7D96 for ; Wed, 17 Mar 2010 06:02:23 +1100 (EST) Received: from localhost ([127.0.0.1]:55006 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nrc1I-0003YC-GJ for incoming@patchwork.ozlabs.org; Tue, 16 Mar 2010 15:01:36 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nrbrg-0002IA-Tw for qemu-devel@nongnu.org; Tue, 16 Mar 2010 14:51:41 -0400 Received: from [199.232.76.173] (port=42499 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nrbrf-0002Ge-QN for qemu-devel@nongnu.org; Tue, 16 Mar 2010 14:51:39 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nrbrd-0000BH-QQ for qemu-devel@nongnu.org; Tue, 16 Mar 2010 14:51:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1035) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nrbrc-0000Ar-Tk for qemu-devel@nongnu.org; Tue, 16 Mar 2010 14:51:37 -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 o2GIpXSS023861 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 16 Mar 2010 14:51:33 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o2GIpPvC023231; Tue, 16 Mar 2010 14:51:32 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 16 Mar 2010 19:51:21 +0100 Message-Id: <006fb499a66db0f303f9f39eff321dcca287a9a9.1268765204.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 5/9] 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 | 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;