mempool: return 0 if area is too small on populate

[dpdk.git] / examples / vhost_blk / vhost_blk.h

diff --git a/examples/vhost_blk/vhost_blk.h b/examples/vhost_blk/vhost_blk.h
index 933e2b7c57fa1f5b69f3854a195668d5105f3f7b..c968eee05e24f5df3c3e6a676465ff953576c20b 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;
@@ -112,8 +110,8 @@ struct inflight_blk_task {
        struct rte_vhost_inflight_info_packed *inflight_packed;
 };
 
-struct vhost_blk_ctrlr *g_vhost_ctrlr;
-struct vhost_device_ops vhost_blk_device_ops;
+extern struct vhost_blk_ctrlr *g_vhost_ctrlr;
+extern struct vhost_device_ops vhost_blk_device_ops;
 
 int vhost_bdev_process_blk_commands(struct vhost_block_dev *bdev,
                                     struct vhost_blk_task *task);