From nobody Thu Jan 26 22:11: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 4P2w0r3ntSz3c8Sg; Thu, 26 Jan 2023 22:11: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 4P2w0r2rJ8z3vyb; Thu, 26 Jan 2023 22:11:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771116; 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=lln3ij59o2PeZXb1EzWTJdlY9z2Z4IRI7v69BmNOuYA=; b=xk+3312T79xpbId4k9XVwg7Bm6uVJ3/pCwBxh4D7Tw340uisHUH1twW6Pc3vrSV9DK32+d Ow2FNCItsfHecfRkc1k+9woJyKZ1SXSzNHzW4SORkRp4QmOk+ffX/3ASOknv9NkFwN6oZu R5GQxhEi4AuaDWgnWLxDDDxTYh2x4BbTMENSLtbU6ZJalESxFagiNFYSs2rGBiKFKgoNY3 TGNte1gRB1vWS0VH0wOI9QWtxYLPt9PW3QAtCiBYqtB268JRi5JAyNsGl0KGu6+FeJtNnM /t/iCz9CiVPH0rTcRf6B+XXgl68PnueGZ71pzt/yj7wDzDrNT9PikMKSf4Sukg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771116; 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=lln3ij59o2PeZXb1EzWTJdlY9z2Z4IRI7v69BmNOuYA=; b=ZlpmlWrgIl8hb6qZw+zHAoYtGKIR4YcU3Za5QED69BHoMGUR4XyXL8uSf4PhqAYkK9bC35 uB6vFM5t1wCL4WOWVKc5StvLu88Yg3qSrUyW5A3b+LAY5AbXqJ78SVVhKNHjWwvMkY5NY6 ZsmVMnv6E8HEw6JNd//C0UBhfAUBkea5DBt/rj80VOwJUfe3nE0R7dd5VL85mzUhiLqbYO wZkXclLlWoPeNK4IiMuzdJWCCjP0H286miaQTCOjQCZAJ7QHBdg2Lxz8XQ9cR+jjeXufEb pqJ1rta5DYBhmRkLkolVkDlrlrPrJ4zmLYUzCXkyKRDj4PcouZSBhkqMrvMQtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674771116; a=rsa-sha256; cv=none; b=ZvJF2ZbY79XHavlm2O2JQuRQlDZBi1obS9Pi8NNuXxwWnr8pKnansCdxsxDcgw19ZaJ/I1 fcN+cMmQ8xnUMFMk23AQ7PQuWJJ5C0Dj5Stx6MyRPfnJOLU1SlY5oGIMBau6wDbr6LQEWU m7VDWAZkxJYZRCdNwCoLhqGSnbVIQ36bwb0vN+rjPCDdNNb899w10DwTcu4hk/W103tKwV EVYBre9pH4WtWSsl999U6EAAqit/edOwpjlKcb7YORKKmNe6ghVLHSWxBqZgaa+m3jzRkf +E/jo+R8uGyJTJcHTlKsv6U1osM4cL+4/W8gldkfdqDHBPzJxuyU+jA+FFPeYg== 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 4P2w0r1mCszm5c; Thu, 26 Jan 2023 22:11: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 30QMBuH9021997; Thu, 26 Jan 2023 22:11:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QMBuL3021996; Thu, 26 Jan 2023 22:11:56 GMT (envelope-from git) Date: Thu, 26 Jan 2023 22:11:56 GMT Message-Id: <202301262211.30QMBuL3021996@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: 63f32b7af988 - stable/13 - vmm: Restore the correct vm_inject_*() prototypes 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: 63f32b7af988e094ae38d23f776633a7e31d8a5d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=63f32b7af988e094ae38d23f776633a7e31d8a5d commit 63f32b7af988e094ae38d23f776633a7e31d8a5d Author: Mark Johnston AuthorDate: 2022-11-18 19:11:21 +0000 Commit: John Baldwin CommitDate: 2023-01-26 22:00: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 (cherry picked from commit ca6b48f08034114edf1fa19cdc088021af2eddf3) --- 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 7c9393128df0..dd1bae47fc41 100644 --- a/sys/amd64/include/vmm.h +++ b/sys/amd64/include/vmm.h @@ -791,27 +791,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);