vfio: Clean up error reporting after previous commit
The previous commit changed vfio's warning messages from vfio warning: DEV-NAME: Could not frobnicate to warning: vfio DEV-NAME: Could not frobnicate To match this change, change error messages from vfio error: DEV-NAME: On fire to vfio DEV-NAME: On fire Note the loss of "error". If we think marking error messages that way is a good idea, we should mark *all* error messages, i.e. make error_report() print it. Cc: Alex Williamson <alex.williamson@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Acked-by: Alex Williamson <alex.williamson@redhat.com> Message-Id: <20181017082702.5581-7-armbru@redhat.com>
This commit is contained in:
parent
e1eb292ace
commit
c3b8e3e0ed
@ -1670,7 +1670,7 @@ static void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr)
|
||||
* but also no point in us enabling VGA if disabled in hardware.
|
||||
*/
|
||||
if (!(gmch & 0x2) && !vdev->vga && vfio_populate_vga(vdev, &err)) {
|
||||
error_reportf_err(err, ERR_PREFIX, vdev->vbasedev.name);
|
||||
error_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name);
|
||||
error_report("IGD device %s failed to enable VGA access, "
|
||||
"legacy mode disabled", vdev->vbasedev.name);
|
||||
goto out;
|
||||
@ -1696,7 +1696,7 @@ static void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int nr)
|
||||
ret = vfio_pci_igd_opregion_init(vdev, opregion, &err);
|
||||
if (ret) {
|
||||
error_append_hint(&err, "IGD legacy mode disabled\n");
|
||||
error_reportf_err(err, ERR_PREFIX, vdev->vbasedev.name);
|
||||
error_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name);
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
@ -745,7 +745,7 @@ static void vfio_msi_disable_common(VFIOPCIDevice *vdev)
|
||||
|
||||
vfio_intx_enable(vdev, &err);
|
||||
if (err) {
|
||||
error_reportf_err(err, ERR_PREFIX, vdev->vbasedev.name);
|
||||
error_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name);
|
||||
}
|
||||
}
|
||||
|
||||
@ -2196,7 +2196,7 @@ static void vfio_pci_post_reset(VFIOPCIDevice *vdev)
|
||||
|
||||
vfio_intx_enable(vdev, &err);
|
||||
if (err) {
|
||||
error_reportf_err(err, ERR_PREFIX, vdev->vbasedev.name);
|
||||
error_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name);
|
||||
}
|
||||
|
||||
for (nr = 0; nr < PCI_NUM_REGIONS - 1; ++nr) {
|
||||
@ -2830,7 +2830,7 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
|
||||
|
||||
if (stat(vdev->vbasedev.sysfsdev, &st) < 0) {
|
||||
error_setg_errno(errp, errno, "no such host device");
|
||||
error_prepend(errp, ERR_PREFIX, vdev->vbasedev.sysfsdev);
|
||||
error_prepend(errp, VFIO_MSG_PREFIX, vdev->vbasedev.sysfsdev);
|
||||
return;
|
||||
}
|
||||
|
||||
@ -3085,7 +3085,7 @@ out_teardown:
|
||||
vfio_teardown_msi(vdev);
|
||||
vfio_bars_exit(vdev);
|
||||
error:
|
||||
error_prepend(errp, ERR_PREFIX, vdev->vbasedev.name);
|
||||
error_prepend(errp, VFIO_MSG_PREFIX, vdev->vbasedev.name);
|
||||
}
|
||||
|
||||
static void vfio_instance_finalize(Object *obj)
|
||||
|
@ -690,7 +690,7 @@ out:
|
||||
}
|
||||
|
||||
if (vdev->vbasedev.name) {
|
||||
error_prepend(errp, ERR_PREFIX, vdev->vbasedev.name);
|
||||
error_prepend(errp, VFIO_MSG_PREFIX, vdev->vbasedev.name);
|
||||
} else {
|
||||
error_prepend(errp, "vfio error: ");
|
||||
}
|
||||
|
@ -31,7 +31,6 @@
|
||||
#include <linux/vfio.h>
|
||||
#endif
|
||||
|
||||
#define ERR_PREFIX "vfio error: %s: "
|
||||
#define VFIO_MSG_PREFIX "vfio %s: "
|
||||
|
||||
enum {
|
||||
|
Loading…
Reference in New Issue
Block a user