From nobody Sun Oct 23 15:18:43 2022 X-Original-To: dev-commits-src-main@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 4MwMKv3tRPz4gdVZ; Sun, 23 Oct 2022 15:18:43 +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 4MwMKv1T2Cz3ffC; Sun, 23 Oct 2022 15:18:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666538323; 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=IalDQtmHYoOaQKy1LKk6Inq2i7X24WYLEXDqjH4pTgA=; b=jZTQiIgyOYUeA5BpUrRLAolN+oULnew7ncz0n0SmgjVw9cCQGhXbGnKaQ2KCGtqisqC/o4 2QNX5TOniW4hE9zBzZjKIPXQCEkgIM8htKBPKFs6yiUnfAClmtBf8MJ1zP88xMUIjhVhVf po7jk2cIctBD1qdQJF94QZ7HuGPofBJjae0KzHgF2Ve4mgHyvzzID2mqSCJfpIIGeAIRrF 37A9F75SHbyou1hViThpNY+h1LuksqBZUoTA/mwiKJ5x/xOgusr43dGQKEbBQ2h2KWYEKT mSOyAiJwGATc9WWVyg6BhlBpSZ+8tFjdiRcFIHmzMerfNPd9VbQ59R9qan2hjA== 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 4MwMKv0b2czwN4; Sun, 23 Oct 2022 15:18:43 +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 29NFIhbE076356; Sun, 23 Oct 2022 15:18:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29NFIhXU076355; Sun, 23 Oct 2022 15:18:43 GMT (envelope-from git) Date: Sun, 23 Oct 2022 15:18:43 GMT Message-Id: <202210231518.29NFIhXU076355@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: f703dc0ef0e1 - main - bhyve: Put the prototype for vmexit_task_switch() in a header List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: f703dc0ef0e1d6ac1697cb8d6662870bd5e0fba6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666538323; 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=IalDQtmHYoOaQKy1LKk6Inq2i7X24WYLEXDqjH4pTgA=; b=xqFt/pb4M3HfnGo9hNEOXKb65Wj+AHeBMgtD/966dRuPtaiZFhL9I/ysU8mGxKBkgukAsB fhIKsq9Y4D8JKplfNiLPe1fxbuqjFy74dM3+/yjDH/wMnQQIyoackCbww6a5DLIwOZzG6u DkrX2WqyCURJDm1rm67ClSAmx/prW+/fkNem9KtmFAx1f8qhOXTI/nR8B5Mu9TSE6qm40L mFb3r/bxiuxVkCF8yJ1nW6w8M0e8osPBq/lM39RMk3tCCNwPLmE7tKEtBArnVwAuCzTJxQ 9GHMAxorFGOCyQZtsyBZfOrHn67Euq5mvHrjDr9N16Jl0EW6rc4mW3wUJs34Eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666538323; a=rsa-sha256; cv=none; b=iZX1Y6GfHVtObpl/ioWsMFP5rn+teKlUKkruHKaethFvhRe7t0Z+aysfYTra9nnvyV0Lag zRxp2brUxfmKw+SpIadjmjnSYnv98Nxkjw9s0xO6v1Hn/m/C8+QTIJtkAw5vu8HHvxy6IM tRT3LANvPo2id6gcqAjwAWct3M02zvWxdio291xdygtT8eey/Kz6FUtD84XmLhCluWJk7g 2/flpdoKxM7kO/ME9JmCXPZ6xviKjxws7atB1zFKhebKC+p7UvGjHnke56tzx+9vdClWqR Rr2IZ7krovTu/0yMLHC4ZZpG1Pc29Oua7o80X5ftAcqly+iF1Kbeiy8XrQLPUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f703dc0ef0e1d6ac1697cb8d6662870bd5e0fba6 commit f703dc0ef0e1d6ac1697cb8d6662870bd5e0fba6 Author: Mark Johnston AuthorDate: 2022-10-23 14:21:50 +0000 Commit: Mark Johnston CommitDate: 2022-10-23 15:11:33 +0000 bhyve: Put the prototype for vmexit_task_switch() in a header No functional change intended. MFC after: 1 week --- 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 348e7ab40196..6e7eed747e97 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 cores, maxcpus, sockets, threads; diff --git a/usr.sbin/bhyve/bhyverun.h b/usr.sbin/bhyve/bhyverun.h index 3ca252a8ffc2..e68b68fe5483 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 cores, sockets, 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