[Qemu-devel] [PULL 0/3] slirp updates

[Qemu-devel] [PULL 0/3] slirp updates

[Samuel Thibault]

warning: redirection vers https://people.debian.org/~sthibault/qemu.git/
The following changes since commit 460b6c8e581aa06b86f59eebd9e52edfe7adf417:

  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2017-09-23 12:55:40 +0100)

are available in the git repository at:

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

for you to fetch changes up to 13146a83951e045c810c37c5c11c2a016ebc0663:

  slirp: Add a special case for the NULL socket (2017-09-24 20:04:09 +0200)

----------------------------------------------------------------
slirp updates

----------------------------------------------------------------
Dr. David Alan Gilbert (1):
      slirp: Add explanation for hostfwd parsing failure

Kevin Cernekee (2):
      slirp: Fix intermittent send queue hangs on a socket
      slirp: Add a special case for the NULL socket

 net/slirp.c   | 13 ++++++++++-
 slirp/if.c    | 69 +++++++++++++++++++++++------------------------------------
 slirp/slirp.h |  1 -
 3 files changed, 39 insertions(+), 44 deletions(-)

[Qemu-devel] [PULL 1/3] slirp: Add explanation for hostfwd parsing failure

[Samuel Thibault]

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

e.g.
./x86_64-softmmu/qemu-system-x86_64 -nographic -netdev 'user,id=vnet,hostfwd=:555.0.0.0:0-:22'
qemu-system-x86_64: -netdev user,id=vnet,hostfwd=:555.0.0.0:0-:22: Invalid host forwarding rule ':555.0.0.0:0-:22' (Bad host address)

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
 net/slirp.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/net/slirp.c b/net/slirp.c
