Date: Wed, 24 May 2023 12:24:20 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 2c0a6d0e7b82 - main - bhyvectl: Update usage of vm_run() Message-ID: <202305241224.34OCOK6k091133@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2c0a6d0e7b82fbe6657fe90d990aa2e812f49b44 commit 2c0a6d0e7b82fbe6657fe90d990aa2e812f49b44 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2023-05-24 12:17:49 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2023-05-24 12:23:22 +0000 bhyvectl: Update usage of vm_run() Fixes: e17eca327633 ("vmm: Avoid embedding cpuset_t ioctl ABIs") --- usr.sbin/bhyvectl/bhyvectl.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c index 5dcdb8e06c96..f723ff1f2e82 100644 --- a/usr.sbin/bhyvectl/bhyvectl.c +++ b/usr.sbin/bhyvectl/bhyvectl.c @@ -1751,7 +1751,7 @@ main(int argc, char *argv[]) char *vmname; int error, ch, vcpuid, ptenum; vm_paddr_t gpa_pmap; - struct vm_exit vmexit; + struct vm_run vmrun; uint64_t rax, cr0, cr2, cr3, cr4, dr0, dr1, dr2, dr3, dr6, dr7; uint64_t rsp, rip, rflags, efer, pat; uint64_t eptp, bm, addr, u64, pteval[4], *pte, info[2]; @@ -2386,7 +2386,13 @@ main(int argc, char *argv[]) } if (!error && run) { - error = vm_run(vcpu, &vmexit); + struct vm_exit vmexit; + cpuset_t cpuset; + + vmrun.vm_exit = &vmexit; + vmrun.cpuset = &cpuset; + vmrun.cpusetsize = sizeof(cpuset); + error = vm_run(vcpu, &vmrun); if (error == 0) dump_vm_run_exitcode(&vmexit, vcpuid); else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305241224.34OCOK6k091133>