d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

examples/vhost_blk: use common macro for minimum

Browse Source 
The macro RTE_MIN can be used in vhost-blk example.

This change implies fixing the sign of used_len as size_t
as defined in vhost_strcpy_pad().

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Reviewed-by: Tiwei Bie <tiwei.bie@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
This commit is contained in:
Thomas Monjalon 2020-02-19 11:39:22 +01:00 committed by Ferruh Yigit
parent 699a225b38
commit 39f59f37ee
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/vhost_blk/blk.c
View File

@ -68,7 +68,7 @@ int
vhost_bdev_process_blk_commands(struct vhost_block_dev *bdev,
struct vhost_blk_task *task)
{
int used_len;
size_t used_len;
if (unlikely(task->data_len > (bdev->blockcnt * bdev->blocklen))) {
fprintf(stderr, "read or write beyond capacity\n");
@ -113,7 +113,7 @@ vhost_bdev_process_blk_commands(struct vhost_block_dev *bdev,
case VIRTIO_BLK_T_GET_ID:
if (!task->iovs_cnt || task->data_len)
return VIRTIO_BLK_S_UNSUPP;
used_len = min(VIRTIO_BLK_ID_BYTES, task->data_len);
used_len = RTE_MIN((size_t)VIRTIO_BLK_ID_BYTES, task->data_len);
vhost_strcpy_pad(task->iovs[0].iov_base,
bdev->product_name, used_len, ' ');
break;

2
examples/vhost_blk/vhost_blk.h
View File

@ -40,8 +40,6 @@ struct vhost_blk_queue {
#define NUM_OF_BLK_QUEUES 1
#define min(a, b) (((a) < (b)) ? (a) : (b))
struct vhost_block_dev {
/** ID for vhost library. */
int vid;

2
examples/vhost_blk/vhost_blk_compat.c
View File

@ -60,7 +60,7 @@ vhost_blk_get_config(struct vhost_block_dev *bdev, uint8_t *config,
fprintf(stdout, "block device:blk_size = %d, blkcnt = %"PRIx64"\n",
blk_size, blkcnt);
memcpy(config, &blkcfg, min(len, sizeof(blkcfg)));
memcpy(config, &blkcfg, RTE_MIN(len, sizeof(blkcfg)));
return 0;
}