From nobody Wed Jan 25 15:23:05 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 4P26zZ1fw7z3bjhT; Wed, 25 Jan 2023 15:23:06 +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 4P26zZ188xz4HKl; Wed, 25 Jan 2023 15:23:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674660186; 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=r5cHNjAD+MnT95K3l8rckXCB3/iH7f8MOVWdc8t2sz0=; b=ngfYg94wqwxtyEJusFK6EeLTHdl/iLaoTRIy5LzLakyNGxwCWvsO9ada1Go+C7q9I6OFN+ 1jKBoLVG8MI2j+0uKhlxJEEiuHZE6GjY150V4pRhkq0rFCpeQcrLwILa8JHdCcoKsL2o7w 6L0R0D47VDZxx1gl2j0YeboUm+YcW/uJsock4xvvYRXBVGkGycA4bDs8/uUdofvUbR/ZOg dL0I16MOLGB1UmrOqTHj4FkP6biN+yEXr75gu/9yryKKC274SyafVzTVFNb75H56sgTMdC N2LP3nK6aaSMNjF8bVFCLmioPxLI4LQv3yXN1T59ZpFGcqlT4j2W52BOEf8vhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674660186; 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=r5cHNjAD+MnT95K3l8rckXCB3/iH7f8MOVWdc8t2sz0=; b=cB8Nbhnofx+Fh2HvmjBKNC9+4x4ZE0PY1upKC9n2nJJn4xHKE+33k8wE7kjL1Yzl1pZxlp X5byZc2tz2XLEG5q07ihk2JuMShjHFczuKXRnaifk91hT0eW1fofrtxPLasshSvJFEkx9y Pljixc91hmbkv8fgVnU3tRQyirZ9Bx7eYX5abYw/lzkfwau5OIs2LAYBNAFQgv+fIoHfNU LBgSZf3gqSONy4baR8mwMBQpq8P2JzQmHueoqNuYcKToGGwMpEZroznOQt0ZgIPxR/8FPY by/YTFJq0D/QN0EC6cEd3UUw9dLoOMNmU28125BqdNIXyxzLgOlc+NlyL2P71g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674660186; a=rsa-sha256; cv=none; b=M68dUqGo7hF/iB8S959Ue4imbES9DajtVrZ8ai9MDCnP2+mT+taN+iDieIdzjOsThQEhXO pGrDbJRaSBeMO0jopDzgkV3IXTbx0aGhWO11Hnr+oy4ZbtHFOx0KvKoYGNOWUgWsyk3CK7 OM+REhpSAqzQa5IoPoIiDLdWAY5HDwGo0oAs8SBJfK9XSdjJpeelLkLMZSyWO5Zv2XhdY3 D2MbBataGXTT/M2qWGoqiJxRaX09OqrecEA06Jp44ZEF9n4r9nXfPEjBw227fGrIVShU6/ wgZEiLrzk21+V2/AdjqMKF9s100JYPajOAqN5x1es3PCek8BvR5JKYGRH+1U+A== 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 4P26zZ0ClXztf2; Wed, 25 Jan 2023 15:23:06 +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 30PFN5ii072021; Wed, 25 Jan 2023 15:23:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30PFN5KT072020; Wed, 25 Jan 2023 15:23:05 GMT (envelope-from git) Date: Wed, 25 Jan 2023 15:23:05 GMT Message-Id: <202301251523.30PFN5KT072020@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: d428dcc996b5 - stable/13 - stand/mips64: Make beri loader compile 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d428dcc996b5ec26166bbd90ef0fc6996838c337 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d428dcc996b5ec26166bbd90ef0fc6996838c337 commit d428dcc996b5ec26166bbd90ef0fc6996838c337 Author: Warner Losh AuthorDate: 2023-01-25 15:14:45 +0000 Commit: Warner Losh CommitDate: 2023-01-25 15:21:04 +0000 stand/mips64: Make beri loader compile The devdesc reorgs in main were done after mips was deleted. Make the minimal changes to beri's devicename.c needed after that. I have no ability to test this, however, so it builds with similar warnings to before all my MFC changes. This is a direct commit to stable/13 --- stand/mips/beri/loader/devicename.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/stand/mips/beri/loader/devicename.c b/stand/mips/beri/loader/devicename.c index b1f0afd5bc1f..eb4c14e8a2af 100644 --- a/stand/mips/beri/loader/devicename.c +++ b/stand/mips/beri/loader/devicename.c @@ -85,7 +85,7 @@ static int beri_arch_parsedev(struct disk_devdesc **dev, const char *devspec, const char **path) { - struct disk_devdesc *idev; + struct devdesc *idev; struct devsw *dv; int i, unit, err; char *cp; @@ -113,7 +113,8 @@ beri_arch_parsedev(struct disk_devdesc **dev, const char *devspec, break; case DEVT_DISK: - err = disk_parsedev(idev, np, path); + free(idev); + err = disk_parsedev(&idev, np, path); if (err != 0) goto fail; break; @@ -139,7 +140,7 @@ beri_arch_parsedev(struct disk_devdesc **dev, const char *devspec, goto fail; } - idev->dd.d_unit = unit; + idev->d_unit = unit; if (path != NULL) *path = (*cp == 0) ? cp : cp + 1; break; @@ -148,11 +149,11 @@ beri_arch_parsedev(struct disk_devdesc **dev, const char *devspec, err = EINVAL; goto fail; } - idev->dd.d_dev = dv; + idev->d_dev = dv; if (dev == NULL) { free(idev); } else { - *dev = idev; + *dev = (struct disk_devdesc *)idev; } return(0);