mbox

[PULLv2,00/65] slirp updates

Message ID 20190114000326.29847-1-samuel.thibault@ens-lyon.org (mailing list archive)
State New, archived
Headers show

Pull-request

https://people.debian.org/~sthibault/qemu.git tags/samuel-thibault

Message

Samuel Thibault Jan. 14, 2019, 12:02 a.m. UTC
The following changes since commit 27df21ca3886fff4dd3d70e515517667963a52f1:

  Merge remote-tracking branch 'remotes/kraxel/tags/misc-20190111-pull-request' into staging (2019-01-11 16:45:59 +0000)

are available in the Git repository at:

  https://people.debian.org/~sthibault/qemu.git tags/samuel-thibault

for you to fetch changes up to 341cb5fd7a15ebdaa821ff068b517e120f22c412:

  slirp: check data length while emulating ident function (2019-01-14 00:44:29 +0100)

----------------------------------------------------------------
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 seperate 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

----------------------------------------------------------------
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 seperate 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.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 +-
 48 files changed, 600 insertions(+), 933 deletions(-)
 delete mode 100644 slirp/slirp_config.h
 create mode 100644 slirp/trace-events

Comments

no-reply@patchew.org Jan. 14, 2019, 3:16 a.m. UTC | #1
Patchew URL: https://patchew.org/QEMU/20190114000326.29847-1-samuel.thibault@ens-lyon.org/



Hi,

This series failed the docker-mingw@fedora build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.

=== TEST SCRIPT BEGIN ===
#!/bin/bash
time make docker-test-mingw@fedora SHOW_ENV=1 J=14
=== TEST SCRIPT END ===




The full log is available at
http://patchew.org/logs/20190114000326.29847-1-samuel.thibault@ens-lyon.org/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
no-reply@patchew.org Jan. 14, 2019, 3:22 a.m. UTC | #2
Patchew URL: https://patchew.org/QEMU/20190114000326.29847-1-samuel.thibault@ens-lyon.org/



Hi,

This series seems to have some coding style problems. See output below for
more information:

Message-id: 20190114000326.29847-1-samuel.thibault@ens-lyon.org
Subject: [Qemu-devel] [PULLv2 00/65] slirp updates
Type: series

=== TEST SCRIPT BEGIN ===
#!/bin/bash
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'
6275a47 slirp: check data length while emulating ident function
9c74041 slirp: Mark debugging calls as unlikely
bb3d819 slirp: call into g_debug() for DEBUG macros
c36b2e7 slirp: set G_LOG_DOMAIN
7c8a45c build-sys: use a seperate slirp-obj-y && slirp.mo
8d5b1d5 slirp: add clock_get_ns() callback
9625749 slirp: factor out guestfwd addition checks
f61349d slirp: replace DEBUG_ARGS with DEBUG_ARG
9c2f0bd slirp: remove remaining DEBUG blocks
ce9fbc1 slirp: use %p for pointers format
dca554f slirp: introduce SLIRP_DEBUG environment variable
624d555 slirp: always build with debug statements
d9875b4 slirp: no need to make DPRINTF conditional on DEBUG
eabc9c0 slirp: replace a DEBUG block with WITH_ICMP_ERROR_MSG
c0314b8 slirp: replace some fprintf() with DEBUG_MISC
8b217c4 slirp: replace a fprintf with g_critical()
a3773ea slirp: use virtual time for packet expiration
2549a0a slirp: rename exec_list
ff22ca8 slirp: drop <Vista compatibility
50cf99b slirp: Enable fork_exec support on Windows
ef06e3b slirp: replace error_report() with g_critical()
3c7a3c3 slirp: simplify fork_exec()
cdedfeb glib-compat: add g_spawn_async_with_fds() fallback
b21bbac net: do not depend on slirp internals
42f9f3a slirp: replace ARRAY_SIZE with G_N_ELEMENTS
c4fd4ba slirp: remove dead TCP_ACK_HACK code
618041d slirp: NULL is defined by stddef.h
258e8a1 slirp: remove unused sbflush()
e860362 slirp: remove #if notdef dead code
96a7b15 slirp: add a callback to log guest errors
8b06252 slirp: improve a bit the debug macros
d8cb1dd slirp: replace error_report() with g_critical()
5cdf17c slirp: remove unused global slirp_instance
8d703b9 slirp: replace compile time DO_KEEPALIVE
f9fb126 slirp: replace SIZEOF_CHAR_P with glib equivalent
f4609a3 slirp: replace HOST_WORDS_BIGENDIAN with glib equivalent
b30900b slirp: remove unused HAVE_INET_ATON
595927a slirp: remove unused DECLARE_IOVEC
5f25a0b slirp: remove HAVE_SYS_FILIO_H
943ee65 slirp: remove HAVE_SYS_IOCTL_H
b182931 slirp: remove unused HAVE_SYS_SELECT_H
50d3be2 slirp: remove unused HAVE_SYS_WAIT_H
971efc1 slirp: remove unused HAVE_ARPA_INET_H
ee30888 slirp: remove unused HAVE_SYS_STROPTS_H
b85e88a slirp: remove NO_UNIX_SOCKETS
99f0499 slirp: remove unused HAVE_SYS_BITYPES_H
d4fa8e3 slirp: remove HAVE_SYS_SIGNAL_H
c647571 slirp: remove the disabled readv()/writev() code path
d1dcd07 slirp: remove FULL_BOLT
49461da slirp: remove PROBE_CONN dead-code
11a813c slirp: use a callback structure to interface with qemu
b062c22 slirp: remove unused M_TRAILINGSPACE
18429aa slirp: move socket pair creation in helper function
e7476d8 slirp: add tftp tracing
769c6de slirp: remove dead declarations
92837b8 slirp: replace the poor-man string split with g_strsplit()
6489a04 slirp: fix slirp_add_exec() leaks
c33bf7b slirp: remove Monitor dependency, return a string for info
0105004 slirp: move internal function declarations
2bc5d0d slirp: rename /extra/chardev
a6a522f slirp: remove unused EMU_RSH
1060874 slirp: use a dedicated field for chardev pointer
39f2cfd slirp: replace ex_pty with ex_chardev
6f3d11e slirp: remove do_pty from fork_exec()
ce0fc2e slirp: associate slirp_output callback with the Slirp context

