[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/16] pci-assign: make assign_failed_examine() just
From: |
Laszlo Ersek |
Subject: |
[Qemu-devel] [PATCH 04/16] pci-assign: make assign_failed_examine() just format the cause |
Date: |
Thu, 10 Apr 2014 10:24:33 +0200 |
This allows us to report the entire error with one error_report() call,
easing future error propagation.
Signed-off-by: Laszlo Ersek <address@hidden>
---
hw/i386/kvm/pci-assign.c | 30 +++++++++++++++++++-----------
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c
index bfce97f..6b8db25 100644
--- a/hw/i386/kvm/pci-assign.c
+++ b/hw/i386/kvm/pci-assign.c
@@ -729,11 +729,16 @@ static void free_assigned_device(AssignedDevice *dev)
}
free_msi_virqs(dev);
}
-static void assign_failed_examine(AssignedDevice *dev)
+/* This function tries to determine the cause of the PCI assignment failure. It
+ * always returns the cause as a dynamically allocated, human readable string.
+ * If the function fails to determine the cause for any internal reason, then
+ * the returned string will state that fact.
+ */
+static char *assign_failed_examine(const AssignedDevice *dev)
{
char name[PATH_MAX], dir[PATH_MAX], driver[PATH_MAX] = {}, *ns;
uint16_t vendor_id, device_id;
int r;
@@ -759,12 +764,12 @@ static void assign_failed_examine(AssignedDevice *dev)
if (get_real_vendor_id(dir, &vendor_id) ||
get_real_device_id(dir, &device_id)) {
goto fail;
}
- error_printf("*** The driver '%s' is occupying your device "
- "%04x:%02x:%02x.%x.\n"
+ return g_strdup_printf(
+ "*** The driver '%s' is occupying your device %04x:%02x:%02x.%x.\n"
"***\n"
"*** You can try the following commands to free it:\n"
"***\n"
"*** $ echo \"%04x %04x\" > /sys/bus/pci/drivers/pci-stub/new_id\n"
"*** $ echo \"%04x:%02x:%02x.%x\" > /sys/bus/pci/drivers/%s/unbind\n"
@@ -776,14 +781,12 @@ static void assign_failed_examine(AssignedDevice *dev)
dev->host.function, vendor_id, device_id,
dev->host.domain, dev->host.bus, dev->host.slot, dev->host.function,
ns, dev->host.domain, dev->host.bus, dev->host.slot,
dev->host.function, vendor_id, device_id);
- return;
-
fail:
- error_report("Couldn't find out why.");
+ return g_strdup("Couldn't find out why.");
}
static int assign_device(AssignedDevice *dev)
{
uint32_t flags = KVM_DEV_ASSIGN_ENABLE_IOMMU;
@@ -808,18 +811,23 @@ static int assign_device(AssignedDevice *dev)
flags |= KVM_DEV_ASSIGN_PCI_2_3;
}
r = kvm_device_pci_assign(kvm_state, &dev->host, flags, &dev->dev_id);
if (r < 0) {
- error_report("Failed to assign device \"%s\" : %s",
- dev->dev.qdev.id, strerror(-r));
-
switch (r) {
- case -EBUSY:
- assign_failed_examine(dev);
+ case -EBUSY: {
+ char *cause;
+
+ cause = assign_failed_examine(dev);
+ error_report("Failed to assign device \"%s\" : %s\n%s",
+ dev->dev.qdev.id, strerror(-r), cause);
+ g_free(cause);
break;
+ }
default:
+ error_report("Failed to assign device \"%s\" : %s",
+ dev->dev.qdev.id, strerror(-r));
break;
}
}
return r;
}
--
1.8.3.1
- [Qemu-devel] [PATCH 00/16] PCI device assignment: improve error reporting over QMP, Laszlo Ersek, 2014/04/10
- [Qemu-devel] [PATCH 01/16] cutils: tighten qemu_parse_fd(), Laszlo Ersek, 2014/04/10
- [Qemu-devel] [PATCH 03/16] pci-assign: accept Error from monitor_handle_fd_param2(), Laszlo Ersek, 2014/04/10
- [Qemu-devel] [PATCH 02/16] monitor: add Error-propagating monitor_handle_fd_param2(), Laszlo Ersek, 2014/04/10
- [Qemu-devel] [PATCH 08/16] pci-assign: accept Error from pci_add_capability2(), Laszlo Ersek, 2014/04/10
- [Qemu-devel] [PATCH 04/16] pci-assign: make assign_failed_examine() just format the cause,
Laszlo Ersek <=
- [Qemu-devel] [PATCH 06/16] pci-assign: propagate Error from check_irqchip_in_kernel(), Laszlo Ersek, 2014/04/10
- [Qemu-devel] [PATCH 10/16] pci-assign: propagate errors from get_real_device(), Laszlo Ersek, 2014/04/10
- [Qemu-devel] [PATCH 09/16] pci-assign: assignment should fail if we can't read config space, Laszlo Ersek, 2014/04/10
- [Qemu-devel] [PATCH 07/16] pci: add Error-propagating pci_add_capability2(), Laszlo Ersek, 2014/04/10