From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark McLoughlin Subject: [PATCH 04/12] kvm: qemu: device-assignment: unregister device if assignment fails Date: Fri, 28 Nov 2008 17:10:42 +0000 Message-ID: <1227892250-14386-4-git-send-email-markmc@redhat.com> References: <> <1227892250-14386-1-git-send-email-markmc@redhat.com> <1227892250-14386-2-git-send-email-markmc@redhat.com> <1227892250-14386-3-git-send-email-markmc@redhat.com> Cc: kvm@vger.kernel.org, Mark McLoughlin To: Avi Kivity Return-path: Received: from mail10.svc.cra.dublin.eircom.net ([159.134.118.26]:30628 "HELO mail10.svc.cra.dublin.eircom.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751677AbYK1RMI (ORCPT ); Fri, 28 Nov 2008 12:12:08 -0500 In-Reply-To: <1227892250-14386-3-git-send-email-markmc@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Fixes a segfault in assigned_dev_update_irq() if assigning a device previously failed. Signed-off-by: Mark McLoughlin --- qemu/hw/device-assignment.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/qemu/hw/device-assignment.c b/qemu/hw/device-assignment.c index 8fbd66c..b5cf6ee 100644 --- a/qemu/hw/device-assignment.c +++ b/qemu/hw/device-assignment.c @@ -550,8 +550,11 @@ struct PCIDevice *init_assigned_device(AssignedDevInfo *adev, PCIBus *bus) } adev->assigned_dev = dev; - out: return &dev->dev; + +out: + pci_unregister_device(&dev->dev); + return NULL; } /* -- 1.5.4.3