[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 62c1d2: slirp: associate slirp_output callbac
|
From: |
GitHub |
|
Subject: |
[Qemu-commits] [qemu/qemu] 62c1d2: slirp: associate slirp_output callback with the Sl... |
|
Date: |
Thu, 17 Jan 2019 02:55:51 -0800 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: 62c1d2c4833f53897098f945f504f5ec3022d35b
https://github.com/qemu/qemu/commit/62c1d2c4833f53897098f945f504f5ec3022d35b
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M net/slirp.c
M slirp/libslirp.h
M slirp/ncsi.c
M slirp/slirp.c
M slirp/slirp.h
Log Message:
-----------
slirp: associate slirp_output callback with the Slirp context
Let's make the slirp interface a bit more library-like.
Associate the slirp_output() with a Slirp context.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 43bc7340b51a652bb54d3ecc95a1627e8b9ec843
https://github.com/qemu/qemu/commit/43bc7340b51a652bb54d3ecc95a1627e8b9ec843
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/misc.c
M slirp/misc.h
M slirp/tcp_subr.c
Log Message:
-----------
slirp: remove do_pty from fork_exec()
QEMU uses fork_exec() with do_pty values 0 or 3.
Let's clean up some unused code.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 7765bee0e3bf5c5e0f396337b341c657fc1152c9
https://github.com/qemu/qemu/commit/7765bee0e3bf5c5e0f396337b341c657fc1152c9
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/misc.c
M slirp/misc.h
M slirp/slirp.c
M slirp/tcp_subr.c
Log Message:
-----------
slirp: replace ex_pty with ex_chardev
do_pty == 3 means to talk to a chardev.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 3ed9f823c688c0dd5dd8d2c936329168c4859d02
https://github.com/qemu/qemu/commit/3ed9f823c688c0dd5dd8d2c936329168c4859d02
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M net/slirp.c
M slirp/libslirp.h
M slirp/misc.c
M slirp/misc.h
M slirp/slirp.c
M slirp/tcp_subr.c
Log Message:
-----------
slirp: use a dedicated field for chardev pointer
Let's not mix command line and chardev pointers.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 2d6cc3d0e77a0d5b4ba4df2cb0d3387881369cfb
https://github.com/qemu/qemu/commit/2d6cc3d0e77a0d5b4ba4df2cb0d3387881369cfb
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/misc.h
M slirp/slirp.c
M slirp/socket.c
M slirp/tcp_subr.c
Log Message:
-----------
slirp: remove unused EMU_RSH
EMU_RSH handling was dropped in commit
0d62c4cfe21752df4c1d6e2c2398f15d5eaa794a.
The assignment, and subsequent free() of ex_ptr->ex_exec to so->extra
looks unsafe (double free is likely to occur).
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: d3b9408c9bae23b5cbe3b42d29ad1927248cbdd5
https://github.com/qemu/qemu/commit/d3b9408c9bae23b5cbe3b42d29ad1927248cbdd5
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/slirp.c
M slirp/socket.h
M slirp/tcp_subr.c
Log Message:
-----------
slirp: rename /extra/chardev
Now it's only used for the chardev pointer.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 634d03487b3018b03f3fc45bf1af001ceb8dd603
https://github.com/qemu/qemu/commit/634d03487b3018b03f3fc45bf1af001ceb8dd603
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/libslirp.h
M slirp/slirp.h
Log Message:
-----------
slirp: move internal function declarations
Clarify that those functions are internal to slirp.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: b7f43bf2f6166cc6e4ee22898ae31b76503378aa
https://github.com/qemu/qemu/commit/b7f43bf2f6166cc6e4ee22898ae31b76503378aa
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M net/slirp.c
M slirp/libslirp.h
M slirp/misc.c
Log Message:
-----------
slirp: remove Monitor dependency, return a string for info
There is nothing performance-sensitive in returning an allocated
string for info, and handling the monitor_printf() on the caller side.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: c27f247865d7e1910136b57a5c066737ab1bf2bb
https://github.com/qemu/qemu/commit/c27f247865d7e1910136b57a5c066737ab1bf2bb
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/misc.h
M slirp/slirp.c
Log Message:
-----------
slirp: fix slirp_add_exec() leaks
Free the list elements allocated in add_exec().
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: fbcd3f9a45702c4eb31d9173aa278cb40bb8d0b0
https://github.com/qemu/qemu/commit/fbcd3f9a45702c4eb31d9173aa278cb40bb8d0b0
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/misc.c
Log Message:
-----------
slirp: replace the poor-man string split with g_strsplit()
Use the glib function for the work, fix a potential crash on >256 words.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 8d05f0992259e2b6a435fd607c3f8a5f7a3d27f2
https://github.com/qemu/qemu/commit/8d05f0992259e2b6a435fd607c3f8a5f7a3d27f2
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/main.h
Log Message:
-----------
slirp: remove dead declarations
An overdue cleanup. Remaining declarations could probably be moved in
other headers, such as slirp.h.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 9a50b0e0b80faf8f4e53d3f7e73144421561a7c8
https://github.com/qemu/qemu/commit/9a50b0e0b80faf8f4e53d3f7e73144421561a7c8
Author: Gerd Hoffmann <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M Makefile.objs
M slirp/tftp.c
A slirp/trace-events
Log Message:
-----------
slirp: add tftp tracing
Useful when debugging pxeboot, to see what the guest tries to do.
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Liam Merwick <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 7f5140929bef33e833b99e02f7b8dceb7b7aa123
https://github.com/qemu/qemu/commit/7f5140929bef33e833b99e02f7b8dceb7b7aa123
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/misc.c
Log Message:
-----------
slirp: move socket pair creation in helper function
Originally, the patch was fixing a bunch of issues, but Peter beat me
to it with earlier commit "slirp: fork_exec(): create and connect
child socket before fork()".
Factor out socket pair creation, to simplify the fork_exec() code.
Use the name socketpair_with_oob() since the code is actually similar
to what socketpair() would do, except that it uses TCP sockets, for
SLIRP to be able to call send with MSG_OOB (since SO_OOBINLINE is set,
this could probably be faked instead on regular unix sockets though).
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: cf2b315265d416cdef1c06120957dc48c098d550
https://github.com/qemu/qemu/commit/cf2b315265d416cdef1c06120957dc48c098d550
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/mbuf.h
Log Message:
-----------
slirp: remove unused M_TRAILINGSPACE
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: d846b927a613afbee7bd30756d1c8384085cfc64
https://github.com/qemu/qemu/commit/d846b927a613afbee7bd30756d1c8384085cfc64
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M net/slirp.c
M slirp/libslirp.h
M slirp/ncsi.c
M slirp/slirp.c
M slirp/slirp.h
Log Message:
-----------
slirp: use a callback structure to interface with qemu
This will bring slirp a bit forward to the state of an independent
project.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 8de6db67dd4ad0a964fd9cfaebe30a8fdb23421a
https://github.com/qemu/qemu/commit/8de6db67dd4ad0a964fd9cfaebe30a8fdb23421a
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/slirp.c
M slirp/slirp_config.h
Log Message:
-----------
slirp: remove PROBE_CONN dead-code
Nobody cares for over 14y. Somebody can revert or rewrite if
interested by that.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 74f0304e17cf9956b3512d4795dfff65ab786d0d
https://github.com/qemu/qemu/commit/74f0304e17cf9956b3512d4795dfff65ab786d0d
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/if.c
M slirp/slirp_config.h
Log Message:
-----------
slirp: remove FULL_BOLT
Looking at git history, this looks like something from the past, when
there was a tty layer. Let's remove it.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 03cee2fb5f3e1eb82587e4cd03131238f43ec9c1
https://github.com/qemu/qemu/commit/03cee2fb5f3e1eb82587e4cd03131238f43ec9c1
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/slirp_config.h
M slirp/socket.c
Log Message:
-----------
slirp: remove the disabled readv()/writev() code path
The soread() function may be used on datagram sockets, and would
provide different behaviour if HAVE_READV was set, on empty datagrams.
This looks like a minor optimization, that never has been a strong
goal for slirp.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: beac4b0e032d63c10c8e34a086ad41b3bff46540
https://github.com/qemu/qemu/commit/beac4b0e032d63c10c8e34a086ad41b3bff46540
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/slirp.h
M slirp/slirp_config.h
Log Message:
-----------
slirp: remove HAVE_SYS_SIGNAL_H
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: fd9cea43fce84148e61fc71db9551b9bbb76de4d
https://github.com/qemu/qemu/commit/fd9cea43fce84148e61fc71db9551b9bbb76de4d
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/slirp.h
M slirp/slirp_config.h
Log Message:
-----------
slirp: remove unused HAVE_SYS_BITYPES_H
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 4e65173dff9a094873e2e58be6cb1dc5f67fcb78
https://github.com/qemu/qemu/commit/4e65173dff9a094873e2e58be6cb1dc5f67fcb78
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/slirp.h
M slirp/slirp_config.h
Log Message:
-----------
slirp: remove NO_UNIX_SOCKETS
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 61abc6d3ab99a0c876b913c514270be7f5dcc7bf
https://github.com/qemu/qemu/commit/61abc6d3ab99a0c876b913c514270be7f5dcc7bf
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/slirp.h
M slirp/slirp_config.h
Log Message:
-----------
slirp: remove unused HAVE_SYS_STROPTS_H
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 5a5aa262990adcc84f1fdbbbd6cb9e6ea4154aa7
https://github.com/qemu/qemu/commit/5a5aa262990adcc84f1fdbbbd6cb9e6ea4154aa7
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/slirp_config.h
Log Message:
-----------
slirp: remove unused HAVE_ARPA_INET_H
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 94c168fed5bb2bf3a71b9e3d487d9e20edf9905d
https://github.com/qemu/qemu/commit/94c168fed5bb2bf3a71b9e3d487d9e20edf9905d
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/slirp.h
M slirp/slirp_config.h
Log Message:
-----------
slirp: remove unused HAVE_SYS_WAIT_H
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 8643dc3ef005956ecbf61f212a3842b002853775
https://github.com/qemu/qemu/commit/8643dc3ef005956ecbf61f212a3842b002853775
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/main.h
M slirp/slirp.h
M slirp/slirp_config.h
Log Message:
-----------
slirp: remove unused HAVE_SYS_SELECT_H
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 9ff748679846ac9016806f8cd22d52229fd9a8cd
https://github.com/qemu/qemu/commit/9ff748679846ac9016806f8cd22d52229fd9a8cd
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/slirp.h
M slirp/slirp_config.h
Log Message:
-----------
slirp: remove HAVE_SYS_IOCTL_H
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 53b8670b80f037a8ae65d470d325b8efcca25a77
https://github.com/qemu/qemu/commit/53b8670b80f037a8ae65d470d325b8efcca25a77
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/slirp.h
M slirp/slirp_config.h
Log Message:
-----------
slirp: remove HAVE_SYS_FILIO_H
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 7b00abe0aed87cf03ee02a140f397e4d1ccd05a6
https://github.com/qemu/qemu/commit/7b00abe0aed87cf03ee02a140f397e4d1ccd05a6
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/slirp_config.h
Log Message:
-----------
slirp: remove unused DECLARE_IOVEC
It's actually qemu configure CONFIG_IOVEC that is being used.
slirp/ does not use it anyway
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 1e9ba46dd0f2b1d21feb675715f5114c0073d822
https://github.com/qemu/qemu/commit/1e9ba46dd0f2b1d21feb675715f5114c0073d822
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/slirp_config.h
Log Message:
-----------
slirp: remove unused HAVE_INET_ATON
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: e429f29602098b0cd62eb375ec1ffea913afb675
https://github.com/qemu/qemu/commit/e429f29602098b0cd62eb375ec1ffea913afb675
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/ip.h
M slirp/ip6.h
M slirp/ip6_icmp.h
M slirp/slirp_config.h
M slirp/tcp.h
Log Message:
-----------
slirp: replace HOST_WORDS_BIGENDIAN with glib equivalent
One more step towards making the project independent from QEMU.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 0826c2400d98a0c35dc4d223e6833b3e2f6d929e
https://github.com/qemu/qemu/commit/0826c2400d98a0c35dc4d223e6833b3e2f6d929e
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/ip.h
M slirp/slirp_config.h
Log Message:
-----------
slirp: replace SIZEOF_CHAR_P with glib equivalent
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 987d3a51d56530a298ab343a6aefe340c4495422
https://github.com/qemu/qemu/commit/987d3a51d56530a298ab343a6aefe340c4495422
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/slirp.c
M slirp/slirp.h
R slirp/slirp_config.h
M slirp/tcp_input.c
M slirp/tcp_timer.c
Log Message:
-----------
slirp: replace compile time DO_KEEPALIVE
Use a global variable instead (similar to slirp_debug)
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 758ac766fab8bbcb3304b33513d66b5fc491b141
https://github.com/qemu/qemu/commit/758ac766fab8bbcb3304b33513d66b5fc491b141
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/slirp.h
Log Message:
-----------
slirp: remove unused global slirp_instance
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 90dfa2784164d1210ba95de462ce0f3b1030a698
https://github.com/qemu/qemu/commit/90dfa2784164d1210ba95de462ce0f3b1030a698
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/ip6_icmp.c
M slirp/misc.c
M slirp/slirp.c
Log Message:
-----------
slirp: replace error_report() with g_critical()
Reduce dependency on QEMU. QEMU could use a custom log handler if it
wants to redirect/filter it.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 2afbb788ff43c5cb5a91fb3da9cae6bd9a70731f
https://github.com/qemu/qemu/commit/2afbb788ff43c5cb5a91fb3da9cae6bd9a70731f
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/arp_table.c
M slirp/bootp.c
M slirp/cksum.c
M slirp/debug.h
M slirp/dhcpv6.c
M slirp/ip6_icmp.c
M slirp/ip_icmp.c
M slirp/mbuf.c
M slirp/ndp_table.c
M slirp/slirp.c
M slirp/socket.c
M slirp/tcp_input.c
M slirp/tcp_output.c
M slirp/tcp_subr.c
M slirp/udp.c
M slirp/udp6.c
Log Message:
-----------
slirp: improve a bit the debug macros
Let them accept multiple arguments. Simplify the inner argument
handling of DEBUG_ARGS/DEBUG_MISC_DEBUG_ERROR.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 2addc8fb6dac59b7232c65d1d43ec4bdd0b73420
https://github.com/qemu/qemu/commit/2addc8fb6dac59b7232c65d1d43ec4bdd0b73420
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M net/slirp.c
M slirp/dhcpv6.c
M slirp/ip6_icmp.c
M slirp/libslirp.h
Log Message:
-----------
slirp: add a callback to log guest errors
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 04c43b445849735177dcca105471e3c3d010b5fe
https://github.com/qemu/qemu/commit/04c43b445849735177dcca105471e3c3d010b5fe
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/ip_input.c
M slirp/tcp_input.c
Log Message:
-----------
slirp: remove #if notdef dead code
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 467bf528beb5cbf63d14cd8121b2eb37fcc82d54
https://github.com/qemu/qemu/commit/467bf528beb5cbf63d14cd8121b2eb37fcc82d54
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/sbuf.h
Log Message:
-----------
slirp: remove unused sbflush()
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 3a600d111a41d93da5e9ca04954ab64bd5107f1d
https://github.com/qemu/qemu/commit/3a600d111a41d93da5e9ca04954ab64bd5107f1d
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/slirp.h
Log Message:
-----------
slirp: NULL is defined by stddef.h
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 3a78c2f468e5458a7ce6658296b8af8019361ce6
https://github.com/qemu/qemu/commit/3a78c2f468e5458a7ce6658296b8af8019361ce6
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/tcp_input.c
Log Message:
-----------
slirp: remove dead TCP_ACK_HACK code
Untouched since original introduction in 2004.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 37b9117faa7348b33b64a2be03b2e69b568249d8
https://github.com/qemu/qemu/commit/37b9117faa7348b33b64a2be03b2e69b568249d8
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/ncsi.c
M slirp/tftp.c
Log Message:
-----------
slirp: replace ARRAY_SIZE with G_N_ELEMENTS
Do not require QEMU macro.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: e05ae1d9fb2b192f31e89a46c10d489500f3da19
https://github.com/qemu/qemu/commit/e05ae1d9fb2b192f31e89a46c10d489500f3da19
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M net/colo-compare.c
M net/colo.c
M net/colo.h
M net/filter-rewriter.c
M net/slirp.c
M net/util.h
M stubs/slirp.c
Log Message:
-----------
net: do not depend on slirp internals
Only slirp/libslirp.h should be included.
Instead of using some slirp declarations and utility functions directly,
let's copy them in net/util.h.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 0aeb4f2c9424fd283df581d0cae3843fcc045e0f
https://github.com/qemu/qemu/commit/0aeb4f2c9424fd283df581d0cae3843fcc045e0f
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M include/glib-compat.h
Log Message:
-----------
glib-compat: add g_spawn_async_with_fds() fallback
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 2bdb920ece0e05c7db70b6df44d724e4eebd91a0
https://github.com/qemu/qemu/commit/2bdb920ece0e05c7db70b6df44d724e4eebd91a0
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/misc.c
Log Message:
-----------
slirp: simplify fork_exec()
Use g_spawn_async_with_fds() to setup the child.
GSpawn handles reaping the child, and closing parent file descriptors.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 6b744ea42a4ef8062c5be269c4554328c4ed7c40
https://github.com/qemu/qemu/commit/6b744ea42a4ef8062c5be269c4554328c4ed7c40
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/misc.c
Log Message:
-----------
slirp: replace error_report() with g_critical()
Reduce dependency on QEMU. QEMU could use a custom log handler if it
wants to redirect/filter it.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: e589a4423fad1c4a03d7b589b2c24709e07cea4a
https://github.com/qemu/qemu/commit/e589a4423fad1c4a03d7b589b2c24709e07cea4a
Author: Samuel Thibault <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/misc.c
Log Message:
-----------
slirp: Enable fork_exec support on Windows
g_spawn_async_with_fds is portable on Windows, so we can now enable
fork_exec support there.
Thanks Daniel P. Berrangé for the notice!
Signed-off-by: Samuel Thibault <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Commit: df2ad332da6c8dd3053b5d5f1b1cc1cbdf6bad5e
https://github.com/qemu/qemu/commit/df2ad332da6c8dd3053b5d5f1b1cc1cbdf6bad5e
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M net/slirp.c
M slirp/ip6_icmp.c
M slirp/ndp_table.c
Log Message:
-----------
slirp: drop <Vista compatibility
Since commit 12f8def0e02232d7c6416ad9b66640f973c531d1 (v2.9), qemu
requires Vista. Let's remove some conditional code.
Note that this introduces a missing declaration warning with mingw.
warning: implicit declaration of function 'inet_ntop'
See also: https://sourceforge.net/p/mingw-w64/mailman/message/36473782/
We could workaround it by declaring it ourself depending on __MINGW64_VERSION_*:
WINSOCK_API_LINKAGE INT WSAAPI inet_pton(int Family, PCTSTR pszAddrString,
PVOID pAddrBuf);
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 5d300fc9222aa700b4449d73f26bf7cf0e5b9ec4
https://github.com/qemu/qemu/commit/5d300fc9222aa700b4449d73f26bf7cf0e5b9ec4
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/misc.c
M slirp/misc.h
M slirp/slirp.c
M slirp/slirp.h
M slirp/tcp_input.c
M slirp/tcp_subr.c
Log Message:
-----------
slirp: rename exec_list
This list is not only used to handle command to execute on guest
connection, it can also redirect to an arbitrary object, such as a
chardev. Let's rename the struct and the field to "guestfwd".
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 6c2d0980e20d0289fa058f29afe89840f4b7b465
https://github.com/qemu/qemu/commit/6c2d0980e20d0289fa058f29afe89840f4b7b465
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/if.c
M slirp/slirp.c
Log Message:
-----------
slirp: use virtual time for packet expiration
Make all packets expiration time based on virtual clock.
Suggested-by: Paolo Bonzini <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: b0866f0c50fccff6e4da52410b8fd838f38631ba
https://github.com/qemu/qemu/commit/b0866f0c50fccff6e4da52410b8fd838f38631ba
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/socket.c
Log Message:
-----------
slirp: replace a fprintf with g_critical()
Reduce dependency on QEMU. QEMU could use a custom glib log handler if
it wants to redirect/filter it.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 717615187496d503132c6e283b2b68553ecf9a5d
https://github.com/qemu/qemu/commit/717615187496d503132c6e283b2b68553ecf9a5d
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/slirp.c
Log Message:
-----------
slirp: replace some fprintf() with DEBUG_MISC
Remove some clutter, and avoids direct call to fprintf().
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: d0ea546caf76734e461f9b4124a2210e3afc23a6
https://github.com/qemu/qemu/commit/d0ea546caf76734e461f9b4124a2210e3afc23a6
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/ip_icmp.c
Log Message:
-----------
slirp: replace a DEBUG block with WITH_ICMP_ERROR_MSG
icmp_send_error() doesnt actually log messages when DEBUG is enabled.
Let's use a different define that describes better the tweaked
behaviour of the function, and avoid uncompiled code.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: c2b3350b67e71d16894d66238e8b55f5e521bd99
https://github.com/qemu/qemu/commit/c2b3350b67e71d16894d66238e8b55f5e521bd99
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/bootp.c
Log Message:
-----------
slirp: no need to make DPRINTF conditional on DEBUG
DEBUG_CALL is already handled conditionally.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 208408c3ed3f02ca97598f90319a2c5760271454
https://github.com/qemu/qemu/commit/208408c3ed3f02ca97598f90319a2c5760271454
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/debug.h
M slirp/misc.c
Log Message:
-----------
slirp: always build with debug statements
Make debug statements condiitonal only on slirp_debug flags, instead
of the pre-processor DEBUG blocks, as it may introduce breakage
easily, since the debug code isn't always compiled.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 039d5b6312738ba552527046509777e94a388ed5
https://github.com/qemu/qemu/commit/039d5b6312738ba552527046509777e94a388ed5
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/misc.c
M slirp/slirp.c
Log Message:
-----------
slirp: introduce SLIRP_DEBUG environment variable
Learn to read SLIRP_DEBUG=call,misc,error (all or help also handled)
to set the slirp_debug flags.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 3402618c3a802650bac70d63c1b3be8dd5039a9f
https://github.com/qemu/qemu/commit/3402618c3a802650bac70d63c1b3be8dd5039a9f
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/ip6_icmp.c
M slirp/ip6_input.c
M slirp/ip6_output.c
M slirp/udp6.c
Log Message:
-----------
slirp: use %p for pointers format
This fixes some compilation warnings on mingw64.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: eb0b159614a09948107cfb31e2761709ba039835
https://github.com/qemu/qemu/commit/eb0b159614a09948107cfb31e2761709ba039835
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/cksum.c
M slirp/ip_icmp.c
M slirp/slirp.c
Log Message:
-----------
slirp: remove remaining DEBUG blocks
Instead, rely on slirp_debug flags, or compile unconditionally (the
substraction in cksum is unlikely to affect any benchmark result).
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: a857d91d8cbf76f9485641fdcbb84ef4e510a67c
https://github.com/qemu/qemu/commit/a857d91d8cbf76f9485641fdcbb84ef4e510a67c
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/arp_table.c
M slirp/debug.h
M slirp/ip6_icmp.c
M slirp/ndp_table.c
M slirp/slirp.c
M slirp/tcp_input.c
Log Message:
-----------
slirp: replace DEBUG_ARGS with DEBUG_ARG
There is no clear benefit in calling an alias DEBUG_ARGS(). Replace
calls with DEBUG_ARG(), and fix the white-spacing while at it.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 4246e8cac719317476f5652975f1a4d537b75770
https://github.com/qemu/qemu/commit/4246e8cac719317476f5652975f1a4d537b75770
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/misc.c
M slirp/slirp.c
Log Message:
-----------
slirp: factor out guestfwd addition checks
This will allow reusing the function in a following patch.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: e6dbff3fb8d2d7ce6cfad54b0c1d767d908bd791
https://github.com/qemu/qemu/commit/e6dbff3fb8d2d7ce6cfad54b0c1d767d908bd791
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M net/slirp.c
M slirp/if.c
M slirp/ip6_icmp.c
M slirp/libslirp.h
M slirp/slirp.c
Log Message:
-----------
slirp: add clock_get_ns() callback
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 1fdf39927fc44e94c83d24ed92aa1913f3ab4dab
https://github.com/qemu/qemu/commit/1fdf39927fc44e94c83d24ed92aa1913f3ab4dab
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M Makefile
M Makefile.objs
M Makefile.target
M slirp/Makefile.objs
Log Message:
-----------
build-sys: use a separate slirp-obj-y && slirp.mo
This will allow to have cflags for the whole slirp.mo -objs.
It makes it possible to build tests that links only with
slirp-obj-y (and not the whole common-obj).
It is also a step towards building slirp as a shared library, although
this requires a bit more thoughts to build with
net/slirp.o (CONFIG_SLIRP would need to be 'm') and other build issues.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 2a2d3e4a258b9ed7ef5be7c6e421d58a365a0297
https://github.com/qemu/qemu/commit/2a2d3e4a258b9ed7ef5be7c6e421d58a365a0297
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/Makefile.objs
Log Message:
-----------
slirp: set G_LOG_DOMAIN
We are moving to g_log() facilities to log errors and probably debug
messages too. Let's have the "Slirp" prefix on messages slirp produces.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 226ea7a96485f2b9db13b523551c536dc68a1689
https://github.com/qemu/qemu/commit/226ea7a96485f2b9db13b523551c536dc68a1689
Author: Marc-André Lureau <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/cksum.c
M slirp/debug.h
M slirp/dhcpv6.c
M slirp/ip_icmp.c
M slirp/slirp.c
M slirp/socket.c
M slirp/tcp_input.c
M slirp/tcp_output.c
M slirp/tcp_subr.c
M slirp/udp.c
M slirp/udp6.c
Log Message:
-----------
slirp: call into g_debug() for DEBUG macros
Make slirp use GLib logging, instead of fprintf(), so that
applications can filter log, process it etc.
With recent versions of glib, G_MESSAGES_DEBUG must be set to "all" or
"Slirp" to see slirp debug messages.
Reformat DEBUG_MISC & DEBUG_ERROR calls to not need \n ending.
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 55ef9c617b4297d324cabfb68e6cea772349f5b4
https://github.com/qemu/qemu/commit/55ef9c617b4297d324cabfb68e6cea772349f5b4
Author: Samuel Thibault <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/debug.h
Log Message:
-----------
slirp: Mark debugging calls as unlikely
to get them out of the hot path.
Signed-off-by: Samuel Thibault <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Commit: a7104eda7dab99d0cdbd3595c211864cba415905
https://github.com/qemu/qemu/commit/a7104eda7dab99d0cdbd3595c211864cba415905
Author: Prasad J Pandit <address@hidden>
Date: 2019-01-14 (Mon, 14 Jan 2019)
Changed paths:
M slirp/tcp_subr.c
Log Message:
-----------
slirp: check data length while emulating ident function
While emulating identification protocol, tcp_emu() does not check
available space in the 'sc_rcv->sb_data' buffer. It could lead to
heap buffer overflow issue. Add check to avoid it.
Reported-by: Kira <address@hidden>
Signed-off-by: Prasad J Pandit <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
Commit: 6f2f34177a25bffd6fd92a05e6e66c8d22d97094
https://github.com/qemu/qemu/commit/6f2f34177a25bffd6fd92a05e6e66c8d22d97094
Author: Peter Maydell <address@hidden>
Date: 2019-01-15 (Tue, 15 Jan 2019)
Changed paths:
M Makefile
M Makefile.objs
M Makefile.target
M include/glib-compat.h
M net/colo-compare.c
M net/colo.c
M net/colo.h
M net/filter-rewriter.c
M net/slirp.c
M net/util.h
M slirp/Makefile.objs
M slirp/arp_table.c
M slirp/bootp.c
M slirp/cksum.c
M slirp/debug.h
M slirp/dhcpv6.c
M slirp/if.c
M slirp/ip.h
M slirp/ip6.h
M slirp/ip6_icmp.c
M slirp/ip6_icmp.h
M slirp/ip6_input.c
M slirp/ip6_output.c
M slirp/ip_icmp.c
M slirp/ip_input.c
M slirp/libslirp.h
M slirp/main.h
M slirp/mbuf.c
M slirp/mbuf.h
M slirp/misc.c
M slirp/misc.h
M slirp/ncsi.c
M slirp/ndp_table.c
M slirp/sbuf.h
M slirp/slirp.c
M slirp/slirp.h
R slirp/slirp_config.h
M slirp/socket.c
M slirp/socket.h
M slirp/tcp.h
M slirp/tcp_input.c
M slirp/tcp_output.c
M slirp/tcp_subr.c
M slirp/tcp_timer.c
M slirp/tftp.c
A slirp/trace-events
M slirp/udp.c
M slirp/udp6.c
M stubs/slirp.c
Log Message:
-----------
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into
staging
slirp updates
Gerd Hoffmann (1):
slirp: add tftp tracing
Marc-André Lureau (61):
slirp: associate slirp_output callback with the Slirp context
slirp: remove do_pty from fork_exec()
slirp: replace ex_pty with ex_chardev
slirp: use a dedicated field for chardev pointer
slirp: remove unused EMU_RSH
slirp: rename /extra/chardev
slirp: move internal function declarations
slirp: remove Monitor dependency, return a string for info
slirp: fix slirp_add_exec() leaks
slirp: replace the poor-man string split with g_strsplit()
slirp: remove dead declarations
slirp: move socket pair creation in helper function
slirp: remove unused M_TRAILINGSPACE
slirp: use a callback structure to interface with qemu
slirp: remove PROBE_CONN dead-code
slirp: remove FULL_BOLT
slirp: remove the disabled readv()/writev() code path
slirp: remove HAVE_SYS_SIGNAL_H
slirp: remove unused HAVE_SYS_BITYPES_H
slirp: remove NO_UNIX_SOCKETS
slirp: remove unused HAVE_SYS_STROPTS_H
slirp: remove unused HAVE_ARPA_INET_H
slirp: remove unused HAVE_SYS_WAIT_H
slirp: remove unused HAVE_SYS_SELECT_H
slirp: remove HAVE_SYS_IOCTL_H
slirp: remove HAVE_SYS_FILIO_H
slirp: remove unused DECLARE_IOVEC
slirp: remove unused HAVE_INET_ATON
slirp: replace HOST_WORDS_BIGENDIAN with glib equivalent
slirp: replace SIZEOF_CHAR_P with glib equivalent
slirp: replace compile time DO_KEEPALIVE
slirp: remove unused global slirp_instance
slirp: replace error_report() with g_critical()
slirp: improve a bit the debug macros
slirp: add a callback to log guest errors
slirp: remove #if notdef dead code
slirp: remove unused sbflush()
slirp: NULL is defined by stddef.h
slirp: remove dead TCP_ACK_HACK code
slirp: replace ARRAY_SIZE with G_N_ELEMENTS
net: do not depend on slirp internals
glib-compat: add g_spawn_async_with_fds() fallback
slirp: simplify fork_exec()
slirp: replace error_report() with g_critical()
slirp: drop <Vista compatibility
slirp: rename exec_list
slirp: use virtual time for packet expiration
slirp: replace a fprintf with g_critical()
slirp: replace some fprintf() with DEBUG_MISC
slirp: replace a DEBUG block with WITH_ICMP_ERROR_MSG
slirp: no need to make DPRINTF conditional on DEBUG
slirp: always build with debug statements
slirp: introduce SLIRP_DEBUG environment variable
slirp: use %p for pointers format
slirp: remove remaining DEBUG blocks
slirp: replace DEBUG_ARGS with DEBUG_ARG
slirp: factor out guestfwd addition checks
slirp: add clock_get_ns() callback
build-sys: use a separate slirp-obj-y && slirp.mo
slirp: set G_LOG_DOMAIN
slirp: call into g_debug() for DEBUG macros
Prasad J Pandit (1):
slirp: check data length while emulating ident function
Samuel Thibault (2):
slirp: Enable fork_exec support on Windows
slirp: Mark debugging calls as unlikely
Makefile | 5 +-
Makefile.objs | 4 +-
Makefile.target | 5 +-
include/glib-compat.h | 56 +++++++++
net/colo-compare.c | 11 +-
net/colo.c | 1 +
net/colo.h | 7 +-
net/filter-rewriter.c | 9 +-
net/slirp.c | 61 +++++----
net/util.h | 55 ++++++++
slirp/Makefile.objs | 37 +++++-
slirp/arp_table.c | 12 +-
slirp/bootp.c | 10 +-
slirp/cksum.c | 8 +-
slirp/debug.h | 47 ++++---
slirp/dhcpv6.c | 17 ++-
slirp/if.c | 4 +-
slirp/ip.h | 10 +-
slirp/ip6.h | 3 +-
slirp/ip6_icmp.c | 27 ++--
slirp/ip6_icmp.h | 6 +-
slirp/ip6_input.c | 2 +-
slirp/ip6_output.c | 4 +-
slirp/ip_icmp.c | 31 ++---
slirp/ip_input.c | 200 -----------------------------
slirp/libslirp.h | 27 ++--
slirp/main.h | 33 -----
slirp/mbuf.c | 2 +-
slirp/mbuf.h | 1 -
slirp/misc.c | 286 +++++++++++++++++-------------------------
slirp/misc.h | 13 +-
slirp/ncsi.c | 4 +-
slirp/ndp_table.c | 32 +++--
slirp/sbuf.h | 1 -
slirp/slirp.c | 177 +++++++++++++-------------
slirp/slirp.h | 45 ++-----
slirp/slirp_config.h | 86 -------------
slirp/socket.c | 53 +++-----
slirp/socket.h | 2 +-
slirp/tcp.h | 4 +-
slirp/tcp_input.c | 84 ++-----------
slirp/tcp_output.c | 2 +-
slirp/tcp_subr.c | 22 ++--
slirp/tcp_timer.c | 2 +-
slirp/tftp.c | 7 +-
slirp/trace-events | 5 +
slirp/udp.c | 5 +-
slirp/udp6.c | 11 +-
stubs/slirp.c | 2 +-
49 files changed, 603 insertions(+), 935 deletions(-)
delete mode 100644 slirp/slirp_config.h
create mode 100644 slirp/trace-events
--
2.20.1
# gpg: Signature made Mon 14 Jan 2019 22:52:32 GMT
# gpg: using RSA key DB550E89F0FA54F3
# gpg: Good signature from "Samuel Thibault <address@hidden>"
# gpg: aka "Samuel Thibault <address@hidden>"
# gpg: aka "Samuel Thibault <address@hidden>"
# gpg: aka "Samuel Thibault <address@hidden>"
# gpg: aka "Samuel Thibault <address@hidden>"
# gpg: aka "Samuel Thibault <address@hidden>"
# gpg: aka "Samuel Thibault <address@hidden>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 900C B024 B679 31D4 0F82 304B D017 8C76 7D06 9EE6
# Subkey fingerprint: E61D BB15 D417 2BDE C97E 92D9 DB55 0E89 F0FA 54F3
* remotes/thibault/tags/samuel-thibault: (65 commits)
slirp: check data length while emulating ident function
slirp: Mark debugging calls as unlikely
slirp: call into g_debug() for DEBUG macros
slirp: set G_LOG_DOMAIN
build-sys: use a separate slirp-obj-y && slirp.mo
slirp: add clock_get_ns() callback
slirp: factor out guestfwd addition checks
slirp: replace DEBUG_ARGS with DEBUG_ARG
slirp: remove remaining DEBUG blocks
slirp: use %p for pointers format
slirp: introduce SLIRP_DEBUG environment variable
slirp: always build with debug statements
slirp: no need to make DPRINTF conditional on DEBUG
slirp: replace a DEBUG block with WITH_ICMP_ERROR_MSG
slirp: replace some fprintf() with DEBUG_MISC
slirp: replace a fprintf with g_critical()
slirp: use virtual time for packet expiration
slirp: rename exec_list
slirp: drop <Vista compatibility
slirp: Enable fork_exec support on Windows
...
Signed-off-by: Peter Maydell <address@hidden>
Compare: https://github.com/qemu/qemu/compare/4b9f0b0f7c84...6f2f34177a25
**NOTE:** This service has been marked for deprecation:
https://developer.github.com/changes/2018-04-25-github-services-deprecation/
Functionality will be removed from GitHub.com on January 31st, 2019.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [qemu/qemu] 62c1d2: slirp: associate slirp_output callback with the Sl...,
GitHub <=