git: 6325451815cd - stable/13 - vmm: Remove support for vm_rendezvous with a cpuid of -1.

The branch stable/13 has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=6325451815cdb3f4c551002f7f02bcce193e3422

commit 6325451815cdb3f4c551002f7f02bcce193e3422
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-11-18 18:03:23 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2023-01-26 22:02:10 +0000

    vmm: Remove support for vm_rendezvous with a cpuid of -1.
    
    This is not currently used.
    
    Reviewed by:    corvink, markj
    Differential Revision:  https://reviews.freebsd.org/D37164
    
    (cherry picked from commit 949f0f47a4e774fea7222923440851c612a3f6fa)
---
 sys/amd64/vmm/vmm.c | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c
index d71ebcc116b0..f92b89bbb732 100644
--- a/sys/amd64/vmm/vmm.c
+++ b/sys/amd64/vmm/vmm.c
@@ -1319,21 +1319,13 @@ vcpu_require_state_locked(struct vm *vm, int vcpuid, enum vcpu_state newstate)
 		panic("Error %d setting state to %d", error, newstate);
 }
 
-#define	RENDEZVOUS_CTR0(vm, vcpuid, fmt)				\
-	do {								\
-		if (vcpuid >= 0)					\
-			VCPU_CTR0(vm, vcpuid, fmt);			\
-		else							\
-			VM_CTR0(vm, fmt);				\
-	} while (0)
-
 static int
 vm_handle_rendezvous(struct vm *vm, int vcpuid)
 {
 	struct thread *td;
 	int error;
 
-	KASSERT(vcpuid == -1 || (vcpuid >= 0 && vcpuid < vm->maxcpus),
+	KASSERT(vcpuid >= 0 && vcpuid < vm->maxcpus,
 	    ("vm_handle_rendezvous: invalid vcpuid %d", vcpuid));
 
 	error = 0;
@@ -1343,8 +1335,7 @@ vm_handle_rendezvous(struct vm *vm, int vcpuid)
 		/* 'rendezvous_req_cpus' must be a subset of 'active_cpus' */
 		CPU_AND(&vm->rendezvous_req_cpus, &vm->rendezvous_req_cpus, &vm->active_cpus);
 
-		if (vcpuid != -1 &&
-		    CPU_ISSET(vcpuid, &vm->rendezvous_req_cpus) &&
+		if (CPU_ISSET(vcpuid, &vm->rendezvous_req_cpus) &&
 		    !CPU_ISSET(vcpuid, &vm->rendezvous_done_cpus)) {
 			VCPU_CTR0(vm, vcpuid, "Calling rendezvous func");
 			(*vm->rendezvous_func)(vm, vcpuid, vm->rendezvous_arg);
@@ -1357,7 +1348,7 @@ vm_handle_rendezvous(struct vm *vm, int vcpuid)
 			wakeup(&vm->rendezvous_func);
 			break;
 		}
-		RENDEZVOUS_CTR0(vm, vcpuid, "Wait for rendezvous completion");
+		VCPU_CTR0(vm, vcpuid, "Wait for rendezvous completion");
 		mtx_sleep(&vm->rendezvous_func, &vm->rendezvous_mtx, 0,
 		    "vmrndv", hz);
 		if ((td->td_flags & TDF_NEEDSUSPCHK) != 0) {
@@ -2579,7 +2570,7 @@ vm_smp_rendezvous(struct vm *vm, int vcpuid, cpuset_t dest,
 	 * Enforce that this function is called without any locks
 	 */
 	WITNESS_WARN(WARN_PANIC, NULL, "vm_smp_rendezvous");
-	KASSERT(vcpuid == -1 || (vcpuid >= 0 && vcpuid < vm->maxcpus),
+	KASSERT(vcpuid >= 0 && vcpuid < vm->maxcpus,
 	    ("vm_smp_rendezvous: invalid vcpuid %d", vcpuid));
 
 restart:
@@ -2590,7 +2581,7 @@ restart:
 		 * call the rendezvous handler in case this 'vcpuid' is one
 		 * of the targets of the rendezvous.
 		 */
-		RENDEZVOUS_CTR0(vm, vcpuid, "Rendezvous already in progress");
+		VCPU_CTR0(vm, vcpuid, "Rendezvous already in progress");
 		mtx_unlock(&vm->rendezvous_mtx);
 		error = vm_handle_rendezvous(vm, vcpuid);
 		if (error != 0)
@@ -2600,7 +2591,7 @@ restart:
 	KASSERT(vm->rendezvous_func == NULL, ("vm_smp_rendezvous: previous "
 	    "rendezvous is still in progress"));
 
-	RENDEZVOUS_CTR0(vm, vcpuid, "Initiating rendezvous");
+	VCPU_CTR0(vm, vcpuid, "Initiating rendezvous");
 	vm->rendezvous_req_cpus = dest;
 	CPU_ZERO(&vm->rendezvous_done_cpus);
 	vm->rendezvous_arg = arg;