qemu.tests.multi_disk: Some bugfixes