From nobody Fri Nov 18 19:13:02 2022 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 4NDRJG3S6dz4dGtk; Fri, 18 Nov 2022 19:13:02 +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 4NDRJG2z83z3Kyv; Fri, 18 Nov 2022 19:13:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668798782; 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=dSQoAtOxdUWphfvrGBmcRMPsJ1WCWLV4wmKGhwQyhD4=; b=cyXmVoRgQXs+woeHQ0gnPVvZhNKC5FJ959iSpl7dE2t/t4sV67Aofu8hjixFjL6ULG2d4/ 4ujTVL+1kj1Rnx24Bkhhbqq5jr6ForR6rtmVOMgVlnBsxBgzFq8wXz8sn1ptsijSucIh8m VF/wk++9pfzQTfr7JtRjaUxSxM6/eAd1/C1rNjd8N8Us4jIgDLLzXowmiFlFRDYCprcxVq xqsAFa+weL0tZsqt1MllnAl1NC68NSGn63I7o63UrFagsiPqPC0Cr6d9iGmf9dNSWw5Ym6 tWJjzcaX7qxs36NmS7A3aQq57UxM1TRDp+XT56COC6mGek5xmsKBsB7M+P0L3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668798782; 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=dSQoAtOxdUWphfvrGBmcRMPsJ1WCWLV4wmKGhwQyhD4=; b=IdqftkHBerbdF/xxg4q90bUnL7pCzDitUjVx3kOpknvQD64MOCszwYO0kVI8GvawMAnJ8Q pupNCRRcvVUSdEkDkk6yhoWjqZukSdx/aqfhkmP9xY8HD/1H2OpMR1lbxrlDM79X9jpsjz mX7SPy52QjywJ3yht1zBKgX9JaY4H9QQr+zxGaaisc8A77xaOwnSK2FM/3ITrtSdq0Wo4t SetIS/ZWAD8NM0xJ5lPVHR+enPnZgrGg40zJUTgygDbWlfQeXJbuTdUxtlyO3oJxOJIvAF DtFAWzkr4T21HuP1jSdySPwAJ6N1WJYX+drzu3gmaw4L9nbeJzkqJquHLHHX6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668798782; a=rsa-sha256; cv=none; b=G0BNXAfvCZSLQKGquXgH+FO8MvM9++bnlm76ubZVIwk8ihSXQQRnQ5BBSWJgdyj9F7Pcz0 nPtE1bAgCXGV12XPwjwfB4NFZIwSkWPa2kQ2wdTP3tlCnBkOOdCd1mkUGQq2OpoUZqTWP5 bOhOSUVuZM1sqH0OW8ILEEcPsQxWaqBtoS9Grf5orbzXIjbHTf2kngOUItqBKakKfzsXXG QlFhgCeTCwQ6Llhi5pgsU+KHiK2AgOJ3LGhGS8ZU0u1KCY8lGKlqn6hiMM/JsjqWaebrNi i8LZNLT54r+PruQwv8WrehPDu3Ov3vLAdFfcqqzrX3lrI3BDEssr3Ahv7sUsdw== 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 4NDRJG21QTzHqy; Fri, 18 Nov 2022 19:13:02 +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 2AIJD2n6001568; Fri, 18 Nov 2022 19:13:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AIJD2BB001567; Fri, 18 Nov 2022 19:13:02 GMT (envelope-from git) Date: Fri, 18 Nov 2022 19:13:02 GMT Message-Id: <202211181913.2AIJD2BB001567@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: ca6b48f08034 - main - vmm: Restore the correct vm_inject_*() prototypes 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: ca6b48f08034114edf1fa19cdc088021af2eddf3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ca6b48f08034114edf1fa19cdc088021af2eddf3 commit ca6b48f08034114edf1fa19cdc088021af2eddf3 Author: Mark Johnston AuthorDate: 2022-11-18 19:11:21 +0000 Commit: Mark Johnston CommitDate: 2022-11-18 19:11:48 +0000 vmm: Restore the correct vm_inject_*() prototypes Fixes: 80cb5d845b8f ("vmm: Pass vcpu instead of vm and vcpuid...") Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D37443 --- sys/amd64/include/vmm.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/amd64/include/vmm.h b/sys/amd64/include/vmm.h index fddc15d2f17c..16423288a657 100644 --- a/sys/amd64/include/vmm.h +++ b/sys/amd64/include/vmm.h @@ -795,27 +795,27 @@ void vm_inject_fault(void *vm, int vcpuid, int vector, int errcode_valid, int errcode); static __inline void -vm_inject_ud(struct vcpu *vcpu) +vm_inject_ud(void *vm, int vcpuid) { - vm_inject_fault(vcpu, IDT_UD, 0, 0); + vm_inject_fault(vm, vcpuid, IDT_UD, 0, 0); } static __inline void -vm_inject_gp(struct vcpu *vcpu) +vm_inject_gp(void *vm, int vcpuid) { - vm_inject_fault(vcpu, IDT_GP, 1, 0); + vm_inject_fault(vm, vcpuid, IDT_GP, 1, 0); } static __inline void -vm_inject_ac(struct vcpu *vcpu, int errcode) +vm_inject_ac(void *vm, int vcpuid, int errcode) { - vm_inject_fault(vcpu, IDT_AC, 1, errcode); + vm_inject_fault(vm, vcpuid, IDT_AC, 1, errcode); } static __inline void -vm_inject_ss(struct vcpu *vcpu, int errcode) +vm_inject_ss(void *vm, int vcpuid, int errcode) { - vm_inject_fault(vcpu, IDT_SS, 1, errcode); + vm_inject_fault(vm, vcpuid, IDT_SS, 1, errcode); } void vm_inject_pf(void *vm, int vcpuid, int error_code, uint64_t cr2);