index 01ed21c006..318a26e892 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -496,9 +496,11 @@ static int slirp_hostfwd(SlirpState *s, const char *redir_str,
     char buf[256];
     int is_udp;
     char *end;
+    const char *fail_reason = "Unknown reason";
 
     p = redir_str;
     if (!p || get_str_sep(buf, sizeof(buf), &p, ':') < 0) {
+        fail_reason = "No : separators";
         goto fail_syntax;
     }
     if (!strcmp(buf, "tcp") || buf[0] == '\0') {
@@ -506,35 +508,43 @@ static int slirp_hostfwd(SlirpState *s, const char *redir_str,
     } else if (!strcmp(buf, "udp")) {
         is_udp = 1;
     } else {
+        fail_reason = "Bad protocol name";
         goto fail_syntax;
     }
 
     if (!legacy_format) {
         if (get_str_sep(buf, sizeof(buf), &p, ':') < 0) {
+            fail_reason = "Missing : separator";
             goto fail_syntax;
         }
         if (buf[0] != '\0' && !inet_aton(buf, &host_addr)) {
+            fail_reason = "Bad host address";
             goto fail_syntax;
         }
     }
 
     if (get_str_sep(buf, sizeof(buf), &p, legacy_format ? ':' : '-') < 0) {
+        fail_reason = "Bad host port separator";
         goto fail_syntax;
     }
     host_port = strtol(buf, &end, 0);
     if (*end != '\0' || host_port < 0 || host_port > 65535) {
+        fail_reason = "Bad host port";
         goto fail_syntax;
     }
 
     if (get_str_sep(buf, sizeof(buf), &p, ':') < 0) {
+        fail_reason = "Missing guest address";
         goto fail_syntax;
     }
     if (buf[0] != '\0' && !inet_aton(buf, &guest_addr)) {
+        fail_reason = "Bad guest address";
         goto fail_syntax;
     }
 
     guest_port = strtol(p, &end, 0);
     if (*end != '\0' || guest_port < 1 || guest_port > 65535) {
+        fail_reason = "Bad guest port";
         goto fail_syntax;
     }
 
@@ -547,7 +557,8 @@ static int slirp_hostfwd(SlirpState *s, const char *redir_str,
     return 0;
 
  fail_syntax:
-    error_setg(errp, "Invalid host forwarding rule '%s'", redir_str);
+    error_setg(errp, "Invalid host forwarding rule '%s' (%s)", redir_str,
+               fail_reason);
     return -1;
 }
 
-- 
2.14.1

[Qemu-devel] [PULL 2/3] slirp: Fix intermittent send queue hangs on a socket

[Samuel Thibault]

From: Kevin Cernekee <cernekee@chromium.org>

if_output() originally sent one mbuf per call and used the slirp->next_m
variable to keep track of where it left off.  But nowadays it tries to
send all of the mbufs from the fastq, and one mbuf from each session on
the batchq.  The next_m variable is both redundant and harmful: there is
a case[0] involving delayed packets in which next_m ends up pointing
to &slirp->if_batchq when an active session still exists, and this
blocks all traffic for that session until qemu is restarted.

The test case was created to reproduce a problem that was seen on
long-running Chromium OS VM tests[1] which rapidly create and
destroy ssh connections through hostfwd.

[0] https://pastebin.com/NNy6LreF
[1] https://bugs.chromium.org/p/chromium/issues/detail?id=766323

Signed-off-by: Kevin Cernekee <cernekee@chromium.org>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
 slirp/if.c    | 51 +++++++++++++++++----------------------------------
 slirp/slirp.h |  1 -
 2 files changed, 17 insertions(+), 35 deletions(-)

diff --git a/slirp/if.c b/slirp/if.c
index 51ae0d0e9a..6262d77495 100644
--- a/slirp/if.c
+++ b/slirp/if.c
@@ -30,7 +30,6 @@ if_init(Slirp *slirp)
 {
     slirp->if_fastq.qh_link = slirp->if_fastq.qh_rlink = &slirp->if_fastq;
     slirp->if_batchq.qh_link = slirp->if_batchq.qh_rlink = &slirp->if_batchq;
-    slirp->next_m = (struct mbuf *) &slirp->if_batchq;
 }
 
 /*
@@ -100,10 +99,6 @@ if_output(struct socket *so, struct mbuf *ifm)
 		}
         } else {
 		ifq = (struct mbuf *) slirp->if_batchq.qh_rlink;
-                /* Set next_m if the queue was empty so far */
-                if ((struct quehead *) slirp->next_m == &slirp->if_batchq) {
-                    slirp->next_m = ifm;
-                }
         }
 
 	/* Create a new doubly linked list for this session */
@@ -143,21 +138,18 @@ diddit:
 }
 
 /*
- * Send a packet
- * We choose a packet based on its position in the output queues;
+ * Send one packet from each session.
  * If there are packets on the fastq, they are sent FIFO, before
- * everything else.  Otherwise we choose the first packet from the
- * batchq and send it.  the next packet chosen will be from the session
- * after this one, then the session after that one, and so on..  So,
- * for example, if there are 3 ftp session's fighting for bandwidth,
+ * everything else.  Then we choose the first packet from each
+ * batchq session (socket) and send it.
+ * For example, if there are 3 ftp sessions fighting for bandwidth,
  * one packet will be sent from the first session, then one packet
- * from the second session, then one packet from the third, then back
- * to the first, etc. etc.
+ * from the second session, then one packet from the third.
  */
 void if_start(Slirp *slirp)
 {
     uint64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
-    bool from_batchq, next_from_batchq;
+    bool from_batchq = false;
     struct mbuf *ifm, *ifm_next, *ifqt;
 
     DEBUG_CALL("if_start");
@@ -167,26 +159,29 @@ void if_start(Slirp *slirp)
     }
     slirp->if_start_busy = true;
 
