[master 10/11] edd: Split up VirtIO and VirtIO SCSI matching