summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2023-12-20 12:30:19 +0100
committerAlyssa Ross <hi@alyssa.is>2023-12-20 12:30:19 +0100
commit891312845bd5b9fbe72f1920029d2a3a565f1a9f (patch)
tree7a0cf8d4b7ff17caa32ba72c583b7419b16da7b9
parenta17f5d4abf9c4f49098cb65868f26c28d348ab0e (diff)
downloadspectrum-891312845bd5b9fbe72f1920029d2a3a565f1a9f.tar
spectrum-891312845bd5b9fbe72f1920029d2a3a565f1a9f.tar.gz
spectrum-891312845bd5b9fbe72f1920029d2a3a565f1a9f.tar.bz2
spectrum-891312845bd5b9fbe72f1920029d2a3a565f1a9f.tar.lz
spectrum-891312845bd5b9fbe72f1920029d2a3a565f1a9f.tar.xz
spectrum-891312845bd5b9fbe72f1920029d2a3a565f1a9f.tar.zst
spectrum-891312845bd5b9fbe72f1920029d2a3a565f1a9f.zip
pkgs: cloud-hypervisor: vhost: fix clippy warning
Signed-off-by: Alyssa Ross <hi@alyssa.is>
-rw-r--r--pkgs/cloud-hypervisor/vhost/0002-vhost_user-add-shared-memory-region-support.patch15
-rw-r--r--pkgs/cloud-hypervisor/vhost/0003-vhost-user-add-protocol-flag-for-shmem.patch2
-rw-r--r--pkgs/cloud-hypervisor/vhost/0004-vmm_vhost-renumber-SHARED_MEMORY_REGIONS.patch2
3 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/cloud-hypervisor/vhost/0002-vhost_user-add-shared-memory-region-support.patch b/pkgs/cloud-hypervisor/vhost/0002-vhost_user-add-shared-memory-region-support.patch
index 6b0bb39..b4b118a 100644
--- a/pkgs/cloud-hypervisor/vhost/0002-vhost_user-add-shared-memory-region-support.patch
+++ b/pkgs/cloud-hypervisor/vhost/0002-vhost_user-add-shared-memory-region-support.patch
@@ -1,4 +1,4 @@
-From 09cbe50dc01c46522f19bf3ab880e978a64a17a3 Mon Sep 17 00:00:00 2001
+From f6295a94fbecabf29ffae4f7189dfa57bdf79447 Mon Sep 17 00:00:00 2001
 From: David Stevens <stevensd@chromium.org>
 Date: Wed, 15 Jun 2022 16:45:12 +0900
 Subject: [PATCH 2/4] vhost_user: add shared memory region support
@@ -32,10 +32,10 @@ Signed-off-by: Alyssa Ross <alyssa.ross@unikie.com>
  crates/vhost/src/vhost_user/backend_req.rs    |  20 ++-
  .../src/vhost_user/backend_req_handler.rs     |  15 ++
  crates/vhost/src/vhost_user/dummy_backend.rs  |   4 +
- crates/vhost/src/vhost_user/frontend.rs       |  25 ++++
+ crates/vhost/src/vhost_user/frontend.rs       |  24 ++++
  .../src/vhost_user/frontend_req_handler.rs    |  53 ++++++-
  crates/vhost/src/vhost_user/message.rs        | 136 +++++++++++++++++-
- 7 files changed, 247 insertions(+), 16 deletions(-)
+ 7 files changed, 246 insertions(+), 16 deletions(-)
 
 diff --git a/crates/vhost-user-backend/src/handler.rs b/crates/vhost-user-backend/src/handler.rs
 index 8be4768..e141e07 100644
@@ -167,7 +167,7 @@ index 060a344..aab5ee1 100644
 +    }
  }
 diff --git a/crates/vhost/src/vhost_user/frontend.rs b/crates/vhost/src/vhost_user/frontend.rs
-index 4068dd6..0d572f3 100644
+index 4068dd6..47ace8f 100644
 --- a/crates/vhost/src/vhost_user/frontend.rs
 +++ b/crates/vhost/src/vhost_user/frontend.rs
 @@ -72,6 +72,9 @@ pub trait VhostUserFrontend: VhostBackend {
@@ -180,7 +180,7 @@ index 4068dd6..0d572f3 100644
  }
  
  fn error_code<T>(err: VhostUserError) -> Result<T> {
-@@ -517,6 +520,28 @@ impl VhostUserFrontend for Frontend {
+@@ -517,6 +520,27 @@ impl VhostUserFrontend for Frontend {
          let hdr = node.send_request_with_body(FrontendReq::REM_MEM_REG, &body, None)?;
          node.wait_for_ack(&hdr).map_err(|e| e.into())
      }
@@ -198,9 +198,8 @@ index 4068dd6..0d572f3 100644
 +        for _ in 0..body_reply.value {
 +            regions.push(
 +                // Can't fail because the input is the correct size.
-+                VhostSharedMemoryRegion::from_slice(&buf_reply[offset..(offset + struct_size)])
-+                    .unwrap()
-+                    .clone(),
++                *VhostSharedMemoryRegion::from_slice(&buf_reply[offset..(offset + struct_size)])
++                    .unwrap(),
 +            );
 +            offset += struct_size;
 +        }
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 f7dcf15..4315650 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,4 +1,4 @@
-From 6ee06aaac2c6d51e993416e81685d6dee120c97d Mon Sep 17 00:00:00 2001
+From 745143566da5090f55c3f373d9310db12d5cd35a 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
diff --git a/pkgs/cloud-hypervisor/vhost/0004-vmm_vhost-renumber-SHARED_MEMORY_REGIONS.patch b/pkgs/cloud-hypervisor/vhost/0004-vmm_vhost-renumber-SHARED_MEMORY_REGIONS.patch
index 34533cd..9090e61 100644
--- a/pkgs/cloud-hypervisor/vhost/0004-vmm_vhost-renumber-SHARED_MEMORY_REGIONS.patch
+++ b/pkgs/cloud-hypervisor/vhost/0004-vmm_vhost-renumber-SHARED_MEMORY_REGIONS.patch
@@ -1,4 +1,4 @@
-From da75b10ab1512d215a7c2ff6c439601547a8217c Mon Sep 17 00:00:00 2001
+From 89ffceed4b74502b2d806115a8d45b93fea903fd 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