Merge pull request #3100 from rubenk/virt-fix-compiler-warning