[master 21/24] edd: Split up VirtIO and VirtIO SCSI matching