b60d6a584c
- target/i386: csv: Release CSV3 shared pages after unmapping DMA - target/i386: Add new CPU model ClearwaterForest - target/i386: add sha512, sm3, sm4 feature bits - docs: Add GNR, SRF and CWF CPU models - target/i386: Export BHI_NO bit to guests - target/i386: Introduce SierraForest-v2 model - vdpa/iommufd:Implement DMA mapping through the iommufd interface - vdpa/iommufd:Introduce vdpa-iommufd module - vdpa/iommufd:support associating iommufd backend for vDPA devices - Kconfig/iommufd/VDPA: Update IOMMUFD module configuration dependencies The vDPA module can also use IOMMUFD like the VFIO module. - backends/iommufd: Get rid of qemu_open_old() - backends/iommufd: Make iommufd_backend_*() return bool - backends/iommufd: Fix missing ERRP_GUARD() for error_prepend() - backends/iommufd: Remove mutex - backends/iommufd: Remove check on number of backend users - hw/intc: Add extioi ability of 256 vcpu interrupt routing - hw/rtc: Fixed loongson rtc emulation errors - hw/loongarch/boot: Adjust the loading position of the initrd - target/loongarch: Fix the cpu unplug resource leak - target/loongarch: fix vcpu reset command word issue - vdpa:Fix dirty page bitmap synchronization not done after suspend for vdpa devices Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit a5212066e7516ff2a316e1b2feaa75dd5ee4d17a)
60 lines
2.0 KiB
Diff
60 lines
2.0 KiB
Diff
From 88006385c8e58b2aa612bf5aa184263f0d4245de Mon Sep 17 00:00:00 2001
|
|
From: Zhao Liu <zhao1.liu@intel.com>
|
|
Date: Mon, 11 Mar 2024 11:37:55 +0800
|
|
Subject: [PATCH] backends/iommufd: Fix missing ERRP_GUARD() for
|
|
error_prepend()
|
|
|
|
As the comment in qapi/error, passing @errp to error_prepend() requires
|
|
ERRP_GUARD():
|
|
|
|
* = Why, when and how to use ERRP_GUARD() =
|
|
*
|
|
* Without ERRP_GUARD(), use of the @errp parameter is restricted:
|
|
...
|
|
* - It should not be passed to error_prepend(), error_vprepend() or
|
|
* error_append_hint(), because that doesn't work with &error_fatal.
|
|
* ERRP_GUARD() lifts these restrictions.
|
|
*
|
|
* To use ERRP_GUARD(), add it right at the beginning of the function.
|
|
* @errp can then be used without worrying about the argument being
|
|
* NULL or &error_fatal.
|
|
|
|
ERRP_GUARD() could avoid the case when @errp is &error_fatal, the user
|
|
can't see this additional information, because exit() happens in
|
|
error_setg earlier than information is added [1].
|
|
|
|
The iommufd_backend_set_fd() passes @errp to error_prepend(), to avoid
|
|
the above issue, add missing ERRP_GUARD() at the beginning of this
|
|
function.
|
|
|
|
[1]: Issue description in the commit message of commit ae7c80a7bd73
|
|
("error: New macro ERRP_GUARD()").
|
|
|
|
Cc: Yi Liu <yi.l.liu@intel.com>
|
|
Cc: Eric Auger <eric.auger@redhat.com>
|
|
Cc: Zhenzhong Duan <zhenzhong.duan@intel.com>
|
|
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
|
|
Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
|
|
Reviewed-by: Eric Auger <eric.auger@redhat.com>
|
|
Message-ID: <20240311033822.3142585-3-zhao1.liu@linux.intel.com>
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
---
|
|
backends/iommufd.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/backends/iommufd.c b/backends/iommufd.c
|
|
index 3cbf11fc8b..f061b6869a 100644
|
|
--- a/backends/iommufd.c
|
|
+++ b/backends/iommufd.c
|
|
@@ -44,6 +44,7 @@ static void iommufd_backend_finalize(Object *obj)
|
|
|
|
static void iommufd_backend_set_fd(Object *obj, const char *str, Error **errp)
|
|
{
|
|
+ ERRP_GUARD();
|
|
IOMMUFDBackend *be = IOMMUFD_BACKEND(obj);
|
|
int fd = -1;
|
|
|
|
--
|
|
2.41.0.windows.1
|
|
|