From: dv <dv@openbsd.org>
Date: Sat, 23 Sep 2023 12:27:21 +0000 (+0000)
Subject: vmd(8): log vmd's vm id, not vmm's in vcpu_run_loop.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e2bf67b268d7e0a19f88f9d1a852fea63cd3e54d;p=openbsd

vmd(8): log vmd's vm id, not vmm's in vcpu_run_loop.

Some guests cause a warning message during a shutdown. Log the vmd
vm id and not the kernel vmm id as it's next to useless to the end
user. This has annoyed me too much.
---

diff --git a/usr.sbin/vmd/vm.c b/usr.sbin/vmd/vm.c
index 15c1dd992df..fe804b4e3b9 100644
--- a/usr.sbin/vmd/vm.c
+++ b/usr.sbin/vmd/vm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm.c,v 1.91 2023/09/06 03:35:57 dv Exp $	*/
+/*	$OpenBSD: vm.c,v 1.92 2023/09/23 12:27:21 dv Exp $	*/
 
 /*
  * Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
@@ -1617,7 +1617,7 @@ vcpu_run_loop(void *arg)
 			/* If run ioctl failed, exit */
 			ret = errno;
 			log_warn("%s: vm %d / vcpu %d run ioctl failed",
-			    __func__, vrp->vrp_vm_id, n);
+			    __func__, current_vm->vm_vmid, n);
 			break;
 		}