提交 6877cff0 编写于 作者: L Laszlo Ersek 提交者: Luiz Capitulino

pci-assign: propagate errors from assign_device()

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: NLaszlo Ersek <lersek@redhat.com>
Reviewed-by: NEric Blake <eblake@redhat.com>
Signed-off-by: NLuiz Capitulino <lcapitulino@redhat.com>
上级 7d9cb533
...@@ -795,7 +795,7 @@ fail: ...@@ -795,7 +795,7 @@ fail:
return g_strdup("Couldn't find out why."); 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; uint32_t flags = KVM_DEV_ASSIGN_ENABLE_IOMMU;
int r; int r;
...@@ -803,15 +803,15 @@ static int assign_device(AssignedDevice *dev) ...@@ -803,15 +803,15 @@ static int assign_device(AssignedDevice *dev)
/* Only pass non-zero PCI segment to capable module */ /* Only pass non-zero PCI segment to capable module */
if (!kvm_check_extension(kvm_state, KVM_CAP_PCI_SEGMENT) && if (!kvm_check_extension(kvm_state, KVM_CAP_PCI_SEGMENT) &&
dev->host.domain) { dev->host.domain) {
error_report("Can't assign device inside non-zero PCI segment " error_setg(errp, "Can't assign device inside non-zero PCI segment "
"as this KVM module doesn't support it."); "as this KVM module doesn't support it.");
return -ENODEV; return;
} }
if (!kvm_check_extension(kvm_state, KVM_CAP_IOMMU)) { if (!kvm_check_extension(kvm_state, KVM_CAP_IOMMU)) {
error_report("No IOMMU found. Unable to assign device \"%s\"", error_setg(errp, "No IOMMU found. Unable to assign device \"%s\"",
dev->dev.qdev.id); dev->dev.qdev.id);
return -ENODEV; return;
} }
if (dev->features & ASSIGNED_DEVICE_SHARE_INTX_MASK && if (dev->features & ASSIGNED_DEVICE_SHARE_INTX_MASK &&
...@@ -826,18 +826,17 @@ static int assign_device(AssignedDevice *dev) ...@@ -826,18 +826,17 @@ static int assign_device(AssignedDevice *dev)
char *cause; char *cause;
cause = assign_failed_examine(dev); cause = assign_failed_examine(dev);
error_report("Failed to assign device \"%s\" : %s\n%s", error_setg_errno(errp, -r, "Failed to assign device \"%s\"\n%s",
dev->dev.qdev.id, strerror(-r), cause); dev->dev.qdev.id, cause);
g_free(cause); g_free(cause);
break; break;
} }
default: default:
error_report("Failed to assign device \"%s\" : %s", error_setg_errno(errp, -r, "Failed to assign device \"%s\"",
dev->dev.qdev.id, strerror(-r)); dev->dev.qdev.id);
break; break;
} }
} }
return r;
} }
static void verify_irqchip_in_kernel(Error **errp) static void verify_irqchip_in_kernel(Error **errp)
...@@ -1812,8 +1811,10 @@ static int assigned_initfn(struct PCIDevice *pci_dev) ...@@ -1812,8 +1811,10 @@ static int assigned_initfn(struct PCIDevice *pci_dev)
dev->intx_route.irq = -1; dev->intx_route.irq = -1;
/* assign device to guest */ /* assign device to guest */
r = assign_device(dev); assign_device(dev, &local_err);
if (r < 0) { if (local_err) {
qerror_report_err(local_err);
error_free(local_err);
goto out; goto out;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册