[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-3.2 06/13] slirp: rename /extra/chardev
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH for-3.2 06/13] slirp: rename /extra/chardev |
Date: |
Sat, 10 Nov 2018 17:45:41 +0400 |
Now it's only used for the chardev pointer.
Signed-off-by: Marc-André Lureau <address@hidden>
---
slirp/socket.h | 2 +-
slirp/slirp.c | 4 ++--
slirp/tcp_subr.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/slirp/socket.h b/slirp/socket.h
index 2f224bc34f..930ed95972 100644
--- a/slirp/socket.h
+++ b/slirp/socket.h
@@ -67,7 +67,7 @@ struct socket {
struct sbuf so_rcv; /* Receive buffer */
struct sbuf so_snd; /* Send buffer */
- void * extra; /* Extra pointer */
+ void * chardev;
};
diff --git a/slirp/slirp.c b/slirp/slirp.c
index daa0d5d4bd..d6623a2bbf 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -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)
{
- if (so->s == -1 && so->extra) {
+ if (so->s == -1 && so->chardev) {
/* XXX this blocks entire thread. Rewrite to use
* 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;
}
diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
index eb894b6527..9b8a11159d 100644
--- a/slirp/tcp_subr.c
+++ b/slirp/tcp_subr.c
@@ -966,7 +966,7 @@ int tcp_ctl(struct socket *so)
so->so_faddr.s_addr == ex_ptr->ex_addr.s_addr) {
if (ex_ptr->ex_chardev) {
so->s = -1;
- so->extra = ex_ptr->ex_chardev;
+ so->chardev = ex_ptr->ex_chardev;
return 1;
}
DEBUG_MISC((dfd, " executing %s\n", ex_ptr->ex_exec));
--
2.19.1.708.g4ede3d42df
- [Qemu-devel] [PATCH for-3.2 00/13] slirp: cleanups, Marc-André Lureau, 2018/11/10
- [Qemu-devel] [PATCH for-3.2 01/13] slirp: associate slirp_output callback with the Slirp context, Marc-André Lureau, 2018/11/10
- [Qemu-devel] [PATCH for-3.2 02/13] slirp: remove do_pty from fork_exec(), Marc-André Lureau, 2018/11/10
- [Qemu-devel] [PATCH for-3.2 03/13] slirp: replace ex_pty with ex_chardev, Marc-André Lureau, 2018/11/10
- [Qemu-devel] [PATCH for-3.2 07/13] slirp: move internal function declarations, Marc-André Lureau, 2018/11/10
- [Qemu-devel] [PATCH for-3.2 06/13] slirp: rename /extra/chardev,
Marc-André Lureau <=
- [Qemu-devel] [PATCH for-3.2 05/13] slirp: remove unused EMU_RSH, Marc-André Lureau, 2018/11/10
- [Qemu-devel] [PATCH for-3.2 08/13] slirp: remove Monitor dependency, return a string for info, Marc-André Lureau, 2018/11/10
- [Qemu-devel] [PATCH for-3.2 04/13] slirp: use a dedicated field for chardev pointer, Marc-André Lureau, 2018/11/10
- [Qemu-devel] [PATCH for-3.2 09/13] slirp: fix slirp_add_exec() leaks, Marc-André Lureau, 2018/11/10