From nobody Mon Aug 22 18:15:24 2022 X-Original-To: dev-commits-ports-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 4MBLBN5H7sz4ZJfF; Mon, 22 Aug 2022 18:15:24 +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 4MBLBN4lqCz3Ydr; Mon, 22 Aug 2022 18:15:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661192124; 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=jMLpXcKdMLRun4OEC4R9eezo+vRpXc/yH7pR1wlMdj0=; b=lJPhP7IVkzGfnTlsMnDs0IyVnw8ZNp9xUtzZ6vQHW3rDIc6efQHThgCym+KDmJMJcFaIQp qyIRJd5OqdPZGEYK37ONSTZAsRiyKJhBgzt5K+cnnfltysVq01Uzc0TNWaTmbViTsCObJ2 PNTSLOFuVYfSfZ7xWKZuhA9esIzlbRa+8r04N9HnX+HRXMcqaQW3c/7Qd4Wu3nbI29bD2t vL84Tajh6t+0kT+qBPnJ6yZgrBCR1lP6IwehfbgGysK/MQ+Dx4A/Hs2+XpxCyXE77qOmup OEOviyJPMRhVmzSESb4GQTjpHlcJiNDJOuJd3JOTAZ2qFyU8X3G4SPPDR8DXyA== 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 4MBLBN3Qftz105j; Mon, 22 Aug 2022 18:15:24 +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 27MIFO4T011227; Mon, 22 Aug 2022 18:15:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27MIFOCU011226; Mon, 22 Aug 2022 18:15:24 GMT (envelope-from git) Date: Mon, 22 Aug 2022 18:15:24 GMT Message-Id: <202208221815.27MIFOCU011226@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: John Baldwin Subject: git: 0dbec9979143 - main - emulators/parallels-tools: Remove devclass from DRIVER_MODULE on recent main. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-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: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0dbec99791436fa18f29b490d73d0e442a585a95 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661192124; 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=jMLpXcKdMLRun4OEC4R9eezo+vRpXc/yH7pR1wlMdj0=; b=RBWwI7nh2lh1GpTVVqCwzUd8G7HqLqbTc7hPAZdeoFkOXQUZLOnO3mtWOFbbytkCjgjpEj VRPCKojj6wG2A1795P5lsHu4DXRjhetXlunitd5+J6qI+fA365d9Njdf6vPZGcTOev+yfX FwYaEemt3tT4HCnI459Vyg4Ti2o/ZpcsT9mfZkQjzRoRRIbdT5uJuj7U+iGA9XKW318ozZ PhM1EoKQipxT8AWX6l90BViec2St8mJw73nhJGscOqUWzeqN2eo0R3yDR+w4zmv0SDe+RP tlbByoSlNhxfBihpB8ytFaSpxb6XeC6GKsozHmMRXaJExwr5ZDfYsuiGtKvsFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661192124; a=rsa-sha256; cv=none; b=WluwjQLT2foUC3HQB0vY76yXchXbdBS764ta84MMuPx2zAKBhDlQUmAiDQiBulRW3TXGHZ fUn7niVEXvAWFfy6ChIi05VnZMh90byYbKgb/a581YxpLde2K7jQPLVcd2PW1HwZ5fPAQS 2pnbeMCMnhdoKLBX17CiyLLBm9+cqOjyATKQgRqRBUbgiIeGpdaJzimallZF+42AgI/DvD 1lRlpXzh4sZ3jVqWZNtVUFwaimaxS6b0FExXKtxAhAWZb4520kSz0D8Tzw/qCmsPZTwcQu T9YBY900NciN6BttJRR45aptTXKi4Y2NqfH0SEkO0Pxrp9NEAz1Ck0ErLuEgLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb (doc, src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=0dbec99791436fa18f29b490d73d0e442a585a95 commit 0dbec99791436fa18f29b490d73d0e442a585a95 Author: John Baldwin AuthorDate: 2022-08-22 18:12:58 +0000 Commit: John Baldwin CommitDate: 2022-08-22 18:12:58 +0000 emulators/parallels-tools: Remove devclass from DRIVER_MODULE on recent main. While here, quiet some set bet unused warnings by removing two unused variables and correcting the check for bus_setup_intr failing. Differential Revision: https://reviews.freebsd.org/D35944 --- .../parallels-tools/files/patch-pvmnet-if_pvmnet.c | 42 ++++++++++++++++++++-- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/emulators/parallels-tools/files/patch-pvmnet-if_pvmnet.c b/emulators/parallels-tools/files/patch-pvmnet-if_pvmnet.c index bd79032b44b2..d7e100bf4dea 100644 --- a/emulators/parallels-tools/files/patch-pvmnet-if_pvmnet.c +++ b/emulators/parallels-tools/files/patch-pvmnet-if_pvmnet.c @@ -1,6 +1,31 @@ --- pvmnet/if_pvmnet.c.orig 2014-02-14 14:09:06 UTC +++ pvmnet/if_pvmnet.c -@@ -364,12 +364,20 @@ pvmnetintr(void *arg) +@@ -245,20 +245,21 @@ static driver_t pvmnet_driver = { + sizeof(struct pvmnet_softc) + }; + ++#if __FreeBSD_version >= 1400058 ++DRIVER_MODULE(pvmnet, pci, pvmnet_driver, 0, 0); ++#else + static devclass_t pvmnet_devclass; + + DRIVER_MODULE(pvmnet, pci, pvmnet_driver, pvmnet_devclass, 0, 0); ++#endif + + static int + pvmnet_probe(device_t dev) + { + uint16_t devid, vendor; +- uint16_t revid, sdevid; + + vendor = pci_get_vendor(dev); + devid = pci_get_device(dev); +- revid = pci_get_revid(dev); +- sdevid = pci_get_subdevice(dev); + + if (vendor != 0x10ec || devid != 0x8029) + return (ENXIO); +@@ -364,12 +365,20 @@ pvmnetintr(void *arg) for (offset = io_get_rcv_offset(sc); (size = io_get_packet_size(sc, offset)); offset += FULL_PACKET_SIZE(size)) { if (size > ETHER_MAX_LEN) { @@ -21,7 +46,7 @@ continue; } m->m_pkthdr.rcvif = ifp; -@@ -379,7 +387,11 @@ pvmnetintr(void *arg) +@@ -379,7 +388,11 @@ pvmnetintr(void *arg) m->m_pkthdr.len = m->m_len = size; io_read_data(sc, offset, m); @@ -33,7 +58,18 @@ PVMNET_UNLOCK(sc); (*ifp->if_input)(ifp, m); -@@ -538,7 +550,11 @@ pvmnet_start_locked(struct ifnet *ifp) +@@ -427,8 +440,8 @@ static int pvmnet_alloc_resources(device_t dev) + + error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET | INTR_MPSAFE, + NULL, pvmnetintr, sc, &sc->irq_handle); +- if (!res) +- return ENXIO; ++ if (error) ++ return error; + return (0); + } + +@@ -538,7 +551,11 @@ pvmnet_start_locked(struct ifnet *ifp) io_notify_sndbuf_full(sc); break; }