diff --git a/lib/include/openamp/virtio.h b/lib/include/openamp/virtio.h
index 0e366314..b9f6328d 100644
--- a/lib/include/openamp/virtio.h
+++ b/lib/include/openamp/virtio.h
@@ -118,6 +118,12 @@ struct virtio_device_id {
  */
 #define VIRTIO_F_NOTIFY_ON_EMPTY (1 << 24)
 
+/*
+ * This feature indicates that the device accepts arbitrary
+ * descriptor layouts.
+ */
+#define VIRTIO_F_ANY_LAYOUT (1 << 27)
+
 /*
  * The guest should never negotiate this feature; it
  * is used to detect faulty drivers.
@@ -443,6 +449,9 @@ static inline int virtio_get_features(struct virtio_device *vdev,
 		return -ENXIO;
 
 	*features = vdev->func->get_features(vdev);
+	if (VIRTIO_ROLE_IS_DEVICE(vdev))
+		vdev->features = *features;
+
 	return 0;
 }
 
@@ -559,6 +568,28 @@ static inline int virtio_free_buf(struct virtio_device *vdev, void *buf)
 	return 0;
 }
 
+/**
+ * @brief Check if the virtio device support a specific feature.
+ *
+ * @param vdev		Pointer to device structure.
+ * @param feature_bit	Feature bit to check.
+ *
+ * @return true if the feature is supported, otherwise false.
+ */
+static inline bool virtio_has_feature(struct virtio_device *vdev,
+				      unsigned int feature_bit)
+{
+	uint32_t features;
+
+	if (!vdev)
+		return false;
+
+	if (!vdev->features)
+		virtio_get_features(vdev, &features);
+
+	return (vdev->features & (1UL << feature_bit)) != 0;
+}
+
 #if defined __cplusplus
 }
 #endif