[ros-diffs] [cwittich] 35987: -fail on kdbg enter

Author: cwittich
Date: Sat Sep  6 10:28:55 2008
New Revision: 35987

URL: http://svn.reactos.org/svn/reactos?rev=35987&view=rev
Log:
-fail on kdbg enter

Modified:
    trunk/tools/sysreg2/console.c
    trunk/tools/sysreg2/reactos.xml
    trunk/tools/sysreg2/sysreg.xml
    trunk/tools/sysreg2/utils.c

Modified: trunk/tools/sysreg2/console.c
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/console.c?rev=35987&…
==============================================================================
--- trunk/tools/sysreg2/console.c [iso-8859-1] (original)
+++ trunk/tools/sysreg2/console.c [iso-8859-1] Sat Sep  6 10:28:55 2008
@@ -62,10 +62,15 @@
         
                 memset(buf, 0, sizeof(buf));
                 got = readln(fds[i].fd, buf, sizeof(buf));
+                if (got == -2) /* kernel debugger */
+                {
+                    Ret = false;                    
+                    goto cleanup;
+                }
                 if (got < 0) {
                     goto cleanup;
                 }
-                if (!got || got == 1 && buf[0] == '\33')
+                if (!got)
                 {
                     goto cleanup;
                 }
@@ -95,6 +100,11 @@
                     }
                     */
                 }
+                else
+                {
+                    if (got == 1 && buf[0] == '\33')
+                        goto cleanup;
+                }
                 
             }
         }

Modified: trunk/tools/sysreg2/reactos.xml
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/reactos.xml?rev=3598…
==============================================================================
--- trunk/tools/sysreg2/reactos.xml [iso-8859-1] (original)
+++ trunk/tools/sysreg2/reactos.xml [iso-8859-1] Sat Sep  6 10:28:55 2008
@@ -6,7 +6,7 @@
   <vcpu>1</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>
-    <boot dev='hd'/>
+    <boot dev='cdrom'/>
   </os>
   <features>
   </features>
@@ -21,15 +21,15 @@
       <target dev='hda' bus='ide'/>
     </disk>
     <disk type='file' device='cdrom'>
-		<source file='/opt/buildbot/kvmtest/ReactOS-RegTest.iso'/>
+        <source file='/opt/buildbot/kvmtest/ReactOS-RegTest.iso'/>
       <target dev='hdc' bus='ide'/>
       <readonly/>
     </disk>
     <interface type='bridge'>
       <mac address='00:16:3e:2e:dd:df'/>
       <source bridge='virbr0'/>
-	  <target dev='vnet0'/>
-	  <model type='pcnet'/>
+      <target dev='vnet0'/>
+      <model type='pcnet'/>
     </interface>
     <serial type='pty'>
       <source path='/dev/pts/4'/>
@@ -39,7 +39,7 @@
       <source path='/dev/pts/4'/>
       <target port='1'/>
     </console>
-    <input type='tablet' bus='usb'/>
+    <input type='tablet' bus='usb'/> 
     <input type='mouse' bus='ps2'/>
     <graphics type='vnc' port='5900' listen='0.0.0.0'/>
   </devices>

Modified: trunk/tools/sysreg2/sysreg.xml
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/sysreg.xml?rev=35987…
==============================================================================
--- trunk/tools/sysreg2/sysreg.xml [iso-8859-1] (original)
+++ trunk/tools/sysreg2/sysreg.xml [iso-8859-1] Sat Sep  6 10:28:55 2008
@@ -1,4 +1,4 @@
-<settings vm="ReactOS"
file="/opt/buildbot/kvmtest/reactos.xml">
+<settings vm="ReactOS"
file="/opt/buildbot/sysreg2/reactos.xml">
 	<general>
 		<!-- kill the VM after n milliseconds without debug msg -->
 		<timeout ms="20000"/>

Modified: trunk/tools/sysreg2/utils.c
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/utils.c?rev=35987&am…
==============================================================================
--- trunk/tools/sysreg2/utils.c [iso-8859-1] (original)
+++ trunk/tools/sysreg2/utils.c [iso-8859-1] Sat Sep  6 10:28:55 2008
@@ -1,4 +1,5 @@
 #include "sysreg.h"
+#include <sys/sysinfo.h>
 
 int readln(int fd, char* buffer, int size)
 {
@@ -7,8 +8,16 @@
 
     while ((bp - buffer < size) && (got = read(fd, bp, 1)))
     {
-        if (*bp == '\33')
-            return 1;
+        if (fd == STDIN_FILENO)  
+        {
+            if (*bp == '\33')
+                return 1;
+        }
+        else
+        {
+             if (strstr(buffer, "kdb:>"))
+                 return -2;
+        }
         if (*bp++ == '\n')
             return (bp - buffer);
     }