From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on atuin.qyliss.net X-Spam-Level: X-Spam-Status: No, score=-4.5 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.4 Received: by atuin.qyliss.net (Postfix, from userid 496) id 539EF6001; Sun, 11 Apr 2021 11:59:21 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by atuin.qyliss.net (Postfix) with ESMTP id 7A59F5C29; Sun, 11 Apr 2021 11:58:22 +0000 (UTC) Received: by atuin.qyliss.net (Postfix, from userid 496) id E70A05B6A; Sun, 11 Apr 2021 11:58:19 +0000 (UTC) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by atuin.qyliss.net (Postfix) with ESMTPS id 73E0F5B2D for ; Sun, 11 Apr 2021 11:57:57 +0000 (UTC) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id DE5115C00D8 for ; Sun, 11 Apr 2021 07:57:56 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sun, 11 Apr 2021 07:57:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alyssa.is; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=YQIF3Go+Ua2iV mV51+I3f4+jRCGMQ6dHbOG8/DaqTcw=; b=CJ10IDNflLP2k5Sv+aFpUWPcvpikw 7fh+S753UqvPomHJMlPgmoou3kadi+owj6ivns6V+1NygG0rBiqUJnyl0m8UeCG8 002pkbyVeme67n0KLEl+TjYJ8TM7WZWPjEKYD5xeyQFYir6+R77D/KCNtb0emf9A lTmHZxyRt02MkVs93mubw1J9napjkwXaCGoGfrAE9iMDnJcPk7eRAFKb6LJlp24+ mpHP8l2H4c7I80mgn2KrwcdSN51OM76KoDdoPmIPSyvCUisG7rzWjDT2DYjDsCMn RpOaALSR+muyUriTE8b6EE181KEImlwJNCtruUAxQdmWHTnnHDN1TIkIg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=YQIF3Go+Ua2iVmV51+I3f4+jRCGMQ6dHbOG8/DaqTcw=; b=hmr5Qvt8 +E0lqRnL3HXsDh6eqkFnbm2E6TNMUCXrXYyctwAMlOgr5tXN+O4Z4MfRnx6QirR5 Zph4B/ZlTM+P4QoaxVXoSWa1pwFm66TGcWFvnUUAO4DGkUfPz3iUHGivppWAkihS szWqSBVlqcpIIzKadbWGmAQGFkUbPfMJ1rxgxST6Pk6LwUnc/MvA9dtSZvrCaO53 EGZkIyeUU4urEzlvXlYkWMlwljL73cnG4dHmmNVk6fJRslu2LMrGnJDywA1cr6YZ naBQnlC8p3w8QS2xFofGff4JeAH8f7W/+yL1yy/wGiY3sE6dT2pvb8+f+BUe1HNf ZaWro/mSktcsFA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudekgedgudejhecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpeetlhihshhsrgcutfhoshhsuceohhhisegrlhihshhsrgdr ihhsqeenucggtffrrghtthgvrhhnpefgiefggedvfefftdefgeduvdetfeefvdffvdfgte ektedtieehteeiueffhfdvleenucffohhmrghinhepghhithhhuhgsrdgtohhmpdhkvghr nhgvlhdrohhrghenucfkphepjeelrddvfeehrdduudelrddutdejnecuvehluhhsthgvrh fuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepqhihlhhishhsseigvddvtddr qhihlhhishhsrdhnvght X-ME-Proxy: Received: from x220.qyliss.net (p4feb776b.dip0.t-ipconnect.de [79.235.119.107]) by mail.messagingengine.com (Postfix) with ESMTPA id A305E24005C for ; Sun, 11 Apr 2021 07:57:56 -0400 (EDT) Received: by x220.qyliss.net (Postfix, from userid 1000) id 82C6F18F6; Sun, 11 Apr 2021 11:57:55 +0000 (UTC) From: Alyssa Ross To: devel@spectrum-os.org Subject: [PATCH nixpkgs 04/16] spectrumPackages.linux_vm: fix cloud-hypervisor hotplug Date: Sun, 11 Apr 2021 11:57:28 +0000 Message-Id: <20210411115740.29615-5-hi@alyssa.is> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210411115740.29615-1-hi@alyssa.is> References: <20210411115740.29615-1-hi@alyssa.is> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: XH4SE6SJB7IIG7KGQBYSD3NTCATXLZW2 X-Message-ID-Hash: XH4SE6SJB7IIG7KGQBYSD3NTCATXLZW2 X-MailFrom: qyliss@x220.qyliss.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.3.1 Precedence: list List-Id: Patches and low-level development discussion Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: This patch (backported from Linux 5.5) fixes hotplugging with cloud-hypervisor. See . --- pkgs/os-specific/linux/kernel/patches.nix | 9 +++++++++ pkgs/os-specific/linux/spectrum/linux/vm.nix | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 8ce1ac2b587..a802a0a24d7 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -92,4 +92,13 @@ name = "mac_nvme_t2"; patch = ./mac-nvme-t2.patch; }; + + # https://github.com/cloud-hypervisor/cloud-hypervisor/blob/8b7aafad16ee8a23d7178a7f7aa6d2c1ec509b5d/docs/hotplug.md#kernel-support + evged = { + name = "evged"; + patch = fetchpatch { + url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch?id=ac36d37e943635fc072e9d4f47e40a48fbcdb3f0"; + sha256 = "0hzl3s2fmsvz54hq478lqi14dwry8a5g2b2awsssxf0r2ga15jk5"; + }; + }; } diff --git a/pkgs/os-specific/linux/spectrum/linux/vm.nix b/pkgs/os-specific/linux/spectrum/linux/vm.nix index 9c9ba78b691..f456053dc99 100644 --- a/pkgs/os-specific/linux/spectrum/linux/vm.nix +++ b/pkgs/os-specific/linux/spectrum/linux/vm.nix @@ -1,8 +1,11 @@ -{ lib, linux }: +{ lib, linux, kernelPatches }: with lib.kernel; linux.override { + # Fix hotplugging with cloud-hypervisor. + kernelPatches = linux.kernelPatches ++ [ kernelPatches.evged ]; + structuredExtraConfig = { VIRTIO_PCI = yes; VIRTIO_BLK = yes; -- 2.30.0