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