Commit 77b40b64 authored by Pawel Niedzwiecki's avatar Pawel Niedzwiecki Committed by Jim Harris
Browse files

test/virtio: Adds vhost block controllers to virtio tests 



Change-Id: Idebfe94ecd54ea281018136c3cd8a5ae1c019dc6
Signed-off-by: default avatarPawel Niedzwiecki <pawelx.niedzwiecki@intel.com>
Reviewed-on: https://review.gerrithub.io/401185


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 17d55c9f

test/vhost/initiator/bdev.conf

+11 −1
Original line number Diff line number Diff line 
[VirtioUser0]

  Path naa.Nvme0n1.0

  Path naa.Nvme0n1_scsi0.0

  Queues 8



[VirtioUser1]
@@ -10,5 +10,15 @@ 
  Path naa.Malloc1.0

  Queues 8



[VirtioUser3]

  Path naa.Nvme0n1_blk0.0

  Type Blk

  Queues 8



[VirtioUser4]

  Path naa.Nvme0n1_blk1.0

  Type Blk

  Queues 8



[Ioat]

  Disable Yes

test/vhost/initiator/blockdev.sh

+9 −8
Original line number Diff line number Diff line
@@ -62,13 +62,14 @@ function create_bdev_config() 
		error "Nvme0n1 bdev not found!"

	fi



	$RPC_PY construct_vhost_scsi_controller naa.Nvme0n1.0

	$RPC_PY add_vhost_scsi_lun naa.Nvme0n1.0 0 Nvme0n1p0

	$RPC_PY add_vhost_scsi_lun naa.Nvme0n1.0 1 Nvme0n1p1

	$RPC_PY add_vhost_scsi_lun naa.Nvme0n1.0 2 Nvme0n1p2

	$RPC_PY add_vhost_scsi_lun naa.Nvme0n1.0 3 Nvme0n1p3

	$RPC_PY add_vhost_scsi_lun naa.Nvme0n1.0 4 Nvme0n1p4

	$RPC_PY add_vhost_scsi_lun naa.Nvme0n1.0 5 Nvme0n1p5

	$RPC_PY construct_vhost_scsi_controller naa.Nvme0n1_scsi0.0

	$RPC_PY add_vhost_scsi_lun naa.Nvme0n1_scsi0.0 0 Nvme0n1p0

	$RPC_PY add_vhost_scsi_lun naa.Nvme0n1_scsi0.0 1 Nvme0n1p1

	$RPC_PY add_vhost_scsi_lun naa.Nvme0n1_scsi0.0 2 Nvme0n1p2

	$RPC_PY add_vhost_scsi_lun naa.Nvme0n1_scsi0.0 3 Nvme0n1p3



	$RPC_PY construct_vhost_blk_controller naa.Nvme0n1_blk0.0 Nvme0n1p4

	$RPC_PY construct_vhost_blk_controller naa.Nvme0n1_blk1.0 Nvme0n1p5



	$RPC_PY construct_malloc_bdev 128 512 --name Malloc0

	$RPC_PY construct_vhost_scsi_controller naa.Malloc0.0
@@ -106,7 +107,7 @@ timing_exit run_spdk_fio_unmap 
timing_enter setup_vm

vm_no="0"

vm_setup --disk-type=spdk_vhost_scsi --force=$vm_no --os=$os_image \

 --disks="Nvme0n1:Malloc0:Malloc1" \

 --disks="Nvme0n1_scsi0:Malloc0:Malloc1:Nvme0n1_blk0,spdk_vhost_blk:Nvme0n1_blk1,spdk_vhost_blk" \

 --queue_num=8 --memory=6144

vm_run $vm_no