From nobody Mon Mar 6 20:56:46 2023 X-Original-To: dev-commits-ports-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 4PVrV65GfRz3wN91; Mon, 6 Mar 2023 20:56:46 +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 4PVrV64n3Tz4YWW; Mon, 6 Mar 2023 20:56:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678136206; 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=b1xZk/sESTzOR2ARIgr7jGMSWsU+po5a0tZzj3+vnlw=; b=B6oP6ErK4ykxnmvfXCP6sHg0tOj8qCK5Hfv4YzN2nlsrT/CJ/996fCae6Y5hfoQB0dXYQQ wMsLh2I9mwU/PVkkunwYVIRiMyG3BGHOkEB2QD8p68H601ccF/NR+iomqaZuczsmwHuSrA 65i7xdbWeQU+MzvnPJdcm9E6Lj7qV0eQaKtciinLofp+69ZC63gNlLzds52qBlLOHff9kT Jneaes4DpHR3FE7F8lG3Vo8E7owcvOMklGCb/3GoMmV8EeH9+FvSK9fM/r5GjLO63EmwxB 2QKoVxeeljG9EloH2kUhC1KB4xoU5U4QQmp0pA/P2OHePCOQkIrG6GdQhdWCaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678136206; 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=b1xZk/sESTzOR2ARIgr7jGMSWsU+po5a0tZzj3+vnlw=; b=J/ALV5cREP2VTWTmcHb32IEhleUaCMfg/Hmpc7CAiFZddx73heNWexZzPQD3uVln1a3zya ifG6d6uil0ndajtvWvqjY6XBLTqbXIk+P2LCeRhgfU/giI0dlDMCvMEAd+JlZy/b6uahOm yUNtXZezDlfOH9nAa2rQOJEB9XouSzA78PAng7R4rIFXP2T62Z4K+zqt3YSpSxnPaxdtpl 1Edz5+WMMeImQTQI1R3g9OQx7/GvWh8c8InPfxui1MKggsUjaLIztSOSqEm72BINGG2OeE mOwYK+wW4OiNk5N7CwTC6KNSNmtwzkXxu/a5bTkvsPavpYy2xTUmUZ3LQojjwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678136206; a=rsa-sha256; cv=none; b=Bn6VU8qVNb+0uh6c/UfBPzHOeKU9UtWChcbE0ZiCd+X4bD7RXhKLNli0I8gy7/9KA+K+u8 HdzOtK4RJzIv+pKnqpZrTnhIlBiIHRKf3PZ8JIKOTs/NWor6EMQur/84H02Wljhhmalw1O yfrBX7qInMlXx2tqX4xdgV33G8rvy/8dm8/DXqV60qRTtfETqIEC/wWfCx4G8VW3mH09pQ i7g/TlumNI13yCjPt8Cs1fW4QpGlj/dJBPU1FR+Voe9riTegVavd2LPUbVlC0UFVU9qd6E 3T5e8eyuFPsvYL5QtjxFm25CLlQb74R9MedqPZErSNOvmcZtg8bMk31Mpi9Jmg== 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 4PVrV63rY0zH2Q; Mon, 6 Mar 2023 20:56:46 +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 326Kuksg050665; Mon, 6 Mar 2023 20:56:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326Kuk6I050664; Mon, 6 Mar 2023 20:56:46 GMT (envelope-from git) Date: Mon, 6 Mar 2023 20:56:46 GMT Message-Id: <202303062056.326Kuk6I050664@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jung-uk Kim Subject: git: 7270b8992214 - main - emulators/virtualbox-ose: Fix build with LLVM 15 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7270b8992214047dcc21af347cbab98900122450 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/ports/commit/?id=7270b8992214047dcc21af347cbab98900122450 commit 7270b8992214047dcc21af347cbab98900122450 Author: Jung-uk Kim AuthorDate: 2023-03-06 20:55:11 +0000 Commit: Jung-uk Kim CommitDate: 2023-03-06 20:55:11 +0000 emulators/virtualbox-ose: Fix build with LLVM 15 The previous commit (f4a869a6424a) was in complete. --- .../files/patch-src_VBox_HostDrivers_Support_freebsd_SUPDrv-freebsd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_Support_freebsd_SUPDrv-freebsd.c b/emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_Support_freebsd_SUPDrv-freebsd.c index b7e262dd4ba2..ea9d35bc1c65 100644 --- a/emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_Support_freebsd_SUPDrv-freebsd.c +++ b/emulators/virtualbox-ose/files/patch-src_VBox_HostDrivers_Support_freebsd_SUPDrv-freebsd.c @@ -127,7 +127,7 @@ } - rc = copyin(pvUser, pHdr, Hdr.cbIn); - if (RT_UNLIKELY(rc)) -+ if (RT_FAILURE(RTR0MemUserCopyFrom(pHdr, pvUser, Hdr.cbIn))) ++ if (RT_FAILURE(RTR0MemUserCopyFrom(pHdr, (uintptr_t)pvUser, Hdr.cbIn))) { - OSDBGPRINT(("VBoxDrvFreeBSDIOCtlSlow: copyin(%p,%p,%#x) -> %#x; ulCmd=%#lx\n", - pvUser, pHdr, Hdr.cbIn, rc, ulCmd)); @@ -146,7 +146,7 @@ - rc = copyout(pHdr, pvUser, cbOut); - if (RT_UNLIKELY(rc)) - OSDBGPRINT(("VBoxDrvFreeBSDIOCtlSlow: copyout(%p,%p,%#x) -> %d; uCmd=%#lx!\n", pHdr, pvUser, cbOut, rc, ulCmd)); -+ if (RT_FAILURE(RTR0MemUserCopyTo(pvUser, pHdr, cbOut))) ++ if (RT_FAILURE(RTR0MemUserCopyTo((uintptr_t)pvUser, pHdr, cbOut))) + OSDBGPRINT(("VBoxDrvFreeBSDIOCtlSlow: copyout(%p,%p,%#x); uCmd=%#lx!\n", pHdr, pvUser, cbOut, ulCmd)); Log(("VBoxDrvFreeBSDIOCtlSlow: returns %d / %d ulCmd=%lx\n", 0, pHdr->rc, ulCmd));