Signed-off-by: Ralf Ramsauer <[email protected]>
---
inmates/demos/arm/gic-demo.c | 3 +--
inmates/demos/x86/ioapic-demo.c | 3 +--
inmates/demos/x86/ivshmem-demo.c | 2 +-
inmates/demos/x86/pci-demo.c | 3 +--
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/inmates/demos/arm/gic-demo.c b/inmates/demos/arm/gic-demo.c
index 37bf4d86..dbe48646 100644
--- a/inmates/demos/arm/gic-demo.c
+++ b/inmates/demos/arm/gic-demo.c
@@ -68,6 +68,5 @@ void inmate_main(void)
led_reg = (void *)(unsigned long)cmdline_parse_int("led-reg", 0);
led_pin = cmdline_parse_int("led-pin", 0);
- while (1)
- asm volatile("wfi" : : : "memory");
+ halt();
}
diff --git a/inmates/demos/x86/ioapic-demo.c b/inmates/demos/x86/ioapic-demo.c
index 7cb491d8..141bad51 100644
--- a/inmates/demos/x86/ioapic-demo.c
+++ b/inmates/demos/x86/ioapic-demo.c
@@ -54,6 +54,5 @@ void inmate_main(void)
printk("Note: ACPI IRQs are broken for Linux now.\n");
asm volatile("sti");
- while (1)
- asm volatile("hlt");
+ halt();
}
diff --git a/inmates/demos/x86/ivshmem-demo.c b/inmates/demos/x86/ivshmem-demo.c
index 7361032e..65541d18 100644
--- a/inmates/demos/x86/ivshmem-demo.c
+++ b/inmates/demos/x86/ivshmem-demo.c
@@ -166,5 +166,5 @@ void inmate_main(void)
}
}
out:
- asm volatile("hlt");
+ halt();
}
diff --git a/inmates/demos/x86/pci-demo.c b/inmates/demos/x86/pci-demo.c
index 8d009d39..84d48891 100644
--- a/inmates/demos/x86/pci-demo.c
+++ b/inmates/demos/x86/pci-demo.c
@@ -75,6 +75,5 @@ void inmate_main(void)
mmio_write16(hdbar + HDA_WAKEEN, 0x0f);
mmio_write32(hdbar + HDA_INTCTL, (1 << 31) | (1 << 30));
- while (1)
- asm volatile("hlt");
+ halt();
}
--
2.17.0
--
You received this message because you are subscribed to the Google Groups
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
