@@ -357,12 +357,6 @@ pub fn run_qemu(arch: UefiArch, opt: &QemuOpt) -> Result<()> {
357
357
358
358
cmd. args ( [ "-device" , "virtio-rng-pci" ] ) ;
359
359
360
- if arch == UefiArch :: IA32 || arch == UefiArch :: X86_64 {
361
- cmd. args ( [ "-debugcon" , "file:./integration-test-debugcon.log" ] ) ;
362
- cmd. args ( [ "-chardev" , "file,id=fw,path=./ovmf-firmware-debugcon.log" ] ) ;
363
- cmd. args ( [ "-device" , "isa-debugcon,chardev=fw,iobase=0x402" ] ) ;
364
- }
365
-
366
360
// Set the boot menu timeout to zero. On aarch64 in particular this speeds
367
361
// up the boot a lot. Note that we have to enable the menu here even though
368
362
// we are skipping right past it, otherwise `splash-time` is ignored in
@@ -419,14 +413,14 @@ pub fn run_qemu(arch: UefiArch, opt: &QemuOpt) -> Result<()> {
419
413
// Map the QEMU exit signal to port f4.
420
414
cmd. args ( [ "-device" , "isa-debug-exit,iobase=0xf4,iosize=0x04" ] ) ;
421
415
422
- // OVMF debug builds can output information to a serial `debugcon`.
423
- // Only enable when debugging UEFI boot .
424
- // cmd.args([
425
- // "-debugcon",
426
- // "file:debug.log",
427
- // "-global",
428
- // "isa- debugcon.iobase=0x402",
429
- // ]);
416
+ // We also add a debugcon logger next to the serial one, as
417
+ // it sumplifies debugging in some rare cases .
418
+ cmd. args ( [ "-debugcon" , "file:./integration-test-debugcon.log" ] ) ;
419
+
420
+ // Debugging messages from the OVMF firmware.
421
+ // More info: https://github.com/tianocore/edk2/blob/62390a89c5eb477594b74b5e1911d65998a8abe2/OvmfPkg/README#L90
422
+ cmd . args ( [ "-chardev" , "file,id=fw,path=./ovmf-firmware- debugcon.log" ] ) ;
423
+ cmd . args ( [ "-device" , "isa-debugcon,chardev=fw,iobase=0x402" ] ) ;
430
424
}
431
425
}
432
426
0 commit comments