[libvirt] [PATCHv2 04/11] conf: some code cleanup