[Qemu-devel] [6734] Fix BSD user

[Qemu-devel] [6734] Fix BSD user

[Blue Swirl]

Revision: 6734
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6734
Author:   blueswir1
Date:     2009-03-07 10:51:36 +0000 (Sat, 07 Mar 2009)
Log Message:
-----------
Fix BSD user

Modified Paths:
--------------
    trunk/gdbstub.c
    trunk/usb-bsd.c

Modified: trunk/gdbstub.c
===================================================================
--- trunk/gdbstub.c	2009-03-07 10:50:46 UTC (rev 6733)
+++ trunk/gdbstub.c	2009-03-07 10:51:36 UTC (rev 6734)
@@ -1808,7 +1808,7 @@
                 }
             break;
         }
-#ifdef CONFIG_LINUX_USER
+#ifdef CONFIG_USER_ONLY
         else if (strncmp(p, "Offsets", 7) == 0) {
             TaskState *ts = s->c_cpu->opaque;
 
@@ -1821,7 +1821,7 @@
             put_packet(s, buf);
             break;
         }
-#else /* !CONFIG_LINUX_USER */
+#else /* !CONFIG_USER_ONLY */
         else if (strncmp(p, "Rcmd,", 5) == 0) {
             int len = strlen(p + 5);
 
@@ -1836,7 +1836,7 @@
             put_packet(s, "OK");
             break;
         }
-#endif /* !CONFIG_LINUX_USER */
+#endif /* !CONFIG_USER_ONLY */
         if (strncmp(p, "Supported", 9) == 0) {
             snprintf(buf, sizeof(buf), "PacketSize=%x", MAX_PACKET_LENGTH);
 #ifdef GDB_CORE_XML

Modified: trunk/usb-bsd.c
===================================================================
--- trunk/usb-bsd.c	2009-03-07 10:50:46 UTC (rev 6733)
+++ trunk/usb-bsd.c	2009-03-07 10:51:36 UTC (rev 6734)
@@ -25,7 +25,7 @@
  */
 
 #include "qemu-common.h"
-#include "console.h"
+#include "monitor.h"
 #include "hw/usb.h"
 
 /* usb.h declares these */