Feedback

will-j-wright · will-j-wright · commit 3961481eeaee · 2025-12-17T14:54:37.000-08:00
diff --git a/vm/devices/vmbus/vmbus_server/src/proxyintegration.rs b/vm/devices/vmbus/vmbus_server/src/proxyintegration.rs
@@ -251,13 +251,11 @@ impl SavedStatePair {
     }
 }
 
-struct VpToPhysicalNodeMap(Option<Vec<u16>>);
+struct VpToPhysicalNodeMap(Vec<u16>);
 
 impl VpToPhysicalNodeMap {
     fn get_numa_node(&self, vp_index: u32) -> u16 {
-        self.0.as_ref().map_or(0, |nodes| {
-            nodes.get(vp_index as usize).copied().unwrap_or(0)
-        })
+        self.0.get(vp_index as usize).copied().unwrap_or(0)
     }
 }
 
@@ -1159,7 +1157,7 @@ async fn proxy_thread(
         hvsock_response_send,
         vtl2_hvsock_response_send,
         Arc::clone(&proxy),
-        VpToPhysicalNodeMap(vp_to_physical_node_map),
+        VpToPhysicalNodeMap(vp_to_physical_node_map.unwrap_or_default()),
     ));
     let offers = task.run_proxy_actions(send, flush_recv, await_flush);
     let requests = task.run_server_requests(

Original file line number	Diff line number	Diff line change
`@@ -251,13 +251,11 @@ impl SavedStatePair {`
`251`	`251`	`}`
`252`	`252`	`}`
`253`	`253`
`254`		`-struct VpToPhysicalNodeMap(Option<Vec<u16>>);`
	`254`	`+struct VpToPhysicalNodeMap(Vec<u16>);`
`255`	`255`
`256`	`256`	`impl VpToPhysicalNodeMap {`
`257`	`257`	`fn get_numa_node(&self, vp_index: u32) -> u16 {`
`258`		`- self.0.as_ref().map_or(0, \|nodes\| {`
`259`		`- nodes.get(vp_index as usize).copied().unwrap_or(0)`
`260`		`- })`
	`258`	`+ self.0.get(vp_index as usize).copied().unwrap_or(0)`
`261`	`259`	`}`
`262`	`260`	`}`
`263`	`261`
`@@ -1159,7 +1157,7 @@ async fn proxy_thread(`
`1159`	`1157`	`hvsock_response_send,`
`1160`	`1158`	`vtl2_hvsock_response_send,`
`1161`	`1159`	`Arc::clone(&proxy),`
`1162`		`- VpToPhysicalNodeMap(vp_to_physical_node_map),`
	`1160`	`+ VpToPhysicalNodeMap(vp_to_physical_node_map.unwrap_or_default()),`
`1163`	`1161`	`));`
`1164`	`1162`	`let offers = task.run_proxy_actions(send, flush_recv, await_flush);`
`1165`	`1163`	`let requests = task.run_server_requests(`