From 3fd82b092eb4344a382d33974d9ff06e2c6a0d6d Mon Sep 17 00:00:00 2001 From: tb Date: Mon, 28 Mar 2022 06:28:47 +0000 Subject: [PATCH] Put call to vmx_remote_vmclear() under #ifdef MULTIPROCESSOR to unbreak build of amd64 GENERIC makes sense to jsing --- sys/arch/amd64/amd64/vmm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/arch/amd64/amd64/vmm.c b/sys/arch/amd64/amd64/vmm.c index c6477d4cbf2..5b2aa6ee38a 100644 --- a/sys/arch/amd64/amd64/vmm.c +++ b/sys/arch/amd64/amd64/vmm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmm.c,v 1.304 2022/03/28 00:22:20 dv Exp $ */ +/* $OpenBSD: vmm.c,v 1.305 2022/03/28 06:28:47 tb Exp $ */ /* * Copyright (c) 2014 Mike Larkin * @@ -494,6 +494,7 @@ vmm_quiesce_vmx(void) continue; } +#ifdef MULTIPROCESSOR if (vcpu->vc_last_pcpu != curcpu()) { /* Remote cpu vmclear via ipi. */ err = vmx_remote_vmclear(vcpu->vc_last_pcpu, @@ -502,7 +503,9 @@ vmm_quiesce_vmx(void) printf("%s: failed to remote vmclear " "vcpu %d of vm %d\n", __func__, vcpu->vc_id, vm->vm_id); - } else { + } else +#endif + { /* Local cpu vmclear instruction. */ if ((err = vmclear(&vcpu->vc_control_pa))) printf("%s: failed to locally vmclear " -- 2.20.1