From patchwork Wed Dec 2 12:04:00 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 40007 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 58C29B7BCB for ; Wed, 2 Dec 2009 23:58:28 +1100 (EST) Received: from localhost ([127.0.0.1]:33525 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFomn-00056l-G3 for incoming@patchwork.ozlabs.org; Wed, 02 Dec 2009 07:58:25 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFnxb-0004JT-AE for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:31 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFnxW-0004Hf-2K for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:30 -0500 Received: from [199.232.76.173] (port=42905 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFnxV-0004Ha-OL for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47392) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFnxV-0004B1-9O for qemu-devel@nongnu.org; Wed, 02 Dec 2009 07:05:25 -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 nB2C5Ope002227 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 2 Dec 2009 07:05:24 -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 nB2C5IL0029769; Wed, 2 Dec 2009 07:05:23 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 2 Dec 2009 13:04:00 +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 02/41] virtio: Teach virtio-blk about DO_UPCAST 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 Signed-off-by: Juan Quintela --- hw/virtio-blk.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 42b766f..39ebc37 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -30,11 +30,6 @@ typedef struct VirtIOBlock size_t config_size; } VirtIOBlock; -static VirtIOBlock *to_virtio_blk(VirtIODevice *vdev) -{ - return (VirtIOBlock *)vdev; -} - /* store identify data in little endian format */ static inline void put_le16(uint16_t *p, unsigned int v) @@ -319,7 +314,7 @@ static void virtio_blk_handle_read(VirtIOBlockReq *req) static void virtio_blk_handle_output(VirtIODevice *vdev, VirtQueue *vq) { - VirtIOBlock *s = to_virtio_blk(vdev); + VirtIOBlock *s = DO_UPCAST(VirtIOBlock, vdev, vdev); VirtIOBlockReq *req; BlockRequest blkreq[32]; int num_writes = 0; @@ -409,7 +404,7 @@ static void virtio_blk_reset(VirtIODevice *vdev) */ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config) { - VirtIOBlock *s = to_virtio_blk(vdev); + VirtIOBlock *s = DO_UPCAST(VirtIOBlock, vdev, vdev); struct virtio_blk_config blkcfg; uint64_t capacity; int cylinders, heads, secs; @@ -431,7 +426,7 @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config) static uint32_t virtio_blk_get_features(VirtIODevice *vdev) { - VirtIOBlock *s = to_virtio_blk(vdev); + VirtIOBlock *s = DO_UPCAST(VirtIOBlock, vdev, vdev); uint32_t features = 0; features |= (1 << VIRTIO_BLK_F_SEG_MAX);