Enable dom0less guests on ARM to use console_io hypercalls: - set input_allow = true for dom0less domains - update the in-code comment in console.c - prioritize the VUART check to retain the same behavior as today
Signed-off-by: Stefano Stabellini <[email protected]> --- Changes in v8: - move in-code comment update to previous patch - add in-code comment about is_focus_domain() check --- xen/common/device-tree/dom0less-build.c | 2 ++ xen/drivers/char/console.c | 16 ++++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/xen/common/device-tree/dom0less-build.c b/xen/common/device-tree/dom0less-build.c index 840d14419d..cb7026fa7e 100644 --- a/xen/common/device-tree/dom0less-build.c +++ b/xen/common/device-tree/dom0less-build.c @@ -829,6 +829,8 @@ static int __init construct_domU(struct kernel_info *kinfo, rangeset_destroy(kinfo->xen_reg_assigned); + d->console->input_allowed = true; + return rc; } diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index ed8f1ad8f2..418d194cef 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -613,11 +613,20 @@ static void __serial_rx(char c) if ( console_rx == 0 ) return handle_keypress(c, false); + /* Includes an is_focus_domain() check. */ d = console_get_domain(); if ( !d ) return; - if ( is_hardware_domain(d) ) +#ifdef CONFIG_SBSA_VUART_CONSOLE + /* Prioritize vpl011 if enabled for this domain */ + if ( d->arch.vpl011.base_addr ) + { + /* Deliver input to the emulated UART. */ + rc = vpl011_rx_char_xen(d, c); + } + else +#endif { unsigned long flags; @@ -636,11 +645,6 @@ static void __serial_rx(char c) */ send_global_virq(VIRQ_CONSOLE); } -#ifdef CONFIG_SBSA_VUART_CONSOLE - else - /* Deliver input to the emulated UART. */ - rc = vpl011_rx_char_xen(d, c); -#endif if ( consoled_is_enabled() ) /* Deliver input to the PV shim console. */ -- 2.25.1
