ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio: remove SCSI-specific Virtio features from the library code

Browse Source 
We can now proudly say that rte_virtio
doesn't contain SCSI references anymore.

Change-Id: Id814de255d8715af03c68a237923432f1e4fe2e1
Signed-off-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/392628
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Dariusz Stojaczyk 2017-12-21 16:01:06 +01:00 committed by Daniel Verkamp
parent 534d9c2002
commit de7760df1e
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/bdev/virtio/bdev_virtio.c
View File

@ -153,6 +153,10 @@ struct bdev_virtio_io_channel {
/** Module finish in progress */ /** Module finish in progress */
static bool g_bdev_virtio_finish = false; static bool g_bdev_virtio_finish = false;
/* Features desired/implemented by this driver. */
#define VIRTIO_SCSI_DEV_SUPPORTED_FEATURES \
(1ULL << VIRTIO_SCSI_F_INOUT)
static void virtio_scsi_dev_unregister_cb(void *io_device); static void virtio_scsi_dev_unregister_cb(void *io_device);
static void virtio_scsi_dev_remove(struct virtio_scsi_dev *svdev); static void virtio_scsi_dev_remove(struct virtio_scsi_dev *svdev);
static int bdev_virtio_scsi_ch_create_cb(void *io_device, void *ctx_buf); static int bdev_virtio_scsi_ch_create_cb(void *io_device, void *ctx_buf);

2
lib/bdev/virtio/rte_virtio/virtio.c
View File

@ -334,6 +334,8 @@ virtio_dev_restart(struct virtio_dev *dev, uint64_t req_features)
{ {
int ret; int ret;
req_features |= (1ULL << VIRTIO_F_VERSION_1);
/* Reset the device although not necessary at startup */ /* Reset the device although not necessary at startup */
virtio_dev_stop(dev); virtio_dev_stop(dev);

8
lib/bdev/virtio/rte_virtio/virtio.h
View File

@ -191,11 +191,6 @@ struct virtio_pci_ctx;
*/ */
typedef int (*virtio_pci_create_cb)(struct virtio_pci_ctx *pci_ctx); typedef int (*virtio_pci_create_cb)(struct virtio_pci_ctx *pci_ctx);
/* Features desired/implemented by this driver. */
#define VIRTIO_SCSI_DEV_SUPPORTED_FEATURES \
(1ULL << VIRTIO_SCSI_F_INOUT | \
1ULL << VIRTIO_F_VERSION_1)
uint16_t virtio_recv_pkts(struct virtqueue *vq, void **io, uint32_t *len, uint16_t io_cnt); uint16_t virtio_recv_pkts(struct virtqueue *vq, void **io, uint32_t *len, uint16_t io_cnt);
/** /**
@ -266,7 +261,8 @@ int virtio_dev_construct(struct virtio_dev *vdev, const struct virtio_dev_ops *o
* This call will also allocate virtqueues and renegotiate feature flags. * This call will also allocate virtqueues and renegotiate feature flags.
* *
* \param vdev virtio device * \param vdev virtio device
* \param req_features features this driver supports * \param req_features features this driver supports. A VIRTIO_F_VERSION_1
* flag will be automatically appended, as legacy devices are not supported.
*/ */
int virtio_dev_restart(struct virtio_dev *vdev, uint64_t req_features); int virtio_dev_restart(struct virtio_dev *vdev, uint64_t req_features);