From nobody Sun Jun 19 18:35:20 2022 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 80A0D863800; Sun, 19 Jun 2022 18:35:20 +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 4LR1fw3ChHz3pLF; Sun, 19 Jun 2022 18:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655663720; 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=PSoacmaW5mgKuXy38YvEGj7ZJet0SqQZ1ooX2ckzMDA=; b=RVyStoV8lyskwZWqtXhO+htgTCccdBwxVYI/xfd4Wt+vfQg4HOwQB5nx5xm79g9/38lhe8 ttChOo5FT0dbNB9/4DE617ZrLjExSau6Z4lj2oJaPo9dJ91E3FbnfINcp5s8ZSkBakXmRp +wSEqJYT22kWwT12rCFyoyJwoxNPneknCDX3XOgKr2wWzlxJiWW1YrXdkLedkdJv3FBB0I /1vS/q6wUJ1nybAA4CAppwohzUmDuiPBKTb+nRzogNR2ud1cdKIpniAD+xAm0YCwmcRoNs xeHveWnIgnfUvANM9FEdlK0WKvARVlARTRFZnvcy0mZgY65WhvicUPpJ5iYLeA== 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 4E42C5F35; Sun, 19 Jun 2022 18:35:20 +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 25JIZKwM029588; Sun, 19 Jun 2022 18:35:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25JIZKH5029587; Sun, 19 Jun 2022 18:35:20 GMT (envelope-from git) Date: Sun, 19 Jun 2022 18:35:20 GMT Message-Id: <202206191835.25JIZKH5029587@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Toomas Soome Subject: git: e368fb6eb6eb - main - userboot is missing vdisk_dev 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tsoome X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e368fb6eb6eb3041fa9f4c608377ddf90d33f11e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655663720; 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=PSoacmaW5mgKuXy38YvEGj7ZJet0SqQZ1ooX2ckzMDA=; b=DFtAPdhRIsmjBlR5MKSb46qj99DebPZe5D7uU/m2wve5I1etqnZDVC8W7AXFq2xjOUCnKL 89InhF0V9/1sn5IVci+lrt7/45OkkjuPHl+OpfDE1qNHTFMRbzqwxBz1vPuJgLW9G18szr WUbFqXeK3g7NpP6MuBlOsh2ISBmCVkEEq9s6lx09EtE3Dvtni83RJZ8W3Eq7EJJQMsnmr2 4r1auW7S3ZmSk7S+qCsggMWiT+sc/NgO0eT8+92NgfdCILFT0ZN0p2fj5T9J3H4M4Qg2xN B5UhmXWeb09sbB5I40iebvLB81pmU8jAkYfc2FMQMsk38VANedJ0rPKX/129qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655663720; a=rsa-sha256; cv=none; b=WcHeCpWrVr4veJMJ88nQwH6y//rqs3+gwJOBOk5VXWI+480u1DRqjBUbYsj2016XopkRlX 7wI5O/5HCJ0jW8lDQXZKfLtq05rzA0cKUlscbg9HoNsI27I7sd8/kAq9fh4Jow5uTIOrwU JUC0To9a8429oSfJCAfHjEMt0PVvRAafjx4UET47W9xhXdUFtvQUZhM4RWi3iN3Zjgyhud fHpGyA/bbm1TWwJYF7Xho2rm5PebnU1DAtZSwaRqw0UtQH87aFqkQmrlWqXPnBxsNpaYH4 d7faHmMvDCHOGPRL5nM5++XhOIugNUuhT6tRdcJF5M0F/f9Ko1qRWJJw1ZJZBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tsoome: URL: https://cgit.FreeBSD.org/src/commit/?id=e368fb6eb6eb3041fa9f4c608377ddf90d33f11e commit e368fb6eb6eb3041fa9f4c608377ddf90d33f11e Author: Toomas Soome AuthorDate: 2022-06-09 06:56:19 +0000 Commit: Toomas Soome CommitDate: 2022-06-19 18:29:49 +0000 userboot is missing vdisk_dev Add vdisk device support in userboot configuration. MFC after: 1 week --- stand/userboot/userboot/conf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/stand/userboot/userboot/conf.c b/stand/userboot/userboot/conf.c index 3762be5332ec..066c2aa87492 100644 --- a/stand/userboot/userboot/conf.c +++ b/stand/userboot/userboot/conf.c @@ -42,6 +42,8 @@ __FBSDID("$FreeBSD$"); #include "libzfs.h" #endif +extern struct devsw vdisk_dev; + /* * We could use linker sets for some or all of these, but * then we would have to control what ended up linked into @@ -55,6 +57,7 @@ __FBSDID("$FreeBSD$"); struct devsw *devsw[] = { &host_dev, &userboot_disk, + &vdisk_dev, #if defined(USERBOOT_ZFS_SUPPORT) &zfs_dev, #endif