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