@cevich If you have time, please help push https://github.com/yangdongsheng/virt-test/commit/519e705382a6b9c1d889ecadcbc4028b163cf3e0 in #921 , and first_disk for now I think no need to change, because I use vm.get_disk_device(), not vmxml, so no need to separate your devices.disk module from #563 .