Re: [Xen-devel] [PATCH v1] pv_console: remove unnecessary #ifdefs

[Wei Liu]

On Tue, Mar 06, 2018 at 08:51:56AM +, Sergey Dyasli wrote:
> The header for PV console contains empty function definitions in case of
> !CONFIG_XEN_GUEST specially to avoid #ifdefs in a code that uses them
> to make the code look cleaner.
> 
> Unfortunately, during the release of shim-comet, PV console functions
> were enclosed into unnecessary #ifdefs CONFIG_X86. Remove them.
> 
> Signed-off-by: Sergey Dyasli 

Acked-by: Wei Liu 

___
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

[Xen-devel] [PATCH v1] pv_console: remove unnecessary #ifdefs

[Sergey Dyasli]

The header for PV console contains empty function definitions in case of
!CONFIG_XEN_GUEST specially to avoid #ifdefs in a code that uses them
to make the code look cleaner.

Unfortunately, during the release of shim-comet, PV console functions
were enclosed into unnecessary #ifdefs CONFIG_X86. Remove them.

Signed-off-by: Sergey Dyasli 
---
Compile tested with aarch64 compiler.
---
 xen/drivers/char/console.c | 12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c
index 121073c8ed..47aff69869 100644
--- a/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@ -30,10 +30,10 @@
 #include  /* for do_console_io */
 #include 
 #include 
+#include 
 
 #ifdef CONFIG_X86
 #include 
-#include 
 #include 
 #endif
 
@@ -347,10 +347,8 @@ static void sercon_puts(const char *s)
 else
 serial_puts(sercon_handle, s);
 
-#ifdef CONFIG_X86
 /* Copy all serial output into PV console */
 pv_console_puts(s);
-#endif
 }
 
 static void dump_console_ring_key(unsigned char key)
@@ -816,9 +814,9 @@ void __init console_init_preirq(void)
 p++;
 if ( !strncmp(p, "vga", 3) )
 video_init();
-#ifdef CONFIG_X86
else if ( !strncmp(p, "pv", 2) )
 pv_console_init();
+#ifdef CONFIG_X86
 else if ( !strncmp(p, "xen", 3) )
 opt_console_xen = true;
 #endif
@@ -841,10 +839,7 @@ void __init console_init_preirq(void)
 }
 
 serial_set_rx_handler(sercon_handle, serial_rx);
-
-#ifdef CONFIG_X86
 pv_console_set_rx_handler(serial_rx);
-#endif
 
 /* HELLO WORLD --- start-of-day banner text. */
 spin_lock(_lock);
@@ -897,10 +892,7 @@ void __init console_init_ring(void)
 void __init console_init_postirq(void)
 {
 serial_init_postirq();
-
-#ifdef CONFIG_X86
 pv_console_init_postirq();
-#endif
 
 if ( conring != _conring )
 return;
-- 
2.14.1


___
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel