From nobody Tue Oct 18 06:03:17 2022 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 4Ms3FL0xNtz4g84K; Tue, 18 Oct 2022 06:03:18 +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 4Ms3FL07Wqz3cJ2; Tue, 18 Oct 2022 06:03:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666072998; 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=hkyaZjrMmaDoBWUaFKlvEj1SAPGkZw2Z58qG2Ep8310=; b=YjbUMzCOq8xrulcRQP24Xti4k45015mLSmZJ5rB2jJGG+mhmqRrPRvuQjlf8eLKfEDqUx6 4aVdBZ8A7oR9sr4hiv/DHZ6ky339PzDnaVf93/p53M763+RSDvRsXuYDzPpz1n/7pOJ9h7 P8q17O87jeveZIbenMXTqqanKkhvEoqnaMJK0bSllnmQINHi8rhUgAmgMAZEclHRRvckdG UN+EEOlU2lTAzZ47mWDpHYRd4ETaQMs3pzMKZH+QKWiQBdP+Jf1udQBzGuzf+yTblK2yCS V43YXYOaUfXnXNQtS94r/gKLeQgdJF8ytPTC9YWcH42A79dBQUzsZTm6oGRXSQ== 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 4Ms3FK66J6z14yD; Tue, 18 Oct 2022 06:03:17 +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 29I63HL6097567; Tue, 18 Oct 2022 06:03:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29I63HcF097566; Tue, 18 Oct 2022 06:03:17 GMT (envelope-from git) Date: Tue, 18 Oct 2022 06:03:17 GMT Message-Id: <202210180603.29I63HcF097566@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 13f34e211b5c - main - PVH: Set bootmethod to PVH 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 13f34e211b5c8311ea751704a0e7fc26e1b53537 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666072998; 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=hkyaZjrMmaDoBWUaFKlvEj1SAPGkZw2Z58qG2Ep8310=; b=p+128tBo5kvH9Uc0Y2ycLrXGioTyzWIet0q1yrsHlRsIBbeirlktLoVlYll9m6vUhwUb7U rX5s8xc+qVv6WEGnYG3tgRMGr3EMjUAc6aOW5EzsRKvY9n/D2JGf1Si5hNhoHvV2kL5vNM 4tbGmo55OQ4U83gLommxeVVMSz8CIZBmXWIx9bJBjZ0tZSuToatRDRcowwnjl40w5DGPCG F3Lr1mQFa959XLs/17oeQj0mPCMeXPdYtYI1x5ND/BhTxVuHc7zkNRnt0cc1XYv7Ia/eQo HXbtRJ4cTw3/RosDgxNK5z9GCq3qgu13uZpTAMyrSkARzmC8C2hLh8UYPzbVUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666072998; a=rsa-sha256; cv=none; b=udFRMkn9NGevdc3CNrae1+dvnvb2FUUl3gBnA/+ux9PV2bBCPvtviLuBszDAbAgFfnheUx xzxtzY9tK0bTlLmrCrpbLvskopu5lkQWHC1GT0T0yX6EYPfMFxsTyHoWL6uM1GcRaTzXa+ kxlAmufKEWSAMjfMZ1QTB/XcXldbSgy4vGQ7yx1u1n58TJqAhevE0qvc9G1JaBaz4aL1Wq Q3hsun5NjBkYHeI3iBYVXZecCaElsO9afsuuPaDO1w6tb9GUf2a2zO+bENMFq+Jqxd30O+ taVEvO8fHnEhwBgMh4eH0I5I/B5Ex23X8N+cICgW+eT0m1rOdNr+LKHA6yqESQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=13f34e211b5c8311ea751704a0e7fc26e1b53537 commit 13f34e211b5c8311ea751704a0e7fc26e1b53537 Author: Colin Percival AuthorDate: 2022-08-13 00:57:19 +0000 Commit: Colin Percival CommitDate: 2022-10-18 06:02:22 +0000 PVH: Set bootmethod to PVH Now that we can PVH boot on a non-Xen hypervisor, we shouldn't set machdep.bootmethod to "XEN". Instead, set it to "PVH"; there are other ways to discern the hypervisor. Reviewed by: royger Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D36191 --- sys/x86/xen/pv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c index 162504f5120c..28794db98700 100644 --- a/sys/x86/xen/pv.c +++ b/sys/x86/xen/pv.c @@ -421,7 +421,7 @@ xen_pvh_parse_preload_data(uint64_t modulep) (char *)(start_info->cmdline_paddr + KERNBASE), ", \t\n"); kmdp = NULL; - strlcpy(bootmethod, "XEN", sizeof(bootmethod)); + strlcpy(bootmethod, "PVH", sizeof(bootmethod)); } boothowto |= boot_env_to_howto();