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