Skip to content

Commit 8c63888

Browse files
committed
boot-qemu.py: Do not add '-no-reboot' unconditionally
This effectively reverts commit 8c78e38 ("boot-qemu: Always use -no-reboot") against the rewrite that occurred in #91. By applying this unconditionally, we potentially miss out on catching panics. Prior to that change, if a machine panicked and rebooted, it would keep rebooting until timeout killed QEMU, resulting in a non-zero exit code. After that change, QEMU just exits cleanly on reboot. Signed-off-by: Nathan Chancellor <nathan@kernel.org>
1 parent 2b85767 commit 8c63888

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

boot-qemu.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ def __init__(self):
6767
self._qemu_args = [
6868
'-display', 'none',
6969
'-nodefaults',
70-
'-no-reboot',
7170
] # yapf: disable
7271
self._qemu_path = None
7372
self._ram = '512m'
@@ -325,6 +324,7 @@ def __init__(self):
325324
self._default_kernel_path = Path('arch/arm/boot/zImage')
326325
self._initrd_arch = self._qemu_arch = 'arm'
327326
self._machine = 'virt'
327+
self._qemu_args.append('-no-reboot')
328328

329329
def run(self):
330330
self._qemu_args += ['-machine', self._machine]
@@ -487,7 +487,11 @@ def __init__(self):
487487
self.cmdline.append('console=ttyS0,115200')
488488
self._default_kernel_path = Path('vmlinux')
489489
self._initrd_arch = self._qemu_arch = 'm68k'
490-
self._qemu_args += ['-cpu', 'm68040', '-M', 'q800']
490+
self._qemu_args += [
491+
'-cpu', 'm68040',
492+
'-M', 'q800',
493+
'-no-reboot',
494+
] # yapf: disable
491495

492496

493497
class MIPSQEMURunner(QEMURunner):
@@ -518,6 +522,7 @@ def __init__(self):
518522
self._initrd_arch = 'ppc32'
519523
self._machine = 'bamboo'
520524
self._qemu_arch = 'ppc'
525+
self._qemu_args.append('-no-reboot')
521526
self._ram = '128m'
522527

523528
def run(self):

0 commit comments

Comments
 (0)