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