On 21.10.2025 00:23, Philippe Mathieu-Daudé wrote:
Replace the compile time check of the TARGET_ARM definition
by a runtime call to target_base_arm().
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
---
Based-on: <[email protected]>
---
hw/vfio/helpers.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/hw/vfio/helpers.c b/hw/vfio/helpers.c
index 23d13e5db5f..007c37b28b8 100644
--- a/hw/vfio/helpers.c
+++ b/hw/vfio/helpers.c
@@ -20,6 +20,7 @@
*/
#include "qemu/osdep.h"
+#include "qemu/target-info.h"
#include <sys/ioctl.h>
#include "system/kvm.h"
@@ -220,9 +221,5 @@ bool vfio_arch_wants_loading_config_after_iter(void)
* See commit d329f5032e17 ("vfio: Move the saving of the config space to
* the right place in VFIO migration").
*/
-#if defined(TARGET_ARM)
- return true;
-#else
- return false;
-#endif
+ return target_base_arm();
}
The only reason why vfio_arch_wants_loading_config_after_iter() was
introduced is that its only caller (vfio_load_config_after_iter())
lives in a target-independent file (migration-multifd.c) so it could
not test TARGET_ARM directly, see:
https://lore.kernel.org/qemu-devel/[email protected]/
If target-independent-safe target_base_arm() were to be used instead
I think this helper won't make sense anymore and so this target_base_arm()
call (and the associated comment) should be moved to
vfio_load_config_after_iter().
Thanks,
Maciej
