diff options
| author | Laszlo Ersek <lersek@redhat.com> | 2014-04-10 10:24:42 +0200 |
|---|---|---|
| committer | Luiz Capitulino <lcapitulino@redhat.com> | 2014-05-08 14:20:00 -0400 |
| commit | 7d9cb533f5a475c3d87b8c7c3fd65b2b6530cdac (patch) | |
| tree | cb06eeffc8d341aaf3e537579aa7f5f05139d87d /hw/i386 | |
| parent | 7a98593b34d3e19d77c43a69dd47f2387250d67d (diff) | |
| download | qemu-7d9cb533f5a475c3d87b8c7c3fd65b2b6530cdac.tar.gz | |
pci-assign: propagate errors from assigned_dev_register_regions()
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Diffstat (limited to 'hw/i386')
| -rw-r--r-- | hw/i386/kvm/pci-assign.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c index 3a904e8392..9aa92a1d3d 100644 --- a/hw/i386/kvm/pci-assign.c +++ b/hw/i386/kvm/pci-assign.c @@ -394,9 +394,10 @@ static uint8_t pci_find_cap_offset(PCIDevice *d, uint8_t cap, uint8_t start) return 0; } -static int assigned_dev_register_regions(PCIRegion *io_regions, - unsigned long regions_num, - AssignedDevice *pci_dev) +static void assigned_dev_register_regions(PCIRegion *io_regions, + unsigned long regions_num, + AssignedDevice *pci_dev, + Error **errp) { uint32_t i; PCIRegion *cur_region = io_regions; @@ -425,9 +426,9 @@ static int assigned_dev_register_regions(PCIRegion *io_regions, if (pci_dev->v_addrs[i].u.r_virtbase == MAP_FAILED) { pci_dev->v_addrs[i].u.r_virtbase = NULL; - error_report("%s: Error: Couldn't mmap 0x%" PRIx64 "!", - __func__, cur_region->base_addr); - return -1; + error_setg_errno(errp, errno, "Couldn't mmap 0x%" PRIx64 "!", + cur_region->base_addr); + return; } pci_dev->v_addrs[i].r_size = cur_region->size; @@ -496,7 +497,6 @@ static int assigned_dev_register_regions(PCIRegion *io_regions, } /* success */ - return 0; } static void get_real_id(const char *devpath, const char *idname, uint16_t *val, @@ -1796,9 +1796,12 @@ static int assigned_initfn(struct PCIDevice *pci_dev) } /* handle real device's MMIO/PIO BARs */ - if (assigned_dev_register_regions(dev->real_device.regions, - dev->real_device.region_number, - dev)) { + assigned_dev_register_regions(dev->real_device.regions, + dev->real_device.region_number, dev, + &local_err); + if (local_err) { + qerror_report_err(local_err); + error_free(local_err); goto out; } |