ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

slirp: rename /extra/chardev 

Now it's only used for the chardev pointer.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
This commit is contained in:
Marc-André Lureau 2018-11-10 17:45:41 +04:00 committed by Samuel Thibault
parent 2d6cc3d0e7
commit d3b9408c9b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slirp/slirp.c
View File

@ -1088,10 +1088,10 @@ int slirp_add_exec(Slirp *slirp, void *chardev, const char *cmdline,
ssize_t slirp_send(struct socket *so, const void *buf, size_t len, int flags) ssize_t slirp_send(struct socket *so, const void *buf, size_t len, int flags)
{ {
if (so->s == -1 && so->extra) { if (so->s == -1 && so->chardev) {
/* XXX this blocks entire thread. Rewrite to use /* XXX this blocks entire thread. Rewrite to use
* qemu_chr_fe_write and background I/O callbacks */ * qemu_chr_fe_write and background I/O callbacks */
qemu_chr_fe_write_all(so->extra, buf, len); qemu_chr_fe_write_all(so->chardev, buf, len);
return len; return len;
} }

2
slirp/socket.h
View File

@ -67,7 +67,7 @@ struct socket {
struct sbuf so_rcv; /* Receive buffer */ struct sbuf so_rcv; /* Receive buffer */
struct sbuf so_snd; /* Send buffer */ struct sbuf so_snd; /* Send buffer */
void * extra; /* Extra pointer */ void * chardev;
}; };

2
slirp/tcp_subr.c
View File

@ -961,7 +961,7 @@ int tcp_ctl(struct socket *so)
so->so_faddr.s_addr == ex_ptr->ex_addr.s_addr) { so->so_faddr.s_addr == ex_ptr->ex_addr.s_addr) {
if (ex_ptr->ex_chardev) { if (ex_ptr->ex_chardev) {
so->s = -1; so->s = -1;
so->extra = ex_ptr->ex_chardev; so->chardev = ex_ptr->ex_chardev;
return 1; return 1;
} }
DEBUG_MISC((dfd, " executing %s\n", ex_ptr->ex_exec)); DEBUG_MISC((dfd, " executing %s\n", ex_ptr->ex_exec));