=== OUTPUT BEGIN ===
1/65 Checking commit ce0fc2e88fc1 (slirp: associate slirp_output callback with the Slirp context)
2/65 Checking commit 6f3d11e27640 (slirp: remove do_pty from fork_exec())
3/65 Checking commit 39f2cfdab9a4 (slirp: replace ex_pty with ex_chardev)
ERROR: code indent should never use tabs
#22: FILE: slirp/misc.c:56:
+^I(*ex_ptr)->ex_chardev = do_pty == 3;$

ERROR: code indent should never use tabs
#35: FILE: slirp/misc.h:12:
+^Iint ex_chardev;$

total: 2 errors, 0 warnings, 40 lines checked

Patch 3/65 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

4/65 Checking commit 1060874fb7c0 (slirp: use a dedicated field for chardev pointer)
ERROR: code indent should never use tabs
#77: FILE: slirp/misc.c:53:
+^I*ex_ptr = g_new0(struct ex_list, 1);$

ERROR: code indent should never use tabs
#82: FILE: slirp/misc.c:56:
+^Iif (chardev) {$

ERROR: code indent should never use tabs
#83: FILE: slirp/misc.c:57:
+^I^I(*ex_ptr)->ex_chardev = chardev;$

ERROR: code indent should never use tabs
#84: FILE: slirp/misc.c:58:
+^I} else {$

ERROR: code indent should never use tabs
#85: FILE: slirp/misc.c:59:
+^I^I(*ex_ptr)->ex_exec = g_strdup(cmdline);$

ERROR: code indent should never use tabs
#86: FILE: slirp/misc.c:60:
+^I}$

ERROR: code indent should never use tabs
#99: FILE: slirp/misc.h:12:
+^Ivoid *ex_chardev;$

total: 7 errors, 0 warnings, 100 lines checked

Patch 4/65 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

5/65 Checking commit a6a522fc7355 (slirp: remove unused EMU_RSH)
6/65 Checking commit 2bc5d0d0c854 (slirp: rename /extra/chardev)
ERROR: "foo * bar" should be "foo *bar"
#39: FILE: slirp/socket.h:70:
+  void * chardev;

total: 1 errors, 0 warnings, 28 lines checked

Patch 6/65 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

7/65 Checking commit 0105004e4080 (slirp: move internal function declarations)
8/65 Checking commit c33bf7b08e20 (slirp: remove Monitor dependency, return a string for info)
9/65 Checking commit 6489a0499efa (slirp: fix slirp_add_exec() leaks)
ERROR: code indent should never use tabs
#22: FILE: slirp/misc.h:15:
+^Ichar *ex_exec;                  /* Command line of what to exec */$

