From patchwork Wed Sep 16 10:40:37 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 33699 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 325CCB7B83 for ; Wed, 16 Sep 2009 20:49:09 +1000 (EST) Received: from localhost ([127.0.0.1]:58140 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mns4P-0004K2-J2 for incoming@patchwork.ozlabs.org; Wed, 16 Sep 2009 06:49:05 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MnryH-00016q-2A for qemu-devel@nongnu.org; Wed, 16 Sep 2009 06:42:45 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MnryD-00010a-3O for qemu-devel@nongnu.org; Wed, 16 Sep 2009 06:42:44 -0400 Received: from [199.232.76.173] (port=37510 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MnryC-000107-Sq for qemu-devel@nongnu.org; Wed, 16 Sep 2009 06:42:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53069) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MnryC-0007Fg-5Z for qemu-devel@nongnu.org; Wed, 16 Sep 2009 06:42:40 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8GAgUOw021553; Wed, 16 Sep 2009 06:42:30 -0400 Received: from redhat.com (dhcp-0-94.tlv.redhat.com [10.35.0.94]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8GAgG17022166 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Wed, 16 Sep 2009 06:42:24 -0400 Date: Wed, 16 Sep 2009 13:40:37 +0300 From: "Michael S. Tsirkin" To: Paul Brook , Avi Kivity , qemu-devel@nongnu.org, Carsten Otte , Christian Borntraeger , kraxel@redhat.com, markmc@redhat.com Message-ID: <20090916104037.GC4446@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.19 (2009-01-05) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCHv2 2/4] qemu/virtio: fix reset with device removal X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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, 8 insertions(+), 6 deletions(-) diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index f7a51ff..e300d28 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -155,9 +155,9 @@ 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(DeviceState *d) { - VirtIOPCIProxy *proxy = opaque; + VirtIOPCIProxy *proxy = container_of(d, VirtIOPCIProxy, pci_dev.qdev); virtio_reset(proxy->vdev); msix_reset(&proxy->pci_dev); } @@ -184,7 +184,7 @@ static void virtio_ioport_write(void *opaque, uint32_t addr, uint32_t val) case VIRTIO_PCI_QUEUE_PFN: pa = (target_phys_addr_t)val << VIRTIO_PCI_QUEUE_ADDR_SHIFT; if (pa == 0) - virtio_pci_reset(proxy); + virtio_pci_reset(&proxy->pci_dev.qdev); else virtio_queue_set_addr(vdev, vdev->queue_sel, pa); break; @@ -198,7 +198,7 @@ static void virtio_ioport_write(void *opaque, uint32_t addr, uint32_t val) case VIRTIO_PCI_STATUS: vdev->status = val & 0xFF; if (vdev->status == 0) - virtio_pci_reset(proxy); + virtio_pci_reset(&proxy->pci_dev.qdev); break; case VIRTIO_MSI_CONFIG_VECTOR: msix_vector_unuse(&proxy->pci_dev, vdev->config_vector); @@ -429,8 +429,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); } @@ -525,6 +523,7 @@ static PCIDeviceInfo virtio_info[] = { DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2), DEFINE_PROP_END_OF_LIST(), }, + .qdev.reset = virtio_pci_reset, },{ .qdev.name = "virtio-net-pci", .qdev.size = sizeof(VirtIOPCIProxy), @@ -534,6 +533,7 @@ static PCIDeviceInfo virtio_info[] = { NIC_NVECTORS_UNSPECIFIED), DEFINE_PROP_END_OF_LIST(), }, + .qdev.reset = virtio_pci_reset, },{ .qdev.name = "virtio-console-pci", .qdev.size = sizeof(VirtIOPCIProxy), @@ -542,10 +542,12 @@ static PCIDeviceInfo virtio_info[] = { DEFINE_PROP_HEX32("class", VirtIOPCIProxy, class_code, 0), DEFINE_PROP_END_OF_LIST(), }, + .qdev.reset = virtio_pci_reset, },{ .qdev.name = "virtio-balloon-pci", .qdev.size = sizeof(VirtIOPCIProxy), .init = virtio_balloon_init_pci, + .qdev.reset = virtio_pci_reset, },{ /* end of list */ }