From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark McLoughlin Subject: [PATCH 12/12] kvm: qemu: device-assignment: init_assigned_device() error handling Date: Fri, 28 Nov 2008 17:10:50 +0000 Message-ID: <1227892250-14386-12-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> <1227892250-14386-4-git-send-email-markmc@redhat.com> <1227892250-14386-5-git-send-email-markmc@redhat.com> <1227892250-14386-6-git-send-email-markmc@redhat.com> <1227892250-14386-7-git-send-email-markmc@redhat.com> <1227892250-14386-8-git-send-email-markmc@redhat.com> <1227892250-14386-9-git-send-email-markmc@redhat.com> <1227892250-14386-10-git-send-email-markmc@redhat.com> <1227892250-14386-11-git-send-email-markmc@redhat.com> Cc: kvm@vger.kernel.org, Mark McLoughlin To: Avi Kivity Return-path: Received: from mail00.svc.cra.dublin.eircom.net ([159.134.118.16]:33713 "HELO mail00.svc.cra.dublin.eircom.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751936AbYK1RMI (ORCPT ); Fri, 28 Nov 2008 12:12:08 -0500 In-Reply-To: <1227892250-14386-11-git-send-email-markmc@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Associate the AssignedDevice with the AssignedDevInfo as soon as we have allocated it and don't try and free it in init_assigned_device() if an error occurs. This ensures that the mmio region is unmapped by free_assigned_device() if init_assigned_device() fails. Signed-off-by: Mark McLoughlin --- qemu/hw/device-assignment.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/qemu/hw/device-assignment.c b/qemu/hw/device-assignment.c index 1964fbc..70640c9 100644 --- a/qemu/hw/device-assignment.c +++ b/qemu/hw/device-assignment.c @@ -548,17 +548,19 @@ struct PCIDevice *init_assigned_device(AssignedDevInfo *adev, PCIBus *bus) return NULL; } + adev->assigned_dev = dev; + if (get_real_device(dev, adev->bus, adev->dev, adev->func)) { fprintf(stderr, "%s: Error: Couldn't get real device (%s)!\n", __func__, adev->name); - goto out; + return NULL; } /* handle real device's MMIO/PIO BARs */ if (assigned_dev_register_regions(dev->real_device.regions, dev->real_device.region_number, dev)) - goto out; + return NULL; /* handle interrupt routing */ e_device = (dev->dev.devfn >> 3) & 0x1f; @@ -588,15 +590,10 @@ struct PCIDevice *init_assigned_device(AssignedDevInfo *adev, PCIBus *bus) if (r < 0) { fprintf(stderr, "Failed to assign device \"%s\" : %s\n", adev->name, strerror(-r)); - goto out; + return NULL; } - adev->assigned_dev = dev; return &dev->dev; - -out: - pci_unregister_device(&dev->dev); - return NULL; } /* -- 1.5.4.3