+    struct mbuf *batch_head = NULL;
+    if (slirp->if_batchq.qh_link != &slirp->if_batchq) {
+        batch_head = (struct mbuf *) slirp->if_batchq.qh_link;
+    }
+
     if (slirp->if_fastq.qh_link != &slirp->if_fastq) {
         ifm_next = (struct mbuf *) slirp->if_fastq.qh_link;
-        next_from_batchq = false;
-    } else if ((struct quehead *) slirp->next_m != &slirp->if_batchq) {
-        /* Nothing on fastq, pick up from batchq via next_m */
-        ifm_next = slirp->next_m;
-        next_from_batchq = true;
+    } else if (batch_head) {
+        /* Nothing on fastq, pick up from batchq */
+        ifm_next = batch_head;
+        from_batchq = true;
     } else {
         ifm_next = NULL;
     }
 
     while (ifm_next) {
         ifm = ifm_next;
-        from_batchq = next_from_batchq;
 
         ifm_next = ifm->ifq_next;
         if ((struct quehead *) ifm_next == &slirp->if_fastq) {
             /* No more packets in fastq, switch to batchq */
-            ifm_next = slirp->next_m;
-            next_from_batchq = true;
+            ifm_next = batch_head;
+            from_batchq = true;
         }
         if ((struct quehead *) ifm_next == &slirp->if_batchq) {
             /* end of batchq */
@@ -199,11 +194,6 @@ void if_start(Slirp *slirp)
             continue;
         }
 
-        if (ifm == slirp->next_m) {
-            /* Set which packet to send on next iteration */
-            slirp->next_m = ifm->ifq_next;
-        }
-
         /* Remove it from the queue */
         ifqt = ifm->ifq_prev;
         remque(ifm);
@@ -214,15 +204,8 @@ void if_start(Slirp *slirp)
 
             insque(next, ifqt);
             ifs_remque(ifm);
-
             if (!from_batchq) {
-                /* Next packet in fastq is from the same session */
                 ifm_next = next;
-                next_from_batchq = false;
-            } else if ((struct quehead *) slirp->next_m == &slirp->if_batchq) {
-                /* Set next_m and ifm_next if the session packet is now the
-                 * only one on batchq */
-                slirp->next_m = ifm_next = next;
             }
         }
 
diff --git a/slirp/slirp.h b/slirp/slirp.h
index 5af4f482b5..898ec9516d 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -183,7 +183,6 @@ struct Slirp {
     /* if states */
     struct quehead if_fastq;   /* fast queue (for interactive data) */
     struct quehead if_batchq;  /* queue for non-interactive data */
-    struct mbuf *next_m;    /* pointer to next mbuf to output */
     bool if_start_busy;     /* avoid if_start recursion */
 
     /* ip states */
-- 
2.14.1

[Qemu-devel] [PULL 3/3] slirp: Add a special case for the NULL socket

[Samuel Thibault]

From: Kevin Cernekee <cernekee@chromium.org>

NULL sockets are used for NDP, BOOTP, and other critical operations.
If the topmost mbuf in a NULL session is blocked pending resolution,
it may cause problems if it blocks other packets with a NULL socket.
So do not add mbufs with a NULL socket field to the same session.

Signed-off-by: Kevin Cernekee <cernekee@chromium.org>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
 slirp/if.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/slirp/if.c b/slirp/if.c
index 6262d77495..590753c658 100644
--- a/slirp/if.c
+++ b/slirp/if.c
@@ -73,14 +73,16 @@ if_output(struct socket *so, struct mbuf *ifm)
 	 * We mustn't put this packet back on the fastq (or we'll send it out of order)
 	 * XXX add cache here?
 	 */
