Seems to fix networking issue with rumprt

vmware-labs · Nov 13, 2023 · 206e95e · 206e95e
1 parent 561c868
commit 206e95e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/vibrio/src/rumprt/dev.rs b/lib/vibrio/src/rumprt/dev.rs
@@ -134,7 +134,7 @@ pub unsafe extern "C" fn rumpcomp_pci_irq_map(
             Some(irq_handler),
             core::ptr::null_mut(),
             cur_thread.current_core,
-            vector as u64 + 31,
+            vector as u64 + 32,
         )
         .expect("Can't create IRQ thread?");
 
@@ -179,7 +179,7 @@ pub unsafe extern "C" fn rumpcomp_pci_irq_establish(
     trace!("rumpcomp_pci_irq_establish {:#x} {:p}", cookie, arg);
     IRQS[0].handler = handler;
     IRQS[0].arg = arg;
-    trace!("register for IRQ {}", IRQS[0].vector as usize + 31);
+    trace!("register for IRQ {}", IRQS[0].vector as usize + 32);
 
     &mut IRQS[0] as *mut _ as *mut c_void
 }

diff --git a/lib/vibrio/src/upcalls.rs b/lib/vibrio/src/upcalls.rs
@@ -81,7 +81,7 @@ pub fn upcall_while_enabled(control: &mut kpi::arch::VirtualCpu, cmd: u64, arg:
         }
     }
 
-    if cmd == 0x2a || cmd == 0x24 {
+    if cmd == 0x2b || cmd == 0x24 {
         // TODO(correctness): this will use `gs` to access the SchedulerControlBlock
         // that assumes that we have already called scheduler.run() and we preserve
         // the SchedulerControlBlock register even if we return from run()