From patchwork Sun Apr 14 13:01:09 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: 236438 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 094862C00E5 for ; Sun, 14 Apr 2013 23:05:16 +1000 (EST) Received: from localhost ([::1]:46885 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URMcM-0008MX-7t for incoming@patchwork.ozlabs.org; Sun, 14 Apr 2013 09:05:14 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47454) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URMYv-0003Hu-Vw for qemu-devel@nongnu.org; Sun, 14 Apr 2013 09:01:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URMYv-0001Oo-1t for qemu-devel@nongnu.org; Sun, 14 Apr 2013 09:01:41 -0400 Received: from greensocs.com ([87.106.252.221]:34342 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URMYu-0001Oe-R0 for qemu-devel@nongnu.org; Sun, 14 Apr 2013 09:01:40 -0400 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id 4920D40EC65; Sun, 14 Apr 2013 13:01:40 +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 OLxLqYtxo7hq; Sun, 14 Apr 2013 15:01:36 +0200 (CEST) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id 9424B40EC68; Sun, 14 Apr 2013 15:01:25 +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 87D5D40EC62; Sun, 14 Apr 2013 15:01:24 +0200 (CEST) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org, aliguori@us.ibm.com, amit.shah@redhat.com Date: Sun, 14 Apr 2013 15:01:09 +0200 Message-Id: <1365944470-13837-8-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1365944470-13837-1-git-send-email-fred.konrad@greensocs.com> References: <1365944470-13837-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: cornelia.huck@de.ibm.com, peter.maydell@linaro.org, mark.burton@greensocs.com, fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH v3 7/8] virtio-rng: cleanup: remove qdev field. 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 The qdev field is no longer needed, just drop it. Signed-off-by: KONRAD Frederic --- hw/virtio/virtio-rng.c | 2 -- include/hw/virtio/virtio-rng.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index 1832996..088f8fe 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -168,8 +168,6 @@ static int virtio_rng_device_init(VirtIODevice *vdev) vrng->vdev.get_features = get_features; - vrng->qdev = qdev; - assert(vrng->conf.max_bytes <= INT64_MAX); vrng->quota_remaining = vrng->conf.max_bytes; diff --git a/include/hw/virtio/virtio-rng.h b/include/hw/virtio/virtio-rng.h index 8b94c27..ac04ad5 100644 --- a/include/hw/virtio/virtio-rng.h +++ b/include/hw/virtio/virtio-rng.h @@ -32,8 +32,6 @@ struct VirtIORNGConf { typedef struct VirtIORNG { VirtIODevice vdev; - DeviceState *qdev; - /* Only one vq - guest puts buffer(s) on it when it needs entropy */ VirtQueue *vq;