From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53758) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmL9h-0006Sa-0F for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:18:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VmL9a-0004SD-AT for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:18:36 -0500 Received: from mail-ea0-x232.google.com ([2a00:1450:4013:c01::232]:34183) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmL9a-0004Q6-16 for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:18:30 -0500 Received: by mail-ea0-f178.google.com with SMTP id d10so6535488eaj.23 for ; Fri, 29 Nov 2013 02:18:29 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 29 Nov 2013 11:17:30 +0100 Message-Id: <1385720262-14107-19-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 18/30] virtio-balloon: 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 since that's what realize's argument is called by convention. No need to keep more "qdev" around than necessary. Avoid duplicate VIRTIO_DEVICE() cast. Signed-off-by: Andreas Färber Signed-off-by: Paolo Bonzini --- hw/virtio/virtio-balloon.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index d7a392d..e6f6b4b 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -339,8 +339,8 @@ static int virtio_balloon_load(QEMUFile *f, void *opaque, int version_id) static int virtio_balloon_device_init(VirtIODevice *vdev) { - DeviceState *qdev = DEVICE(vdev); - VirtIOBalloon *s = VIRTIO_BALLOON(vdev); + DeviceState *dev = DEVICE(vdev); + VirtIOBalloon *s = VIRTIO_BALLOON(dev); int ret; virtio_init(vdev, "virtio-balloon", VIRTIO_ID_BALLOON, 8); @@ -349,7 +349,7 @@ static int virtio_balloon_device_init(VirtIODevice *vdev) virtio_balloon_stat, s); if (ret < 0) { - virtio_cleanup(VIRTIO_DEVICE(s)); + virtio_cleanup(vdev); return -1; } @@ -357,13 +357,13 @@ static int virtio_balloon_device_init(VirtIODevice *vdev) s->dvq = virtio_add_queue(vdev, 128, virtio_balloon_handle_output); s->svq = virtio_add_queue(vdev, 128, virtio_balloon_receive_stats); - register_savevm(qdev, "virtio-balloon", -1, 1, + register_savevm(dev, "virtio-balloon", -1, 1, virtio_balloon_save, virtio_balloon_load, s); - object_property_add(OBJECT(qdev), "guest-stats", "guest statistics", + object_property_add(OBJECT(dev), "guest-stats", "guest statistics", balloon_stats_get_all, NULL, NULL, s, NULL); - object_property_add(OBJECT(qdev), "guest-stats-polling-interval", "int", + object_property_add(OBJECT(dev), "guest-stats-polling-interval", "int", balloon_stats_get_poll_interval, balloon_stats_set_poll_interval, NULL, s, NULL); -- 1.8.3.1