-	for (ifq = (struct mbuf *) slirp->if_batchq.qh_rlink;
-	     (struct quehead *) ifq != &slirp->if_batchq;
-	     ifq = ifq->ifq_prev) {
-		if (so == ifq->ifq_so) {
-			/* A match! */
-			ifm->ifq_so = so;
-			ifs_insque(ifm, ifq->ifs_prev);
-			goto diddit;
+	if (so) {
+		for (ifq = (struct mbuf *) slirp->if_batchq.qh_rlink;
+		     (struct quehead *) ifq != &slirp->if_batchq;
+		     ifq = ifq->ifq_prev) {
+			if (so == ifq->ifq_so) {
+				/* A match! */
+				ifm->ifq_so = so;
+				ifs_insque(ifm, ifq->ifs_prev);
+				goto diddit;
+			}
 		}
 	}
 
-- 
2.14.1

Re: [Qemu-devel] [PULL 0/3] slirp updates

[no-reply]

Hi,

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

Type: series
Message-id: 20170924180848.19168-1-samuel.thibault@ens-lyon.org
Subject: [Qemu-devel] [PULL 0/3] slirp updates

=== TEST SCRIPT BEGIN ===
#!/bin/bash

BASE=base
n=1
total=$(git log --oneline $BASE.. | wc -l)
failed=0

git config --local diff.renamelimit 0
git config --local diff.renames True

commits="$(git log --format=%H --reverse $BASE..)"
for c in $commits; do
    echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..."
    if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then
        failed=1
        echo
    fi
    n=$((n+1))
done

exit $failed
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'
3b8560cf71 slirp: Add a special case for the NULL socket
91a5c1c7c4 slirp: Fix intermittent send queue hangs on a socket
16d5416215 slirp: Add explanation for hostfwd parsing failure

=== OUTPUT BEGIN ===
Checking PATCH 1/3: slirp: Add explanation for hostfwd parsing failure...
Checking PATCH 2/3: slirp: Fix intermittent send queue hangs on a socket...
Checking PATCH 3/3: slirp: Add a special case for the NULL socket...
ERROR: code indent should never use tabs
#31: FILE: slirp/if.c:76:
+^Iif (so) {$

ERROR: code indent should never use tabs
#32: FILE: slirp/if.c:77:
+^I^Ifor (ifq = (struct mbuf *) slirp->if_batchq.qh_rlink;$

ERROR: code indent should never use tabs
#33: FILE: slirp/if.c:78:
+^I^I     (struct quehead *) ifq != &slirp->if_batchq;$

ERROR: code indent should never use tabs
#34: FILE: slirp/if.c:79:
+^I^I     ifq = ifq->ifq_prev) {$

ERROR: code indent should never use tabs
#35: FILE: slirp/if.c:80:
+^I^I^Iif (so == ifq->ifq_so) {$

ERROR: code indent should never use tabs
#36: FILE: slirp/if.c:81:
+^I^I^I^I/* A match! */$

ERROR: code indent should never use tabs
#37: FILE: slirp/if.c:82:
+^I^I^I^Iifm->ifq_so = so;$

ERROR: code indent should never use tabs
#38: FILE: slirp/if.c:83:
+^I^I^I^Iifs_insque(ifm, ifq->ifs_prev);$

ERROR: code indent should never use tabs
#39: FILE: slirp/if.c:84:
+^I^I^I^Igoto diddit;$

ERROR: code indent should never use tabs
#40: FILE: slirp/if.c:85:
+^I^I^I}$

total: 10 errors, 0 warnings, 24 lines checked

Your patch 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


---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@freelists.org

Re: [Qemu-devel] [PULL 0/3] slirp updates

[Peter Maydell]

On 24 September 2017 at 19:08, Samuel Thibault
<samuel.thibault@ens-lyon.org> wrote:
> warning: redirection vers https://people.debian.org/~sthibault/qemu.git/
> The following changes since commit 460b6c8e581aa06b86f59eebd9e52edfe7adf417:
>
>   Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2017-09-23 12:55:40 +0100)
>
> are available in the git repository at:
>
>   http://people.debian.org/~sthibault/qemu.git tags/samuel-thibault
>
> for you to fetch changes up to 13146a83951e045c810c37c5c11c2a016ebc0663:
>
>   slirp: Add a special case for the NULL socket (2017-09-24 20:04:09 +0200)
>
> ----------------------------------------------------------------
> slirp updates
>
> ----------------------------------------------------------------
> Dr. David Alan Gilbert (1):
>       slirp: Add explanation for hostfwd parsing failure
>
> Kevin Cernekee (2):
>       slirp: Fix intermittent send queue hangs on a socket
>       slirp: Add a special case for the NULL socket

Applied, thanks.

-- PMM

Re: [Qemu-devel] [PULL 0/3] slirp updates

[Samuel Thibault]

This is actually superseded by the complete pull I have just sent.

Samuel

[Qemu-devel] [PULL 0/3] slirp updates

[Samuel Thibault]

The following changes since commit ad7a21e81231ae64540310384fb0f87ac8758b02:

  Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into staging (2019-01-25 17:22:20 +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 4956f29c43c2105dc37ee9826959b3aa1d3b0b69:

  slirp: Don't mark struct ipq or struct ipasfrag as packed (2019-01-26 22:09:48 +0100)

----------------------------------------------------------------
slirp updates

Peter Maydell (2):
  slirp: Avoid marking naturally packed structs as QEMU_PACKED
  slirp: Don't mark struct ipq or struct ipasfrag as packed

Samuel Thibault (1):
  slirp: Avoid unaligned 16bit memory access

----------------------------------------------------------------
Peter Maydell (2):
      slirp: Avoid marking naturally packed structs as QEMU_PACKED
      slirp: Don't mark struct ipq or struct ipasfrag as packed

Samuel Thibault (1):
      slirp: Avoid unaligned 16bit memory access

 slirp/ip.h       |  7 +++++--
 slirp/ip6.h      | 12 ++++++++++--
 slirp/ip6_icmp.h | 20 +++++++++++++++-----
 slirp/slirp.c    |  2 +-
 4 files changed, 31 insertions(+), 10 deletions(-)

Re: [Qemu-devel] [PULL 0/3] Slirp updates

[Peter Maydell]

On 7 October 2018 at 19:05, Samuel Thibault
<samuel.thibault@ens-lyon.org> wrote:
> The following changes since commit 3c2d3042849686969add641bd38b08b9877b9e8f:
>
>   Merge remote-tracking branch 'remotes/mcayland/tags/qemu-openbios.for-upstream-20181005' into staging (2018-10-05 17:55:22 +0100)
>
> are available in the Git repository at:
>
>   https://people.debian.org/~sthibault/qemu.git tags/samuel-thibault
>
> for you to fetch changes up to 93a972f8548571d35c718ca3a94d5ab1507b2443:
>
>   slirp: Propagate host TCP RST packet to the guest after socket disconnected (2018-10-07 19:50:48 +0200)
>
> ----------------------------------------------------------------
> slirp updates
>
> Andrew Oates (1):
>   slirp: fix ICMP handling on macOS hosts
>
> Gavin Grant (1):
>   slirp: Propagate host TCP RST packet to the guest after socket
>     disconnected
>
> Peter Maydell (1):
>   slirp: document mbuf pointers and sizes
>

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/3] Slirp updates

[Samuel Thibault]

The following changes since commit 3c2d3042849686969add641bd38b08b9877b9e8f:

  Merge remote-tracking branch 'remotes/mcayland/tags/qemu-openbios.for-upstream-20181005' into staging (2018-10-05 17:55:22 +0100)

are available in the Git repository at:

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

for you to fetch changes up to 93a972f8548571d35c718ca3a94d5ab1507b2443:

  slirp: Propagate host TCP RST packet to the guest after socket disconnected (2018-10-07 19:50:48 +0200)

----------------------------------------------------------------
slirp updates

Andrew Oates (1):
  slirp: fix ICMP handling on macOS hosts

Gavin Grant (1):
  slirp: Propagate host TCP RST packet to the guest after socket
    disconnected

Peter Maydell (1):
  slirp: document mbuf pointers and sizes

----------------------------------------------------------------
Andrew Oates (1):
      slirp: fix ICMP handling on macOS hosts

Gavin Grant (1):
      slirp: Propagate host TCP RST packet to the guest after socket disconnected

Peter Maydell (1):
      slirp: document mbuf pointers and sizes

 slirp/ip_icmp.c | 27 ++++++++++++++++++++++++++-
 slirp/mbuf.c    | 14 +++++++-------
 slirp/mbuf.h    | 13 +++++++++++++
 slirp/socket.c  | 13 ++++++++++---
 4 files changed, 56 insertions(+), 11 deletions(-)

Re: [Qemu-devel] [PULL 0/3] slirp updates

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 1153 bytes --]

On Sat, May 27, 2017 at 11:46:15PM +0200, Samuel Thibault wrote:
> The following changes since commit 9964e96dc9999cf7f7c936ee854a795415d19b60:
> 
>   Merge remote-tracking branch 'jasowang/tags/net-pull-request' into staging (2017-05-23 15:01:31 +0100)
> 
> are available in the git repository at:
> 
>   http://people.debian.org/~sthibault/qemu.git tags/samuel-thibault
> 
> for you to fetch changes up to 2e30230aa95a2d6cfaadac015bd96c3db19c45e4:
> 
>   Fix total IP header length in forwarded TCP packets (2017-05-27 23:35:00 +0200)
> 
> ----------------------------------------------------------------
> slirp updates
> 
> ----------------------------------------------------------------
> Marc-André Lureau (1):
>       slirp: fix leak
> 
> Sjors Gielen (1):
>       Fix total IP header length in forwarded TCP packets
> 
> Tao Wu (1):
>       slirp: Fix wrong mss bug.
> 
>  slirp/socket.c    | 3 +++
>  slirp/tcp_input.c | 4 ++--
>  slirp/tcp_subr.c  | 4 ++--
>  3 files changed, 7 insertions(+), 4 deletions(-)
> 

Thanks, applied to my staging tree:
https://github.com/stefanha/qemu/commits/staging

Stefan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]

Re: [Qemu-devel] [PULL 0/3] slirp updates

[no-reply]

Hi,

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

Subject: [Qemu-devel] [PULL 0/3] slirp updates
Message-id: 20170527214618.32626-1-samuel.thibault@ens-lyon.org
Type: series

=== TEST SCRIPT BEGIN ===
#!/bin/bash

BASE=base
n=1
total=$(git log --oneline $BASE.. | wc -l)
failed=0

git config --local diff.renamelimit 0
git config --local diff.renames True

commits="$(git log --format=%H --reverse $BASE..)"
for c in $commits; do
    echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..."
    if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then
        failed=1
        echo
    fi
    n=$((n+1))
done

exit $failed
=== TEST SCRIPT END ===

Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
 * [new tag]         patchew/20170527214618.32626-1-samuel.thibault@ens-lyon.org -> patchew/20170527214618.32626-1-samuel.thibault@ens-lyon.org
Switched to a new branch 'test'
489f78a Fix total IP header length in forwarded TCP packets
c0516eb slirp: fix leak
faedb70 slirp: Fix wrong mss bug.

=== OUTPUT BEGIN ===
Checking PATCH 1/3: slirp: Fix wrong mss bug....
ERROR: code indent should never use tabs
#25: FILE: slirp/tcp_input.c:1590:
+^I                              - sizeof(struct ip);$

ERROR: code indent should never use tabs
#30: FILE: slirp/tcp_input.c:1594:
+^I                              - sizeof(struct ip6);$

total: 2 errors, 0 warnings, 13 lines checked

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

Checking PATCH 2/3: slirp: fix leak...
ERROR: suspect code indent for conditional statements (2, 6)
#38: FILE: slirp/socket.c:103:
+  if (so->so_tcpcb) {
+      free(so->so_tcpcb);

total: 1 errors, 0 warnings, 9 lines checked

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

Checking PATCH 3/3: Fix total IP header length in forwarded TCP packets...
ERROR: code indent should never use tabs
#23: FILE: slirp/tcp_subr.c:207:
+^I    ip->ip_len = m->m_len;$

ERROR: code indent should never use tabs
#32: FILE: slirp/tcp_subr.c:227:
+^I    ip6->ip_pl = tcpiph_save.ti_len;$

total: 2 errors, 0 warnings, 16 lines checked

Your patch 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


---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to patchew-devel@freelists.org

[Qemu-devel] [PULL 0/3] slirp updates

[Samuel Thibault]

The following changes since commit 9964e96dc9999cf7f7c936ee854a795415d19b60:

  Merge remote-tracking branch 'jasowang/tags/net-pull-request' into staging (2017-05-23 15:01:31 +0100)

are available in the git repository at:

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

for you to fetch changes up to 2e30230aa95a2d6cfaadac015bd96c3db19c45e4:

  Fix total IP header length in forwarded TCP packets (2017-05-27 23:35:00 +0200)

----------------------------------------------------------------
slirp updates

----------------------------------------------------------------
Marc-André Lureau (1):
      slirp: fix leak

Sjors Gielen (1):
      Fix total IP header length in forwarded TCP packets

Tao Wu (1):
      slirp: Fix wrong mss bug.

 slirp/socket.c    | 3 +++
 slirp/tcp_input.c | 4 ++--
 slirp/tcp_subr.c  | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

Re: [Qemu-devel] [PULL 0/3] slirp updates

[Peter Maydell]

On 29 March 2017 at 12:16, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> On Wed, Mar 29, 2017 at 12:53:24AM +0200, Samuel Thibault wrote:
>> The following changes since commit df9046363220e57d45818312759b954c033c58ab:
>>
>>   Update version for v2.9.0-rc2 release (2017-03-28 19:11:16 +0100)
>>
>> are available in the git repository at:
>>
>>   http://people.debian.org/~sthibault/qemu.git tags/samuel-thibault
>>
>> for you to fetch changes up to a2f80fdfc683019901cdf4c0863a5920c0ca7245:
>>
>>   slirp: Send RDNSS in RA only if host has an IPv6 DNS server (2017-03-29 00:51:25 +0200)
>>
>> ----------------------------------------------------------------
>> slirp updates
>>
>> ----------------------------------------------------------------
>> Laurent Vivier (1):
>>       slirp: fix compilation errors with DEBUG set
>>
>> Samuel Thibault (2):
>>       slirp: Make RA build more flexible
>>       slirp: Send RDNSS in RA only if host has an IPv6 DNS server
>>
>>  slirp/ip6_icmp.c | 47 ++++++++++++++++++++++-------------------------
>>  slirp/slirp.c    |  2 +-
>>  2 files changed, 23 insertions(+), 26 deletions(-)
>
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

Applied, thanks.

-- PMM

Re: [Qemu-devel] [PULL 0/3] slirp updates

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 1115 bytes --]

On Wed, Mar 29, 2017 at 12:53:24AM +0200, Samuel Thibault wrote:
> The following changes since commit df9046363220e57d45818312759b954c033c58ab:
> 
>   Update version for v2.9.0-rc2 release (2017-03-28 19:11:16 +0100)
> 
> are available in the git repository at:
> 
>   http://people.debian.org/~sthibault/qemu.git tags/samuel-thibault
> 
> for you to fetch changes up to a2f80fdfc683019901cdf4c0863a5920c0ca7245:
> 
>   slirp: Send RDNSS in RA only if host has an IPv6 DNS server (2017-03-29 00:51:25 +0200)
> 
> ----------------------------------------------------------------
> slirp updates
> 
> ----------------------------------------------------------------
> Laurent Vivier (1):
>       slirp: fix compilation errors with DEBUG set
> 
> Samuel Thibault (2):
>       slirp: Make RA build more flexible
>       slirp: Send RDNSS in RA only if host has an IPv6 DNS server
> 
>  slirp/ip6_icmp.c | 47 ++++++++++++++++++++++-------------------------
>  slirp/slirp.c    |  2 +-
>  2 files changed, 23 insertions(+), 26 deletions(-)

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 455 bytes --]

