From nobody Mon Mar 6 13:17:30 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 4PVfJC0X1Nz3wtS4; Mon, 6 Mar 2023 13:17:31 +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 4PVfJC04CNz3M8V; Mon, 6 Mar 2023 13:17:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678108651; 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=fFiDdEnSuhwnXHr1bMzgIDKEswcGFVEui1FyuCEvp7M=; b=n0JZx37vKTwq2BZgop2j+XUtk0jHO5hKGPJbSUfPzRo3E6A7DbD2FuWxe57kaG8a7oLUQ3 EBes3/6FQiTNNe55seYVxtglxSyQ7VYTNy4R7lmyh1/zj87Uthe5uFoU+ErBczpgopsXp1 0+pBcaEnlw0V6yye7y36uSOZQVa7RbQkezCE2YHBxr8DZI4/VS2zRBTc/340w3P6hJg2My K2qFl1QOXwma17ngw8JlCE+tRRG/52iZuTM2Qi1v5Sy0A/ssSWxIisyF+u2y4gyBM19tU8 g0U+DID44KBm1EoEqngYyPdo6kvmf+UBIZXy4SlLBf/Hdg3h4oFk9dSi9VtHnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678108651; 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=fFiDdEnSuhwnXHr1bMzgIDKEswcGFVEui1FyuCEvp7M=; b=bE32tLb09CdJ5CBdsiQJ5FBmpUeEpU0CErU7uM+FKb2Do/gL/ivmwwxsJ9hV4mAeGfNdOp m9HWewmrUB9tFcaIEswNPIhD6yw3uPbsrJMotV7K36bybJONoB4jx8v8HvwrIpvTWUyPfX 6wko9W1942AA4/R10HaVBji2L/l5DEoH1fqKQKvhC3rdzmOxHRMSKoURAE0eMiZJqAoHW5 Xw1KsKFCgWdRWfmqmu05LH8pVcEC2pshpXiDR9d5j9drl4VPWM4gvC+atD4IGSDuSyyUT6 cSZcyYfDIN6362MjN85pPA06KY+u348DMEnZRqOWGsmvnx+AXErm1I0RV5FpVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678108651; a=rsa-sha256; cv=none; b=R0id0ABTVz2EovuteFN0Rk/YXpMr3mIcNguX2Eq02FCUL5EAclcAACJ1MZ5yXxmaPdvG/S KwatrZQpLO0qo7g2rI8BGOuPoSjXXH/bTTvW12NrrB6+EeO0W0cAUFxLXEoVn2mGzEZCal 8yp+rIGFMlcVol53yGytGfV9+cZhtIeRf1BMHl9twW5ekJRT48VWz33LrRXmb5waxepk01 enfEjBaQ9JINX4Wc1nDAT0iLc7HL2l4tSgXNHep021g8fFszBpq1BAIMGziaphh4swdJ06 xxUJBu8hboIvAsU9d2TVtuptjnZrqwK/8N+0GYAnihqO9DV4DDGx4q5V3Dt6NQ== 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 4PVfJB6Dclz13L7; Mon, 6 Mar 2023 13:17:30 +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 326DHULt095918; Mon, 6 Mar 2023 13:17:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326DHUiq095917; Mon, 6 Mar 2023 13:17:30 GMT (envelope-from git) Date: Mon, 6 Mar 2023 13:17:30 GMT Message-Id: <202303061317.326DHUiq095917@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: f4a869a6424a - main - emulators/virtualbox-ose-kmod: 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: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f4a869a6424aa8bc32d50642762d9f294c7ce3da Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=f4a869a6424aa8bc32d50642762d9f294c7ce3da commit f4a869a6424aa8bc32d50642762d9f294c7ce3da Author: Joseph Mingrone AuthorDate: 2023-03-04 04:31:00 +0000 Commit: Joseph Mingrone CommitDate: 2023-03-06 13:15:34 +0000 emulators/virtualbox-ose-kmod: Fix build with LLVM 15 Starting with clang 15, the -Wint-conversion warning diagnostic for implicit int <-> pointer conversions defaults to an error. Use a cast to fix such an error here. See also: https://lists.freebsd.org/archives/freebsd-emulation/2023-February/000431.html https://lists.freebsd.org/archives/freebsd-emulation/2023-February/000460.html PR: 269721 Reported by: fbl@aoek.com, ohartmann@walstatt.org, rkoberman@gmail.com Differential Revision: https://reviews.freebsd.org/D38906 Sponsored by: The FreeBSD Foundation --- ...ch-src_VBox_HostDrivers_Support_freebsd_SUPDrv-freebsd.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 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 2e2c292d7ee8..b7e262dd4ba2 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 @@ -1,5 +1,5 @@ ---- src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c.orig 2021-10-18 10:58:03.000000000 -0700 -+++ src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c 2021-11-19 15:31:33.152269000 -0800 +--- src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c.orig 2022-07-19 20:58:42 UTC ++++ src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c @@ -44,8 +44,10 @@ #include #include @@ -26,7 +26,7 @@ #ifdef VBOX_WITH_HARDENING # define VBOXDRV_PERM 0600 #else -@@ -76,7 +85,9 @@ static d_open_t VBoxDrvFreeBSDOpenUsr; +@@ -76,7 +85,9 @@ static d_ioctl_t VBoxDrvFreeBSDIOCtl; static d_open_t VBoxDrvFreeBSDOpenSys; static void vboxdrvFreeBSDDtr(void *pvData); static d_ioctl_t VBoxDrvFreeBSDIOCtl; @@ -112,7 +112,7 @@ pvUser = *(void **)pvData; - int rc = copyin(pvUser, &Hdr, sizeof(Hdr)); - if (RT_UNLIKELY(rc)) -+ if (RT_FAILURE(RTR0MemUserCopyFrom(&Hdr, pvUser, sizeof(Hdr)))) ++ if (RT_FAILURE(RTR0MemUserCopyFrom(&Hdr, (uintptr_t)pvUser, sizeof(Hdr)))) { - OSDBGPRINT(("VBoxDrvFreeBSDIOCtlSlow: copyin(%p,Hdr,) -> %#x; ulCmd=%#lx\n", pvUser, rc, ulCmd)); - return rc; @@ -151,7 +151,7 @@ Log(("VBoxDrvFreeBSDIOCtlSlow: returns %d / %d ulCmd=%lx\n", 0, pHdr->rc, ulCmd)); -@@ -540,8 +595,7 @@ bool VBOXCALL supdrvOSGetForcedAsyncTscMode(PSUPDRVDE +@@ -540,8 +595,7 @@ bool VBOXCALL supdrvOSAreCpusOfflinedOnSuspend(void) bool VBOXCALL supdrvOSAreCpusOfflinedOnSuspend(void) { @@ -161,7 +161,7 @@ } -@@ -624,19 +678,43 @@ int VBOXCALL supdrvOSMsrProberModify(RTCPUID idCpu, +@@ -624,20 +678,44 @@ int VBOXCALL supdrvOSMsrProberModify(RTCPUID idCpu, #endif /* SUPDRV_WITH_MSR_PROBER */ @@ -206,3 +206,4 @@ + return fFlags; } +