more fixes

Signed-off-by: Ivan Velickovic <[email protected]>
au-ts · Aug 21, 2024 · 3dac982 · 3dac982
1 parent e51b809
commit 3dac982
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/examples/virtio/blk_driver_vmm.c b/examples/virtio/blk_driver_vmm.c
@@ -95,7 +95,7 @@ void init(void)
     }
 
     /* Initialise the virtual GIC driver */
-    bool success = virq_controller_init(GUEST_BOOT_VCPU_ID);
+    bool success = virq_controller_init();
     if (!success) {
         LOG_VMM_ERR("Failed to initialise emulated interrupt controller\n");
         return;
@@ -134,7 +134,7 @@ void init(void)
 #endif
 
     /* Finally start the guest */
-    guest_start(GUEST_BOOT_VCPU_ID, kernel_pc, GUEST_DTB_VADDR, GUEST_INIT_RAM_DISK_VADDR);
+    guest_start(kernel_pc, GUEST_DTB_VADDR, GUEST_INIT_RAM_DISK_VADDR);
 }
 
 void notified(microkit_channel ch)

diff --git a/examples/virtio/client_vmm.c b/examples/virtio/client_vmm.c
@@ -103,7 +103,7 @@ void init(void)
     }
 
     /* Initialise the virtual GIC driver */
-    bool success = virq_controller_init(GUEST_BOOT_VCPU_ID);
+    bool success = virq_controller_init();
     if (!success) {
         LOG_VMM_ERR("Failed to initialise emulated interrupt controller\n");
         return;
@@ -140,7 +140,7 @@ void init(void)
     assert(success);
 
     /* Finally start the guest */
-    guest_start(GUEST_BOOT_VCPU_ID, kernel_pc, GUEST_DTB_VADDR, GUEST_INIT_RAM_DISK_VADDR);
+    guest_start(kernel_pc, GUEST_DTB_VADDR, GUEST_INIT_RAM_DISK_VADDR);
 }
 
 void notified(microkit_channel ch)

diff --git a/examples/zig/src/vmm.zig b/examples/zig/src/vmm.zig
@@ -96,7 +96,7 @@ export fn init() callconv(.C) void {
         return;
     }
     // Initialise the virtual interrupt controller
-    if (!c.virq_controller_init(GUEST_BOOT_VCPU_ID)) {
+    if (!c.virq_controller_init()) {
         log.err("Failed to initialise virtual interrupt controller\n", .{});
         return;
     }
@@ -109,7 +109,7 @@ export fn init() callconv(.C) void {
     // handle, we ack it here.
     microkit.microkit_irq_ack(SERIAL_IRQ_CH);
     // Finally we can start the guest
-    if (!c.guest_start(GUEST_BOOT_VCPU_ID, kernel_pc, GUEST_DTB_VADDR, GUEST_INIT_RAM_DISK_VADDR)) {
+    if (!c.guest_start(kernel_pc, GUEST_DTB_VADDR, GUEST_INIT_RAM_DISK_VADDR)) {
         log.err("Failed to start guest\n", .{});
         return;
     }