Re: [libvirt] [jenkins-ci PATCH] guests: Make mappings more future proof