devices: vmm: Update IOAPIC IRQ routes

Update the IOAPIC IRQ routes to use the new wrapped
`kvm_bindings::KvmIrqRouting` instead of
`kvm_bindings::kvm_irq_routing`.

Signed-off-by: Jake Correnti <[email protected]>

Author: jakecorrenti

examples/chroot_vm.c

@@ -248,7 +248,7 @@ int main(int argc, char *const argv[])
     }
 
     // Set the log level to "warn".
-    err = krun_init_log(cmdline.log_target, KRUN_LOG_LEVEL_WARN, cmdline.log_style, 0);
+    err = krun_init_log(cmdline.log_target, KRUN_LOG_LEVEL_DEBUG, cmdline.log_style, 0);
     if (err) {
         errno = -err;
         perror("Error configuring log level");
@@ -331,7 +331,7 @@ int main(int argc, char *const argv[])
         return -1;
     }
 
-    if (err = krun_split_irqchip(ctx_id, false)) {
+    if (err = krun_split_irqchip(ctx_id, true)) {
         errno = -err;
         perror("Error setting split IRQCHIP property");
         return -1;

src/devices/src/legacy/ioapic.rs

@@ -1,7 +1,7 @@
 use crossbeam_channel::unbounded;
 use kvm_bindings::{
-    kvm_enable_cap, kvm_irq_routing, kvm_irq_routing_entry, kvm_irq_routing_entry__bindgen_ty_1,
-    kvm_irq_routing_msi, KVM_CAP_SPLIT_IRQCHIP, KVM_IRQ_ROUTING_MSI,
+    kvm_enable_cap, kvm_irq_routing_entry, kvm_irq_routing_entry__bindgen_ty_1,
+    kvm_irq_routing_msi, KvmIrqRouting, KVM_CAP_SPLIT_IRQCHIP, KVM_IRQ_ROUTING_MSI,
 };
 use kvm_ioctls::{Error, VmFd};
 
@@ -125,20 +125,10 @@ impl IoApic {
 
         (0..IOAPIC_NUM_PINS).for_each(|i| ioapic.add_msi_route(i));
 
-        let mut irq_routing = utils::sized_vec::vec_with_array_field::<
-            kvm_irq_routing,
-            kvm_irq_routing_entry,
-        >(ioapic.irq_routes.len());
-        irq_routing[0].nr = ioapic.irq_routes.len() as u32;
-        irq_routing[0].flags = 0;
-
-        unsafe {
-            let entries_slice: &mut [kvm_irq_routing_entry] =
-                irq_routing[0].entries.as_mut_slice(ioapic.irq_routes.len());
-            entries_slice.copy_from_slice(ioapic.irq_routes.as_slice());
-        }
-
-        vm.set_gsi_routing(&irq_routing[0])?;
+        let mut routing = KvmIrqRouting::new(ioapic.irq_routes.len()).unwrap();
+        let routing_entires = routing.as_mut_slice();
+        routing_entires.copy_from_slice(ioapic.irq_routes.as_slice());
+        vm.set_gsi_routing(&routing)?;
 
         Ok(ioapic)
     }

src/vmm/src/worker.rs

@@ -44,21 +44,11 @@ impl super::Vmm {
             WorkerMessage::GpuRemoveMapping(s, g, l) => self.remove_mapping(s, g, l),
             #[cfg(target_arch = "x86_64")]
             WorkerMessage::GsiRoute(sender, entries) => {
-                let mut irq_routing = utils::sized_vec::vec_with_array_field::<
-                    kvm_bindings::kvm_irq_routing,
-                    kvm_bindings::kvm_irq_routing_entry,
-                >(entries.len());
-                irq_routing[0].nr = entries.len() as u32;
-                irq_routing[0].flags = 0;
-
-                unsafe {
-                    let entries_slice: &mut [kvm_bindings::kvm_irq_routing_entry] =
-                        irq_routing[0].entries.as_mut_slice(entries.len());
-                    entries_slice.copy_from_slice(&entries);
-                }
-
+                let mut routing = kvm_bindings::KvmIrqRouting::new(entries.len()).unwrap();
+                let routing_entries = routing.as_mut_slice();
+                routing_entries.copy_from_slice(&entries);
                 sender
-                    .send(self.vm.fd().set_gsi_routing(&irq_routing[0]).is_ok())
+                    .send(self.vm.fd().set_gsi_routing(&routing).is_ok())
                     .unwrap();
             }
             #[cfg(target_arch = "x86_64")]