Revision 7c9d8e07 gdbstub.c

b/gdbstub.c
704 704
}
705 705

  
706 706
#else
707
static int gdb_can_read(void *opaque)
708
{
709
    return 256;
710
}
711

  
712
static void gdb_read(void *opaque, const uint8_t *buf, int size)
707
static void gdb_read(void *opaque)
713 708
{
714 709
    GDBState *s = opaque;
715
    int i;
710
    int i, size;
711
    uint8_t buf[4096];
712

  
713
    size = read(s->fd, buf, sizeof(buf));
714
    if (size < 0)
715
        return;
716 716
    if (size == 0) {
717 717
        /* end of connection */
718 718
        qemu_del_vm_stop_handler(gdb_vm_stopped, s);
719
        qemu_del_fd_read_handler(s->fd);
719
        qemu_set_fd_handler(s->fd, NULL, NULL, NULL);
720 720
        qemu_free(s);
721 721
        vm_start();
722 722
    } else {
......
727 727

  
728 728
#endif
729 729

  
730
static void gdb_accept(void *opaque, const uint8_t *buf, int size)
730
static void gdb_accept(void *opaque)
731 731
{
732 732
    GDBState *s;
733 733
    struct sockaddr_in sockaddr;
......
768 768
    vm_stop(EXCP_INTERRUPT);
769 769

  
770 770
    /* start handling I/O */
771
    qemu_add_fd_read_handler(s->fd, gdb_can_read, gdb_read, s);
771
    qemu_set_fd_handler(s->fd, gdb_read, NULL, s);
772 772
    /* when the VM is stopped, the following callback is called */
773 773
    qemu_add_vm_stop_handler(gdb_vm_stopped, s);
774 774
#endif
......
815 815
        return -1;
816 816
    /* accept connections */
817 817
#ifdef CONFIG_USER_ONLY
818
    gdb_accept (NULL, NULL, 0);
818
    gdb_accept (NULL);
819 819
#else
820
    qemu_add_fd_read_handler(gdbserver_fd, NULL, gdb_accept, NULL);
820
    qemu_set_fd_handler(gdbserver_fd, gdb_accept, NULL, NULL);
821 821
#endif
822 822
    return 0;
823 823
}

Also available in: Unified diff