lib: virtio: Fix VIRTIO ROLE_XXXX macro definitions

Add parentheses around the "vdev" parameter to avoid side effects. This fixes a build error when using the macro in the following way: if (VIRTIO_ROLE_IS_DEVICE(&my_context->vdev)) The error encountered: openamp/open-amp/lib/include/openamp/virtio.h:89:49: error: invalid type argument of ‘->’ (have ‘struct virtio_device’) 89 | (VIRTIO_ENABLED(VIRTIO_DRIVER_SUPPORT) && (vdev->role) == VIRTIO_DEV_DRIVER) Signed-off-by: Arnaud Pouliquen <[email protected]>
OpenAMP · Jan 10, 2025 · 398f0ca · 398f0ca
1 parent 4ace354
commit 398f0ca
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/include/openamp/virtio.h b/lib/include/openamp/virtio.h
@@ -86,18 +86,18 @@ extern "C" {
 
 #ifdef VIRTIO_DRIVER_SUPPORT
 #define VIRTIO_ROLE_IS_DRIVER(vdev) \
-	(VIRTIO_ENABLED(VIRTIO_DRIVER_SUPPORT) && (vdev->role) == VIRTIO_DEV_DRIVER)
+	(VIRTIO_ENABLED(VIRTIO_DRIVER_SUPPORT) && ((vdev)->role) == VIRTIO_DEV_DRIVER)
 #else
 /* Default definition without code size optimization */
-#define VIRTIO_ROLE_IS_DRIVER(vdev) (vdev->role == VIRTIO_DEV_DRIVER)
+#define VIRTIO_ROLE_IS_DRIVER(vdev) ((vdev)->role == VIRTIO_DEV_DRIVER)
 #endif
 
 #ifdef VIRTIO_DEVICE_SUPPORT
 #define VIRTIO_ROLE_IS_DEVICE(vdev) \
-	(VIRTIO_ENABLED(VIRTIO_DEVICE_SUPPORT) && (vdev->role) == VIRTIO_DEV_DEVICE)
+	(VIRTIO_ENABLED(VIRTIO_DEVICE_SUPPORT) && ((vdev)->role) == VIRTIO_DEV_DEVICE)
 #else
 /* Default definition without code size optimization */
-#define VIRTIO_ROLE_IS_DEVICE(vdev) (vdev->role == VIRTIO_DEV_DEVICE)
+#define VIRTIO_ROLE_IS_DEVICE(vdev) ((vdev)->role == VIRTIO_DEV_DEVICE)
 #endif
 
 /** @brief Virtio device identifier. */