From patchwork Mon Dec 9 20:48:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 299218 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 847812C00A6 for ; Tue, 10 Dec 2013 09:18:18 +1100 (EST) Received: from localhost ([::1]:45782 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vq7nk-0008Nz-Hb for incoming@patchwork.ozlabs.org; Mon, 09 Dec 2013 15:51:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51051) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vq7lM-0004sG-AK for qemu-devel@nongnu.org; Mon, 09 Dec 2013 15:49:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vq7lH-0003iv-Gn for qemu-devel@nongnu.org; Mon, 09 Dec 2013 15:49:08 -0500 Received: from mail-ea0-x22e.google.com ([2a00:1450:4013:c01::22e]:44427) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vq7lH-0003ih-9M; Mon, 09 Dec 2013 15:49:03 -0500 Received: by mail-ea0-f174.google.com with SMTP id b10so1820910eae.33 for ; Mon, 09 Dec 2013 12:49:02 -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=eOd48gkVdbir/LuhDBh8RGbnXAjGNoAxTRAdEUClaiQ=; b=Z/AtYfgAbYgpnzzH4gvBNjTeEhM35q4Obcb3RhBrUcaH0OyGcW3f0xQ4SLkxLz91Gq GJkwjfN/BnzrJ0pwCDaEwVOMOs54uPMYaJwNl9kkp8dceZ0OA6iRaHMnc/dsdqDaZFj6 KiXrTAWtI/AKtv43KyHB2usJOE5NXIv8tboZc+vEymJ8OpaAl2o9AtiODbft1CRBXuNr ZsWZkMvpRfRHQskpQ6ycC+gkh98f/ZOY0ADzGhb0D0vCsMaHPR20mzy9DtQU9rQXPx2Y zX9qjB9AVQvoOz1qQXbUKkONp76xLaPSWZ8WBPO0PQPQ1zcPklut0Yr9v/CkykBWtROw HdUA== X-Received: by 10.14.6.136 with SMTP id 8mr14282667een.11.1386622142155; Mon, 09 Dec 2013 12:49:02 -0800 (PST) Received: from yakj.lan (net-2-35-202-54.cust.dsl.vodafone.it. [2.35.202.54]) by mx.google.com with ESMTPSA id a45sm33003002eem.6.2013.12.09.12.48.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Dec 2013 12:49:00 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 9 Dec 2013 21:48:08 +0100 Message-Id: <1386622112-27257-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1386622112-27257-1-git-send-email-pbonzini@redhat.com> References: <1386622112-27257-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::22e Cc: cornelia.huck@de.ibm.com, qemu-stable@nongnu.org, afaerber@suse.de, mst@redhat.com Subject: [Qemu-devel] [PULL 06/30] virtio-blk: 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, and avoids leaking bus_name which is freed by virtio_device_exit. Cc: qemu-stable@nongnu.org Acked-by: Andreas Faerber Signed-off-by: Paolo Bonzini --- hw/block/virtio-blk.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c index 13f6d82..7f0440f 100644 --- a/hw/block/virtio-blk.c +++ b/hw/block/virtio-blk.c @@ -728,20 +728,18 @@ static int virtio_blk_device_init(VirtIODevice *vdev) return 0; } -static int virtio_blk_device_exit(DeviceState *dev) +static void virtio_blk_device_exit(VirtIODevice *vdev) { - VirtIODevice *vdev = VIRTIO_DEVICE(dev); - VirtIOBlock *s = VIRTIO_BLK(dev); + VirtIOBlock *s = VIRTIO_BLK(vdev); #ifdef CONFIG_VIRTIO_BLK_DATA_PLANE remove_migration_state_change_notifier(&s->migration_state_notifier); virtio_blk_data_plane_destroy(s->dataplane); s->dataplane = NULL; #endif qemu_del_vm_change_state_handler(s->change); - unregister_savevm(dev, "virtio-blk", s); + unregister_savevm(DEVICE(vdev), "virtio-blk", s); blockdev_mark_auto_del(s->bs); virtio_cleanup(vdev); - return 0; } static Property virtio_blk_properties[] = { @@ -753,10 +751,10 @@ static void virtio_blk_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass); - dc->exit = virtio_blk_device_exit; dc->props = virtio_blk_properties; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); vdc->init = virtio_blk_device_init; + vdc->exit = virtio_blk_device_exit; vdc->get_config = virtio_blk_update_config; vdc->set_config = virtio_blk_set_config; vdc->get_features = virtio_blk_get_features;