[Qemu-devel] more serial ports on arm?

[Jason A. Donenfeld]

Hey guys,

I sort of lost track of the discussion, but what ever happened to
adding an extra serial port to the arm virt machine? I'm still
carrying around the attached patch to run build.wireguard.com and I'd
of course like to see a real solution upstream.

Jason

diff -ru qemu-3.0.0/hw/arm/virt.c qemu-3.0.0-modified/hw/arm/virt.c
--- qemu-3.0.0/hw/arm/virt.c	2018-08-14 21:10:34.000000000 +0200
+++ qemu-3.0.0-modified/hw/arm/virt.c	2018-09-14 11:48:31.914772294 +0200
@@ -672,13 +672,7 @@
     qemu_fdt_setprop(vms->fdt, nodename, "clock-names",
                          clocknames, sizeof(clocknames));
 
-    if (uart == VIRT_UART) {
-        qemu_fdt_setprop_string(vms->fdt, "/chosen", "stdout-path", nodename);
-    } else {
-        /* Mark as not usable by the normal world */
-        qemu_fdt_setprop_string(vms->fdt, nodename, "status", "disabled");
-        qemu_fdt_setprop_string(vms->fdt, nodename, "secure-status", "okay");
-    }
+    qemu_fdt_setprop_string(vms->fdt, "/chosen", "stdout-path", nodename);
 
     g_free(nodename);
 }
@@ -1497,11 +1491,11 @@
 
     fdt_add_pmu_nodes(vms);
 
+    create_uart(vms, pic, VIRT_SECURE_UART, sysmem, serial_hd(1));
     create_uart(vms, pic, VIRT_UART, sysmem, serial_hd(0));
 
     if (vms->secure) {
         create_secure_ram(vms, secure_sysmem);
-        create_uart(vms, pic, VIRT_SECURE_UART, secure_sysmem, serial_hd(1));
     }
 
     vms->highmem_ecam &= vms->highmem && (!firmware_loaded || aarch64);