[libvirt] [PATCH 0/2] Fix genericxml2xml test and avoid further mistakes