[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/16] pci-assign: accept Error from monitor_handle_
From: |
Laszlo Ersek |
Subject: |
[Qemu-devel] [PATCH 03/16] pci-assign: accept Error from monitor_handle_fd_param2() |
Date: |
Thu, 10 Apr 2014 10:24:32 +0200 |
Propagate any errors in monitor fd handling up to get_real_device(), and
report them there. We'll continue the propagation upwards when
get_real_device() becomes a leaf itself (when none of its callees will
report errors internally any longer when detecting and returning an
error).
Signed-off-by: Laszlo Ersek <address@hidden>
---
hw/i386/kvm/pci-assign.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c
index a825871..bfce97f 100644
--- a/hw/i386/kvm/pci-assign.c
+++ b/hw/i386/kvm/pci-assign.c
@@ -539,22 +539,27 @@ static int get_real_device(AssignedDevice *pci_dev)
FILE *f;
uint64_t start, end, size, flags;
uint16_t id;
PCIRegion *rp;
PCIDevRegions *dev = &pci_dev->real_device;
+ Error *local_err = NULL;
dev->region_number = 0;
snprintf(dir, sizeof(dir), "/sys/bus/pci/devices/%04x:%02x:%02x.%x/",
pci_dev->host.domain, pci_dev->host.bus,
pci_dev->host.slot, pci_dev->host.function);
snprintf(name, sizeof(name), "%sconfig", dir);
if (pci_dev->configfd_name && *pci_dev->configfd_name) {
- dev->config_fd = monitor_handle_fd_param(cur_mon,
pci_dev->configfd_name);
- if (dev->config_fd < 0) {
+ dev->config_fd = monitor_handle_fd_param2(cur_mon,
+ pci_dev->configfd_name,
+ &local_err);
+ if (local_err) {
+ qerror_report_err(local_err);
+ error_free(local_err);
return 1;
}
} else {
dev->config_fd = open(name, O_RDWR);
--
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 <=
- [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, 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