[libvirt] [PATCH v2 6/6] conf: Clean up some unnecessary goto paths