From nobody Thu Jan 26 22:12:00 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 4P2w0x06Wkz3c8MW; Thu, 26 Jan 2023 22:12:01 +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 4P2w0w6gDjz3wCd; Thu, 26 Jan 2023 22:12:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771120; 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=LbuQhjjGn2Po5+5xLo4Psi3H44zW0hnxunG2q4h/DAY=; b=MygRjmF1C2R3l6nrG9cB2R8XIkn0IBeunhYjmdbb5NueChD9JHK7fwUoOfbEzRaEtUQ8FE iJqZ7WT49ZstOlQGQ5nlLIBbiNOnxdTc9TnHKsSUZKm2+ps+n2t0zWGci/aUqDIUFsUVpb gdjxWXFitKCiv9AFbA5JjPXScv6bnUHs5aOSIlxBDPpezsBNU3mclt0dvnp/Exc6j1Z62U DiZophKLrjCTcJeHdfAlEUFIp90IFKM0gf1hqVBEK1C/88w43Pysp34RBBpdS3GdQBhsj9 WeQMLfqzje5Ofj/dYsB023zXlKrCWYXQJ7JwpeJ0obHiU68gE6RDpcS6ucxiFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771120; 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=LbuQhjjGn2Po5+5xLo4Psi3H44zW0hnxunG2q4h/DAY=; b=wRgs/H/YzhOruyfXREnjUZXl9AnYQLS6UBqiUzEzobwzoYInXYmyRX7qfcTU1tS2OPZaC3 LS3ck/QIWUNQGfiLtyDPphWHhZ6UCmQSrL1cLcFOjjfMY0NW2YYz1fiW0W4Ev98FcneRNF i8o9B6ngfh2edxdiXG9pj2oZCY3ztvvGcNAbUDFe1/VJAkbZGAbYF15mys6IqIm8udg+A+ MTTrdUW/eYLP9oi97F3BQyTi29qsEN1bnxF+PcWIHwOgZmxE5mWHLT1Z2Rbb2mdqhW7KHy wwxy+AvjteIK5IRwxIprre8h6tMOPVBsuW21KG+84gwjLotGnaBCqZBI9vMzEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674771120; a=rsa-sha256; cv=none; b=W/IacMP2iw4RYTnHptDR7shnW6066LjX/5hThtFpDElN4+842mL/b4vjGukZYQiaxa26nj l775Y6VWmmZDnx7rCKeZN+4zx+O//OoxRgyFLwkU5nesLDCcWo6a2T69C8qxSUs5zZL5w+ HHdPq6pPKpObc55tuBXzZPgE9QqqHmiVTeW+/qYkXJQO/4cNN0UzBbuojXFdin2iNjygQX XWoYsjhmcOTGJYxiSnn8pWh6nagSzpgp3yj5h/ispiCYWw79nRnqbqd9wFYM5LPY8ngLDJ w6U5Y33Ulhrgaghqbjxy7stijJWpcCAuWCOAVkDPljJXR/uePCzRaGPoOGdBzA== 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 4P2w0w5mYNzm5f; Thu, 26 Jan 2023 22:12:00 +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 30QMC0v4022106; Thu, 26 Jan 2023 22:12:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QMC06L022105; Thu, 26 Jan 2023 22:12:00 GMT (envelope-from git) Date: Thu, 26 Jan 2023 22:12:00 GMT Message-Id: <202301262212.30QMC06L022105@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: 9ed7e7c69e1a - stable/13 - vmm: Remove unused vcpuid argument from vioapic_process_eoi. 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: 9ed7e7c69e1ac984e747d534b05519cfd3bbc510 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9ed7e7c69e1ac984e747d534b05519cfd3bbc510 commit 9ed7e7c69e1ac984e747d534b05519cfd3bbc510 Author: John Baldwin AuthorDate: 2022-11-18 18:03:39 +0000 Commit: John Baldwin CommitDate: 2023-01-26 22:02:33 +0000 vmm: Remove unused vcpuid argument from vioapic_process_eoi. Reviewed by: corvink, markj Differential Revision: https://reviews.freebsd.org/D37166 (cherry picked from commit e42c24d56b3d949aafd0c916e30ab91a4fe1e24d) --- sys/amd64/vmm/io/vioapic.c | 2 +- sys/amd64/vmm/io/vioapic.h | 2 +- sys/amd64/vmm/io/vlapic.c | 3 +-- sys/amd64/vmm/vmm.c | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/amd64/vmm/io/vioapic.c b/sys/amd64/vmm/io/vioapic.c index aee58849dd7d..e41b5acac920 100644 --- a/sys/amd64/vmm/io/vioapic.c +++ b/sys/amd64/vmm/io/vioapic.c @@ -455,7 +455,7 @@ vioapic_mmio_write(struct vcpu *vcpu, uint64_t gpa, uint64_t wval, } void -vioapic_process_eoi(struct vm *vm, int vcpuid, int vector) +vioapic_process_eoi(struct vm *vm, int vector) { struct vioapic *vioapic; int pin; diff --git a/sys/amd64/vmm/io/vioapic.h b/sys/amd64/vmm/io/vioapic.h index e45975c548a8..988321a6435c 100644 --- a/sys/amd64/vmm/io/vioapic.h +++ b/sys/amd64/vmm/io/vioapic.h @@ -51,7 +51,7 @@ int vioapic_mmio_read(struct vcpu *vcpu, uint64_t gpa, uint64_t *rval, int size, void *arg); int vioapic_pincount(struct vm *vm); -void vioapic_process_eoi(struct vm *vm, int vcpuid, int vector); +void vioapic_process_eoi(struct vm *vm, int vector); #ifdef BHYVE_SNAPSHOT int vioapic_snapshot(struct vioapic *vioapic, struct vm_snapshot_meta *meta); diff --git a/sys/amd64/vmm/io/vlapic.c b/sys/amd64/vmm/io/vlapic.c index 67a09401efb1..664852260943 100644 --- a/sys/amd64/vmm/io/vlapic.c +++ b/sys/amd64/vmm/io/vlapic.c @@ -593,8 +593,7 @@ vlapic_process_eoi(struct vlapic *vlapic) vlapic->isrvec_stk_top--; vlapic_update_ppr(vlapic); if ((tmrptr[idx] & (1 << bitpos)) != 0) { - vioapic_process_eoi(vlapic->vm, vlapic->vcpuid, - vector); + vioapic_process_eoi(vlapic->vm, vector); } return; } diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index 1c4157c534a0..2405a4450072 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -1810,8 +1810,7 @@ restart: error = vm_handle_suspend(vm, vcpuid, &retu); break; case VM_EXITCODE_IOAPIC_EOI: - vioapic_process_eoi(vm, vcpuid, - vme->u.ioapic_eoi.vector); + vioapic_process_eoi(vm, vme->u.ioapic_eoi.vector); break; case VM_EXITCODE_RENDEZVOUS: error = vm_handle_rendezvous(vcpu);