[libvirt] [PATCH 2/4] util: Code simplification