From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MnZ8o-00082P-6r for qemu-devel@nongnu.org; Tue, 15 Sep 2009 10:36:22 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MnZ8j-000801-Pa for qemu-devel@nongnu.org; Tue, 15 Sep 2009 10:36:21 -0400 Received: from [199.232.76.173] (port=35730 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MnZ8j-0007zn-Cc for qemu-devel@nongnu.org; Tue, 15 Sep 2009 10:36:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:5323) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MnZ8i-0002v3-TK for qemu-devel@nongnu.org; Tue, 15 Sep 2009 10:36:17 -0400 Date: Tue, 15 Sep 2009 17:33:52 +0300 From: "Michael S. Tsirkin" Message-ID: <20090915143352.GC24708@redhat.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: [Qemu-devel] [PATCH 2/2] qemu/virtio: fix reset with device removal List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paul Brook , Avi Kivity , qemu-devel@nongnu.org, Carsten Otte , Christian Borntraeger , kraxel@redhat.com, markmc@redhat.com virtio pci registers its own reset handler, but fails to unregister it, which will lead to crashes after device removal. Solve this problem by switching to qdev reset handler, which is automatically unregistered. Signed-off-by: Michael S. Tsirkin --- hw/virtio-pci.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index f7a51ff..951d1dc 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -155,9 +155,8 @@ static int virtio_pci_load_queue(void * opaque, int n, QEMUFile *f) return 0; } -static void virtio_pci_reset(void *opaque) +static void virtio_pci_reset(VirtIOPCIProxy *proxy) { - VirtIOPCIProxy *proxy = opaque; virtio_reset(proxy->vdev); msix_reset(&proxy->pci_dev); } @@ -429,8 +428,6 @@ static void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev, pci_register_bar(&proxy->pci_dev, 0, size, PCI_ADDRESS_SPACE_IO, virtio_map); - qemu_register_reset(virtio_pci_reset, proxy); - virtio_bind_device(vdev, &virtio_pci_bindings, proxy); } @@ -514,6 +511,11 @@ static int virtio_balloon_init_pci(PCIDevice *pci_dev) return 0; } +static void virtio_reset_pci(DeviceState *d) +{ + virtio_pci_reset(container_of(d, VirtIOPCIProxy, pci_dev.qdev)); +} + static PCIDeviceInfo virtio_info[] = { { .qdev.name = "virtio-blk-pci", @@ -525,6 +527,7 @@ static PCIDeviceInfo virtio_info[] = { DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2), DEFINE_PROP_END_OF_LIST(), }, + .qdev.reset = virtio_reset_pci, },{ .qdev.name = "virtio-net-pci", .qdev.size = sizeof(VirtIOPCIProxy), @@ -534,6 +537,7 @@ static PCIDeviceInfo virtio_info[] = { NIC_NVECTORS_UNSPECIFIED), DEFINE_PROP_END_OF_LIST(), }, + .qdev.reset = virtio_reset_pci, },{ .qdev.name = "virtio-console-pci", .qdev.size = sizeof(VirtIOPCIProxy), @@ -542,10 +546,12 @@ static PCIDeviceInfo virtio_info[] = { DEFINE_PROP_HEX32("class", VirtIOPCIProxy, class_code, 0), DEFINE_PROP_END_OF_LIST(), }, + .qdev.reset = virtio_reset_pci, },{ .qdev.name = "virtio-balloon-pci", .qdev.size = sizeof(VirtIOPCIProxy), .init = virtio_balloon_init_pci, + .qdev.reset = virtio_reset_pci, },{ /* end of list */ } -- 1.6.2.5