From patchwork Fri Nov 29 10:17:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 295217 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 264492C00A7 for ; Fri, 29 Nov 2013 21:19:18 +1100 (EST) Received: from localhost ([::1]:46516 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmLAJ-0006PP-CB for incoming@patchwork.ozlabs.org; Fri, 29 Nov 2013 05:19:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53566) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmL9S-00064u-Fn for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:18:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VmL9L-0004Em-B6 for qemu-devel@nongnu.org; Fri, 29 Nov 2013 05:18:22 -0500 Received: from mail-ea0-x22b.google.com ([2a00:1450:4013:c01::22b]:57631) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmL9L-0004EN-4l; Fri, 29 Nov 2013 05:18:15 -0500 Received: by mail-ea0-f171.google.com with SMTP id h10so6653326eak.16 for ; Fri, 29 Nov 2013 02:18:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=LG5dytnzYDRsMKCPJMvZI2UgPSQ8lsWy6GK4lJTd2Cw=; b=DzXIbnOGBV53Idud+BWTV21+2jQTp47xGJ9652Q6W38uXtyCrWhYduzPQZKV9L3I8D 9DvXgb7kP15OG8qvKldq6ypSr+jg/WukbYCQcc1OjKxjJQj0oT3w+HWoQfe1Iup/drFs DC+gGzlkm8EgdEKJVslDgGk0jA+dF3aX4FJ4eF22Kor2aSnqqJlU4DRo/L2axmRw+tZv W4N6t8aPYII8nqgsnHw/fvk5PQJRelYc15iRNBP3r+5SKV2ERkMhRhDWEWOvv0IiELqu fPgOnE4amKCB+3l1Q03EIld4w5Xhiz+hGK8BNgZhQjXr3VebsqcMcJx/e8+3jzekmKEV +rTg== X-Received: by 10.15.33.139 with SMTP id c11mr1439238eev.110.1385720294273; Fri, 29 Nov 2013 02:18:14 -0800 (PST) Received: from playground.lan (net-37-117-137-113.cust.dsl.vodafone.it. [37.117.137.113]) by mx.google.com with ESMTPSA id b42sm39055362eem.9.2013.11.29.02.18.12 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Nov 2013 02:18:13 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 29 Nov 2013 11:17:23 +0100 Message-Id: <1385720262-14107-12-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1385720262-14107-1-git-send-email-pbonzini@redhat.com> References: <1385720262-14107-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::22b Cc: qemu-stable@nongnu.org, afaerber@suse.de, mst@redhat.com Subject: [Qemu-devel] [PATCH 11/30] virtio-rng: switch exit callback to VirtioDeviceClass 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 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 b22ccf1..42ca568 100644 --- a/hw/virtio/virtio-rng.c +++ b/hw/virtio/virtio-rng.c @@ -190,16 +190,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[] = { @@ -211,10 +209,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; }