aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWilliam Henderson <william.henderson@nutanix.com>2023-07-13 15:13:12 +0000
committerJohn Levon <john.levon@nutanix.com>2023-09-15 12:59:39 +0100
commit54599b2d0434a15bc2e41a656ff9385343cebf35 (patch)
treeda5a25b9f8bb3583378cf577283be16be9655e03 /include
parente1b95e28f05b23d442584cec421b1c8fb77f51a0 (diff)
downloadlibvfio-user-54599b2d0434a15bc2e41a656ff9385343cebf35.zip
libvfio-user-54599b2d0434a15bc2e41a656ff9385343cebf35.tar.gz
libvfio-user-54599b2d0434a15bc2e41a656ff9385343cebf35.tar.bz2
fix: more fixes and responses to comments
Signed-off-by: William Henderson <william.henderson@nutanix.com>
Diffstat (limited to 'include')
-rw-r--r--include/vfio-user.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/vfio-user.h b/include/vfio-user.h
index 77b3c43..532e353 100644
--- a/include/vfio-user.h
+++ b/include/vfio-user.h
@@ -229,7 +229,7 @@ struct vfio_user_bitmap_range {
struct vfio_user_device_feature {
uint32_t argsz;
uint32_t flags;
-#ifndef VFIO_DEVICE_FEATURE_MASK
+#ifndef VFIO_REGION_TYPE_MIGRATION_DEPRECATED
#define VFIO_DEVICE_FEATURE_MASK (0xffff) /* 16-bit feature index */
#define VFIO_DEVICE_FEATURE_GET (1 << 16) /* Get feature into data[] */
#define VFIO_DEVICE_FEATURE_SET (1 << 17) /* Set feature from data[] */
@@ -241,13 +241,13 @@ struct vfio_user_device_feature {
/* Analogous to vfio_device_feature_migration */
struct vfio_user_device_feature_migration {
uint64_t flags;
-#ifndef VFIO_MIGRATION_STOP_COPY
+#ifndef VFIO_REGION_TYPE_MIGRATION_DEPRECATED
#define VFIO_MIGRATION_STOP_COPY (1 << 0)
#define VFIO_MIGRATION_P2P (1 << 1)
#define VFIO_MIGRATION_PRE_COPY (1 << 2)
#endif
} __attribute__((packed));
-#ifndef VFIO_DEVICE_FEATURE_MIGRATION
+#ifndef VFIO_REGION_TYPE_MIGRATION_DEPRECATED
#define VFIO_DEVICE_FEATURE_MIGRATION 1
#endif
_Static_assert(sizeof(struct vfio_user_device_feature_migration) == 8,