diff options
| author | Markus Armbruster <armbru@redhat.com> | 2022-11-21 09:50:46 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2022-12-14 16:19:35 +0100 |
| commit | 740d6c4eba8bb44ea00550ccc97a4c49945ecc3c (patch) | |
| tree | 944dd4ac26340610b52c35d548c7d2bc035b4ce6 /hw | |
| parent | 6c37ebf3301ca449ebe449138b86e55762503250 (diff) | |
error: Drop a few superfluous ERRP_GUARD()
include/qapi/error.h on ERRP_GUARD():
* It must be used when the function dereferences @errp or passes
* @errp to error_prepend(), error_vprepend(), or error_append_hint().
* It is safe to use even when it's not needed, but please avoid
* cluttering the source with useless code.
Clean up some of this clutter.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20221121085054.683122-3-armbru@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/core/qdev.c | 2 | ||||
| -rw-r--r-- | hw/pci/msi.c | 1 | ||||
| -rw-r--r-- | hw/remote/vfio-user-obj.c | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 0145501904..67be2feaf3 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -493,8 +493,6 @@ void qdev_del_unplug_blocker(DeviceState *dev, Error *reason) bool qdev_unplug_blocked(DeviceState *dev, Error **errp) { - ERRP_GUARD(); - if (dev->unplug_blockers) { error_propagate(errp, error_copy(dev->unplug_blockers->data)); return true; diff --git a/hw/pci/msi.c b/hw/pci/msi.c index 058d1d1ef1..1cadf150bc 100644 --- a/hw/pci/msi.c +++ b/hw/pci/msi.c @@ -317,7 +317,6 @@ bool msi_is_masked(const PCIDevice *dev, unsigned int vector) void msi_set_mask(PCIDevice *dev, int vector, bool mask, Error **errp) { - ERRP_GUARD(); uint16_t flags = pci_get_word(dev->config + msi_flags_off(dev)); bool msi64bit = flags & PCI_MSI_FLAGS_64BIT; uint32_t irq_state, vector_mask, pending; diff --git a/hw/remote/vfio-user-obj.c b/hw/remote/vfio-user-obj.c index 4e36bb8bcf..6d0310cec9 100644 --- a/hw/remote/vfio-user-obj.c +++ b/hw/remote/vfio-user-obj.c @@ -719,7 +719,6 @@ static void vfu_object_machine_done(Notifier *notifier, void *data) */ static void vfu_object_init_ctx(VfuObject *o, Error **errp) { - ERRP_GUARD(); DeviceState *dev = NULL; vfu_pci_type_t pci_type = VFU_PCI_TYPE_CONVENTIONAL; int ret; |