From nobody Thu Jan 26 19:28:42 2023 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 4P2rNW1pLLz3bV02; Thu, 26 Jan 2023 19:28: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 4P2rNW06kXz4LwK; Thu, 26 Jan 2023 19:28:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674761323; 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=SxoRKCuLv67QlucAgr/4sUjR3ULDwCQPg8ksjegZ7Rc=; b=ennBbltj2yEB8ojTZQQY+m3CUsi0FqKCSSwWWLyydXkZo9Y3Ryi55qNH07MfmUa5vjOd+x ZbEAWKyKpdmnHrKB7JkNGynf1DGavKzDuve3dHI4RTdUsIbrHnMVJduE9fUa13r1iI3bK0 5iS7QRluHWwb9qLDZONzIsN2hzQ6zmQUNlzrXFDL0EAjEv+2RwNQmt4mi7RH70JV+nEToE IOV2L0sMgHij0Zt7hIEJ53fd7Qgw1zxlXgUf0zytaMgxjYL/XKFOjqp8mbV4y220v4Zcjx adO4cGd0U8kg9dNPUH9ryHwqNogfkczK8XJhESgvGlmjv6UcZKhdVnuYgcm68g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674761323; 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=SxoRKCuLv67QlucAgr/4sUjR3ULDwCQPg8ksjegZ7Rc=; b=BmVllNbwmRA/8Or6tOuCzV3NDU0LBplJBtUgMOSaAPPJIgaEr5xH+fg0vI87eTKQlnADmd P3hYzlUJGDQ1RNwCR6VphsegLnO3CKSSvXEaOK0J031dKzdz++VZJsQ2o4edN9xUjJ4rsR pA68ZGZvGYXjORLV2sCfgHSE8mXtK8Uz0zu59FCMdVcH/+GUrr0bz8LPhq6Vn363vC7Peo w7OtWOkF+ljbq8E6ySMy+3Ld1U/75jnPNCW9hhPSYsOhCZEqoBTiE57uT5Ddu0Qg6l5TtG xeAMoB8+efdE11fOh8AZunJ6fDd1JHgnHb8I8+arXdcPfgnDobqv8IUYzA8U+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674761323; a=rsa-sha256; cv=none; b=axSNocdEZQjyEECYz2CJ+ScPlz1wR5rOV8VTShCrY0yCkY1oyQzDdqBLeJERqItsYvaaNQ kCFSBve4zI4XR/0fPvr7H8pqBru+1G2mc0aABkh7gbhiUmNFbYLIZYDT4CGwDftfsbeELc p/bhvysQyJHH1fO9voT0UmfNkrunrxtzP2h8+I8EbLKu6CFf23ysVnJ/z3CMLht2ePESWs 5sqNhHX5tQgtXCI18JoDSiWdO0dLeVK9/aLaZFOVoyM1NpX0dNaiWzaKcfUaYz0PW0B+Yy bHLTbkG9kIFmTPRxxQ5dK+czUjapvGmCHomabTZupzrHCfwwWl/NK5TXgcg8BA== 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 4P2rNV6KyQzhC7; Thu, 26 Jan 2023 19:28:42 +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 30QJSgPn078852; Thu, 26 Jan 2023 19:28:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QJSg3P078851; Thu, 26 Jan 2023 19:28:42 GMT (envelope-from git) Date: Thu, 26 Jan 2023 19:28:42 GMT Message-Id: <202301261928.30QJSg3P078851@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: 27007f7863f1 - stable/13 - vmm: fix set but not used warnings 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 27007f7863f19e4b10b514090b28819d62228a62 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=27007f7863f19e4b10b514090b28819d62228a62 commit 27007f7863f19e4b10b514090b28819d62228a62 Author: Robert Wing AuthorDate: 2022-04-10 18:30:08 +0000 Commit: John Baldwin CommitDate: 2023-01-26 19:26:46 +0000 vmm: fix set but not used warnings (cherry picked from commit f877977a034b41bedacdf507e79e4233b28a8bfc) --- sys/amd64/vmm/amd/svm.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sys/amd64/vmm/amd/svm.c b/sys/amd64/vmm/amd/svm.c index f50a4c8c9097..8fbe0817fc8e 100644 --- a/sys/amd64/vmm/amd/svm.c +++ b/sys/amd64/vmm/amd/svm.c @@ -351,7 +351,7 @@ svm_msr_index(uint64_t msr, int *index, int *bit) static void svm_msr_perm(uint8_t *perm_bitmap, uint64_t msr, bool read, bool write) { - int index, bit, error; + int index, bit, error __diagused; error = svm_msr_index(msr, &index, &bit); KASSERT(error == 0, ("%s: invalid msr %#lx", __func__, msr)); @@ -658,7 +658,7 @@ svm_vcpu_mode(struct vmcb *vmcb) { struct vmcb_segment seg; struct vmcb_state *state; - int error; + int error __diagused; state = &vmcb->state; @@ -723,7 +723,7 @@ static void svm_inout_str_seginfo(struct svm_softc *svm_sc, int vcpu, int64_t info1, int in, struct vm_inout_str *vis) { - int error, s; + int error __diagused, s; if (in) { vis->seg_name = VM_REG_GUEST_ES; @@ -862,7 +862,7 @@ svm_handle_inst_emul(struct vmcb *vmcb, uint64_t gpa, struct vm_exit *vmexit) struct vmcb_segment seg; struct vmcb_ctrl *ctrl; char *inst_bytes; - int error, inst_len; + int error __diagused, inst_len; ctrl = &vmcb->ctrl; paging = &vmexit->u.inst_emul.paging; @@ -1117,7 +1117,7 @@ enable_nmi_blocking(struct svm_softc *sc, int vcpu) static void clear_nmi_blocking(struct svm_softc *sc, int vcpu) { - int error; + int error __diagused; KASSERT(nmi_blocked(sc, vcpu), ("vNMI already unblocked")); VCPU_CTR0(sc->vm, vcpu, "vNMI blocking cleared"); @@ -1150,7 +1150,7 @@ svm_write_efer(struct svm_softc *sc, int vcpu, uint64_t newval, bool *retu) struct vm_exit *vme; struct vmcb_state *state; uint64_t changed, lma, oldval; - int error; + int error __diagused; state = svm_get_vmcb_state(sc, vcpu); @@ -1332,7 +1332,7 @@ svm_vmexit(struct svm_softc *svm_sc, int vcpu, struct vm_exit *vmexit) struct svm_regctx *ctx; uint64_t code, info1, info2, val; uint32_t eax, ecx, edx; - int error, errcode_valid, handled, idtvec, reflect; + int error __diagused, errcode_valid, handled, idtvec, reflect; bool retu; ctx = svm_get_guest_regctx(svm_sc, vcpu); @@ -2572,7 +2572,6 @@ done: static int svm_vmcx_snapshot(void *arg, struct vm_snapshot_meta *meta, int vcpu) { - struct vmcb *vmcb; struct svm_softc *sc; int err, running, hostcpu; @@ -2580,7 +2579,6 @@ svm_vmcx_snapshot(void *arg, struct vm_snapshot_meta *meta, int vcpu) err = 0; KASSERT(arg != NULL, ("%s: arg was NULL", __func__)); - vmcb = svm_get_vmcb(sc, vcpu); running = vcpu_is_running(sc->vm, vcpu, &hostcpu); if (running && hostcpu !=curcpu) {