[libvirt PATCH 5/8] util: sync variable names between header and C files