[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 06/38] vfio: Clean up error reporting after previ
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v4 06/38] vfio: Clean up error reporting after previous commit |
Date: |
Wed, 17 Oct 2018 10:26:30 +0200 |
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 <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Acked-by: Alex Williamson <address@hidden>
---
hw/vfio/pci-quirks.c | 4 ++--
hw/vfio/pci.c | 8 ++++----
hw/vfio/platform.c | 2 +-
include/hw/vfio/vfio-common.h | 1 -
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
index 481fd08df7..eae31c74d6 100644
--- a/hw/vfio/pci-quirks.c
+++ b/hw/vfio/pci-quirks.c
@@ -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;
}
diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
index 0c3d245932..5c7bd96984 100644
--- a/hw/vfio/pci.c
+++ b/hw/vfio/pci.c
@@ -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)
diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
index baf236ae79..398db38f14 100644
--- a/hw/vfio/platform.c
+++ b/hw/vfio/platform.c
@@ -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: ");
}
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
index 1d7630345b..1b434d02f6 100644
--- a/include/hw/vfio/vfio-common.h
+++ b/include/hw/vfio/vfio-common.h
@@ -31,7 +31,6 @@
#include <linux/vfio.h>
#endif
-#define ERR_PREFIX "vfio error: %s: "
#define VFIO_MSG_PREFIX "vfio %s: "
enum {
--
2.17.1
- Re: [Qemu-devel] [PATCH v4 03/38] block: Use warn_report() & friends to report warnings, (continued)
- [Qemu-devel] [PATCH v4 18/38] vl: Clean up error reporting in parse_add_fd(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 11/38] smbios: Clean up error handling in smbios_add(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 20/38] vl: Clean up error reporting in chardev_init_func(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 15/38] numa: Fix QMP command set-numa-node error handling, Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 13/38] l2tpv3: Improve -netdev/netdev_add/-net/... error reporting, Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 22/38] vl: Clean up error reporting in mon_init_func(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 27/38] vnc: Clean up error reporting in vnc_init_func(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 21/38] vl: Clean up error reporting in machine_set_property(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 06/38] vfio: Clean up error reporting after previous commit,
Markus Armbruster <=
- [Qemu-devel] [PATCH v4 19/38] qom: Clean up error reporting in user_creatable_add_opts_foreach(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 23/38] vl: Clean up error reporting in parse_fw_cfg(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 24/38] vl: Clean up error reporting in device_init_func(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 28/38] numa: Clean up error reporting in parse_numa(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 30/38] spice: Clean up error reporting in add_channel(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 33/38] blockdev: Convert drive_new() to Error, Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 29/38] tpm: Clean up error reporting in tpm_init_tpmdev(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 32/38] vl: Assert drive_new() does not fail in default_drive(), Markus Armbruster, 2018/10/17
- [Qemu-devel] [PATCH v4 34/38] vl: Fix exit status for -drive format=help, Markus Armbruster, 2018/10/17