From 0b8a988c5d34c73815136bb41b10f67009b42a1c Mon Sep 17 00:00:00 2001 From: blueswir1 Date: Sat, 7 Mar 2009 10:51:36 +0000 Subject: [PATCH] Fix BSD user git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6734 c046a42c-6fe2-441c-8c8c-71466251a162 --- gdbstub.c | 6 +++--- usb-bsd.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 27e887e..d549766 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -1808,7 +1808,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) } 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 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) 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 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) 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 diff --git a/usb-bsd.c b/usb-bsd.c index 22610ab..ddcce41 100644 --- a/usb-bsd.c +++ b/usb-bsd.c @@ -25,7 +25,7 @@ */ #include "qemu-common.h" -#include "console.h" +#include "monitor.h" #include "hw/usb.h" /* usb.h declares these */ -- 1.7.9.5