From: Denis Mukhin <dmukhin@ford.com>

Update the symbol name to match the code better.

No functional change.

Signed-off-by: Denis Mukhin <dmukhin@ford.com>
---
 xen/drivers/char/console.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index 37289d5558..5797f29d31 100644
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -503,11 +503,11 @@ static void cf_check conring_dump_keyhandler(unsigned char key)
 #define switch_code (opt_conswitch[0]-'a'+1)
 
 /* Console owner domain identifier. */
-static domid_t __read_mostly console_rx = DOMID_XEN;
+static domid_t __read_mostly console_domid = DOMID_XEN;
 
 struct domain *console_get_domain(void)
 {
-    struct domain *d = rcu_lock_domain_by_id(console_rx);
+    struct domain *d = rcu_lock_domain_by_id(console_domid);
 
     if ( !d )
         return NULL;
@@ -533,7 +533,7 @@ static void console_set_domid(domid_t domid)
     else
         printk("*** Serial input to DOM%u", domid);
 
-    console_rx = domid;
+    console_domid = domid;
 
     if ( switch_code )
         printk(" (type 'CTRL-%c' three times to switch input)",
@@ -549,10 +549,10 @@ static void console_switch_input(void)
 {
     domid_t hint;
 
-    if ( console_rx == DOMID_XEN )
+    if ( console_domid == DOMID_XEN )
         hint = get_initial_domain_id();
     else
-        hint = console_rx + 1;
+        hint = console_domid + 1;
 
     hint = domid_find_with_input_allowed(hint);
 
@@ -564,7 +564,7 @@ static void __serial_rx(char c)
     struct domain *d;
     int rc = 0;
 
-    if ( console_rx == DOMID_XEN )
+    if ( console_domid == DOMID_XEN )
         return handle_keypress(c, false);
 
     d = console_get_domain();
-- 
2.34.1

On Fri, 30 May 2025, dmkhn@proton.me wrote:
> From: Denis Mukhin <dmukhin@ford.com>
> 
> Update the symbol name to match the code better.
> 
> No functional change.
> 
> Signed-off-by: Denis Mukhin <dmukhin@ford.com>

Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>


> ---
>  xen/drivers/char/console.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
> index 37289d5558..5797f29d31 100644
> --- a/xen/drivers/char/console.c
> +++ b/xen/drivers/char/console.c
> @@ -503,11 +503,11 @@ static void cf_check conring_dump_keyhandler(unsigned char key)
>  #define switch_code (opt_conswitch[0]-'a'+1)
>  
>  /* Console owner domain identifier. */
> -static domid_t __read_mostly console_rx = DOMID_XEN;
> +static domid_t __read_mostly console_domid = DOMID_XEN;
>  
>  struct domain *console_get_domain(void)
>  {
> -    struct domain *d = rcu_lock_domain_by_id(console_rx);
> +    struct domain *d = rcu_lock_domain_by_id(console_domid);
>  
>      if ( !d )
>          return NULL;
> @@ -533,7 +533,7 @@ static void console_set_domid(domid_t domid)
>      else
>          printk("*** Serial input to DOM%u", domid);
>  
> -    console_rx = domid;
> +    console_domid = domid;
>  
>      if ( switch_code )
>          printk(" (type 'CTRL-%c' three times to switch input)",
> @@ -549,10 +549,10 @@ static void console_switch_input(void)
>  {
>      domid_t hint;
>  
> -    if ( console_rx == DOMID_XEN )
> +    if ( console_domid == DOMID_XEN )
>          hint = get_initial_domain_id();
>      else
> -        hint = console_rx + 1;
> +        hint = console_domid + 1;
>  
>      hint = domid_find_with_input_allowed(hint);
>  
> @@ -564,7 +564,7 @@ static void __serial_rx(char c)
>      struct domain *d;
>      int rc = 0;
>  
> -    if ( console_rx == DOMID_XEN )
> +    if ( console_domid == DOMID_XEN )
>          return handle_keypress(c, false);
>  
>      d = console_get_domain();
> -- 
> 2.34.1
> 
>