From patchwork Tue Oct 15 16:46:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 283743 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 AFE8A2C0077 for ; Wed, 16 Oct 2013 03:52:39 +1100 (EST) Received: from localhost ([::1]:43040 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VW7rJ-00072o-CD for incoming@patchwork.ozlabs.org; Tue, 15 Oct 2013 12:52:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43527) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VW7mM-0006eq-31 for qemu-devel@nongnu.org; Tue, 15 Oct 2013 12:47:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VW7mH-0007cy-2N for qemu-devel@nongnu.org; Tue, 15 Oct 2013 12:47:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:24146) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VW7mG-0007cg-Iz; Tue, 15 Oct 2013 12:47:24 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9FGlLQW011125 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 15 Oct 2013 12:47:22 -0400 Received: from playground.com (ovpn-112-59.ams2.redhat.com [10.36.112.59]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r9FGkq5x011192; Tue, 15 Oct 2013 12:47:19 -0400 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 15 Oct 2013 18:46:48 +0200 Message-Id: <1381855610-6890-11-git-send-email-pbonzini@redhat.com> In-Reply-To: <1381855610-6890-1-git-send-email-pbonzini@redhat.com> References: <1379689080-32396-2-git-send-email-pbonzini@redhat.com> <1381855610-6890-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: cornelia.huck@de.ibm.com, qemu-stable@nongnu.org, mst@redhat.com Subject: [Qemu-devel] [PATCH v3 10/12] virtio-balloon: 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-balloon.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index 9504877..d7a392d 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -370,16 +370,14 @@ static int virtio_balloon_device_init(VirtIODevice *vdev) return 0; } -static int virtio_balloon_device_exit(DeviceState *qdev) +static void virtio_balloon_device_exit(VirtIODevice *vdev) { - VirtIOBalloon *s = VIRTIO_BALLOON(qdev); - VirtIODevice *vdev = VIRTIO_DEVICE(qdev); + VirtIOBalloon *s = VIRTIO_BALLOON(vdev); balloon_stats_destroy_timer(s); qemu_remove_balloon_handler(s); - unregister_savevm(qdev, "virtio-balloon", s); + unregister_savevm(DEVICE(vdev), "virtio-balloon", s); virtio_cleanup(vdev); - return 0; } static Property virtio_balloon_properties[] = { @@ -390,10 +388,10 @@ static void virtio_balloon_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass); - dc->exit = virtio_balloon_device_exit; dc->props = virtio_balloon_properties; set_bit(DEVICE_CATEGORY_MISC, dc->categories); vdc->init = virtio_balloon_device_init; + vdc->exit = virtio_balloon_device_exit; vdc->get_config = virtio_balloon_get_config; vdc->set_config = virtio_balloon_set_config; vdc->get_features = virtio_balloon_get_features;