[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/16] pci-assign: accept Error from pci_add_capabil
From: |
Laszlo Ersek |
Subject: |
[Qemu-devel] [PATCH 08/16] pci-assign: accept Error from pci_add_capability2() |
Date: |
Thu, 10 Apr 2014 10:24:37 +0200 |
Propagate any errors while adding PCI capabilities to
assigned_device_pci_cap_init(). We'll continue the propagation upwards
when assigned_device_pci_cap_init() becomes a leaf itself (when none of
its callees will report errors internally any longer when detecting and
returning them).
Signed-off-by: Laszlo Ersek <address@hidden>
---
hw/i386/kvm/pci-assign.c | 35 ++++++++++++++++++++++++++++-------
1 file changed, 28 insertions(+), 7 deletions(-)
diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c
index b4696aa..f91d4fb 100644
--- a/hw/i386/kvm/pci-assign.c
+++ b/hw/i386/kvm/pci-assign.c
@@ -1261,12 +1261,15 @@ static int assigned_device_pci_cap_init(PCIDevice
*pci_dev)
error_free(local_err);
return -ENOTSUP;
}
dev->cap.available |= ASSIGNED_DEVICE_CAP_MSI;
/* Only 32-bit/no-mask currently supported */
- ret = pci_add_capability(pci_dev, PCI_CAP_ID_MSI, pos, 10);
+ ret = pci_add_capability2(pci_dev, PCI_CAP_ID_MSI, pos, 10,
+ &local_err);
if (ret < 0) {
+ error_report("%s", error_get_pretty(local_err));
+ error_free(local_err);
return ret;
}
pci_dev->msi_cap = pos;
pci_set_word(pci_dev->config + pos + PCI_MSI_FLAGS,
@@ -1292,12 +1295,15 @@ static int assigned_device_pci_cap_init(PCIDevice
*pci_dev)
error_report("%s", error_get_pretty(local_err));
error_free(local_err);
return -ENOTSUP;
}
dev->cap.available |= ASSIGNED_DEVICE_CAP_MSIX;
- ret = pci_add_capability(pci_dev, PCI_CAP_ID_MSIX, pos, 12);
+ ret = pci_add_capability2(pci_dev, PCI_CAP_ID_MSIX, pos, 12,
+ &local_err);
if (ret < 0) {
+ error_report("%s", error_get_pretty(local_err));
+ error_free(local_err);
return ret;
}
pci_dev->msix_cap = pos;
pci_set_word(pci_dev->config + pos + PCI_MSIX_FLAGS,
@@ -1320,12 +1326,15 @@ static int assigned_device_pci_cap_init(PCIDevice
*pci_dev)
/* Minimal PM support, nothing writable, device appears to NAK changes */
pos = pci_find_cap_offset(pci_dev, PCI_CAP_ID_PM, 0);
if (pos) {
uint16_t pmc;
- ret = pci_add_capability(pci_dev, PCI_CAP_ID_PM, pos, PCI_PM_SIZEOF);
+ ret = pci_add_capability2(pci_dev, PCI_CAP_ID_PM, pos, PCI_PM_SIZEOF,
+ &local_err);
if (ret < 0) {
+ error_report("%s", error_get_pretty(local_err));
+ error_free(local_err);
return ret;
}
assigned_dev_setup_cap_read(dev, pos, PCI_PM_SIZEOF);
@@ -1386,12 +1395,15 @@ static int assigned_device_pci_cap_init(PCIDevice
*pci_dev)
error_report("%s: Unsupported PCI express capability version %d",
__func__, version);
return -EINVAL;
}
- ret = pci_add_capability(pci_dev, PCI_CAP_ID_EXP, pos, size);
+ ret = pci_add_capability2(pci_dev, PCI_CAP_ID_EXP, pos, size,
+ &local_err);
if (ret < 0) {
+ error_report("%s", error_get_pretty(local_err));
+ error_free(local_err);
return ret;
}
assigned_dev_setup_cap_read(dev, pos, size);
@@ -1460,12 +1472,15 @@ static int assigned_device_pci_cap_init(PCIDevice
*pci_dev)
if (pos) {
uint16_t cmd;
uint32_t status;
/* Only expose the minimum, 8 byte capability */
- ret = pci_add_capability(pci_dev, PCI_CAP_ID_PCIX, pos, 8);
+ ret = pci_add_capability2(pci_dev, PCI_CAP_ID_PCIX, pos, 8,
+ &local_err);
if (ret < 0) {
+ error_report("%s", error_get_pretty(local_err));
+ error_free(local_err);
return ret;
}
assigned_dev_setup_cap_read(dev, pos, 8);
@@ -1486,12 +1501,15 @@ static int assigned_device_pci_cap_init(PCIDevice
*pci_dev)
}
pos = pci_find_cap_offset(pci_dev, PCI_CAP_ID_VPD, 0);
if (pos) {
/* Direct R/W passthrough */
- ret = pci_add_capability(pci_dev, PCI_CAP_ID_VPD, pos, 8);
+ ret = pci_add_capability2(pci_dev, PCI_CAP_ID_VPD, pos, 8,
+ &local_err);
if (ret < 0) {
+ error_report("%s", error_get_pretty(local_err));
+ error_free(local_err);
return ret;
}
assigned_dev_setup_cap_read(dev, pos, 8);
@@ -1502,12 +1520,15 @@ static int assigned_device_pci_cap_init(PCIDevice
*pci_dev)
/* Devices can have multiple vendor capabilities, get them all */
for (pos = 0; (pos = pci_find_cap_offset(pci_dev, PCI_CAP_ID_VNDR, pos));
pos += PCI_CAP_LIST_NEXT) {
uint8_t len = pci_get_byte(pci_dev->config + pos + PCI_CAP_FLAGS);
/* Direct R/W passthrough */
- ret = pci_add_capability(pci_dev, PCI_CAP_ID_VNDR, pos, len);
+ ret = pci_add_capability2(pci_dev, PCI_CAP_ID_VNDR, pos, len,
+ &local_err);
if (ret < 0) {
+ error_report("%s", error_get_pretty(local_err));
+ error_free(local_err);
return ret;
}
assigned_dev_setup_cap_read(dev, pos, len);
--
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 <=
- [Qemu-devel] [PATCH 04/16] pci-assign: make assign_failed_examine() just format the cause, Laszlo Ersek, 2014/04/10
- [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