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