svn commit: r305673 - in stable: 10/sys/amd64/vmm 11/sys/amd64/vmm

[John Baldwin]

Author: jhb
Date: Fri Sep  9 20:30:36 2016
New Revision: 305673
URL: https://svnweb.freebsd.org/changeset/base/305673

Log:
  MFC 303713: Correct assertion on vcpuid argument to vm_gpa_hold().
  
  PR:		208168

Modified:
  stable/11/sys/amd64/vmm/vmm.c
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/sys/amd64/vmm/vmm.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/11/sys/amd64/vmm/vmm.c
==============================================================================
--- stable/11/sys/amd64/vmm/vmm.c	Fri Sep  9 19:57:32 2016	(r305672)
+++ stable/11/sys/amd64/vmm/vmm.c	Fri Sep  9 20:30:36 2016	(r305673)
@@ -914,7 +914,7 @@ vm_gpa_hold(struct vm *vm, int vcpuid, v
 	 * guaranteed if at least one vcpu is in the VCPU_FROZEN state.
 	 */
 	int state;
-	KASSERT(vcpuid >= -1 || vcpuid < VM_MAXCPU, ("%s: invalid vcpuid %d",
+	KASSERT(vcpuid >= -1 && vcpuid < VM_MAXCPU, ("%s: invalid vcpuid %d",
 	    __func__, vcpuid));
 	for (i = 0; i < VM_MAXCPU; i++) {
 		if (vcpuid != -1 && vcpuid != i)