From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50349) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VN2AD-0007ef-MS for qemu-devel@nongnu.org; Fri, 20 Sep 2013 10:58:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VN2A7-0004QZ-NL for qemu-devel@nongnu.org; Fri, 20 Sep 2013 10:58:33 -0400 Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 20 Sep 2013 16:57:59 +0200 Message-Id: <1379689080-32396-11-git-send-email-pbonzini@redhat.com> In-Reply-To: <1379689080-32396-1-git-send-email-pbonzini@redhat.com> References: <1379689080-32396-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 10/11] virtio-rng: switch exit callback to VirtioDeviceClass List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: fred.konrad@greensocs.com, qemu-stable@nongnu.org, mst@redhat.com This ensures hot-unplug is handled properly by the proxy. Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- hw/virtio/virtio-rng.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c index 314e393..18cbfac 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -184,16 +184,14 @@ static int virtio_rng_device_init(VirtIODevice *vdev) return 0; } -static int virtio_rng_device_exit(DeviceState *qdev) +static void virtio_rng_device_exit(VirtIODevice *vdev) { - VirtIORNG *vrng = VIRTIO_RNG(qdev); - VirtIODevice *vdev = VIRTIO_DEVICE(qdev); + VirtIORNG *vrng = VIRTIO_RNG(vdev); timer_del(vrng->rate_limit_timer); timer_free(vrng->rate_limit_timer); - unregister_savevm(qdev, "virtio-rng", vrng); + unregister_savevm(DEVICE(vdev), "virtio-rng", vrng); virtio_cleanup(vdev); - return 0; } static Property virtio_rng_properties[] = { @@ -205,10 +203,10 @@ static void virtio_rng_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass); - dc->exit = virtio_rng_device_exit; dc->props = virtio_rng_properties; set_bit(DEVICE_CATEGORY_MISC, dc->categories); vdc->init = virtio_rng_device_init; + vdc->exit = virtio_rng_device_exit; vdc->get_features = get_features; } -- 1.8.3.1