CURRENT: build world failure: /usr/src/usr.sbin/bhyvectl/bhyvectl.c:1466:8: error: use of undeclared identifier 'VMCS_EXIT_INTERRUPTION_ERROR' VMCS_EXIT_INTERRUPTION_ERROR, &u64);

[Marcus Karlsson]

On Sat, Jan 11, 2014 at 12:34:44PM +0100, Marcus Karlsson wrote:
> On Sat, Jan 11, 2014 at 11:32:06AM +0100, O. Hartmann wrote:
> > Recent sources (revision 260540) fail to build: 
> > 
> > cc  -O2 -pipe -O3 -march=native
> > -I/usr/src/usr.sbin/bhyvectl/../../sys/amd64/vmm -pipe -O3 -std=gnu99
> > -Qunused-arguments  -fstack-protector -Wsystem-headers -Werror -Wall
> > -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes
> > -Wmissing-prototypes -Wpointer-arith -Wno-uninitialized
> > -Wno-pointer-sign -Wno-empty-body -Wno-string-plus-int
> > -Wno-tautological-compare -Wno-unused-value -Wno-parentheses-equality
> > -Wno-unused-function -Wno-enum-conversion
> > -c /usr/src/usr.sbin/bhyvectl/bhyvectl.c /usr/src/usr.sbin/bhyvectl/bhyvectl.c:1457:8:
> > error: use of undeclared identifier 'VMCS_EXIT_INTERRUPTION_INFO'; did
> > you mean 'SET_VMCS_ENTRY_INTERRUPTION_INFO'?
> > VMCS_EXIT_INTERRUPTION_INFO, &u64); ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> > SET_VMCS_ENTRY_INTERRUPTION_INFO /usr/src/usr.sbin/bhyvectl/bhyvectl.c:382:2:
> > note: 'SET_VMCS_ENTRY_INTERRUPTION_INFO' declared here
> > SET_VMCS_ENTRY_INTERRUPTION_INFO,
> > ^ /usr/src/usr.sbin/bhyvectl/bhyvectl.c:1466:8: error: use of
> > undeclared identifier 'VMCS_EXIT_INTERRUPTION_ERROR'
> > VMCS_EXIT_INTERRUPTION_ERROR, &u64);
> 
> I see the same thing. It appears that the definition of
> VMCS_EXIT_INTERRUPTION_INFO and VMCS_EXIT_INTERRUPTION_ERROR changed in
> r260531 to VMC_EXIT_INT_INFO and VMCS_EXIT_INTR_ERRCODE respectively.

This patch was enough for the build to complete successfully in case
anyone else wants it. The old macros are not used anywhere else in the
source tree apart from bhyvectl.
-------------- next part --------------
Index: usr.sbin/bhyvectl/bhyvectl.c
===================================================================
--- usr.sbin/bhyvectl/bhyvectl.c	(revision 260540)
+++ usr.sbin/bhyvectl/bhyvectl.c	(working copy)
@@ -1454,7 +1454,7 @@
 
 	if (!error && (get_vmcs_exit_interruption_info || get_all)) {
 		error = vm_get_vmcs_field(ctx, vcpu,
-					  VMCS_EXIT_INTERRUPTION_INFO, &u64);
+					  VMCS_EXIT_INTR_INFO, &u64);
 		if (error == 0) {
 			printf("vmcs_exit_interruption_info[%d]\t0x%08lx\n",
 				vcpu, u64);
@@ -1463,7 +1463,7 @@
 
 	if (!error && (get_vmcs_exit_interruption_error || get_all)) {
 		error = vm_get_vmcs_field(ctx, vcpu,
-					  VMCS_EXIT_INTERRUPTION_ERROR, &u64);
+					  VMCS_EXIT_INTR_ERRCODE, &u64);
 		if (error == 0) {
 			printf("vmcs_exit_interruption_error[%d]\t0x%08lx\n",
 				vcpu, u64);