[libvirt] Refactored previous patch into 5 patches