From nobody Tue Oct 18 06:03:16 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 4Ms3FK0xjDz4g7wY; Tue, 18 Oct 2022 06:03:17 +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 4Ms3FJ6BZLz3cHW; Tue, 18 Oct 2022 06:03:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666072996; 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=Y6gM9f+vi6R7zjPPuffWMWiRG/SIao4cf7+OrwQzroA=; b=QNLTqAKtVOFBNVxyckKi9xoER/LN6M3u7UJ6ERBrHrykf/1zxNM5O+qe1wg7wVNh+5BFm/ tZ+To/bQis2kZj3SkciID1CsN9+A4K/OgN/zkwRETwcYs/DuYfzcRXs29z8Hbddiwwj5zv ayo9QrBljbBM/odJg9+rniC2KJuwrL/26+hO7BuAeZxBbsZu+qBH1s12F/Q6py51N0zK79 0wYGwTeC97Diuy8JYmSSiPE5hw9Dx4xE6r14IE8uWf96f+DzqQPpetRa8Am2KcDblV941A UqIDiyiF+IJLR6sBbRXJLHtWyQamzl0NRreAnTEfgh21YCNDIEA0n+IylxL7Xg== 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 4Ms3FJ5JWvz1510; Tue, 18 Oct 2022 06:03:16 +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 29I63Gks097537; Tue, 18 Oct 2022 06:03:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29I63GqE097536; Tue, 18 Oct 2022 06:03:16 GMT (envelope-from git) Date: Tue, 18 Oct 2022 06:03:16 GMT Message-Id: <202210180603.29I63GqE097536@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: c4a4011c744a - main - PVH: support whitespace cmdline splitting 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c4a4011c744a8e75892d126702a825e617d9e064 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666072996; 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=Y6gM9f+vi6R7zjPPuffWMWiRG/SIao4cf7+OrwQzroA=; b=p863MET81M65mLePHEmOoVxV4BI99PLAP0jnfalhD2kChMMLKEbbYX7shVKw7wDATB4HAz PfKXwQdZh61gaWmjDKYTAMfDJyTFm/3SipudKsMoltUUu4en3BTUYVMHvbYTyRVbDey9JB URe6u2ZFSQ01r0VsDUPfYjDlBcJvEXm/9hU7EiXxzobfBJnqRxp+3a28JVvy45a+woiB/Y Uvjrptp92YuA+YMNAMbotzRMG9ngKBKgXAPEplJvgAlHzj9Sane7WOfCjT/4W7sm2a8lKL BN3zH2p78EllaecE0eBn5Szs5zlUk0q2EJQZWcdjmTIpW7zLBbKSpVwOjNZ5LQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666072996; a=rsa-sha256; cv=none; b=HtnPd9IjMfSLNnZq2EvHR2uRfdbdzAdKV+j+W8Qn02sB0K5lKGQFUsF8CsYFSowQjEEK82 oFonTFo2LqhIPHC0bHZecsnk9i2Koz28Nfbknpd0W7N1g4O2OWs4OUXgasVcV3lyVXEtBd 2jkXlsEeIIR0tJ4jH1MWnUx/T2S7/c+BZrUHsVGVtqWFhRui30ApIeFbOL9Uxogc9ur+Vy 9FtKoEAwxE8wx5nkCFNTH1u7QM2pth4y2/GFMpOpQSWIldp7vpk+0E7Hf5EHyp8xzsgVI/ fKX9atffaFj2CsYLclodutvoLZCtdJLkzloJ+9asWK3tFfXdLSgHfF+pZGOuIQ== 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=c4a4011c744a8e75892d126702a825e617d9e064 commit c4a4011c744a8e75892d126702a825e617d9e064 Author: Colin Percival AuthorDate: 2022-08-13 00:56:30 +0000 Commit: Colin Percival CommitDate: 2022-10-18 06:02:22 +0000 PVH: support whitespace cmdline splitting For historical reasons, Xen kernel command lines have options separated by commas. Every other FreeBSD platform uses whitespace; this is also necessary in PVH in order to support the Firecracker VMM. Allow options to be separated by any combination of commas and whitespace. Reviewed by: imp Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D36190 --- 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 b81423a1be88..162504f5120c 100644 --- a/sys/x86/xen/pv.c +++ b/sys/x86/xen/pv.c @@ -419,7 +419,7 @@ xen_pvh_parse_preload_data(uint64_t modulep) if (start_info->cmdline_paddr != 0) boot_parse_cmdline_delim( (char *)(start_info->cmdline_paddr + KERNBASE), - ","); + ", \t\n"); kmdp = NULL; strlcpy(bootmethod, "XEN", sizeof(bootmethod)); }