From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34759) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUbsA-0006Ki-LA for qemu-devel@nongnu.org; Wed, 16 May 2012 06:54:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SUbs8-0001pD-Nc for qemu-devel@nongnu.org; Wed, 16 May 2012 06:54:26 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:35957) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SUbs8-0001l9-78 for qemu-devel@nongnu.org; Wed, 16 May 2012 06:54:24 -0400 Received: by dadv2 with SMTP id v2so1073411dad.4 for ; Wed, 16 May 2012 03:54:22 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 16 May 2012 12:54:04 +0200 Message-Id: <1337165646-28118-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1337165646-28118-1-git-send-email-pbonzini@redhat.com> References: <1337165646-28118-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 1.1 2/4] virtio-blk: blockdev_mark_auto_del is transport-independent List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, mst@redhat.com Move it from virtio_blk_exit_pci to virtio_blk_exit. This is included here because the next patch removes proxy->block. Signed-off-by: Paolo Bonzini --- hw/virtio-blk.c | 1 + hw/virtio-pci.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index 7148572..0569382 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -626,5 +626,6 @@ void virtio_blk_exit(VirtIODevice *vdev) { VirtIOBlock *s = to_virtio_blk(vdev); unregister_savevm(s->qdev, "virtio-blk", s); + blockdev_mark_auto_del(s->bs); virtio_cleanup(vdev); } diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 4a4413d..7b2d576 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -726,7 +726,6 @@ static int virtio_blk_exit_pci(PCIDevice *pci_dev) virtio_pci_stop_ioeventfd(proxy); virtio_blk_exit(proxy->vdev); - blockdev_mark_auto_del(proxy->block.bs); return virtio_exit_pci(pci_dev); } -- 1.7.10.1