Commit 0b8a988c5d34c73815136bb41b10f67009b42a1c

Authored by blueswir1
1 parent b4950060

Fix BSD user

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6734 c046a42c-6fe2-441c-8c8c-71466251a162
Showing 2 changed files with 4 additions and 4 deletions
gdbstub.c
... ... @@ -1808,7 +1808,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf)
1808 1808 }
1809 1809 break;
1810 1810 }
1811   -#ifdef CONFIG_LINUX_USER
  1811 +#ifdef CONFIG_USER_ONLY
1812 1812 else if (strncmp(p, "Offsets", 7) == 0) {
1813 1813 TaskState *ts = s->c_cpu->opaque;
1814 1814  
... ... @@ -1821,7 +1821,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf)
1821 1821 put_packet(s, buf);
1822 1822 break;
1823 1823 }
1824   -#else /* !CONFIG_LINUX_USER */
  1824 +#else /* !CONFIG_USER_ONLY */
1825 1825 else if (strncmp(p, "Rcmd,", 5) == 0) {
1826 1826 int len = strlen(p + 5);
1827 1827  
... ... @@ -1836,7 +1836,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf)
1836 1836 put_packet(s, "OK");
1837 1837 break;
1838 1838 }
1839   -#endif /* !CONFIG_LINUX_USER */
  1839 +#endif /* !CONFIG_USER_ONLY */
1840 1840 if (strncmp(p, "Supported", 9) == 0) {
1841 1841 snprintf(buf, sizeof(buf), "PacketSize=%x", MAX_PACKET_LENGTH);
1842 1842 #ifdef GDB_CORE_XML
... ...
usb-bsd.c
... ... @@ -25,7 +25,7 @@
25 25 */
26 26  
27 27 #include "qemu-common.h"
28   -#include "console.h"
  28 +#include "monitor.h"
29 29 #include "hw/usb.h"
30 30  
31 31 /* usb.h declares these */
... ...