From patchwork Tue Apr 23 09:08:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fred.konrad@greensocs.com X-Patchwork-Id: 238824 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 252A82C0137 for ; Tue, 23 Apr 2013 19:11:56 +1000 (EST) Received: from localhost ([::1]:55882 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUZGU-0004MQ-AW for incoming@patchwork.ozlabs.org; Tue, 23 Apr 2013 05:11:54 -0400 Received: from eggs.gnu.org ([208.118.235.92]:38554) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUZDo-0000kV-9x for qemu-devel@nongnu.org; Tue, 23 Apr 2013 05:09:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UUZDl-0005Wi-MX for qemu-devel@nongnu.org; Tue, 23 Apr 2013 05:09:08 -0400 Received: from greensocs.com ([87.106.252.221]:42946 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUZDl-0005Wa-GR for qemu-devel@nongnu.org; Tue, 23 Apr 2013 05:09:05 -0400 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id E0B2B40EC68; Tue, 23 Apr 2013 09:09:04 +0000 (UTC) Received: from s15328186.onlinehome-server.info ([127.0.0.1]) by localhost (s15328186.onlinehome-server.info [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id E1u2+hK65Y2e; Tue, 23 Apr 2013 11:08:59 +0200 (CEST) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id ED03040EC62; Tue, 23 Apr 2013 11:08:57 +0200 (CEST) Received: from compaq.katmai.xl.cx.katmai.xl.cx (lan31-11-83-155-143-136.fbx.proxad.net [83.155.143.136]) by s15328186.onlinehome-server.info (Postfix) with ESMTPSA id EFC7240B250; Tue, 23 Apr 2013 11:08:56 +0200 (CEST) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org, aliguori@us.ibm.com Date: Tue, 23 Apr 2013 11:08:43 +0200 Message-Id: <1366708123-19626-5-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1366708123-19626-1-git-send-email-fred.konrad@greensocs.com> References: <1366708123-19626-1-git-send-email-fred.konrad@greensocs.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 87.106.252.221 Cc: peter.maydell@linaro.org, mark.burton@greensocs.com, "Aneesh Kumar K.V" , fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH v4 4/4] virtio-9p: cleanup: QOM casts. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: KONRAD Frederic As the virtio-9p-pci is switched to the new API, we can use QOM casts. Signed-off-by: KONRAD Frederic --- hw/9pfs/virtio-9p-device.c | 11 +++-------- hw/9pfs/virtio-9p.c | 2 +- hw/9pfs/virtio-9p.h | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c index 29a639e..62a291b 100644 --- a/hw/9pfs/virtio-9p-device.c +++ b/hw/9pfs/virtio-9p-device.c @@ -26,16 +26,11 @@ static uint32_t virtio_9p_get_features(VirtIODevice *vdev, uint32_t features) return features; } -static V9fsState *to_virtio_9p(VirtIODevice *vdev) -{ - return (V9fsState *)vdev; -} - static void virtio_9p_get_config(VirtIODevice *vdev, uint8_t *config) { int len; struct virtio_9p_config *cfg; - V9fsState *s = to_virtio_9p(vdev); + V9fsState *s = VIRTIO_9P(vdev); len = strlen(s->tag); cfg = g_malloc0(sizeof(struct virtio_9p_config) + len); @@ -97,9 +92,9 @@ static int virtio_9p_device_init(VirtIODevice *vdev) s->ctx.uid = -1; s->ops = fse->ops; - s->vdev.get_features = virtio_9p_get_features; + vdev->get_features = virtio_9p_get_features; s->config_size = sizeof(struct virtio_9p_config) + len; - s->vdev.get_config = virtio_9p_get_config; + vdev->get_config = virtio_9p_get_config; s->fid_list = NULL; qemu_co_rwlock_init(&s->rename_lock); diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index db2ae32..296f66f 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -631,7 +631,7 @@ static void complete_pdu(V9fsState *s, V9fsPDU *pdu, ssize_t len) virtqueue_push(s->vq, &pdu->elem, len); /* FIXME: we should batch these completions */ - virtio_notify(&s->vdev, s->vq); + virtio_notify(VIRTIO_DEVICE(s), s->vq); /* Now wakeup anybody waiting in flush for this request */ qemu_co_queue_next(&pdu->complete); diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h index e1fa506..1d6eedb 100644 --- a/hw/9pfs/virtio-9p.h +++ b/hw/9pfs/virtio-9p.h @@ -205,7 +205,7 @@ struct V9fsFidState typedef struct V9fsState { - VirtIODevice vdev; + VirtIODevice parent_obj; VirtQueue *vq; V9fsPDU pdus[MAX_REQ]; QLIST_HEAD(, V9fsPDU) free_list;