[Libvir] build problems with latest cvs version