diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2023-05-24 12:17:49 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2023-05-24 12:23:22 +0000 |
| commit | 2c0a6d0e7b82fbe6657fe90d990aa2e812f49b44 (patch) | |
| tree | 7329aaaae66484bb1dc9e38e1c4a7ae7700539a9 | |
| parent | 255adf35c0b928e43c82ade2a491eea51e71383f (diff) | |
| download | src-2c0a6d0e7b82fbe6657fe90d990aa2e812f49b44.tar.gz src-2c0a6d0e7b82fbe6657fe90d990aa2e812f49b44.zip | |
bhyvectl: Update usage of vm_run()
Fixes: e17eca327633 ("vmm: Avoid embedding cpuset_t ioctl ABIs")
| -rw-r--r-- | usr.sbin/bhyvectl/bhyvectl.c | 10 |
1 files 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 |