From nobody Tue Jan 9 16:45:24 2024 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 4T8cHS3b06z55qnm; Tue, 9 Jan 2024 16:45: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 4T8cHS32Rpz4C6n; Tue, 9 Jan 2024 16:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704818724; 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=CVE2rVSiAjq2+PSEwhLk44+01Y3RtBh9rbGIRR08qwA=; b=AVCoeqCWm5YJ+m7E/k+fAPaEwU1ERicTsHfeRlXveivvXfyRjuh14QuKmv/flQZsyKo9IH kB42Bm83Tshzjg4oYLP2MwRlIraDnstuMVJ/ViRSYPDPgb4vx61FrcQ9dJ8cZNPCiiqIya q83HzaQ4pAkz4FvgNnyC51J3AKJcFr7rHJnu5TEC1fCCtGA5O5Oa1big7D2HMBctM3aWFf oBrwNYQoi/BLilfOFDn9/PhMDvBuqz84Y2O/xEO6Qqk2ZToHpFo1fR5NJ/DvalgWga4sp/ b1FdafdJxhOKK9kuxm/1JEHaWd46vEFcyG8/hYE1A+02IygICT4fPECHj5yPww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704818724; 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=CVE2rVSiAjq2+PSEwhLk44+01Y3RtBh9rbGIRR08qwA=; b=Aar9b1W0kKrRLWZ0Ep3h5FobXBtf52k6wq3DloM+/eqAlyMsdLQLHbabaSlf8/uVd8IdVT ZC/R2n513zTn1vMSBMF95gc/Nv26jxEwAwMfAS03DeQNg42YA4uetpN6hVeou914VcO6V7 g7y8SRGt7Jnidh8yO+ZTCCrSao9zxN5ZdwXzEVoUsh6AAaMUG5FYv5IBAL5z3VK50cTseI sDSX7jWV7LUPhYDyU5EfuUWhA6UlDbf4D+mHU1FDP3aG7o9OYKg1jXoIe3/wlUn4+oyDkA rKcGKN0iRdc6J0nWpTrIat7g960ygzY+xtMEG/zUUYzQJDOgY6EBPtJt+NB+XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704818724; a=rsa-sha256; cv=none; b=ATVJt0Ju9xYPmcdJLgys9pSXPnFd6Ty6jqpsx2x+VntTltbAIPNh8czIjbjvoCtzld+vQ5 qgnUQ+7K4SOqecboPHRcZD7zQxbiGyBdfNfsMpEfLG554F2+vO4IGi5UaxUqjfCl9qgRCi 4FV9TPadJcZs+OzqXD2P9Dy8rLDLibpem6byzTsMtqyCY3PCRh2D9GMdIhbxv6g2N7sEji eJY4Bs1zgeLGQXliSkFadhjAFuUw2hHbJ/QitsjiPrM6pvEDZnmXx9mD1sO1s6Tzqysz8d IRAl1k2CGdsKQn+59GVc7sOxhKIa89yv3oGCacNNJwpNGSKmQ1M7EG4AQnkp5Q== 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 4T8cHS26N7zym7; Tue, 9 Jan 2024 16:45:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 409GjOEm061324; Tue, 9 Jan 2024 16:45:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 409GjOjJ061321; Tue, 9 Jan 2024 16:45:24 GMT (envelope-from git) Date: Tue, 9 Jan 2024 16:45:24 GMT Message-Id: <202401091645.409GjOjJ061321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 644327466048 - stable/14 - vmrun.sh: allow device name arguments in pci-passthru option 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 644327466048248c848e1f598496692ec741de33 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=644327466048248c848e1f598496692ec741de33 commit 644327466048248c848e1f598496692ec741de33 Author: Christos Margiolis AuthorDate: 2024-01-02 18:20:42 +0000 Commit: Christos Margiolis CommitDate: 2024-01-09 16:45:05 +0000 vmrun.sh: allow device name arguments in pci-passthru option This is more intuitive than having to run `pciconf -l` and figure out the bus/slot/func entry manually. Reviewed by: markj Sponsored by; The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43270 (cherry picked from commit 2ee77056d2d4f9d43bd316ce6dc91bf5e4b0848b) --- share/examples/bhyve/vmrun.sh | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/share/examples/bhyve/vmrun.sh b/share/examples/bhyve/vmrun.sh index d2cc371e472f..323d8e22a041 100755 --- a/share/examples/bhyve/vmrun.sh +++ b/share/examples/bhyve/vmrun.sh @@ -62,7 +62,7 @@ usage() { echo " [-L ]" echo " [-m ]" \ "[-n ]" - echo " [-p ]" + echo " [-p ]" echo " [-P ] [-t ] " echo "" echo " -h: display this help message" @@ -87,8 +87,8 @@ usage() { echo " -m: memory size (default: ${DEFAULT_MEMSIZE})" echo " -n: network adapter emulation type" \ "(default: ${DEFAULT_NIC})" - echo " -p: pass-through a host PCI device at bus/slot/func" \ - "(e.g. 10/0/0)" + echo " -p: pass-through a host PCI device (e.g ppt0 or" \ + "bus/slot/func)" echo " -P: UEFI GOP VNC port (default: ${DEFAULT_VNCPORT})" echo " -t: tap device for virtio-net (default: $DEFAULT_TAPDEV)" echo " -T: Enable tablet device (for UEFI GOP)" @@ -351,10 +351,21 @@ while [ 1 ]; do i=0 while [ $i -lt $pass_total ] ; do - eval "pass=\$pass_dev${i}" - devargs="$devargs -s $nextslot:0,passthru,${pass} " - nextslot=$(($nextslot + 1)) - i=$(($i + 1)) + eval "pass=\$pass_dev${i}" + bsfform="$(echo "${pass}" | grep "^[0-9]\+/[0-9]\+/[0-9]\+$")" + if [ -z "${bsfform}" ]; then + bsf="$(pciconf -l "${pass}" 2>/dev/null)" + if [ $? -ne 0 ]; then + errmsg "${pass} is not a host PCI device" + exit 1 + fi + bsf="$(echo "${bsf}" | awk -F: '{print $2"/"$3"/"$4}')" + else + bsf="${pass}" + fi + devargs="$devargs -s $nextslot:0,passthru,${bsf} " + nextslot=$(($nextslot + 1)) + i=$(($i + 1)) done efiargs=""