Commit dd3ec6e6 authored by Pawel Wodkowski's avatar Pawel Wodkowski Committed by Daniel Verkamp
Browse files

vhost: pull out common features to vhost_internal.h 



Change-Id: Ie247d7a0266d253769d7bd7d9fa60227749bd502
Signed-off-by: default avatarPawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-on: https://review.gerrithub.io/373577


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
parent d783ad1f

lib/vhost/vhost_blk.c

+2 −3
Original line number Diff line number Diff line
@@ -606,15 +606,14 @@ spdk_vhost_blk_dump_config_json(struct spdk_vhost_dev *vdev, struct spdk_json_wr 
}



static const struct spdk_vhost_dev_backend vhost_blk_device_backend = {

	.virtio_features = (1ULL << VHOST_F_LOG_ALL) | (1ULL << VHOST_USER_F_PROTOCOL_FEATURES) |

	(1ULL << VIRTIO_F_VERSION_1) | (1ULL << VIRTIO_F_NOTIFY_ON_EMPTY) |

	.virtio_features = SPDK_VHOST_FEATURES |

	(1ULL << VIRTIO_BLK_F_SIZE_MAX) | (1ULL << VIRTIO_BLK_F_SEG_MAX) |

	(1ULL << VIRTIO_BLK_F_GEOMETRY) | (1ULL << VIRTIO_BLK_F_RO) |

	(1ULL << VIRTIO_BLK_F_BLK_SIZE) | (1ULL << VIRTIO_BLK_F_TOPOLOGY) |

	(1ULL << VIRTIO_BLK_F_BARRIER)  | (1ULL << VIRTIO_BLK_F_SCSI) |

	(1ULL << VIRTIO_BLK_F_FLUSH)    | (1ULL << VIRTIO_BLK_F_CONFIG_WCE) |

	(1ULL << VIRTIO_BLK_F_MQ),

	.disabled_features = (1ULL << VHOST_F_LOG_ALL) | (1ULL << VIRTIO_BLK_F_GEOMETRY) |

	.disabled_features = SPDK_VHOST_DISABLED_FEATURES | (1ULL << VIRTIO_BLK_F_GEOMETRY) |

	(1ULL << VIRTIO_BLK_F_RO) | (1ULL << VIRTIO_BLK_F_FLUSH) | (1ULL << VIRTIO_BLK_F_CONFIG_WCE) |

	(1ULL << VIRTIO_BLK_F_BARRIER) | (1ULL << VIRTIO_BLK_F_SCSI),

	.dump_config_json = spdk_vhost_blk_dump_config_json,

lib/vhost/vhost_internal.h

+11 −0
Original line number Diff line number Diff line
@@ -66,6 +66,17 @@ 


#define SPDK_VHOST_IOVS_MAX 128



#define SPDK_VHOST_FEATURES ((1ULL << VHOST_F_LOG_ALL) | \

	(1ULL << VHOST_USER_F_PROTOCOL_FEATURES) | \

	(1ULL << VIRTIO_F_VERSION_1) | \

	(1ULL << VIRTIO_F_NOTIFY_ON_EMPTY) | \

	(1ULL << VIRTIO_RING_F_EVENT_IDX) | \

	(1ULL << VIRTIO_RING_F_INDIRECT_DESC))



#define SPDK_VHOST_DISABLED_FEATURES ((1ULL << VHOST_F_LOG_ALL) | \

	(1ULL << VIRTIO_RING_F_EVENT_IDX) | \

	(1ULL << VIRTIO_RING_F_INDIRECT_DESC))



enum spdk_vhost_dev_type {

	SPDK_VHOST_DEV_T_SCSI,

	SPDK_VHOST_DEV_T_BLK,

lib/vhost/vhost_scsi.c

+2 −5
Original line number Diff line number Diff line
@@ -49,10 +49,7 @@ 
#include "spdk_internal/assert.h"



/* Features supported by SPDK VHOST lib. */

#define SPDK_VHOST_SCSI_FEATURES	((1ULL << VIRTIO_F_VERSION_1) | \

					(1ULL << VHOST_F_LOG_ALL) | \

					(1ULL << VHOST_USER_F_PROTOCOL_FEATURES) | \

					(1ULL << VIRTIO_F_NOTIFY_ON_EMPTY) | \

#define SPDK_VHOST_SCSI_FEATURES	(SPDK_VHOST_FEATURES | \

					(1ULL << VIRTIO_SCSI_F_INOUT) | \

					(1ULL << VIRTIO_SCSI_F_HOTPLUG) | \

					(1ULL << VIRTIO_SCSI_F_CHANGE ) | \
@@ -62,7 +59,7 @@ 
 * - Live migration not supported yet

 * - T10 PI

 */

#define SPDK_VHOST_SCSI_DISABLED_FEATURES	((1ULL << VHOST_F_LOG_ALL) | \

#define SPDK_VHOST_SCSI_DISABLED_FEATURES	(SPDK_VHOST_DISABLED_FEATURES | \

						(1ULL << VIRTIO_SCSI_F_T10_PI ))



#define MGMT_POLL_PERIOD_US (1000 * 5)