D37444.id113328.diff
No OneTemporary
Actions

Size

767 B

Referenced Files

None

Subscribers

None

D37444.id113328.diff
View Options

	diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c
	--- a/sys/amd64/vmm/intel/vmx.c
	+++ b/sys/amd64/vmm/intel/vmx.c
	@@ -1020,7 +1020,9 @@
	static void *
	vmx_init(struct vm *vm, pmap_t pmap)
	{
	+#ifdef INVARIANTS
	int error;
	+#endif
	struct vmx *vmx;

	vmx = malloc(sizeof(struct vmx), M_VMX, M_WAITOK \| M_ZERO);
	@@ -1083,7 +1085,12 @@
	panic("vmx_init: error setting guest msr access");

	if (virtual_interrupt_delivery) {
	- error = vm_map_mmio(vm, DEFAULT_APIC_BASE, PAGE_SIZE,
	+#ifdef INVARIANTS
	+ error =
	+#else
	+ (void)
	+#endif
	+ vm_map_mmio(vm, DEFAULT_APIC_BASE, PAGE_SIZE,
	APIC_ACCESS_ADDRESS);
	/* XXX this should really return an error to the caller */
	KASSERT(error == 0, ("vm_map_mmio(apicbase) error %d", error));