From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53766) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmL9i-0006VC-2u for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:18:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VmL9c-0004Wf-EZ for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:18:38 -0500 Received: from mail-ea0-x236.google.com ([2a00:1450:4013:c01::236]:61492) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmL9c-0004Us-58 for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:18:32 -0500 Received: by mail-ea0-f182.google.com with SMTP id o10so8796688eaj.13 for ; Fri, 29 Nov 2013 02:18:31 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 29 Nov 2013 11:17:31 +0100 Message-Id: <1385720262-14107-20-git-send-email-pbonzini@redhat.com> In-Reply-To: <1385720262-14107-1-git-send-email-pbonzini@redhat.com> References: <1385720262-14107-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 19/30] virtio-rng: QOM realize preparations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: afaerber@suse.de, mst@redhat.com From: Andreas Färber Rename qdev -> dev because that's what realize's argument is called by convention. No need to keep more "qdev" around than necessary. Signed-off-by: Andreas Färber Signed-off-by: Paolo Bonzini --- hw/virtio/virtio-rng.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index 42ca568..9e2a66a 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -135,8 +135,8 @@ static void check_rate_limit(void *opaque) static int virtio_rng_device_init(VirtIODevice *vdev) { - DeviceState *qdev = DEVICE(vdev); - VirtIORNG *vrng = VIRTIO_RNG(vdev); + DeviceState *dev = DEVICE(vdev); + VirtIORNG *vrng = VIRTIO_RNG(dev); Error *local_err = NULL; if (!vrng->conf.period_ms > 0) { @@ -148,12 +148,12 @@ static int virtio_rng_device_init(VirtIODevice *vdev) if (vrng->conf.rng == NULL) { vrng->conf.default_backend = RNG_RANDOM(object_new(TYPE_RNG_RANDOM)); - object_property_add_child(OBJECT(qdev), + object_property_add_child(OBJECT(dev), "default-backend", OBJECT(vrng->conf.default_backend), NULL); - object_property_set_link(OBJECT(qdev), + object_property_set_link(OBJECT(dev), OBJECT(vrng->conf.default_backend), "rng", NULL); } @@ -184,7 +184,7 @@ static int virtio_rng_device_init(VirtIODevice *vdev) timer_mod(vrng->rate_limit_timer, qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL) + vrng->conf.period_ms); - register_savevm(qdev, "virtio-rng", -1, 1, virtio_rng_save, + register_savevm(dev, "virtio-rng", -1, 1, virtio_rng_save, virtio_rng_load, vrng); return 0; -- 1.8.3.1