X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=gdbstub.c;h=5da66f1794173740e5f85071a44d76725e18a89b;hb=e5dfc5e8e715c572aea44ac4d96c43941d4741c7;hp=59d16506c52c82bd9954231a893c517aab95ac6b;hpb=b3820e6ca0c364cfa73c9bc1614d2f303fc74703;p=mirror_qemu.git
diff --git a/gdbstub.c b/gdbstub.c
index 59d16506c5..5da66f1794 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -16,17 +16,11 @@
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, see .
*/
-#include "config.h"
-#include "qemu-common.h"
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "qemu/cutils.h"
+#include "cpu.h"
#ifdef CONFIG_USER_ONLY
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
#include "qemu.h"
#else
#include "monitor/monitor.h"
@@ -41,6 +35,7 @@
#include "qemu/sockets.h"
#include "sysemu/kvm.h"
#include "exec/semihost.h"
+#include "exec/exec-all.h"
#ifdef CONFIG_USER_ONLY
#define GDB_ATTACHED "0"
@@ -338,7 +333,7 @@ static int get_char(GDBState *s)
if (ret < 0) {
if (errno == ECONNRESET)
s->fd = -1;
- if (errno != EINTR && errno != EAGAIN)
+ if (errno != EINTR)
return -1;
} else if (ret == 0) {
close(s->fd);
@@ -399,7 +394,7 @@ static void put_buffer(GDBState *s, const uint8_t *buf, int len)
while (len > 0) {
ret = send(s->fd, buf, len, 0);
if (ret < 0) {
- if (errno != EINTR && errno != EAGAIN)
+ if (errno != EINTR)
return;
} else {
buf += ret;
@@ -1498,19 +1493,6 @@ void gdb_exit(CPUArchState *env, int code)
}
#ifdef CONFIG_USER_ONLY
-int
-gdb_queuesig (void)
-{
- GDBState *s;
-
- s = gdbserver_state;
-
- if (gdbserver_fd < 0 || s->fd < 0)
- return 0;
- else
- return 1;
-}
-
int
gdb_handlesig(CPUState *cpu, int sig)
{
@@ -1548,9 +1530,13 @@ gdb_handlesig(CPUState *cpu, int sig)
for (i = 0; i < n; i++) {
gdb_read_byte(s, buf[i]);
}
- } else if (n == 0 || errno != EAGAIN) {
+ } else {
/* XXX: Connection closed. Should probably wait for another
connection before continuing. */
+ if (n == 0) {
+ close(s->fd);
+ }
+ s->fd = -1;
return sig;
}
}
@@ -1605,8 +1591,6 @@ static void gdb_accept(void)
gdb_has_xml = false;
gdbserver_state = s;
-
- fcntl(fd, F_SETFL, O_NONBLOCK);
}
static int gdbserver_open(int port)
@@ -1634,7 +1618,7 @@ static int gdbserver_open(int port)
close(fd);
return -1;
}
- ret = listen(fd, 0);
+ ret = listen(fd, 1);
if (ret < 0) {
perror("listen");
close(fd);
@@ -1759,7 +1743,7 @@ int gdbserver_start(const char *device)
sigaction(SIGINT, &act, NULL);
}
#endif
- chr = qemu_chr_new("gdb", device, NULL);
+ chr = qemu_chr_new_noreplay("gdb", device, NULL);
if (!chr)
return -1;