vDPA: code clean for vhost_vdpa uapi
PATCH v2 1/1 vDPA: code clean for vhost_vdpa uapi
This commit cleans up the upai for vhost_vdpa by
better naming some of the enums which report blk
information to user space, and they are not
in any official releases yet.
Fixes 1ac61ddfee93 ("vDPA: report virtio-blk flush info to user space")
Fixes ae1374b7f72c ("vDPA: report virtio-block read-only info to user space")
Fixes 330b8aea6924 ("vDPA: report virtio-block max segment size to user space")
Signed-off-by Zhu Lingshan <[email protected]>
--- drivers/vdpa/vdpa.c | 6 +++--- include/uapi/linux/vdpa.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/vdpa/vdpa.c +3 -3
@@ -967,7 +967,7 @@ vdpa_dev_blk_seg_size_config_fill(struct sk_buff *msg, u64 features, val_u32 =__virtio32_to_cpu (true, config->size_max); -return nla_put_u32 (msg,VDPA_ATTR_DEV_BLK_CFG_SEG_SIZE , val_u32); +return nla_put_u32 (msg,VDPA_ATTR_DEV_BLK_CFG_SIZE_MAX , val_u32); }/* fill the block size*/
@@ -1089,7 +1089,7 @@ static int vdpa_dev_blk_ro_config_fill(struct sk_buff *msg, u64 features)u8 ro; ro = ((features &BIT_ULL (VIRTIO_BLK_F_RO )) ==0 ) ?0 :1 ; -if (nla_put_u8 (msg,VDPA_ATTR_DEV_BLK_CFG_READ_ONLY , ro)) +if (nla_put_u8 (msg,VDPA_ATTR_DEV_BLK_READ_ONLY , ro))return -EMSGSIZE ;return 0 ;
@@ -1100,7 +1100,7 @@ static int vdpa_dev_blk_flush_config_fill(struct sk_buff *msg, u64 features)u8 flush; flush = ((features &BIT_ULL (VIRTIO_BLK_F_FLUSH )) ==0 ) ?0 :1 ; -if (nla_put_u8 (msg,VDPA_ATTR_DEV_BLK_CFG_FLUSH , flush)) +if (nla_put_u8 (msg,VDPA_ATTR_DEV_BLK_FLUSH , flush))return -EMSGSIZE ;return 0 ;
include/uapi/linux/vdpa.h +3 -3
@@ -57,7 +57,7 @@ enum vdpa_attr {VDPA_ATTR_DEV_FEATURES ,/* u64 */ VDPA_ATTR_DEV_BLK_CFG_CAPACITY ,/* u64 */ -VDPA_ATTR_DEV_BLK_CFG_SEG_SIZE ,/* u32 */ +VDPA_ATTR_DEV_BLK_CFG_SIZE_MAX ,/* u32 */ VDPA_ATTR_DEV_BLK_CFG_BLK_SIZE ,/* u32 */ VDPA_ATTR_DEV_BLK_CFG_SEG_MAX ,/* u32 */ VDPA_ATTR_DEV_BLK_CFG_NUM_QUEUES, /* u16 */
@@ -70,8 +70,8 @@ enum vdpa_attr {VDPA_ATTR_DEV_BLK_CFG_DISCARD_SEC_ALIGN ,/* u32 */ VDPA_ATTR_DEV_BLK_CFG_MAX_WRITE_ZEROES_SEC ,/* u32 */ VDPA_ATTR_DEV_BLK_CFG_MAX_WRITE_ZEROES_SEG ,/* u32 */ -VDPA_ATTR_DEV_BLK_CFG_READ_ONLY ,/* u8 */ -VDPA_ATTR_DEV_BLK_CFG_FLUSH ,/* u8 */ +VDPA_ATTR_DEV_BLK_READ_ONLY ,/* u8 */ +VDPA_ATTR_DEV_BLK_FLUSH ,/* u8 */ /* new attributes must be added above here */ VDPA_ATTR_MAX,
Signature · 1 line
2.39.3