Commit ca329299 caused build errors in bhyvexml2argvtest.c because of
some undefined variables.

Pushing under the build breaker rule.