Changeset 516ff92 in mainline for kernel/arch/ia32xen/src/drivers/xconsole.c

Timestamp:

2009-01-31T21:27:18Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4863e50b

Parents:

96a2e45

Message:

silent kernel console output when user space console is active

File:

• kernel/arch/ia32xen/src/drivers/xconsole.c (modified) (1 diff)

kernel/arch/ia32xen/src/drivers/xconsole.c

@@ -56 +56 @@
 }
 
-void xen_putchar(chardev_t *d, const char ch)
+void xen_putchar(chardev_t *d, const char ch, bool silent)
 {
-        if (start_info.console.domU.evtchn != 0) {
-                uint32_t cons = console_page.out_cons;
-                uint32_t prod = console_page.out_prod;
-                
-                memory_barrier();
-                
-                if ((prod - cons) > sizeof(console_page.out))
-                        return;
-                
-                if (ch == '\n')
-                        console_page.out[MASK_INDEX(prod++, console_page.out)] = '\r';
-                console_page.out[MASK_INDEX(prod++, console_page.out)] = ch;
-                
-                write_barrier();
-                
-                console_page.out_prod = prod;
-                
-                xen_notify_remote(start_info.console.domU.evtchn);
-        } else
-                xen_console_io(CONSOLE_IO_WRITE, 1, &ch);
+        if (!silent) {
+                if (start_info.console.domU.evtchn != 0) {
+                        uint32_t cons = console_page.out_cons;
+                        uint32_t prod = console_page.out_prod;
+                        
+                        memory_barrier();
+                        
+                        if ((prod - cons) > sizeof(console_page.out))
+                                return;
+                        
+                        if (ch == '\n')
+                                console_page.out[MASK_INDEX(prod++, console_page.out)] = '\r';
+                        console_page.out[MASK_INDEX(prod++, console_page.out)] = ch;
+                        
+                        write_barrier();
+                        
+                        console_page.out_prod = prod;
+                        
+                        xen_notify_remote(start_info.console.domU.evtchn);
+                } else
+                        xen_console_io(CONSOLE_IO_WRITE, 1, &ch);
+        }
 }