Actually I don't think it will be too much work.  But generally whoever makes the change, needs to "clean up" after themselves :)  So, just include a single commit that corrects all the references.  You should be able to find the references with a 'grep -r libvirt_vm.libvirtd_'  across all libvirt tests.  The only other modules calls to them might exist is in env_process and libvirt_vm (maybe).  When we double-check the patch, we can just run some of the other tests also to make sure they're all working.  I don't believe there are more than 10-20 references though, so it shouldn't be too bad.