git: 131a87a32703 - stable/13 - bhyve: Put the prototype for vmexit_task_switch() in a header

From: John Baldwin <jhb_at_FreeBSD.org>
Date: Thu, 26 Jan 2023 19:47:56 UTC
The branch stable/13 has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=131a87a32703d457aaceda68132d6b06af22a8a2

commit 131a87a32703d457aaceda68132d6b06af22a8a2
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2022-10-23 14:21:50 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
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