OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vfio-pci: Cleanup error_reports

Browse Source 
Remove carriage returns and tweak formatting for error_reports.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
This commit is contained in:
Alex Williamson 2013-10-02 12:52:38 -06:00
parent 6f864e6ec8
commit 8fbf47c3a8
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hw/misc/vfio.c
View File

@ -3055,13 +3055,15 @@ static int vfio_get_device(VFIOGroup *group, const char *name, VFIODevice *vdev)
ret = ioctl(vdev->fd, VFIO_DEVICE_GET_IRQ_INFO, &irq_info); ret = ioctl(vdev->fd, VFIO_DEVICE_GET_IRQ_INFO, &irq_info);
if (ret) { if (ret) {
/* This can fail for an old kernel or legacy PCI dev */ /* This can fail for an old kernel or legacy PCI dev */
DPRINTF("VFIO_DEVICE_GET_IRQ_INFO failure ret=%d\n", ret); DPRINTF("VFIO_DEVICE_GET_IRQ_INFO failure: %m\n");
ret = 0; ret = 0;
} else if (irq_info.count == 1) { } else if (irq_info.count == 1) {
vdev->pci_aer = true; vdev->pci_aer = true;
} else { } else {
error_report("vfio: Warning: " error_report("vfio: %04x:%02x:%02x.%x "
"Could not enable error recovery for the device\n"); "Could not enable error recovery for the device",
vdev->host.domain, vdev->host.bus, vdev->host.slot,
vdev->host.function);
} }
error: error:
@ -3102,11 +3104,10 @@ static void vfio_err_notifier_handler(void *opaque)
* guest to contain the error. * guest to contain the error.
*/ */
error_report("%s (%04x:%02x:%02x.%x)" error_report("%s(%04x:%02x:%02x.%x) Unrecoverable error detected. "
"Unrecoverable error detected...\n" "Please collect any data possible and then kill the guest",
"Please collect any data possible and then kill the guest", __func__, vdev->host.domain, vdev->host.bus,
__func__, vdev->host.domain, vdev->host.bus, vdev->host.slot, vdev->host.function);
vdev->host.slot, vdev->host.function);
vm_stop(RUN_STATE_IO_ERROR); vm_stop(RUN_STATE_IO_ERROR);
} }
@ -3129,8 +3130,7 @@ static void vfio_register_err_notifier(VFIODevice *vdev)
} }
if (event_notifier_init(&vdev->err_notifier, 0)) { if (event_notifier_init(&vdev->err_notifier, 0)) {
error_report("vfio: Warning: " error_report("vfio: Unable to init event notifier for error detection");
"Unable to init event notifier for error detection\n");
vdev->pci_aer = false; vdev->pci_aer = false;
return; return;
} }
@ -3151,7 +3151,7 @@ static void vfio_register_err_notifier(VFIODevice *vdev)
ret = ioctl(vdev->fd, VFIO_DEVICE_SET_IRQS, irq_set); ret = ioctl(vdev->fd, VFIO_DEVICE_SET_IRQS, irq_set);
if (ret) { if (ret) {
error_report("vfio: Failed to set up error notification\n"); error_report("vfio: Failed to set up error notification");
qemu_set_fd_handler(*pfd, NULL, NULL, vdev); qemu_set_fd_handler(*pfd, NULL, NULL, vdev);
event_notifier_cleanup(&vdev->err_notifier); event_notifier_cleanup(&vdev->err_notifier);
vdev->pci_aer = false; vdev->pci_aer = false;
@ -3184,7 +3184,7 @@ static void vfio_unregister_err_notifier(VFIODevice *vdev)
ret = ioctl(vdev->fd, VFIO_DEVICE_SET_IRQS, irq_set); ret = ioctl(vdev->fd, VFIO_DEVICE_SET_IRQS, irq_set);
if (ret) { if (ret) {
error_report("vfio: Failed to de-assign error fd: %d\n", ret); error_report("vfio: Failed to de-assign error fd: %m");
} }
g_free(irq_set); g_free(irq_set);
qemu_set_fd_handler(event_notifier_get_fd(&vdev->err_notifier), qemu_set_fd_handler(event_notifier_get_fd(&vdev->err_notifier),