From patchwork Fri Apr 19 13:57:28 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: 237960 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 138022C026F for ; Fri, 19 Apr 2013 23:59:58 +1000 (EST) Received: from localhost ([::1]:52170 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UTBr2-0006GE-Bq for incoming@patchwork.ozlabs.org; Fri, 19 Apr 2013 09:59:56 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56938) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UTBp5-0003Ww-5X for qemu-devel@nongnu.org; Fri, 19 Apr 2013 09:57:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UTBp3-0002Qd-Tg for qemu-devel@nongnu.org; Fri, 19 Apr 2013 09:57:55 -0400 Received: from greensocs.com ([87.106.252.221]:47530 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UTBp3-0002QU-OM for qemu-devel@nongnu.org; Fri, 19 Apr 2013 09:57:53 -0400 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id D6A7E40EC62; Fri, 19 Apr 2013 13:57:52 +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 0ubHgYD7L-F8; Fri, 19 Apr 2013 15:57:51 +0200 (CEST) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id D8B4E40EC63; Fri, 19 Apr 2013 15:57:50 +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 0238440EC61; Fri, 19 Apr 2013 15:57:49 +0200 (CEST) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org, aliguori@us.ibm.com Date: Fri, 19 Apr 2013 15:57:28 +0200 Message-Id: <1366379855-28649-2-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1366379855-28649-1-git-send-email-fred.konrad@greensocs.com> References: <1366379855-28649-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 v4 1/8] virtio-rng: don't use pointer for configuration. 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 configuration field must not be a pointer as it will be used for virtio-rng properties. So *conf is replaced by conf. Signed-off-by: KONRAD Frederic --- hw/virtio/virtio-rng.c | 12 ++++++------ include/hw/virtio/virtio-rng.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index fcc223a..05b4d57 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -124,10 +124,10 @@ static void check_rate_limit(void *opaque) { VirtIORNG *s = opaque; - s->quota_remaining = s->conf->max_bytes; + s->quota_remaining = s->conf.max_bytes; virtio_rng_process(s); qemu_mod_timer(s->rate_limit_timer, - qemu_get_clock_ms(vm_clock) + s->conf->period_ms); + qemu_get_clock_ms(vm_clock) + s->conf.period_ms); } @@ -159,16 +159,16 @@ VirtIODevice *virtio_rng_init(DeviceState *dev, VirtIORNGConf *conf) vrng->vdev.get_features = get_features; vrng->qdev = dev; - vrng->conf = conf; + memcpy(&(vrng->conf), conf, sizeof(struct VirtIORNGConf)); - assert(vrng->conf->max_bytes <= INT64_MAX); - vrng->quota_remaining = vrng->conf->max_bytes; + assert(vrng->conf.max_bytes <= INT64_MAX); + vrng->quota_remaining = vrng->conf.max_bytes; vrng->rate_limit_timer = qemu_new_timer_ms(vm_clock, check_rate_limit, vrng); qemu_mod_timer(vrng->rate_limit_timer, - qemu_get_clock_ms(vm_clock) + vrng->conf->period_ms); + qemu_get_clock_ms(vm_clock) + vrng->conf.period_ms); register_savevm(dev, "virtio-rng", -1, 1, virtio_rng_save, virtio_rng_load, vrng); diff --git a/include/hw/virtio/virtio-rng.h b/include/hw/virtio/virtio-rng.h index c9cadc2..c578c00 100644 --- a/include/hw/virtio/virtio-rng.h +++ b/include/hw/virtio/virtio-rng.h @@ -33,7 +33,7 @@ typedef struct VirtIORNG { /* Only one vq - guest puts buffer(s) on it when it needs entropy */ VirtQueue *vq; - VirtIORNGConf *conf; + VirtIORNGConf conf; RngBackend *rng;