Commit 6f2f3417 authored Jan 15, 2019 by Peter Maydell

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 <samuel.thibault@aquilenet.fr>"
# gpg:                 aka "Samuel Thibault <sthibault@debian.org>"
# gpg:                 aka "Samuel Thibault <samuel.thibault@gnu.org>"
# gpg:                 aka "Samuel Thibault <samuel.thibault@inria.fr>"
# gpg:                 aka "Samuel Thibault <samuel.thibault@labri.fr>"
# gpg:                 aka "Samuel Thibault <samuel.thibault@ens-lyon.org>"
# gpg:                 aka "Samuel Thibault <samuel.thibault@u-bordeaux.fr>"
# 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 <peter.maydell@linaro.org>

parents 4b9f0b0f a7104eda

Makefile

+3 −2

Original line number	Diff line number	Diff line
		@@ -379,7 +379,8 @@ dummy := $(call unnest-vars,, \
		ui-obj-m \
		audio-obj-y \
		audio-obj-m \
		trace-obj-y)
		trace-obj-y \
		slirp-obj-y)

		include $(SRC_PATH)/tests/Makefile.include

		@@ -452,7 +453,7 @@ CAP_CFLAGS += -DCAPSTONE_HAS_X86
		subdir-capstone: .git-submodule-status
		$(call quiet-command,$(MAKE) -C $(SRC_PATH)/capstone CAPSTONE_SHARED=no BUILDDIR="$(BUILD_DIR)/capstone" CC="$(CC)" AR="$(AR)" LD="$(LD)" RANLIB="$(RANLIB)" CFLAGS="$(CAP_CFLAGS)" $(SUBDIR_MAKEFLAGS) $(BUILD_DIR)/capstone/$(LIBCAPSTONE))

		$(SUBDIR_RULES): libqemuutil.a $(common-obj-y) $(chardev-obj-y) \
		$(SUBDIR_RULES): libqemuutil.a $(common-obj-y) $(chardev-obj-y) $(slirp-obj-y) \
		$(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY))

		ROMSUBDIR_RULES=$(patsubst %,romsubdir-%, $(ROMS))

Makefile.objs

+2 −2

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ util-obj-y += $(QAPI_MODULES:%=qapi/qapi-events-%.o)
		util-obj-y += qapi/qapi-introspect.o

		chardev-obj-y = chardev/
		slirp-obj-$(CONFIG_SLIRP) = slirp/

		#######################################################################
		# block-obj-y is code used by both qemu system emulation and qemu-img
		@@ -79,8 +80,6 @@ common-obj-y += vl.o
		vl.o-cflags := $(GPROF_CFLAGS) $(SDL_CFLAGS)
		common-obj-$(CONFIG_TPM) += tpm.o

		common-obj-$(CONFIG_SLIRP) += slirp/

		common-obj-y += backends/
		common-obj-y += chardev/

		@@ -193,6 +192,7 @@ trace-events-subdirs += net
		trace-events-subdirs += qapi
		trace-events-subdirs += qom
		trace-events-subdirs += scsi
		trace-events-subdirs += slirp
		trace-events-subdirs += target/arm
		trace-events-subdirs += target/i386
		trace-events-subdirs += target/mips

Makefile.target

+4 −1

Original line number	Diff line number	Diff line
		@@ -165,6 +165,7 @@ target-obj-y :=
		block-obj-y :=
		common-obj-y :=
		chardev-obj-y :=
		slirp-obj-y :=
		include $(SRC_PATH)/Makefile.objs
		dummy := $(call unnest-vars,,target-obj-y)
		target-obj-y-save := $(target-obj-y)
		@@ -177,7 +178,8 @@ dummy := $(call unnest-vars,.., \
		qom-obj-y \
		io-obj-y \
		common-obj-y \
		common-obj-m)
		common-obj-m \
		slirp-obj-y)
		target-obj-y := $(target-obj-y-save)
		all-obj-y += $(common-obj-y)
		all-obj-y += $(target-obj-y)
		@@ -186,6 +188,7 @@ all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y) $(chardev-obj-y)
		all-obj-$(CONFIG_USER_ONLY) += $(crypto-aes-obj-y)
		all-obj-$(CONFIG_SOFTMMU) += $(crypto-obj-y)
		all-obj-$(CONFIG_SOFTMMU) += $(io-obj-y)
		all-obj-$(CONFIG_SOFTMMU) += $(slirp-obj-y)

		$(QEMU_PROG_BUILD): config-devices.mak

