[libvirt] [PATCH 2/3] Improve tokenizing of linkable terms