examples/vhost_blk: use common macro for minimum

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>

diff --git a/examples/vhost_blk/blk.c b/examples/vhost_blk/blk.c
index 1b0b764..0d1e038 100644 (file)
--- a/examples/vhost_blk/blk.c
+++ b/examples/vhost_blk/blk.c
@@ -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;

diff --git a/examples/vhost_blk/vhost_blk.h b/examples/vhost_blk/vhost_blk.h
index 17258d2..c968eee 100644 (file)
--- a/examples/vhost_blk/vhost_blk.h
+++ b/examples/vhost_blk/vhost_blk.h
@@ -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;

diff --git a/examples/vhost_blk/vhost_blk_compat.c b/examples/vhost_blk/vhost_blk_compat.c
index 51a1be6..f6de83a 100644 (file)
--- a/examples/vhost_blk/vhost_blk_compat.c
+++ b/examples/vhost_blk/vhost_blk_compat.c
@@ -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;
 }