include/glib-compat.h

+56 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,62 @@ static inline gboolean g_strv_contains_qemu(const gchar const strv,
		}
		#define g_strv_contains(a, b) g_strv_contains_qemu(a, b)

		#if !GLIB_CHECK_VERSION(2, 58, 0)
		typedef struct QemuGSpawnFds {
		GSpawnChildSetupFunc child_setup;
		gpointer user_data;
		gint stdin_fd;
		gint stdout_fd;
		gint stderr_fd;
		} QemuGSpawnFds;

		static inline void
		qemu_gspawn_fds_setup(gpointer user_data)
		{
		QemuGSpawnFds q = (QemuGSpawnFds )user_data;

		dup2(q->stdin_fd, 0);
		dup2(q->stdout_fd, 1);
		dup2(q->stderr_fd, 2);
		q->child_setup(q->user_data);
		}
		#endif

		static inline gboolean
		g_spawn_async_with_fds_qemu(const gchar *working_directory,
		gchar **argv,
		gchar **envp,
		GSpawnFlags flags,
		GSpawnChildSetupFunc child_setup,
		gpointer user_data,
		GPid *child_pid,
		gint stdin_fd,
		gint stdout_fd,
		gint stderr_fd,
		GError **error)
		{
		#if GLIB_CHECK_VERSION(2, 58, 0)
		return g_spawn_async_with_fds(working_directory, argv, envp, flags,
		child_setup, user_data,
		child_pid, stdin_fd, stdout_fd, stderr_fd,
		error);
		#else
		QemuGSpawnFds setup = {
		.child_setup = child_setup,
		.user_data = user_data,
		.stdin_fd = stdin_fd,
		.stdout_fd = stdout_fd,
		.stderr_fd = stderr_fd,
		};

		return g_spawn_async(working_directory, argv, envp, flags,
		qemu_gspawn_fds_setup, &setup,
		child_pid, error);
		#endif
		}

		#define g_spawn_async_with_fds(wd, argv, env, f, c, d, p, ifd, ofd, efd, err) \
		g_spawn_async_with_fds_qemu(wd, argv, env, f, c, d, p, ifd, ofd, efd, err)

		#if defined(_WIN32) && !GLIB_CHECK_VERSION(2, 50, 0)
		/*

net/colo-compare.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@
		#include "net/colo-compare.h"
		#include "migration/colo.h"
		#include "migration/migration.h"
		#include "util.h"

		#define TYPE_COLO_COMPARE "colo-compare"
		#define COLO_COMPARE(obj) \
		@@ -129,19 +130,19 @@ static int compare_chr_send(CompareState *s,

		static gint seq_sorter(Packet a, Packet b, gpointer data)
		{
		struct tcphdr atcp, btcp;
		struct tcp_hdr atcp, btcp;

		atcp = (struct tcphdr *)(a->transport_header);
		btcp = (struct tcphdr *)(b->transport_header);
		atcp = (struct tcp_hdr *)(a->transport_header);
		btcp = (struct tcp_hdr *)(b->transport_header);
		return ntohl(atcp->th_seq) - ntohl(btcp->th_seq);
		}

		static void fill_pkt_tcp_info(void data, uint32_t max_ack)
		{
		Packet *pkt = data;
		struct tcphdr *tcphd;
		struct tcp_hdr *tcphd;

		tcphd = (struct tcphdr *)pkt->transport_header;
		tcphd = (struct tcp_hdr *)pkt->transport_header;

		pkt->tcp_seq = ntohl(tcphd->th_seq);
		pkt->tcp_ack = ntohl(tcphd->th_ack);