From nobody Tue Jul 18 13:36:44 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 4R50Nc0ldHz4mqVQ; Tue, 18 Jul 2023 13:36:48 +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 4R50NY0hbBz3hD0; Tue, 18 Jul 2023 13:36:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689687405; 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=ycIPmmC7AHmV3YyQ6C03rWINV1W2qPBA243VSHjnssE=; b=WAUJ5I+ov+c2eD/9DelaIzCedbezP/JZeaGnGK8FP6DZcSbQf4RznpOBa/hLJnNMZyKUeH Pu6cHvkyXxlxEcZ28SyN1BsbIYC2/O4curP3wL07c7dGCWPYY2PUcES/TwpqVA0QDv27ZW KpwHu7T40b8tnx9eMwcGkBEYfjgW7abaR6qRMBXehiojCMjxbQyQjSCOYu3jymcMVHYj5j jI3WL/HAHbD8hzb72ms6cZV/+AURSHdTsLSUCEc5+r5cFbAOhZXk8pPqijEu3z/kZyJp2n LE1UoBR3fg4xJaT1AZu2G6QZV8YPciKC7EcaKHXkqu8ZWa1zjroKfcvc52aWiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689687405; 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=ycIPmmC7AHmV3YyQ6C03rWINV1W2qPBA243VSHjnssE=; b=D+pz56pGY/SoWg1MfC8hLhcsQ5pQq+DVsK8QYYPVzzjnKkjQvF+gGLsBhqRFkL5dmrajbx xZEkPgIQbjdia8+TPOut508qfSBDAkxdpzpwYmdrliJWObvsO+TZn2qcNkeVQS3pNiPphr 1PhRDncSwKWhYCt+1a5VxrE7X20HSFh7iUn3GOV+2SPamWuoA6pcTYWXrhGAXTgdQhV50O PIrIVr3szRpjH5YyVnd/Nm8p4ckt6KHy+TCcj3nhdar9ykQI+HfQTwcqwilagy4Do5T3Pr NywfHRSRd1ECSjBayqL5KWzEcWHIOpeIt0ysfHEL5CBqQV9vRpsELv+SXM6lGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689687405; a=rsa-sha256; cv=none; b=RstHrAP0VZQeUTpipb5g1FspPgeKaAVHYi5KM5tbfVdn5KJKuW/BYYb3dJ40oXHe9tufML qGy0cUJXsllXFytwSwbnbhxFNvJxStQ7IW5/+ZVo/XFrLSrJ/DBwO9rf8QO58SBGQZoTrN Zh1TcApXJ4LZr43890XSYdZrlLfM26UWul2IIdKsBFDjPmRtzlp2/lqZLri2PB4TfowZDL Uq2s6O25CmgBZyLVzusXvBX1Qg6aftQPeZYg9XbWIprOoZNsJnh/joHo4vyY7UF+eZN6LS qcw5cYX1cDuHW75992waVjklW9PTH/onmln0YKC3NIaAuO57DtgifiAgHmWN8A== 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 4R50NX6gdFz178v; Tue, 18 Jul 2023 13:36:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36IDai1K049925; Tue, 18 Jul 2023 13:36:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36IDaitY049924; Tue, 18 Jul 2023 13:36:44 GMT (envelope-from git) Date: Tue, 18 Jul 2023 13:36:44 GMT Message-Id: <202307181336.36IDaitY049924@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a710a3f13da3 - stable/13 - bhyve: Deduplicate some code in modify_bar_registration() 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/stable/13 X-Git-Reftype: branch X-Git-Commit: a710a3f13da34aa5fd26eb9c6b33381aff6f38b8 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a710a3f13da34aa5fd26eb9c6b33381aff6f38b8 commit a710a3f13da34aa5fd26eb9c6b33381aff6f38b8 Author: Mark Johnston AuthorDate: 2023-07-11 19:22:37 +0000 Commit: Mark Johnston CommitDate: 2023-07-18 13:36:25 +0000 bhyve: Deduplicate some code in modify_bar_registration() No functional change intended. Reviewed by: corvink, jhb MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D40877 (cherry picked from commit 0dea4f064dfcd0725d02b9b2d02b2494ca866857) --- usr.sbin/bhyve/pci_emul.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c index 34ce3cb7d49a..2b73d82be025 100644 --- a/usr.sbin/bhyve/pci_emul.c +++ b/usr.sbin/bhyve/pci_emul.c @@ -606,9 +606,6 @@ modify_bar_registration(struct pci_devinst *pi, int idx, int registration) error = register_inout(&iop); } else error = unregister_inout(&iop); - if (pe->pe_baraddr != NULL) - (*pe->pe_baraddr)(pi, idx, registration, - pi->pi_bar[idx].addr); break; case PCIBAR_MEM32: case PCIBAR_MEM64: @@ -624,21 +621,18 @@ modify_bar_registration(struct pci_devinst *pi, int idx, int registration) error = register_mem(&mr); } else error = unregister_mem(&mr); - if (pe->pe_baraddr != NULL) - (*pe->pe_baraddr)(pi, idx, registration, - pi->pi_bar[idx].addr); break; case PCIBAR_ROM: error = 0; - if (pe->pe_baraddr != NULL) - (*pe->pe_baraddr)(pi, idx, registration, - pi->pi_bar[idx].addr); break; default: error = EINVAL; break; } assert(error == 0); + + if (pe->pe_baraddr != NULL) + (*pe->pe_baraddr)(pi, idx, registration, pi->pi_bar[idx].addr); } static void