From nobody Thu Jan 26 19:47:56 2023 X-Original-To: dev-commits-src-branches@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 4P2rph73Rtz3bnRM; Thu, 26 Jan 2023 19:47:56 +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 4P2rph5cmgz3DCt; Thu, 26 Jan 2023 19:47:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674762476; 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=Orj+WE8Ylg1eY+vAtWVD0O/Kd14VuFNElLgPT4/14qM=; b=p0OrzqFUd9L78B38/UcQmu6wyeVwVDX/0YtFcCr6o2F1aOv8LY25UGxPQeQIPo+89z05jw zhh/EUaTuqMwqvi2OXN3tY7W5HMdQVttd/iMpqm5VpLffKell5pqRCuEEUJ9neMs/h9NdF dxBTu/ZLM+YI9bVkwQrPG8dl0nsy/ehMTguKHJcBwBd4+QfERfGdw7LB5/a2fw5dSUaxiu jzaLAUDIzUGuW5Vp6kc8NgAUW2rUmhL/Mm1PZvV2C1Qgi4qqR08Ob1Ja8/0plA6ObFXX4f p2S6Xd6MwaMXt9LI/b171fGZoIHEJSWFtVPHqu9KMJY0pkMIRUvwI6B/LuiEGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674762476; 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=Orj+WE8Ylg1eY+vAtWVD0O/Kd14VuFNElLgPT4/14qM=; b=yU+l7aAvzZtJuH0gn65Ik1AvXX75jZTeuV+wLEdLZsz+VezYjc3hN+chLmtW7ibNYGLRp7 R6HiGminVJLU2xcpT3+oAkBaGGaHhuI+7g7VySqanT8h1RB2DZzWWYFlU2bW1GapDpp9VR 7GwntNzJXm6LeHy4wnyOn00kykqgu1/1Tq0KSpX5ThUx2hlC9Z6o61T4q1jHUEmYEtDPKl 2lQbQBFxP0OXxl9wam8nxVM6yydEQAAMdKGRQe5aw4yBi4lX5fMh+zwlLcYf62cgDKH5lM iaoGardATrKdswl5dW0bQl+Wz6ZyDPtCoUGqoehRW4r1pmLdZrfN9m5jWj7sYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674762476; a=rsa-sha256; cv=none; b=OOO/jaGOCRC5ZIV8u+ITB4HJJfQ/Tfl3/Kf6iC3uMNumHKKXlyW8lSVwzC4HS37dES+K/l DDimewIiKY8hsfSnJGwNvSEtjYuypcgg2RkyLsT9Vp6EzN77GPtysRR/ozuTI3YBYWzq6d ffCZwArHr1EiPOfU8V6jm+3GmFCNvhln+YsOkCAF/rHNIgNxtXWe66MWUPPxVu5Uoe9Kf+ rEib7mv9Mb/uH0c8ICMTkD2WpAi7Dy1JHy1QDWOnkktnL1s6lc8F/ZefM6C0NAdHOj3edd mvKUxcKUQfP+JJ9KJ5qnlocSOWgXAlBD+9rdDyAc0EiqduJiVQjapHrK7/C3sA== 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 4P2rph4hMHzgv7; Thu, 26 Jan 2023 19:47:56 +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 30QJluaq007301; Thu, 26 Jan 2023 19:47:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QJluV3007300; Thu, 26 Jan 2023 19:47:56 GMT (envelope-from git) Date: Thu, 26 Jan 2023 19:47:56 GMT Message-Id: <202301261947.30QJluV3007300@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 131a87a32703 - stable/13 - bhyve: Put the prototype for vmexit_task_switch() in a header List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 131a87a32703d457aaceda68132d6b06af22a8a2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=131a87a32703d457aaceda68132d6b06af22a8a2 commit 131a87a32703d457aaceda68132d6b06af22a8a2 Author: Mark Johnston AuthorDate: 2022-10-23 14:21:50 +0000 Commit: John Baldwin CommitDate: 2023-01-26 19:31:41 +0000 bhyve: Put the prototype for vmexit_task_switch() in a header No functional change intended. MFC after: 1 week (cherry picked from commit f703dc0ef0e1d6ac1697cb8d6662870bd5e0fba6) --- usr.sbin/bhyve/bhyverun.c | 1 - usr.sbin/bhyve/bhyverun.h | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index cdd5a8833ba3..6b0b61cc897c 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -183,7 +183,6 @@ static const char * const vmx_exit_reason_desc[] = { }; typedef int (*vmexit_handler_t)(struct vmctx *, struct vm_exit *, int *vcpu); -extern int vmexit_task_switch(struct vmctx *, struct vm_exit *, int *vcpu); int guest_ncpus; uint16_t cpu_cores, cpu_sockets, cpu_threads; diff --git a/usr.sbin/bhyve/bhyverun.h b/usr.sbin/bhyve/bhyverun.h index 5bd7542d8533..1e1e5f9880f8 100644 --- a/usr.sbin/bhyve/bhyverun.h +++ b/usr.sbin/bhyve/bhyverun.h @@ -34,10 +34,12 @@ #define VMEXIT_CONTINUE (0) #define VMEXIT_ABORT (-1) -struct vmctx; extern int guest_ncpus; extern uint16_t cpu_cores, cpu_sockets, cpu_threads; +struct vmctx; +struct vm_exit; + void *paddr_guest2host(struct vmctx *ctx, uintptr_t addr, size_t len); #ifdef BHYVE_SNAPSHOT uintptr_t paddr_host2guest(struct vmctx *ctx, void *addr); @@ -46,4 +48,6 @@ uintptr_t paddr_host2guest(struct vmctx *ctx, void *addr); void fbsdrun_set_capabilities(struct vmctx *ctx, int cpu); int fbsdrun_virtio_msix(void); +int vmexit_task_switch(struct vmctx *, struct vm_exit *, int *vcpu); + #endif