OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

pci-assign: propagate errors from assign_device()

Browse Source 
Also, change the return type to "void"; the function is static (with a
sole caller) and the negative errno values are not distinguished from each
other.

Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Laszlo Ersek 2014-04-10 10:24:43 +02:00 committed by Luiz Capitulino
parent 7d9cb533f5
commit 6877cff044
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hw/i386/kvm/pci-assign.c
View File

@ -795,7 +795,7 @@ fail:
return g_strdup("Couldn't find out why.");
}
static int assign_device(AssignedDevice *dev)
static void assign_device(AssignedDevice *dev, Error **errp)
{
uint32_t flags = KVM_DEV_ASSIGN_ENABLE_IOMMU;
int r;
@ -803,15 +803,15 @@ static int assign_device(AssignedDevice *dev)
/* Only pass non-zero PCI segment to capable module */
if (!kvm_check_extension(kvm_state, KVM_CAP_PCI_SEGMENT) &&
dev->host.domain) {
error_report("Can't assign device inside non-zero PCI segment "
"as this KVM module doesn't support it.");
return -ENODEV;
error_setg(errp, "Can't assign device inside non-zero PCI segment "
"as this KVM module doesn't support it.");
return;
}
if (!kvm_check_extension(kvm_state, KVM_CAP_IOMMU)) {
error_report("No IOMMU found. Unable to assign device \"%s\"",
dev->dev.qdev.id);
return -ENODEV;
error_setg(errp, "No IOMMU found. Unable to assign device \"%s\"",
dev->dev.qdev.id);
return;
}
if (dev->features & ASSIGNED_DEVICE_SHARE_INTX_MASK &&
@ -826,18 +826,17 @@ static int assign_device(AssignedDevice *dev)
char *cause;
cause = assign_failed_examine(dev);
error_report("Failed to assign device \"%s\" : %s\n%s",
dev->dev.qdev.id, strerror(-r), cause);
error_setg_errno(errp, -r, "Failed to assign device \"%s\"\n%s",
dev->dev.qdev.id, cause);
g_free(cause);
break;
}
default:
error_report("Failed to assign device \"%s\" : %s",
dev->dev.qdev.id, strerror(-r));
error_setg_errno(errp, -r, "Failed to assign device \"%s\"",
dev->dev.qdev.id);
break;
}
}
return r;
}
static void verify_irqchip_in_kernel(Error **errp)
@ -1812,8 +1811,10 @@ static int assigned_initfn(struct PCIDevice *pci_dev)
dev->intx_route.irq = -1;
/* assign device to guest */
r = assign_device(dev);
if (r < 0) {
assign_device(dev, &local_err);
if (local_err) {
qerror_report_err(local_err);
error_free(local_err);
goto out;
}