total: 1 errors, 0 warnings, 22 lines checked

Patch 9/65 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

10/65 Checking commit 92837b86dc53 (slirp: replace the poor-man string split with g_strsplit())
ERROR: code indent should never use tabs
#26: FILE: slirp/misc.c:91:
+^Ichar **argv;$

ERROR: code indent should never use tabs
#27: FILE: slirp/misc.c:92:
+^Iint ret;$

total: 2 errors, 0 warnings, 33 lines checked

Patch 10/65 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

11/65 Checking commit 769c6de16559 (slirp: remove dead declarations)
12/65 Checking commit e7476d80f18d (slirp: add tftp tracing)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#57: 
new file mode 100644

total: 0 errors, 1 warnings, 33 lines checked

Patch 12/65 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
13/65 Checking commit 18429aa49561 (slirp: move socket pair creation in helper function)
ERROR: code indent should never use tabs
#102: FILE: slirp/misc.c:136:
+^Iint opt, c, sp[2];$

ERROR: code indent should never use tabs
#154: FILE: slirp/misc.c:151:
+^I^Iclosesocket(sp[0]);$

ERROR: code indent should never use tabs
#155: FILE: slirp/misc.c:152:
+^I^Iclosesocket(sp[1]);$

ERROR: code indent should never use tabs
#168: FILE: slirp/misc.c:156:
+^I^Isetsid();$

ERROR: code indent should never use tabs
#169: FILE: slirp/misc.c:157:
+^I^Idup2(sp[1], 0);$

ERROR: code indent should never use tabs
#170: FILE: slirp/misc.c:158:
+^I^Idup2(sp[1], 1);$

ERROR: code indent should never use tabs
#171: FILE: slirp/misc.c:159:
+^I^Idup2(sp[1], 2);$

ERROR: code indent should never use tabs
#172: FILE: slirp/misc.c:160:
+^I^Ifor (c = getdtablesize() - 1; c >= 3; c--)$

ERROR: suspect code indent for conditional statements (16, 19)
#172: FILE: slirp/misc.c:160:
+               for (c = getdtablesize() - 1; c >= 3; c--)
+                  close(c);

ERROR: braces {} are necessary for all arms of this statement
#172: FILE: slirp/misc.c:160:
+               for (c = getdtablesize() - 1; c >= 3; c--)
[...]

ERROR: code indent should never use tabs
#173: FILE: slirp/misc.c:161:
+^I^I   close(c);$

ERROR: code indent should never use tabs
#181: FILE: slirp/misc.c:173:
+^I^Iso->s = sp[0];$

ERROR: code indent should never use tabs
#182: FILE: slirp/misc.c:174:
+^I^Iclosesocket(sp[1]);$

ERROR: code indent should never use tabs
#196: FILE: slirp/misc.c:176:
+^I^Isocket_set_fast_reuse(so->s);$

ERROR: code indent should never use tabs
#197: FILE: slirp/misc.c:177:
+^I^Iopt = 1;$

WARNING: line over 80 characters
#198: FILE: slirp/misc.c:178:
+               qemu_setsockopt(so->s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(int));

ERROR: code indent should never use tabs
#198: FILE: slirp/misc.c:178:
+^I^Iqemu_setsockopt(so->s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(int));$

total: 16 errors, 1 warnings, 175 lines checked

Patch 13/65 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

14/65 Checking commit b062c225672b (slirp: remove unused M_TRAILINGSPACE)
15/65 Checking commit 11a813c58080 (slirp: use a callback structure to interface with qemu)
16/65 Checking commit 49461da94e37 (slirp: remove PROBE_CONN dead-code)
17/65 Checking commit d1dcd0787397 (slirp: remove FULL_BOLT)
18/65 Checking commit c647571f1719 (slirp: remove the disabled readv()/writev() code path)
19/65 Checking commit d4fa8e3e735e (slirp: remove HAVE_SYS_SIGNAL_H)
20/65 Checking commit 99f04996db32 (slirp: remove unused HAVE_SYS_BITYPES_H)
21/65 Checking commit b85e88ad1e19 (slirp: remove NO_UNIX_SOCKETS)
22/65 Checking commit ee308889ba4b (slirp: remove unused HAVE_SYS_STROPTS_H)
23/65 Checking commit 971efc11fa79 (slirp: remove unused HAVE_ARPA_INET_H)
24/65 Checking commit 50d3be21d155 (slirp: remove unused HAVE_SYS_WAIT_H)
25/65 Checking commit b182931f25a9 (slirp: remove unused HAVE_SYS_SELECT_H)
26/65 Checking commit 943ee65394ab (slirp: remove HAVE_SYS_IOCTL_H)
27/65 Checking commit 5f25a0be34be (slirp: remove HAVE_SYS_FILIO_H)
WARNING: architecture specific defines should be avoided
#21: FILE: slirp/slirp.h:39:
+#ifdef __APPLE__

