ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pci-assign: propagate errors from get_real_device() 

Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
Laszlo Ersek 2014-04-10 10:24:39 +02:00 committed by Luiz Capitulino
parent f3455d4704
commit 5b877045d3
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hw/i386/kvm/pci-assign.c
View File

@ -532,7 +532,7 @@ static void get_real_device_id(const char *devpath, uint16_t *val,
get_real_id(devpath, "device", val, 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]; char dir[128], name[128];
int fd, r = 0; int fd, r = 0;
@ -556,16 +556,15 @@ static int get_real_device(AssignedDevice *pci_dev)
pci_dev->configfd_name, pci_dev->configfd_name,
&local_err); &local_err);
if (local_err) { if (local_err) {
qerror_report_err(local_err); error_propagate(errp, local_err);
error_free(local_err); return;
return 1;
} }
} else { } else {
dev->config_fd = open(name, O_RDWR); dev->config_fd = open(name, O_RDWR);
if (dev->config_fd == -1) { if (dev->config_fd == -1) {
error_report("%s: %s: %m", __func__, name); error_setg_file_open(errp, errno, name);
return 1; return;
} }
} }
again: again:
@ -575,8 +574,10 @@ again:
if (errno == EINTR || errno == EAGAIN) { if (errno == EINTR || errno == EAGAIN) {
goto again; goto again;
} }
error_report("%s: read failed, errno = %d", __func__, errno); error_setg_errno(errp, errno, "read(\"%s\")",
return 1; (pci_dev->configfd_name && *pci_dev->configfd_name) ?
pci_dev->configfd_name : name);
return;
} }
/* Restore or clear multifunction, this is always controlled by qemu */ /* Restore or clear multifunction, this is always controlled by qemu */
@ -596,8 +597,8 @@ again:
f = fopen(name, "r"); f = fopen(name, "r");
if (f == NULL) { if (f == NULL) {
error_report("%s: %s: %m", __func__, name); error_setg_file_open(errp, errno, name);
return 1; return;
} }
for (r = 0; r < PCI_ROM_SLOT; r++) { for (r = 0; r < PCI_ROM_SLOT; r++) {
@ -642,9 +643,8 @@ again:
/* read and fill vendor ID */ /* read and fill vendor ID */
get_real_vendor_id(dir, &id, &local_err); get_real_vendor_id(dir, &id, &local_err);
if (local_err) { if (local_err) {
error_report("%s", error_get_pretty(local_err)); error_propagate(errp, local_err);
error_free(local_err); return;
return 1;
} }
pci_dev->dev.config[0] = id & 0xff; pci_dev->dev.config[0] = id & 0xff;
pci_dev->dev.config[1] = (id & 0xff00) >> 8; pci_dev->dev.config[1] = (id & 0xff00) >> 8;
@ -652,9 +652,8 @@ again:
/* read and fill device ID */ /* read and fill device ID */
get_real_device_id(dir, &id, &local_err); get_real_device_id(dir, &id, &local_err);
if (local_err) { if (local_err) {
error_report("%s", error_get_pretty(local_err)); error_propagate(errp, local_err);
error_free(local_err); return;
return 1;
} }
pci_dev->dev.config[2] = id & 0xff; pci_dev->dev.config[2] = id & 0xff;
pci_dev->dev.config[3] = (id & 0xff00) >> 8; pci_dev->dev.config[3] = (id & 0xff00) >> 8;
@ -663,7 +662,6 @@ again:
PCI_COMMAND_MASTER | PCI_COMMAND_INTX_DISABLE); PCI_COMMAND_MASTER | PCI_COMMAND_INTX_DISABLE);
dev->region_number = r; dev->region_number = r;
return 0;
} }
static void free_msi_virqs(AssignedDevice *dev) static void free_msi_virqs(AssignedDevice *dev)
@ -1751,6 +1749,7 @@ static int assigned_initfn(struct PCIDevice *pci_dev)
AssignedDevice *dev = DO_UPCAST(AssignedDevice, dev, pci_dev); AssignedDevice *dev = DO_UPCAST(AssignedDevice, dev, pci_dev);
uint8_t e_intx; uint8_t e_intx;
int r; int r;
Error *local_err = NULL;
if (!kvm_enabled()) { if (!kvm_enabled()) {
error_report("pci-assign: error: requires KVM support"); error_report("pci-assign: error: requires KVM support");
@ -1783,9 +1782,10 @@ static int assigned_initfn(struct PCIDevice *pci_dev)
memcpy(dev->emulate_config_write, dev->emulate_config_read, memcpy(dev->emulate_config_write, dev->emulate_config_read,
sizeof(dev->emulate_config_read)); sizeof(dev->emulate_config_read));
if (get_real_device(dev)) { get_real_device(dev, &local_err);
error_report("pci-assign: Error: Couldn't get real device (%s)!", if (local_err) {
dev->dev.qdev.id); qerror_report_err(local_err);
error_free(local_err);
goto out; goto out;
} }