More fixes

Signed-off-by: Ivan Velickovic <[email protected]>
au-ts · Aug 19, 2024 · 6532fe7 · 6532fe7
1 parent acdc3cb
commit 6532fe7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/examples/simple/vmm.c b/examples/simple/vmm.c
@@ -115,7 +115,7 @@ void init(void) {
     /* Just in case there is already an interrupt available to handle, we ack it here. */
     microkit_irq_ack(SERIAL_IRQ_CH);
     /* 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/src/arch/aarch64/psci.c b/src/arch/aarch64/psci.c
@@ -124,7 +124,7 @@ bool handle_psci(size_t vcpu_id, seL4_UserContext *regs, uint64_t fn_number, uin
         case PSCI_SYSTEM_OFF:
             // @refactor, is it guaranteed that the CPU that does the vCPU request
             // is the boot vcpu?
-            guest_stop(vcpu_id);
+            guest_stop();
             return true;
         default:
             LOG_VMM_ERR("Unhandled PSCI function ID 0x%lx\n", fn_number);

diff --git a/src/arch/aarch64/vgic/vgic_v3.c b/src/arch/aarch64/vgic/vgic_v3.c
@@ -149,9 +149,9 @@ static bool vgic_handle_fault_redist_write(size_t vcpu_id, vgic_t *vgic, uint64_
 
 bool vgic_handle_fault_redist(size_t vcpu_id, size_t offset, size_t fsr, seL4_UserContext *regs, void *data) {
     if (fault_is_read(fsr)) {
-        return handle_vgic_redist_read_fault(vcpu_id, &vgic, offset, fsr, regs);
+        return vgic_handle_fault_redist_read(vcpu_id, &vgic, offset, fsr, regs);
     } else {
-        return handle_vgic_redist_write_fault(vcpu_id, &vgic, offset, fsr, regs);
+        return vgic_handle_fault_redist_write(vcpu_id, &vgic, offset, fsr, regs);
     }
 }