[libvirt] [jenkins-ci PATCH v2 2/2] guests: Make rpcgen mapping more future-proof