From nobody Sat Sep 21 13:42:33 2024 X-Original-To: dev-commits-src-main@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 4X9r6L21gDz5WZfl; Sat, 21 Sep 2024 13:42:34 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X9r6L0Tvcz4FS5; Sat, 21 Sep 2024 13:42:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726926154; 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=auO+nt3NNBeXIpgW//RoGmqRmFn9PhYgNtY0Izo3wPI=; b=pXRBNss+ez8iX6lj37lXw3KieRnfp2A+nJ8eTCt3O0gUDzjUyBWDQalpNS2mHpWYsBNhrO 23rM3aaz5pnp9kivKhuy+ppq2OJufYX3X+LJFvBY1OMirHhEX2ctbmj466O+vP6cllIWNj xZn4DCeR4HiBed8mXVI+oJ5kJrUS0dB0DcGtYWoEyeB/4Gbnccdl63Bt6ideTm1RBi78/E M1dG+krbSeUVsdtlIECOHR0l09aoFFkwAlcX8qzluVF+RxgJmcdDl/n05bAfI9AKzytRVk XNTLRXapvDMv0Z+uq/cOAlRQsMeJYJuYRP5QMrEXJjwRFvACnfEJv9m4e3v37A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726926154; a=rsa-sha256; cv=none; b=ySBwTdINufVmrAeVHYsyEa6nK2L5XcrGwY6HJb5oYdasWXvZUYhQibV38DArAKNPqK36Sy MujBCzCSoUp8Rtn3upnfFcxEV2CUhUX7GY5wW8jnx0L4JaG5F+uWhB96oeipMFAymqs8jE Z7DsCJDXjNAcN1mOU2vC37MxyBdd+wMn7deeA5AJp8422n27SMLZvW7F0Poi+hFBI+sEcT 7rkExyyiOhwqENLWygRqgLK3Wm5rTgLrx35tg+rWYK8fXRh4C3Lc+qlZlsOusUa8cOHuFN O2LTOPVORbpIfR0Pcxi73fZOgx9Ars+uPUpaKViqG9brZIOmXvQZfHAyxtzHAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726926154; 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=auO+nt3NNBeXIpgW//RoGmqRmFn9PhYgNtY0Izo3wPI=; b=lyaJfFn7UyAJXot05H8/IJeH8AZEsX1MW9hnKnWhKFTw1VWaj8D3OCmPdCL1kKsG8fjsr6 MOxuZ3ExH2AK2EQGfmgqJXJTrFGmvGEFy9r1tM9yu7PA/W1sqYONMDZ0/GooDMyeeZvIDz vvWCpFq9lI8rGDNQqjE7JBGV/5i4PRGrxDPQZraUEfKQlFzmos3T/oyCw/0baD557AAsT6 Gh43fpsNou1ggdyL8XES5tbHcZsHumyZ56JQRt/Gqox/d2ODKdddxr5S0ly7+0zCNkgqud wQLXXoscsR4/8bt8eDyucat+0lbnfMDz93baM6q0th2M2llr/aEeAjdGi4FJSg== 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 4X9r6K6xfFzc6v; Sat, 21 Sep 2024 13:42:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48LDgXsF078473; Sat, 21 Sep 2024 13:42:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48LDgXQC078470; Sat, 21 Sep 2024 13:42:33 GMT (envelope-from git) Date: Sat, 21 Sep 2024 13:42:33 GMT Message-Id: <202409211342.48LDgXQC078470@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: 7cfdb02a73df - main - bhyve: Fix an inverted check when enabling PCI busmastering List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 7cfdb02a73df33d33952119c87f3e12f12778360 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7cfdb02a73df33d33952119c87f3e12f12778360 commit 7cfdb02a73df33d33952119c87f3e12f12778360 Author: Mark Johnston AuthorDate: 2024-09-21 13:15:26 +0000 Commit: Mark Johnston CommitDate: 2024-09-21 13:42:15 +0000 bhyve: Fix an inverted check when enabling PCI busmastering Reported by: Andy Fiddaman Fixes: e962b37bf0ff ("bhyve: Do not enable PCI BAR decoding if a boot ROM is present") --- usr.sbin/bhyve/pci_emul.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c index e066d6766f3c..b61f29aa6830 100644 --- a/usr.sbin/bhyve/pci_emul.c +++ b/usr.sbin/bhyve/pci_emul.c @@ -1160,7 +1160,7 @@ pci_emul_init(struct vmctx *ctx, struct pci_devemu *pde, int bus, int slot, pci_set_cfgdata8(pdi, PCIR_INTLINE, 255); pci_set_cfgdata8(pdi, PCIR_INTPIN, 0); - if (!get_config_bool_default("pci.enable_bars", !bootrom_boot())) + if (get_config_bool_default("pci.enable_bars", !bootrom_boot())) pci_set_cfgdata8(pdi, PCIR_COMMAND, PCIM_CMD_BUSMASTEREN); err = (*pde->pe_init)(pdi, fi->fi_config);