diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-12-20 12:34:37 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-12-20 12:34:37 +0100 |
| commit | 5240ec4a5a9c3a58d3990502e7d931c041961b45 (patch) | |
| tree | bbdafad1330e6691b2ab3a6a359eb080805b468c /pkgs/cloud-hypervisor | |
| parent | 891312845bd5b9fbe72f1920029d2a3a565f1a9f (diff) | |
| download | spectrum-5240ec4a5a9c3a58d3990502e7d931c041961b45.tar spectrum-5240ec4a5a9c3a58d3990502e7d931c041961b45.tar.gz spectrum-5240ec4a5a9c3a58d3990502e7d931c041961b45.tar.bz2 spectrum-5240ec4a5a9c3a58d3990502e7d931c041961b45.tar.lz spectrum-5240ec4a5a9c3a58d3990502e7d931c041961b45.tar.xz spectrum-5240ec4a5a9c3a58d3990502e7d931c041961b45.tar.zst spectrum-5240ec4a5a9c3a58d3990502e7d931c041961b45.zip | |
pkgs: cloud-hypervisor: consistent commit messages
"vhost_user" seems to be the only prefix used for vhost-user-specific changes in the vhost crate, so let's stick with that. It doesn't make sense to keep the crosvm-specific prefix from the original commits. Signed-off-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'pkgs/cloud-hypervisor')
| -rw-r--r-- | pkgs/cloud-hypervisor/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/cloud-hypervisor/vhost/0003-vhost_user-add-protocol-flag-for-shmem.patch (renamed from pkgs/cloud-hypervisor/vhost/0003-vhost-user-add-protocol-flag-for-shmem.patch) | 4 | ||||
| -rw-r--r-- | pkgs/cloud-hypervisor/vhost/0004-vhost_user-renumber-SHARED_MEMORY_REGIONS.patch (renamed from pkgs/cloud-hypervisor/vhost/0004-vmm_vhost-renumber-SHARED_MEMORY_REGIONS.patch) | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/cloud-hypervisor/default.nix b/pkgs/cloud-hypervisor/default.nix index 194e4f3..9364e3c 100644 --- a/pkgs/cloud-hypervisor/default.nix +++ b/pkgs/cloud-hypervisor/default.nix @@ -41,8 +41,8 @@ final.rustPlatform.buildRustPackage { vhostPatches = [ vhost/0001-vhost-fix-receiving-reply-payloads.patch vhost/0002-vhost_user-add-shared-memory-region-support.patch - vhost/0003-vhost-user-add-protocol-flag-for-shmem.patch - vhost/0004-vmm_vhost-renumber-SHARED_MEMORY_REGIONS.patch + vhost/0003-vhost_user-add-protocol-flag-for-shmem.patch + vhost/0004-vhost_user-renumber-SHARED_MEMORY_REGIONS.patch ]; # Don't concatenate versions from super.cloud-hypervisor, diff --git a/pkgs/cloud-hypervisor/vhost/0003-vhost-user-add-protocol-flag-for-shmem.patch b/pkgs/cloud-hypervisor/vhost/0003-vhost_user-add-protocol-flag-for-shmem.patch index 4315650..565765b 100644 --- a/pkgs/cloud-hypervisor/vhost/0003-vhost-user-add-protocol-flag-for-shmem.patch +++ b/pkgs/cloud-hypervisor/vhost/0003-vhost_user-add-protocol-flag-for-shmem.patch @@ -1,7 +1,7 @@ -From 745143566da5090f55c3f373d9310db12d5cd35a Mon Sep 17 00:00:00 2001 +From 6ff8acf9d8bc27a49954c43cf93f36ae18d2f9cb Mon Sep 17 00:00:00 2001 From: David Stevens <stevensd@chromium.org> Date: Thu, 13 Oct 2022 10:37:47 +0900 -Subject: [PATCH 3/4] vhost-user: add protocol flag for shmem +Subject: [PATCH 3/4] vhost_user: add protocol flag for shmem SPDX-FileCopyrightText: 2019-2021 Alibaba Cloud. All rights reserved. SPDX-FileCopyrightText: The Chromium OS Authors SPDX-FileCopyrightText: 2023 Alyssa Ross <hi@alyssa.is> diff --git a/pkgs/cloud-hypervisor/vhost/0004-vmm_vhost-renumber-SHARED_MEMORY_REGIONS.patch b/pkgs/cloud-hypervisor/vhost/0004-vhost_user-renumber-SHARED_MEMORY_REGIONS.patch index 9090e61..293cd27 100644 --- a/pkgs/cloud-hypervisor/vhost/0004-vmm_vhost-renumber-SHARED_MEMORY_REGIONS.patch +++ b/pkgs/cloud-hypervisor/vhost/0004-vhost_user-renumber-SHARED_MEMORY_REGIONS.patch @@ -1,7 +1,7 @@ -From 89ffceed4b74502b2d806115a8d45b93fea903fd Mon Sep 17 00:00:00 2001 +From 465b7c191a4149f4536384e24dc127eaae70a803 Mon Sep 17 00:00:00 2001 From: Alyssa Ross <hi@alyssa.is> Date: Sat, 29 Jul 2023 12:03:18 +0000 -Subject: [PATCH 4/4] vmm_vhost: renumber SHARED_MEMORY_REGIONS +Subject: [PATCH 4/4] vhost_user: renumber SHARED_MEMORY_REGIONS SPDX-FileCopyrightText: 2019-2021 Alibaba Cloud. All rights reserved. SPDX-FileCopyrightText: The Chromium OS Authors SPDX-FileCopyrightText: 2023 Alyssa Ross <hi@alyssa.is> |