@@ -110,7 +110,7 @@ pub struct ProxyIntegrationBuilder<'a, T: SpawnDriver + Clone> {
110110 vtl2_server : Option < ProxyServerInfo > ,
111111 mem : Option < & ' a GuestMemory > ,
112112 require_flush_before_start : bool ,
113- vp_to_physical_node_map : Option < Vec < u16 > > ,
113+ vp_to_physical_node_map : Vec < u16 > ,
114114}
115115
116116impl < ' a , T : SpawnDriver + Clone > ProxyIntegrationBuilder < ' a , T > {
@@ -135,7 +135,7 @@ impl<'a, T: SpawnDriver + Clone> ProxyIntegrationBuilder<'a, T> {
135135 /// Adds a NUMA node map to be passed to the proxy driver. This map is of the format
136136 /// VP -> Physical NUMA Node. For example, `map[0]` is the physical NUMA node for VP 0.
137137 pub fn vp_to_physical_node_map ( mut self , map : Vec < u16 > ) -> Self {
138- self . vp_to_physical_node_map = Some ( map) ;
138+ self . vp_to_physical_node_map = map;
139139 self
140140 }
141141
@@ -192,7 +192,7 @@ impl ProxyIntegration {
192192 vtl2_server : None ,
193193 mem : None ,
194194 require_flush_before_start : false ,
195- vp_to_physical_node_map : None ,
195+ vp_to_physical_node_map : vec ! [ ] ,
196196 }
197197 }
198198
@@ -1123,7 +1123,7 @@ async fn proxy_thread(
11231123 vtl2_server : Option < ProxyServerInfo > ,
11241124 flush_recv : mesh:: Receiver < FailableRpc < ( ) , ( ) > > ,
11251125 await_flush : bool ,
1126- vp_to_physical_node_map : Option < Vec < u16 > > ,
1126+ vp_to_physical_node_map : Vec < u16 > ,
11271127) {
11281128 // Separate the hvsocket relay channels.
11291129 let ( hvsock_request_recv, hvsock_response_send) = server
@@ -1157,7 +1157,7 @@ async fn proxy_thread(
11571157 hvsock_response_send,
11581158 vtl2_hvsock_response_send,
11591159 Arc :: clone ( & proxy) ,
1160- VpToPhysicalNodeMap ( vp_to_physical_node_map. unwrap_or_default ( ) ) ,
1160+ VpToPhysicalNodeMap ( vp_to_physical_node_map) ,
11611161 ) ) ;
11621162 let offers = task. run_proxy_actions ( send, flush_recv, await_flush) ;
11631163 let requests = task. run_server_requests (
0 commit comments