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 4EFCBE43F; Sat, 07 Sep 2024 08:02:15 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 993) id 5E4ACE3D1; Sat, 07 Sep 2024 08:02:10 +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=2.3 required=5.0 tests=DMARC_NONE,FORGED_SPF_HELO, KHOP_HELO_FCRDNS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 Received: from LO2P265CU024.outbound.protection.outlook.com (mail-uksouthazlp170110003.outbound.protection.outlook.com [IPv6:2a01:111:f403:c205::3]) by atuin.qyliss.net (Postfix) with ESMTPS id 08BD2E3C9 for ; Sat, 07 Sep 2024 08:02:08 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RvCA9TOQJgYSv5bkZXag6f27/01coq18xjFq0FlKl1SurzAVVmR/V2RyQwNhsFCvmEtzbxQOu1IcryRyQMTnuHDeAr0HXXI9cXIFKJWIp3jjFbYvEs5aVj2ENsGFX5bUSkNfc5+gmrqxNMd+RhrtZyBSec/72YCTXle8H5pXsopruyRhA//vs8NY4I8MNsmFhxteXRSOJC/40eDQoa6iPZKka9vrbZDt2L3zRSAd0vQ3thKoaC3PEOLXFB4kUrQHvw89+qOR6iVV8pA8aweGM2BpC8DtYQdl0aiQghc+WjbkxFv1UMcL8pXAI8JBE7yqb/LrcYVQNj/mj1LngmwMVg== 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=h+X7sfoq/h8+tB6pZqSEUE61x83LcKXRhiBOIWdJM+A=; b=hcPF0mxFOOVvb6rpEiiShJy9eA37VeCBZr5/0DMr4Q/bzTUVT2Gdvkq9Dn7ZG4jskz6vZf/NbcuwWjP6QasfQphZe+iMz9jY90GoJBhjL8DfUAdhY7ehiQHHiyM/pEwTR4CwMkTt4SmX/Ew7xcuMA/tqY5kYwgFpCVcXXWbcfWIke0GNq9Kj0cG0BE58k4tARpAuMyRb1sPhUdyke9bWe+N6MgVEXJIrrNCxKvDNyqkTp148Xr7NgUF9srmPyylBI/AAPVDRbZS5HlC4p8fB/5sqVRQrgq4Zl7vmG2eBrDJSwaFlwkTc4A+VeAxOrF5wqKYkXTw30EmL5BOWRvg0PA== 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=h+X7sfoq/h8+tB6pZqSEUE61x83LcKXRhiBOIWdJM+A=; b=LIrOGJVC/rmRtmrZrLgL8x5mW3YccX0iW/qFrweqqNvqm6dnKKctWYBl49230UmwA8612LeGy+YiReyc54eHEUFviM+eVMWUoJBEWTTprBzf4OSkzGU693v2r4dh+cCAcmQHY/uw/S/iaO5BdS4kXN2KBu4cw7sUmJVOm4ToLfc+943oavmFaqXCE1WAGRo1gSxyokknVxtR/tNtor2au/pnZYZ91yxhcsDnBC8QM4fCDlEbCT0HOCTuEc0EUDclMlqSLqWT0TFgG00AYubbTxEjUnCUZuKhaDh+oHHrQ3Xe9j6sfla141+2EB9AddyW8SSLzKaqIEvk3loA4Q46iQ== Received: from LO4P123CA0139.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:193::18) by LO7P265MB7571.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:412::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7939.20; Sat, 7 Sep 2024 08:02:05 +0000 Received: from LO1PEPF000022FD.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:193:cafe::8a) by LO4P123CA0139.outlook.office365.com (2603:10a6:600:193::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7939.20 via Frontend Transport; Sat, 7 Sep 2024 08:02:05 +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 LO1PEPF000022FD.mail.protection.outlook.com (10.167.240.21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.7918.13 via Frontend Transport; Sat, 7 Sep 2024 08:02:04 +0000 Received: from MORPHEUS-LINUX.localdomain (unknown [217.155.6.253]) by oracle.rodriguez.org.uk (Postfix) with ESMTPSA id 40477ACA0047 for ; Sat, 7 Sep 2024 08:02:04 +0000 (UTC) Received: from MORPHEUS-LINUX.fritz.box (localhost [IPv6:::1]) by MORPHEUS-LINUX.localdomain (Postfix) with ESMTP id CA85D322B98 for ; Fri, 06 Sep 2024 23:43:29 +0100 (BST) From: Dom Rodriguez To: devel@spectrum-os.org Subject: [PATCH v2] crosvm: Rename `--vhost-user-{fs,gpu}` args Date: Fri, 6 Sep 2024 23:42:32 +0100 Message-ID: <20240906224329.2336996-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: LO1PEPF000022FD:EE_|LO7P265MB7571:EE_ Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 2858c3bc-8bcc-4a71-99b8-08dccf135ccd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|36860700013|34020700016|82310400026|36200700002; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?2dl/F7IX3FnyAU7wgE40CFSZV1H3lhhB78yXnJD5OQEEGMan11BaoygVHGCx?= =?us-ascii?Q?6MCB8DcDv+6BRcTZ4wIjXqQaoTZk7A5kVHRwotbRCS4hatg36MVbPF6EO38p?= =?us-ascii?Q?gLl2zSo/jlW+GFmhJcDzEq06o7WAxhX7p9vuCil4l7DqQi7/7JmRypLOQeOv?= =?us-ascii?Q?H2An7JIz+uddSn5AbHPU5rdo8xpBKJ3WPeKOEAXV7DmD89lSODUB1oJXjzTI?= =?us-ascii?Q?TmxUOUsv/YNJBPtYYy1ucNHXsjtwtYPlES/xKnIaAfNkEwQGgopE/UhWU3zp?= =?us-ascii?Q?2XbB5VNB/5nMDPTe7YtKsWs+1PgY7BKOmZdj3IbrO9o23gfDyFkA+qh7jhup?= =?us-ascii?Q?++697hmbt4PNIOsjdECNxzqzPor2kbwGvRiCJTsAWHvnJX+q+hTLQUA+VM8J?= =?us-ascii?Q?/S0Q0jqKq/vH81upbCUuVdLq/gqIO4DcxSUW6OftNVKx+zJcVpnkSVcIfJko?= =?us-ascii?Q?+3uO2AI7n8B226IZqKx3zh+UPJSLJN8r5ysAlUnx5OiireGDuQj3r1FPJm/O?= =?us-ascii?Q?RSZ4UT7WJgxLcC2vGQAzJIIkCcdFblnX6RLV+Vcp1NOnDcHxxF8Cl43JRHa+?= =?us-ascii?Q?vhxZDxr8EtgG9klAxfric2TXo2uzPTFaa9pcEv0s83sP0AWyIip5LRJ7XTWp?= =?us-ascii?Q?pKf1r/UygPC02Q6oymw+3oTfPdEVq7eQZekHmSq953L1uARV6+yvNuQWuvmY?= =?us-ascii?Q?7KlGly2S+puFfZU4AsAVj1KwLGiNC/AHVLLF0JA100o0b0T3QI2jIiCiUcHy?= =?us-ascii?Q?OJyXvjRlZ+fyk4X4/DhKBrGxT6nBAodl9o9mQfdQStXjA5jMjRY37rfWry8R?= =?us-ascii?Q?JRxB0pYtpL7J83n86fw+pOOK4l3HrvE1IATJ0bE6U+JMpo2/1TBki1+xdy2j?= =?us-ascii?Q?XrY0kGLuaOeioZNZ7vrb6jRaXWDbUPnducjFrEutKLd2J9IpkMIxQi1zkcMv?= =?us-ascii?Q?yp2yjwd+wc0OeFI5QRHD67hWzgGPcd+bkzSuPX9J5Q62Ip9C63FgPnyiylAc?= =?us-ascii?Q?DCTWxqL/puMgjtHsc179ZFUdN0/y4hNtcRegCuTQzXsvhw8tkDfNzMs5b1Ms?= =?us-ascii?Q?uw30wrOYGDSK0jIpCNECcJrKwsIByNp4Mr81lyEK7cN0W86unLxmTOSVDPZN?= =?us-ascii?Q?nNJdaxmdC9n1VpZ60a7AsrScgDNeAvJlKuahqiuIQzzim4Bh2PW0aQZu6lsE?= =?us-ascii?Q?XpJLxoe+4zKwpski7TCOEaaBTGDTWGG7/pu6Cx78RHU7Moh4IwLUBqB/YBfE?= =?us-ascii?Q?nNUQnJDnDmi7bjlDQX9NbvtbkhZaALGZ6R9UmwOuhel3XVF2W8NtLsHHx25Y?= =?us-ascii?Q?/hWkuZ2yMJFpBy/5SmLGmshrbwu5cPLJVog32hTfpGHHZEWB/eTZRb2QPRqP?= =?us-ascii?Q?Zvkx9p6v7DqqUfQaqf38Bt5IlWiqFPwlSW+gyXywcjZZSaSlGd3IRwamdUNj?= =?us-ascii?Q?fTa7tdGejqaFMMz1VTu/lynqL0H6OLiqz4TCPSLrs23+tDYdf28XOQ=3D=3D?= 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)(1800799024)(376014)(36860700013)(34020700016)(82310400026)(36200700002);DIR:OUT;SFP:1102; X-OriginatorOrg: shymega.org.uk X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2024 08:02:04.7292 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2858c3bc-8bcc-4a71-99b8-08dccf135ccd 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: LO1PEPF000022FD.GBRP265.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LO7P265MB7571 Message-ID-Hash: K4HATNRTGOZ5RFBUIDLTXXYEZAQYVPO3 X-Message-ID-Hash: K4HATNRTGOZ5RFBUIDLTXXYEZAQYVPO3 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,socket=$PATH`, where `$DEVICE` is, in this case, `gpu` or `fs`, and `$PATH` is the path to the Unix socket. 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..11ef6e1 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,socket=build/virtiofsd.sock:virtiofs0 \ + --vhost-user gpu,socket=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..a36dbab 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,socket=/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