From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from atuin.qyliss.net (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 8DF7A19ECA; Fri, 06 Sep 2024 09:34:49 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id EA68C19EC2; Fri, 06 Sep 2024 09:34:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on atuin.qyliss.net X-Spam-Level: **** X-Spam-Status: No, score=4.8 required=5.0 tests=DMARC_NONE,KHOP_HELO_FCRDNS, RCVD_IN_SBL_CSS,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=4.0.1 Received: from CWXP265CU009.outbound.protection.outlook.com (mail-ukwestazlp170110003.outbound.protection.outlook.com [IPv6:2a01:111:f403:c206::3]) by atuin.qyliss.net (Postfix) with ESMTPS id 0933819EC1 for ; Fri, 06 Sep 2024 09:34:44 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XdVOTsLoGg0CE+2aOIu3+jukIewEW2doxMDVnAgbuqjxJRlwxViAPQ0epI7RamGTCKD/0V3+4ikydTGP078H8lEA2QhvqyCCNkITO1t+JyLgMu1mpSy3Vjqy73MjfzYkebW8SJiQPqKX1CG7dXM26SmDVRq5veBFdy7NbkDYPkQLBWjxnFnNwfyLWxhYNZHFflQHcVuZtsinJxit/nFSBgD/jKrj+Op3T4QRFEpl5F0i1GWZOXU9zG4hoP87+nwri++d4XNHo676llv+mn6Doi1AWpe/lmHa86z1Uq9cpg51zPyfUCzepFi4kznQBzYZ8rcEKX5SSB6A6QLuoYBWVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tebjXhurhDb3XAwiWnClh/0A3XSwx3uC1kJWAzKy8R8=; b=EB+sGbjRHs1Y5mZVbwmmYz5JX+LQJcDsiHC/WX/bOo8YkZPwb0MlwGBOdBD63PEeklorB9Mazz1x3pNt1z4EYojvXaiOo7GrfdHU5eNVWoYSegV9pFbBIamE1+KlYnnRLj3ahTAdiQ0AX+TUOgVUHlIGcwen87GfKpkdA2TaArbA63ppblj+Zs9QTBVB0v6jKtSzd06yRTjDSj8qpZqsdwqvJy9Y0b/exOqHbzo6x29pNbDCc5N0WVQiqZ327/JP1SElqtA0kqsHPxpIgbbg+g4r/WQO+O9drXIEdLo2mZEFlM6PTbBdyuzu+bNLPTCn37/4Mu73XJNkotDw46xcqQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 62.210.214.198) smtp.rcpttodomain=spectrum-os.org smtp.mailfrom=shymega.org.uk; dmarc=pass (p=none sp=none pct=100) action=none header.from=shymega.org.uk; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shymega.org.uk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tebjXhurhDb3XAwiWnClh/0A3XSwx3uC1kJWAzKy8R8=; b=LlGZVZSPLeyHcm8P1pW1QL3Ki5LuJ3BqQliCmQjWbTpfeAZ84gIoSMirFIpwhRtsCvBgwI5ZjELxWmH0fvDpKYFeRdRVM9Y8Obm8RYNWmoHDW2YPi8tKM/QiTKdVDtz65q+tCeAMVZiLZSWktMcIMuXcgc1/lG3cM5z0MRJWzHZlObP/gQCl9NzquPMQiTjkEqv2oLQ+6oPhLDgtSVpKjRazInsGX1bdq3QJT4AQKjPykxLLllRpBGaQk1vt/7UgHTJFsqi33e0J0yla7fu954JmP5ornWlL16y2cVCNZ3qJneZxsncwUj49o7D+E2saqxqLb2vrTeqA0S/tl99Hjg== Received: from FR3P281CA0203.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a5::11) by LO2P265MB3532.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:1b0::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7939.17; Fri, 6 Sep 2024 09:34:40 +0000 Received: from CW2PEPF000056BD.GBRP265.PROD.OUTLOOK.COM (2603:10a6:d10:a5:cafe::64) by FR3P281CA0203.outlook.office365.com (2603:10a6:d10:a5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7939.18 via Frontend Transport; Fri, 6 Sep 2024 09:34:39 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 62.210.214.198) smtp.mailfrom=shymega.org.uk; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=shymega.org.uk; Received-SPF: Pass (protection.outlook.com: domain of shymega.org.uk designates 62.210.214.198 as permitted sender) receiver=protection.outlook.com; client-ip=62.210.214.198; helo=oracle.rodriguez.org.uk; pr=C Received: from oracle.rodriguez.org.uk (62.210.214.198) by CW2PEPF000056BD.mail.protection.outlook.com (10.167.240.20) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.7918.13 via Frontend Transport; Fri, 6 Sep 2024 09:34:39 +0000 Received: from MORPHEUS-LINUX.localdomain (92.40.168.209.threembb.co.uk [92.40.168.209]) by oracle.rodriguez.org.uk (Postfix) with ESMTPSA id D9475ACA0045 for ; Fri, 6 Sep 2024 09:34:38 +0000 (UTC) Received: from MORPHEUS-LINUX.fritz.box (localhost [IPv6:::1]) by MORPHEUS-LINUX.localdomain (Postfix) with ESMTP id 480D526021C for ; Fri, 06 Sep 2024 10:34:30 +0100 (BST) From: Dom Rodriguez To: devel@spectrum-os.org Subject: [PATCH] crosvm: Rename `--vhost-user-{fs,gpu}` args Date: Fri, 6 Sep 2024 10:34:30 +0100 Message-ID: <20240906093430.1168464-1-shymega@shymega.org.uk> X-Mailer: git-send-email 2.44.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CW2PEPF000056BD:EE_|LO2P265MB3532:EE_ Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 4850d2e0-0fd9-479e-b25a-08dcce572120 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?8UBiiY2OVfruNZUH+gTBQhm5g2FGrGXj00Tnf13mthX8XoK7ztqvwhbJM65C?= =?us-ascii?Q?YUG1ccjwJinKq/chp6Riduvp6kkLwZ1cyH6YGCIm/x7tuUhg4xufSe4je5KK?= =?us-ascii?Q?x9QDJwfg9Bn3dTLNnH2OIGMm1xIrTb70asIJv5Rc50XxvhCtfy+wBskiUVPZ?= =?us-ascii?Q?Cd+DC3E+wJzp9FIkTorrMXgTfIn+uRhxWXgy+aGr+Bkyqdi+zxOdfbOZRWY4?= =?us-ascii?Q?ljVBhWFtQkpLDt6tpffsXHfmpnnrKg+qwKmHizeu71prcawNdinizzQHOoQq?= =?us-ascii?Q?/bPt2uD6eSV9QzzpOcrBdV6BwFOrNO3WCiakPVF7ZgWam95ePhNFITx4YVC8?= =?us-ascii?Q?+1u6MClofx/A2GBmDJQLI5HICAEgESl0MMnV4ciK64CmbeHp6ZW5ClkDT4oQ?= =?us-ascii?Q?ke1J/1PfKiAwiRrb6K7y5M7qfVxU/v5WxcN2OlwdKfLBC9g5C1HLuYAla4Rm?= =?us-ascii?Q?VIZSl1XQFr0sRj5KLYPw8nGHqWEtajOfazozZZyLA5jZ35QL6C1vZiS+YlPd?= =?us-ascii?Q?Lp29TOAySzY6BYMlCVxunPhk3p/N17/Jh/n3T8+dyoW0VzafTaOAmfhIsX6p?= =?us-ascii?Q?YcUzDunV5PEnoIWCdNRBtRrCfFUb4lY0Kz2KLM37Z9j87nqVIdHp7Nb6R0+o?= =?us-ascii?Q?VcvNBfvKnHqKDuFc240xJLXgqBdxFqFC/b8Dj+sZCDd/x/00Z3kOae+OhjuO?= =?us-ascii?Q?802U4Mm6QhErRMMdT4RRPe/+UDSs55zA6mXOXWjarKIZFJcwqAD3NobwIAxx?= =?us-ascii?Q?TUm1wUJplTIt1Br6r3gBFzfgov/CViT+uNyzZM2UyuPlARtDVgVPaCv3kgFp?= =?us-ascii?Q?T9fuCA35AM+bsHcrqY5yRiHZC/Qao1RqmITRdRLBUlYWebUdbwDx4XxdwUX/?= =?us-ascii?Q?iZHJWrvhu1n0P9UCEzV44/Bs34tg2VeCG/ZxAxPwIxUOAwrfRnV55c9iA4xC?= =?us-ascii?Q?PxdymtUfmET+xfOzn5Johk2hYlda6hzNOyKkPfgN5+OvLJcgWExsKhvbQ3We?= =?us-ascii?Q?pXmJi/BtKXGpTdZL3fszjOSnvZVgk4g0tI0/rpP6IjRYyCli9SSUcHJO6glm?= =?us-ascii?Q?+Vg7p5teRDcvhq8NPOFHy12xayDw/bbD499dlHT+2Gvob4f6nGDEOBNEejHU?= =?us-ascii?Q?9UJxn9wGLkwnH+O1r63C4pS582KZvj/U2NkSQONrFzyOAdFZkqKDIl/odPJa?= =?us-ascii?Q?WcLOZpdv5Ut14HePsf0UF3GQt8m7ncCU9z53QgaEq/02zuGo7Qb/rjwA6sT2?= =?us-ascii?Q?njzNQLlwTcEovm6e2c7oGoIdT0Kp12PT15ibiSnL4gOj3gEjBbTDjiVCE4KY?= =?us-ascii?Q?b6UIj19zzHA1DbvRp9y/BIHAVtzP15NpnhKjlOyyiIex66dZ6oIY6s9iPKO7?= =?us-ascii?Q?MYPFU4dfPSFvDrkj5sucJCYX/QIPHCFYCSIv4AK37aTPbIWsuk3YAxNNPQUq?= =?us-ascii?Q?KPB9uQeDwBfTZyploxcgHvwroxKGi3yO?= X-Forefront-Antispam-Report: CIP:62.210.214.198;CTRY:FR;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:oracle.rodriguez.org.uk;PTR:oracle.rodriguez.org.uk;CAT:NONE;SFS:(13230040)(376014)(82310400026)(36860700013)(1800799024);DIR:OUT;SFP:1102; X-OriginatorOrg: shymega.org.uk X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2024 09:34:39.2410 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4850d2e0-0fd9-479e-b25a-08dcce572120 X-MS-Exchange-CrossTenant-Id: 7e15dc52-0465-4028-b82a-3c894bbc5ba6 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=7e15dc52-0465-4028-b82a-3c894bbc5ba6;Ip=[62.210.214.198];Helo=[oracle.rodriguez.org.uk] X-MS-Exchange-CrossTenant-AuthSource: CW2PEPF000056BD.GBRP265.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LO2P265MB3532 Message-ID-Hash: J3IMEX4ZPYUDY6FRRTEVFYB7CXIP44L4 X-Message-ID-Hash: J3IMEX4ZPYUDY6FRRTEVFYB7CXIP44L4 X-MailFrom: shymega@shymega.org.uk X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-devel.spectrum-os.org-0; header-match-devel.spectrum-os.org-1; header-match-devel.spectrum-os.org-2; header-match-devel.spectrum-os.org-3; header-match-devel.spectrum-os.org-4; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.9 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: crosvm was producing warnings when using `--vhost-user-gpu` and `--vhost-user-fs`. In this commit, I have adjusted the `crosvm` invocations to look something like `--vhost-user $DEVICE`, where `$DEVICE` is, in this case, `gpu` or `fs`. I have run unit tests, but would appreciate testing. Signed-off-by: Dom Rodriguez --- img/app/Makefile | 4 ++-- release/checks/wayland/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/img/app/Makefile b/img/app/Makefile index 3adf8c4..fd8befe 100644 --- a/img/app/Makefile +++ b/img/app/Makefile @@ -152,8 +152,8 @@ run-crosvm: $(imgdir)/appvm/blk/root.img start-vhost-user-gpu start-virtiofsd --disk $(RUN_IMG) \ -p "console=ttyS0 root=PARTLABEL=root" \ --net tap-name=tap0 \ - --vhost-user-fs build/virtiofsd.sock:virtiofs0 \ - --vhost-user-gpu build/vhost-user-gpu.sock \ + --vhost-user fs build/virtiofsd.sock:virtiofs0 \ + --vhost-user gpu build/vhost-user-gpu.sock \ --vsock cid=3 \ --serial type=file,hardware=serial,path=build/serial.log \ --serial type=stdout,hardware=virtio-console,stdin=true \ diff --git a/release/checks/wayland/default.nix b/release/checks/wayland/default.nix index d05aa88..774c9b9 100644 --- a/release/checks/wayland/default.nix +++ b/release/checks/wayland/default.nix @@ -29,7 +29,7 @@ nixosTest ({ lib, pkgs, ... }: { systemd.services.crosvm = { after = [ "crosvm-gpu.service" "weston.service" ]; requires = [ "crosvm-gpu.service" "weston.service" ]; - serviceConfig.ExecStart = "${lib.getExe pkgs.crosvm} run -s /run/crosvm --disk ${appvm}/img/appvm/blk/root.img --disk ${run}/blk/run.img -p \"console=ttyS0 root=PARTLABEL=root\" --vhost-user-gpu /run/crosvm-gpu.sock --vsock cid=3 --serial type=stdout,hardware=virtio-console,stdin=true ${appvm}/img/appvm/vmlinux"; + serviceConfig.ExecStart = "${lib.getExe pkgs.crosvm} run -s /run/crosvm --disk ${appvm}/img/appvm/blk/root.img --disk ${run}/blk/run.img -p \"console=ttyS0 root=PARTLABEL=root\" --vhost-user gpu /run/crosvm-gpu.sock --vsock cid=3 --serial type=stdout,hardware=virtio-console,stdin=true ${appvm}/img/appvm/vmlinux"; serviceConfig.ExecStop = "${lib.getExe pkgs.crosvm} stop /run/crosvm"; }; -- 2.44.1