From nobody Wed May 24 12:24:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QR9NN2NQCz4Cf5y; Wed, 24 May 2023 12:24:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QR9NN1s01z3FGW; Wed, 24 May 2023 12:24:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684931060; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0u/p4goGu2LqJ56EZAUN3FMosn/VE6buyJSGeF/8JPE=; b=W6gC8gdtv7ICE48nGV58fGkQ/SYrjhdBIAWHHWuUwri2q5yH99gJyd7R5jiVQ2nEZ46M3F VxW/9eWBpC1lmC+bpy46ka/CZ+RdNO0/Z5O/nsIEHxAgrVsFxy0YASiUneggyxb4jMHrzO tCV6wgSSK0zFR2rT25AJKGhM01vFyiAyBK+9zuzXk9DwFXEC6o2N/w9yA4brq8xOqNPoXo ZJ7Lz3S/UEA6mIbc9axWFP9tayhLib9dJ+2S9mdFH5+iezjqjEdhVhN4hGkTKXWwWqc1/U 3B5Hp77hVpDUfnjGuCcm1aVdF0H8p5l0phKD8wU26V5fTk+5BU9/1N797brkCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684931060; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0u/p4goGu2LqJ56EZAUN3FMosn/VE6buyJSGeF/8JPE=; b=ro8Fw5EuWNYuTho91wvdYUXvhfOmydJi0RN3tsa9CRWTa7oOfl3uErb4MUcxWfzsNR1gp8 33wcUTOgGGm8tl4xR1c3REMVclMZRnxtCaxSQLsCN/bsi9wbgzxbqX2IQ1CPb25S237HVm XUOxFEsxqrEv9DpAhBVCRQ3jc4fsg2wDgL6G8Ym/kjI2uOt/2Y3n8h+2j5DILw/qDqeMve 6AwcmTrpNQHm5v0nUv2I003oSox/SvEP1Er/YTAVUkis6JHOmqZeuJq7+AHMK1jWnlYd4i 8W9D8JwKL1kKlyvFimDZeR48VIsGQMKIyF4RXwzBq5Kk5nXYGlVYaM46fIKWtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684931060; a=rsa-sha256; cv=none; b=dg3UcJrkUI9jtCi4jN6JfnrCdu0rlS4AZ04Dujjn6ZqrilEDYp23mAZ+zMmF3oKnWC+Ntw qqO4qi9c41qLOxfjotKBzReZ4leSDIJCu1tJZ5C+m35Zdg4/luH5a+Gcnd5HK+iLVL00a1 IadSEK1rh/6ldMBlrvj6KtQ+Zh/g5AWSGhhedkEqbOiktjiHJ87x1ZJ19EZjZzvWjndla6 nOVKicbo7RIPRn/fCWJEbU3t7QGtL6sKfH/lujj23DRfbdKP4DbBJWmfTeB3YohQoK/we2 PmqB1fQ44lyCt92nNHN5ph19+sCos4+RoLeT5SMar2mSIA8E493kXmCOpCDaCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QR9NN0tZgzhwg; Wed, 24 May 2023 12:24:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34OCOKkV091134; Wed, 24 May 2023 12:24:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34OCOK6k091133; Wed, 24 May 2023 12:24:20 GMT (envelope-from git) Date: Wed, 24 May 2023 12:24:20 GMT Message-Id: <202305241224.34OCOK6k091133@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 2c0a6d0e7b82 - main - bhyvectl: Update usage of vm_run() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c0a6d0e7b82fbe6657fe90d990aa2e812f49b44 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2c0a6d0e7b82fbe6657fe90d990aa2e812f49b44 commit 2c0a6d0e7b82fbe6657fe90d990aa2e812f49b44 Author: Mark Johnston AuthorDate: 2023-05-24 12:17:49 +0000 Commit: Mark Johnston 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