bdev_virtio: add defines for virtqueue IDs

Remove some magic numbers from the code.

Change-Id: I494d57331888dd03f0bbff1f6beeac46139d7e96
Signed-off-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/382348
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Dariusz Stojaczyk 2017-10-12 19:00:42 +02:00 committed by Daniel Verkamp
parent 8b0a4a3c53
commit 9760edb041

View File

@ -59,6 +59,10 @@
#define BDEV_VIRTIO_MAX_TARGET 64
#define BDEV_VIRTIO_SCAN_PAYLOAD_SIZE 256
#define VIRTIO_SCSI_CONTROLQ 0
#define VIRTIO_SCSI_EVENTQ 1
#define VIRTIO_SCSI_REQUESTQ 2
static int bdev_virtio_initialize(void);
static void bdev_virtio_finish(void);
@ -351,7 +355,7 @@ bdev_virtio_create_cb(void *io_device, void *ctx_buf)
struct virtqueue *vq;
int32_t queue_idx;
queue_idx = virtio_dev_find_and_acquire_queue(vdev, 2);
queue_idx = virtio_dev_find_and_acquire_queue(vdev, VIRTIO_SCSI_REQUESTQ);
if (queue_idx < 0) {
SPDK_ERRLOG("Couldn't get an unused queue for the io_channel.\n");
return queue_idx;
@ -722,13 +726,13 @@ bdev_virtio_initialize(void)
base->vdev = vdev;
TAILQ_INIT(&base->found_disks);
rc = virtio_dev_acquire_queue(vdev, 2);
rc = virtio_dev_acquire_queue(vdev, VIRTIO_SCSI_REQUESTQ);
if (rc != 0) {
SPDK_ERRLOG("Couldn't acquire requestq for the target scan.\n");
goto out;
}
vq = vdev->vqs[2];
vq = vdev->vqs[VIRTIO_SCSI_REQUESTQ];
base->vq = vq;
spdk_bdev_poller_start(&vq->poller, bdev_scan_poll, base,
vq->owner_lcore, 0);