The split of scsi-disk into the two separate devices was introduced by
qemu commit b443ae67 released in qemu v0.15.

All changes to test files are not really related to disk testing thanks
to previous refactors.
Signed-off-by: NPeter Krempa <pkrempa@redhat.com>