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