From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYAIE-0005QG-AP for qemu-devel@nongnu.org; Thu, 10 Apr 2014 04:25:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WYAI8-0003MG-41 for qemu-devel@nongnu.org; Thu, 10 Apr 2014 04:25:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40277) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WYAI7-0003Lz-T3 for qemu-devel@nongnu.org; Thu, 10 Apr 2014 04:25:00 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s3A8OxKZ013849 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 10 Apr 2014 04:24:59 -0400 Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-60.ams2.redhat.com [10.36.116.60]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s3A8OlIa005705 for ; Thu, 10 Apr 2014 04:24:58 -0400 From: Laszlo Ersek Date: Thu, 10 Apr 2014 10:24:39 +0200 Message-Id: <1397118285-11715-11-git-send-email-lersek@redhat.com> In-Reply-To: <1397118285-11715-1-git-send-email-lersek@redhat.com> References: <1397118285-11715-1-git-send-email-lersek@redhat.com> Subject: [Qemu-devel] [PATCH 10/16] pci-assign: propagate errors from get_real_device() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Laszlo Ersek --- hw/i386/kvm/pci-assign.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c index e89bb6a..c6d1094 100644 --- a/hw/i386/kvm/pci-assign.c +++ b/hw/i386/kvm/pci-assign.c @@ -530,11 +530,11 @@ static void get_real_device_id(const char *devpath, uint16_t *val, Error **errp) { get_real_id(devpath, "device", val, errp); } -static int get_real_device(AssignedDevice *pci_dev) +static void get_real_device(AssignedDevice *pci_dev, Error **errp) { char dir[128], name[128]; int fd, r = 0; FILE *f; uint64_t start, end, size, flags; @@ -554,31 +554,32 @@ static int get_real_device(AssignedDevice *pci_dev) if (pci_dev->configfd_name && *pci_dev->configfd_name) { 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; + error_propagate(errp, local_err); + return; } } else { dev->config_fd = open(name, O_RDWR); if (dev->config_fd == -1) { - error_report("%s: %s: %m", __func__, name); - return 1; + error_setg_file_open(errp, errno, name); + return; } } again: r = read(dev->config_fd, pci_dev->dev.config, pci_config_size(&pci_dev->dev)); if (r < 0) { if (errno == EINTR || errno == EAGAIN) { goto again; } - error_report("%s: read failed, errno = %d", __func__, errno); - return 1; + error_setg_errno(errp, errno, "read(\"%s\")", + (pci_dev->configfd_name && *pci_dev->configfd_name) ? + pci_dev->configfd_name : name); + return; } /* Restore or clear multifunction, this is always controlled by qemu */ if (pci_dev->dev.cap_present & QEMU_PCI_CAP_MULTIFUNCTION) { pci_dev->dev.config[PCI_HEADER_TYPE] |= PCI_HEADER_TYPE_MULTI_FUNCTION; @@ -594,12 +595,12 @@ again: snprintf(name, sizeof(name), "%sresource", dir); f = fopen(name, "r"); if (f == NULL) { - error_report("%s: %s: %m", __func__, name); - return 1; + error_setg_file_open(errp, errno, name); + return; } for (r = 0; r < PCI_ROM_SLOT; r++) { if (fscanf(f, "%" SCNi64 " %" SCNi64 " %" SCNi64 "\n", &start, &end, &flags) != 3) { @@ -640,32 +641,29 @@ again: fclose(f); /* read and fill vendor ID */ get_real_vendor_id(dir, &id, &local_err); if (local_err) { - error_report("%s", error_get_pretty(local_err)); - error_free(local_err); - return 1; + error_propagate(errp, local_err); + return; } pci_dev->dev.config[0] = id & 0xff; pci_dev->dev.config[1] = (id & 0xff00) >> 8; /* read and fill device ID */ get_real_device_id(dir, &id, &local_err); if (local_err) { - error_report("%s", error_get_pretty(local_err)); - error_free(local_err); - return 1; + error_propagate(errp, local_err); + return; } pci_dev->dev.config[2] = id & 0xff; pci_dev->dev.config[3] = (id & 0xff00) >> 8; pci_word_test_and_clear_mask(pci_dev->emulate_config_write + PCI_COMMAND, PCI_COMMAND_MASTER | PCI_COMMAND_INTX_DISABLE); dev->region_number = r; - return 0; } static void free_msi_virqs(AssignedDevice *dev) { int i; @@ -1749,10 +1747,11 @@ static void reset_assigned_device(DeviceState *dev) static int assigned_initfn(struct PCIDevice *pci_dev) { AssignedDevice *dev = DO_UPCAST(AssignedDevice, dev, pci_dev); uint8_t e_intx; int r; + Error *local_err = NULL; if (!kvm_enabled()) { error_report("pci-assign: error: requires KVM support"); return -1; } @@ -1781,13 +1780,14 @@ static int assigned_initfn(struct PCIDevice *pci_dev) assigned_dev_direct_config_read(dev, PCI_MIN_GNT, 1); assigned_dev_direct_config_read(dev, PCI_MAX_LAT, 1); memcpy(dev->emulate_config_write, dev->emulate_config_read, sizeof(dev->emulate_config_read)); - if (get_real_device(dev)) { - error_report("pci-assign: Error: Couldn't get real device (%s)!", - dev->dev.qdev.id); + get_real_device(dev, &local_err); + if (local_err) { + qerror_report_err(local_err); + error_free(local_err); goto out; } if (assigned_device_pci_cap_init(pci_dev) < 0) { goto out; -- 1.8.3.1