total: 0 errors, 1 warnings, 20 lines checked

Patch 27/65 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
28/65 Checking commit 595927ac37c9 (slirp: remove unused DECLARE_IOVEC)
29/65 Checking commit b30900b86a18 (slirp: remove unused HAVE_INET_ATON)
30/65 Checking commit f4609a353a12 (slirp: replace HOST_WORDS_BIGENDIAN with glib equivalent)
31/65 Checking commit f9fb126ccc18 (slirp: replace SIZEOF_CHAR_P with glib equivalent)
32/65 Checking commit 8d703b9d6201 (slirp: replace compile time DO_KEEPALIVE)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#52: 
deleted file mode 100644

ERROR: code indent should never use tabs
#78: FILE: slirp/tcp_input.c:484:
+^Iif (slirp_do_keepalive)$

ERROR: suspect code indent for conditional statements (8, 11)
#78: FILE: slirp/tcp_input.c:484:
+       if (slirp_do_keepalive)
           tp->t_timer[TCPT_KEEP] = TCPTV_KEEPINTVL;

ERROR: braces {} are necessary for all arms of this statement
#78: FILE: slirp/tcp_input.c:484:
+       if (slirp_do_keepalive)
[...]
        else
[...]

ERROR: code indent should never use tabs
#91: FILE: slirp/tcp_timer.c:265:
+^I^Iif (slirp_do_keepalive && tp->t_state <= TCPS_CLOSE_WAIT) {$

total: 4 errors, 1 warnings, 43 lines checked

Patch 32/65 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

33/65 Checking commit 5cdf17cf45c4 (slirp: remove unused global slirp_instance)
34/65 Checking commit d8cb1dd94bf5 (slirp: replace error_report() with g_critical())
35/65 Checking commit 8b0625216191 (slirp: improve a bit the debug macros)
ERROR: code indent should never use tabs
#68: FILE: slirp/cksum.c:127:
+^I^IDEBUG_ERROR("cksum: out of data\n");$

ERROR: code indent should never use tabs
#69: FILE: slirp/cksum.c:128:
+^I^IDEBUG_ERROR(" len = %d\n", len);$

ERROR: code indent should never use tabs
#199: FILE: slirp/ip_icmp.c:168:
+^IDEBUG_MISC("icmp_input udp_attach errno = %d-%s\n",$

ERROR: space required after that ',' (ctx:VxV)
#200: FILE: slirp/ip_icmp.c:169:
+               errno,strerror(errno));
                     ^

ERROR: code indent should never use tabs
#210: FILE: slirp/ip_icmp.c:191:
+^IDEBUG_MISC("icmp_input udp sendto tx errno = %d-%s\n",$

ERROR: space required after that ',' (ctx:VxV)
#211: FILE: slirp/ip_icmp.c:192:
+               errno,strerror(errno));
                     ^

ERROR: code indent should never use tabs
#244: FILE: slirp/mbuf.c:235:
+^IDEBUG_ERROR("dtom failed");$

ERROR: line over 90 characters
#322: FILE: slirp/socket.c:211:
+                       DEBUG_MISC(" --- soread() disconnected, nn = %d, errno = %d-%s\n", nn, errno,strerror(errno));

ERROR: code indent should never use tabs
#322: FILE: slirp/socket.c:211:
+^I^I^IDEBUG_MISC(" --- soread() disconnected, nn = %d, errno = %d-%s\n", nn, errno,strerror(errno));$

ERROR: space required after that ',' (ctx:VxV)
#322: FILE: slirp/socket.c:211:
+                       DEBUG_MISC(" --- soread() disconnected, nn = %d, errno = %d-%s\n", nn, errno,strerror(errno));
                                                                                                    ^

ERROR: code indent should never use tabs
#331: FILE: slirp/socket.c:240:
+^IDEBUG_MISC(" ... read nn = %d bytes\n", nn);$

ERROR: code indent should never use tabs
#340: FILE: slirp/socket.c:373:
+^I^I^IDEBUG_ERROR("Didn't send all data urgently XXXXX\n");$

ERROR: line over 90 characters
#349: FILE: slirp/socket.c:382:
+       DEBUG_MISC(" ---2 sent %d bytes urgent data, %d urgent bytes left\n", n, so->so_urgc);

ERROR: code indent should never use tabs
#349: FILE: slirp/socket.c:382:
+^IDEBUG_MISC(" ---2 sent %d bytes urgent data, %d urgent bytes left\n", n, so->so_urgc);$

ERROR: code indent should never use tabs
#368: FILE: slirp/socket.c:481:
+^IDEBUG_MISC(" --- sowrite disconnected, so->so_state = %x, errno = %d\n",$

ERROR: code indent should never use tabs
#379: FILE: slirp/socket.c:515:
+^I    DEBUG_MISC(" udp icmp rx errno = %d-%s\n",$

ERROR: space required after that ',' (ctx:VxV)
#380: FILE: slirp/socket.c:516:
+                   errno,strerror(errno));
                         ^

ERROR: code indent should never use tabs
#390: FILE: slirp/socket.c:567:
+^I  DEBUG_MISC(" did recvfrom %d, errno = %d-%s\n",$

ERROR: space required after that ',' (ctx:VxV)
#391: FILE: slirp/socket.c:568:
+                 m->m_len, errno,strerror(errno));
                                 ^

ERROR: code indent should never use tabs
#400: FILE: slirp/socket.c:582:
+^I      DEBUG_MISC(" rx error, tx icmp ICMP_UNREACH:%i\n", code);$

ERROR: code indent should never use tabs
#409: FILE: slirp/socket.c:594:
+^I      DEBUG_MISC(" rx error, tx icmp6 ICMP_UNREACH:%i\n", code);$

ERROR: code indent should never use tabs
#436: FILE: slirp/tcp_input.c:239:
+^IDEBUG_ARGS(" m = %p  iphlen = %2d  inso = %p\n",$

ERROR: code indent should never use tabs
#447: FILE: slirp/tcp_input.c:665:
+^I    DEBUG_MISC(" tcp fconnect errno = %d-%s\n",$

ERROR: space required after that ',' (ctx:VxV)
#448: FILE: slirp/tcp_input.c:666:
+                   errno,strerror(errno));
                         ^

ERROR: suspect code indent for conditional statements (24, 26)
#455: FILE: slirp/tcp_input.c:1034:
                        if (ti->ti_len == 0 && tiwin == tp->snd_wnd) {
+                         DEBUG_MISC(" dup ack  m = %p  so = %p\n", m, so);

ERROR: code indent should never use tabs
#458: FILE: slirp/tcp_input.c:1035:
+^I^I^I  DEBUG_MISC(" dup ack  m = %p  so = %p\n", m, so);$

ERROR: code indent should never use tabs
#467: FILE: slirp/tcp_input.c:1413:
+^IDEBUG_ARGS(" tp = %p  cnt=%i\n", tp, cnt);$

ERROR: code indent should never use tabs
#476: FILE: slirp/tcp_input.c:1613:
+^IDEBUG_MISC(" returning mss = %d\n", mss);$

ERROR: code indent should never use tabs
#489: FILE: slirp/tcp_output.c:95:
+^IDEBUG_MISC(" --- tcp_output flags = 0x%x\n", flags);$

ERROR: code indent should never use tabs
#525: FILE: slirp/udp.c:175:
+^I    DEBUG_MISC(" udp_attach errno = %d-%s\n",$

ERROR: code indent should never use tabs
#535: FILE: slirp/udp.c:212:
+^I  DEBUG_MISC("udp tx errno = %d-%s\n", errno, strerror(errno));$

total: 31 errors, 0 warnings, 445 lines checked

Patch 35/65 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

36/65 Checking commit 96a7b158120e (slirp: add a callback to log guest errors)
37/65 Checking commit e86036219b00 (slirp: remove #if notdef dead code)
38/65 Checking commit 258e8a178217 (slirp: remove unused sbflush())
39/65 Checking commit 618041d3131b (slirp: NULL is defined by stddef.h)
40/65 Checking commit c4fd4baf8262 (slirp: remove dead TCP_ACK_HACK code)
41/65 Checking commit 42f9f3ada7b6 (slirp: replace ARRAY_SIZE with G_N_ELEMENTS)
ERROR: suspect code indent for conditional statements (2, 6)
#37: FILE: slirp/tftp.c:362:
+  while (k < pktlen && nb_options < G_N_ELEMENTS(option_name)) {
       const char *key, *value;

ERROR: suspect code indent for conditional statements (2, 6)
#44: FILE: slirp/tftp.c:405:
   if (nb_options > 0) {
+      assert(nb_options <= G_N_ELEMENTS(option_name));

total: 2 errors, 0 warnings, 24 lines checked

Patch 41/65 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

42/65 Checking commit b21bbacb1c38 (net: do not depend on slirp internals)
43/65 Checking commit cdedfeb7b8bb (glib-compat: add g_spawn_async_with_fds() fallback)
44/65 Checking commit 3c7a3c352c59 (slirp: simplify fork_exec())
WARNING: Block comments use a leading /* on a separate line
#58: FILE: slirp/misc.c:154:
+    g_spawn_async_with_fds(NULL /* cwd */,

WARNING: Block comments use a leading /* on a separate line
#60: FILE: slirp/misc.c:156:
+                           NULL /* env */,

WARNING: Block comments use a leading /* on a separate line
#62: FILE: slirp/misc.c:158:
+                           fork_exec_child_setup, NULL /* data */,

WARNING: Block comments use a leading /* on a separate line
#63: FILE: slirp/misc.c:159:
+                           NULL /* child_pid */,

total: 0 errors, 4 warnings, 92 lines checked

Patch 44/65 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
45/65 Checking commit ef06e3b7b2fb (slirp: replace error_report() with g_critical())
46/65 Checking commit 50cf99b1ddc3 (slirp: Enable fork_exec support on Windows)
47/65 Checking commit ff22ca88f466 (slirp: drop <Vista compatibility)
48/65 Checking commit 2549a0ad6501 (slirp: rename exec_list)
ERROR: code indent should never use tabs
#28: FILE: slirp/misc.c:42:
+^Istruct gfwd_list *tmp_ptr;$

ERROR: code indent should never use tabs
#37: FILE: slirp/misc.c:52:
+^I*ex_ptr = g_new0(struct gfwd_list, 1);$

ERROR: code indent should never use tabs
#56: FILE: slirp/misc.h:16:
+^Istruct gfwd_list *ex_next;$

WARNING: line over 80 characters
#99: FILE: slirp/slirp.c:783:
+            for (ex_ptr = slirp->guestfwd_list; ex_ptr; ex_ptr = ex_ptr->ex_next) {

WARNING: line over 80 characters
#173: FILE: slirp/tcp_input.c:397:
+            for (ex_ptr = slirp->guestfwd_list; ex_ptr; ex_ptr = ex_ptr->ex_next) {

ERROR: code indent should never use tabs
#182: FILE: slirp/tcp_input.c:619:
+^I^Ifor (ex_ptr = slirp->guestfwd_list; ex_ptr;$

ERROR: suspect code indent for conditional statements (16, 18)
#182: FILE: slirp/tcp_input.c:619:
+               for (ex_ptr = slirp->guestfwd_list; ex_ptr;
[...]
                  if(ex_ptr->ex_fport == so->so_fport &&

total: 5 errors, 2 warnings, 152 lines checked

Patch 48/65 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

49/65 Checking commit a3773ea55249 (slirp: use virtual time for packet expiration)
50/65 Checking commit 8b217c4a8c9a (slirp: replace a fprintf with g_critical())
51/65 Checking commit c0314b856a02 (slirp: replace some fprintf() with DEBUG_MISC)
52/65 Checking commit eabc9c071561 (slirp: replace a DEBUG block with WITH_ICMP_ERROR_MSG)
53/65 Checking commit d9875b4a1082 (slirp: no need to make DPRINTF conditional on DEBUG)
54/65 Checking commit 624d55579187 (slirp: always build with debug statements)
55/65 Checking commit dca554f9de99 (slirp: introduce SLIRP_DEBUG environment variable)
56/65 Checking commit ce9fbc17091b (slirp: use %p for pointers format)
57/65 Checking commit 9c2f0bdf4f99 (slirp: remove remaining DEBUG blocks)
58/65 Checking commit f61349dcb374 (slirp: replace DEBUG_ARGS with DEBUG_ARG)
ERROR: code indent should never use tabs
#145: FILE: slirp/tcp_input.c:218:
+^IDEBUG_ARG("m = %p  iphlen = %2d  inso = %p",$

ERROR: code indent should never use tabs
#155: FILE: slirp/tcp_input.c:1392:
+^IDEBUG_ARG("tp = %p  cnt=%i", tp, cnt);$

total: 2 errors, 0 warnings, 112 lines checked

Patch 58/65 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

59/65 Checking commit 962574912f2e (slirp: factor out guestfwd addition checks)
60/65 Checking commit 8d5b1d5a03d7 (slirp: add clock_get_ns() callback)
61/65 Checking commit 7c8a45c26a48 (build-sys: use a seperate slirp-obj-y && slirp.mo)
62/65 Checking commit c36b2e7d0124 (slirp: set G_LOG_DOMAIN)
63/65 Checking commit bb3d819d9e35 (slirp: call into g_debug() for DEBUG macros)
ERROR: code indent should never use tabs
#29: FILE: slirp/cksum.c:124:
+^I^IDEBUG_ERROR("cksum: out of data");$

ERROR: code indent should never use tabs
#30: FILE: slirp/cksum.c:125:
+^I^IDEBUG_ERROR(" len = %d", len);$

ERROR: code indent should never use tabs
#127: FILE: slirp/ip_icmp.c:172:
+^IDEBUG_MISC("icmp_input udp_attach errno = %d-%s",$

ERROR: code indent should never use tabs
#136: FILE: slirp/ip_icmp.c:195:
+^IDEBUG_MISC("icmp_input udp sendto tx errno = %d-%s",$

WARNING: line over 80 characters
#204: FILE: slirp/socket.c:211:
+                       DEBUG_MISC(" --- soread() disconnected, nn = %d, errno = %d-%s",

ERROR: code indent should never use tabs
#204: FILE: slirp/socket.c:211:
+^I^I^IDEBUG_MISC(" --- soread() disconnected, nn = %d, errno = %d-%s",$

ERROR: space required after that ',' (ctx:VxV)
#205: FILE: slirp/socket.c:212:
+                       nn, errno,strerror(errno));
                                 ^

ERROR: code indent should never use tabs
#214: FILE: slirp/socket.c:241:
+^IDEBUG_MISC(" ... read nn = %d bytes", nn);$

ERROR: code indent should never use tabs
#223: FILE: slirp/socket.c:374:
+^I^I^IDEBUG_ERROR("Didn't send all data urgently XXXXX");$

ERROR: line over 90 characters
#232: FILE: slirp/socket.c:383:
+       DEBUG_MISC(" ---2 sent %d bytes urgent data, %d urgent bytes left", n, so->so_urgc);

ERROR: code indent should never use tabs
#232: FILE: slirp/socket.c:383:
+^IDEBUG_MISC(" ---2 sent %d bytes urgent data, %d urgent bytes left", n, so->so_urgc);$

ERROR: code indent should never use tabs
#250: FILE: slirp/socket.c:482:
+^IDEBUG_MISC(" --- sowrite disconnected, so->so_state = %x, errno = %d",$

ERROR: code indent should never use tabs
#259: FILE: slirp/socket.c:516:
+^I    DEBUG_MISC(" udp icmp rx errno = %d-%s",$

ERROR: code indent should never use tabs
#268: FILE: slirp/socket.c:568:
+^I  DEBUG_MISC(" did recvfrom %d, errno = %d-%s",$

ERROR: code indent should never use tabs
#277: FILE: slirp/socket.c:583:
+^I      DEBUG_MISC(" rx error, tx icmp ICMP_UNREACH:%i", code);$

ERROR: code indent should never use tabs
#286: FILE: slirp/socket.c:595:
+^I      DEBUG_MISC(" rx error, tx icmp6 ICMP_UNREACH:%i", code);$

ERROR: code indent should never use tabs
#310: FILE: slirp/tcp_input.c:644:
+^I    DEBUG_MISC(" tcp fconnect errno = %d-%s", errno, strerror(errno));$

ERROR: suspect code indent for conditional statements (24, 26)
#317: FILE: slirp/tcp_input.c:1012:
                        if (ti->ti_len == 0 && tiwin == tp->snd_wnd) {
+                         DEBUG_MISC(" dup ack  m = %p  so = %p", m, so);

ERROR: code indent should never use tabs
#319: FILE: slirp/tcp_input.c:1013:
+^I^I^I  DEBUG_MISC(" dup ack  m = %p  so = %p", m, so);$

ERROR: code indent should never use tabs
#328: FILE: slirp/tcp_input.c:1552:
+^IDEBUG_MISC(" returning mss = %d", mss);$

ERROR: code indent should never use tabs
#341: FILE: slirp/tcp_output.c:95:
+^IDEBUG_MISC(" --- tcp_output flags = 0x%x", flags);$

ERROR: code indent should never use tabs
#368: FILE: slirp/udp.c:175:
+^I    DEBUG_MISC(" udp_attach errno = %d-%s", errno, strerror(errno));$

ERROR: code indent should never use tabs
#377: FILE: slirp/udp.c:211:
+^I  DEBUG_MISC("udp tx errno = %d-%s", errno, strerror(errno));$

total: 22 errors, 1 warnings, 310 lines checked

Patch 63/65 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

64/65 Checking commit 9c74041547ad (slirp: Mark debugging calls as unlikely)
65/65 Checking commit 6275a478c2d9 (slirp: check data length while emulating ident function)
ERROR: code indent should never use tabs
#24: FILE: slirp/tcp_subr.c:637:
+^I^I^Iif (m->m_len > so_rcv->sb_datalen$

ERROR: code indent should never use tabs
#25: FILE: slirp/tcp_subr.c:638:
+^I^I^I^I^I- (so_rcv->sb_wptr - so_rcv->sb_data)) {$

ERROR: code indent should never use tabs
#26: FILE: slirp/tcp_subr.c:639:
+^I^I^I    return 1;$

ERROR: code indent should never use tabs
#27: FILE: slirp/tcp_subr.c:640:
+^I^I^I}$

total: 4 errors, 0 warnings, 11 lines checked

Patch 65/65 has style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

=== OUTPUT END ===

Test command exited with code: 1


The full log is available at
http://patchew.org/logs/20190114000326.29847-1-samuel.thibault@ens-lyon.org/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
Samuel Thibault Jan. 14, 2019, 7:18 a.m. UTC | #3
no-reply@patchew.org, le dim. 13 janv. 2019 19:16:44 -0800, a ecrit:
> This series failed the docker-mingw@fedora build test. Please find the testing commands and
> their output below. If you have Docker installed, you can probably reproduce it
> locally.
> 
> === TEST SCRIPT BEGIN ===
> #!/bin/bash
> time make docker-test-mingw@fedora SHOW_ENV=1 J=14
> === TEST SCRIPT END ===
> 
> The full log is available at
> http://patchew.org/logs/20190114000326.29847-1-samuel.thibault@ens-lyon.org/testing.docker-mingw@fedora/?type=message.

make[1]: *** No rule to make target '../slirp/arp_table.o', needed by 'qemu-system-aarch64w.exe'.  Stop.

Samuel
Marc-André Lureau Jan. 14, 2019, 9:54 p.m. UTC | #4
Hi

On Mon, Jan 14, 2019 at 11:19 AM Samuel Thibault
<samuel.thibault@gnu.org> wrote:
>
> no-reply@patchew.org, le dim. 13 janv. 2019 19:16:44 -0800, a ecrit:
> > This series failed the docker-mingw@fedora build test. Please find the testing commands and
> > their output below. If you have Docker installed, you can probably reproduce it
> > locally.
> >
> > === TEST SCRIPT BEGIN ===
> > #!/bin/bash
> > time make docker-test-mingw@fedora SHOW_ENV=1 J=14
> > === TEST SCRIPT END ===
> >
> > The full log is available at
> > http://patchew.org/logs/20190114000326.29847-1-samuel.thibault@ens-lyon.org/testing.docker-mingw@fedora/?type=message.
>
> make[1]: *** No rule to make target '../slirp/arp_table.o', needed by 'qemu-system-aarch64w.exe'.  Stop.

Build failure when building entirely outside of QEMU source tree, it
needs to have correct dependency set on SUBDIR_RULES targets. Please
squash in "build-sys: use a seperate slirp-obj-y && slirp.mo":

diff --git a/Makefile b/Makefile
index a9ac16d94e8..dccba1dca27 100644
--- a/Makefile
+++ b/Makefile
@@ -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))