[Qemu-devel] [PULL 0/3] slirp updates

[Samuel Thibault]

The following changes since commit df9046363220e57d45818312759b954c033c58ab:

  Update version for v2.9.0-rc2 release (2017-03-28 19:11:16 +0100)

are available in the git repository at:

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

for you to fetch changes up to a2f80fdfc683019901cdf4c0863a5920c0ca7245:

  slirp: Send RDNSS in RA only if host has an IPv6 DNS server (2017-03-29 00:51:25 +0200)

----------------------------------------------------------------
slirp updates

----------------------------------------------------------------
Laurent Vivier (1):
      slirp: fix compilation errors with DEBUG set

Samuel Thibault (2):
      slirp: Make RA build more flexible
      slirp: Send RDNSS in RA only if host has an IPv6 DNS server

 slirp/ip6_icmp.c | 47 ++++++++++++++++++++++-------------------------
 slirp/slirp.c    |  2 +-
 2 files changed, 23 insertions(+), 26 deletions(-)

Re: [Qemu-devel] [PULL 0/3] slirp updates

[Peter Maydell]

On 26 February 2017 at 14:43, Samuel Thibault
<samuel.thibault@ens-lyon.org> wrote:
> The following changes since commit 6528a4c1f20c1ba5a22ab84bec6788a574ac04c8:
>
>   Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging (2017-02-26 11:47:00 +0000)
>
> are available in the git repository at:
>
>   http://people.debian.org/~sthibault/qemu.git tags/samuel-thibault
>
> for you to fetch changes up to bd5d2353aa69e68e45d8a89787bab17c155e9e24:
>
>   slirp: tcp_listen(): Don't try to close() an fd we never opened (2017-02-26 15:39:29 +0100)
>
> ----------------------------------------------------------------
> slirp updates
>
> ----------------------------------------------------------------
> Peter Maydell (3):
>       slirp: Check qemu_socket() return value in udp_listen()
>       slirp: Convert mbufs to use g_malloc() and g_free()
>       slirp: tcp_listen(): Don't try to close() an fd we never opened
>
>  slirp/mbuf.c   | 30 ++++++++++++++----------------
>  slirp/socket.c |  4 +++-
>  slirp/udp.c    |  4 ++++
>  3 files changed, 21 insertions(+), 17 deletions(-)

Applied, thanks.

-- PMM

[Qemu-devel] [PULL 0/3] slirp updates

[Samuel Thibault]

The following changes since commit 6528a4c1f20c1ba5a22ab84bec6788a574ac04c8:

  Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging (2017-02-26 11:47:00 +0000)

are available in the git repository at:

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

for you to fetch changes up to bd5d2353aa69e68e45d8a89787bab17c155e9e24:

  slirp: tcp_listen(): Don't try to close() an fd we never opened (2017-02-26 15:39:29 +0100)

----------------------------------------------------------------
slirp updates

----------------------------------------------------------------
Peter Maydell (3):
      slirp: Check qemu_socket() return value in udp_listen()
      slirp: Convert mbufs to use g_malloc() and g_free()
      slirp: tcp_listen(): Don't try to close() an fd we never opened

 slirp/mbuf.c   | 30 ++++++++++++++----------------
 slirp/socket.c |  4 +++-
 slirp/udp.c    |  4 ++++
 3 files changed, 21 insertions(+), 17 deletions(-)