From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: Maxime Coquelin <maxime.coquelin@redhat.com>,
Tiwei Bie <tiwei.bie@intel.com>,
Zhihong Wang <zhihong.wang@intel.com>
Subject: [dpdk-dev] [PATCH] examples/vhost_blk: use common macros for min/max
Date: Wed, 19 Feb 2020 11:39:22 +0100 [thread overview]
Message-ID: <20200219103923.2259246-1-thomas@monjalon.net> (raw)
The macros RTE_MIN and RTE_MAX can be used in DPDK applications.
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>
---
examples/vhost_blk/blk.c | 4 ++--
examples/vhost_blk/vhost_blk.h | 2 --
examples/vhost_blk/vhost_blk_compat.c | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/examples/vhost_blk/blk.c b/examples/vhost_blk/blk.c
index 1b0b764b22..0d1e038741 100644
--- 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 933e2b7c57..ce36c6e588 100644
--- 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 51a1be6b6d..f6de83a5e4 100644
--- 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;
}
--
2.25.0
next reply other threads:[~2020-02-19 10:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-19 10:39 Thomas Monjalon [this message]
2020-02-20 2:52 ` [dpdk-dev] [PATCH] examples/vhost_blk: use common macros for min/max Tiwei Bie
2020-02-21 18:29 ` Thomas Monjalon
2020-02-21 23:50 ` Tiwei Bie
2020-04-07 13:36 ` Maxime Coquelin
2020-04-10 14:42 ` Maxime Coquelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200219103923.2259246-1-thomas@monjalon.net \
--to=thomas@monjalon.net \
--cc=dev@dpdk.org \
--cc=maxime.coquelin@redhat.com \
--cc=tiwei.bie@intel.com \
--cc=zhihong.wang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.