* [Qemu-devel] [PULL 1/4] slirp: Clean up slirp_config.h
2016-05-16 19:25 [Qemu-devel] [PULL 0/4] slirp updates Samuel Thibault
@ 2016-05-16 19:25 ` Samuel Thibault
2016-05-16 19:25 ` [Qemu-devel] [PULL 2/4] slirp: Remove obsolete backward-compatibility cruft Samuel Thibault
` (3 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: Samuel Thibault @ 2016-05-16 19:25 UTC (permalink / raw)
To: qemu-devel, peter.maydell; +Cc: Thomas Huth, jan.kiszka, Samuel Thibault
From: Thomas Huth <thuth@redhat.com>
There are a lot of unused #defines / #undefs in slirp_config.h,
which are apparently left-overs from the very early slirp code.
Since there is no more code that uses them, let's simply remove
them from our version of slirp.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
slirp/slirp_config.h | 87 ----------------------------------------------------
1 file changed, 87 deletions(-)
diff --git a/slirp/slirp_config.h b/slirp/slirp_config.h
index 896d802..a5fa36e 100644
--- a/slirp/slirp_config.h
+++ b/slirp/slirp_config.h
@@ -9,19 +9,6 @@
/* Define to 1 if you want KEEPALIVE timers */
#define DO_KEEPALIVE 0
-/* Define to MAX interfaces you expect to use at once */
-/* MAX_INTERFACES determines the max. TOTAL number of interfaces (SLIP and PPP) */
-/* MAX_PPP_INTERFACES determines max. number of PPP interfaces */
-#define MAX_INTERFACES 1
-#define MAX_PPP_INTERFACES 1
-
-/* Define if you want slirp's socket in /tmp */
-/* XXXXXX Do this in ./configure */
-#undef USE_TMPSOCKET
-
-/* Define if you want slirp to use cfsetXspeed() on the terminal */
-#undef DO_CFSETSPEED
-
/* Define this if you want slirp to write to the tty as fast as it can */
/* This should only be set if you are using load-balancing, slirp does a */
/* pretty good job on single modems already, and seting this will make */
@@ -29,34 +16,12 @@
/* XXXXX Talk about having fast modem as unit 0 */
#undef FULL_BOLT
-/*
- * Define if you want slirp to use less CPU
- * You will notice a small lag in interactive sessions, but it's not that bad
- * Things like Netscape/ftp/etc. are completely unaffected
- * This is mainly for sysadmins who have many slirp users
- */
-#undef USE_LOWCPU
-
-/* Define this if your compiler doesn't like prototypes */
-#ifndef __STDC__
-#define NO_PROTOTYPES
-#endif
-
/*********************************************************/
/*
* Autoconf defined configuration options
* You shouldn't need to touch any of these
*/
-/* Ignore this */
-#undef DUMMY_PPP
-
-/* Define if you have unistd.h */
-#define HAVE_UNISTD_H
-
-/* Define if you have stdlib.h */
-#define HAVE_STDLIB_H
-
/* Define if you have sys/ioctl.h */
#undef HAVE_SYS_IOCTL_H
#ifndef _WIN32
@@ -72,10 +37,6 @@
/* Define if you have strerror */
#define HAVE_STRERROR
-/* Define according to how time.h should be included */
-#define TIME_WITH_SYS_TIME 0
-#undef HAVE_SYS_TIME_H
-
/* Define if you have sys/bitypes.h */
#undef HAVE_SYS_BITYPES_H
@@ -100,9 +61,6 @@
#define HAVE_SYS_SELECT_H
#endif
-/* Define if you have strings.h */
-#define HAVE_STRING_H
-
/* Define if you have arpa/inet.h */
#undef HAVE_ARPA_INET_H
#ifndef _WIN32
@@ -115,51 +73,18 @@
/* Define if you have sys/stropts.h */
#undef HAVE_SYS_STROPTS_H
-/* Define to whatever your compiler thinks inline should be */
-//#define inline inline
-
-/* Define to whatever your compiler thinks const should be */
-//#define const const
-
-/* Define if your compiler doesn't like prototypes */
-#undef NO_PROTOTYPES
-
-/* Define to sizeof(char) */
-#define SIZEOF_CHAR 1
-
-/* Define to sizeof(short) */
-#define SIZEOF_SHORT 2
-
-/* Define to sizeof(int) */
-#define SIZEOF_INT 4
-
/* Define to sizeof(char *) */
#define SIZEOF_CHAR_P (HOST_LONG_BITS / 8)
-/* Define if you have random() */
-#undef HAVE_RANDOM
-
-/* Define if you have srandom() */
-#undef HAVE_SRANDOM
-
/* Define if you have inet_aton */
#undef HAVE_INET_ATON
#ifndef _WIN32
#define HAVE_INET_ATON
#endif
-/* Define if you have setenv */
-#undef HAVE_SETENV
-
/* Define if you have index() */
#define HAVE_INDEX
-/* Define if you have bcmp() */
-#undef HAVE_BCMP
-
-/* Define if you have drand48 */
-#undef HAVE_DRAND48
-
/* Define if you have memmove */
#define HAVE_MEMMOVE
@@ -171,15 +96,3 @@
#ifdef _WIN32
#define NO_UNIX_SOCKETS
#endif
-
-/* Define if you have revoke() */
-#undef HAVE_REVOKE
-
-/* Define if you have the sysv method of opening pty's (/dev/ptmx, etc.) */
-#undef HAVE_GRANTPT
-
-/* Define if you have fchmod */
-#undef HAVE_FCHMOD
-
-/* Define if you have <sys/type32.h> */
-#undef HAVE_SYS_TYPES32_H
--
2.8.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Qemu-devel] [PULL 2/4] slirp: Remove obsolete backward-compatibility cruft
2016-05-16 19:25 [Qemu-devel] [PULL 0/4] slirp updates Samuel Thibault
2016-05-16 19:25 ` [Qemu-devel] [PULL 1/4] slirp: Clean up slirp_config.h Samuel Thibault
@ 2016-05-16 19:25 ` Samuel Thibault
2016-05-16 19:25 ` [Qemu-devel] [PULL 3/4] slirp: Remove some unused code from slirp.h Samuel Thibault
` (2 subsequent siblings)
4 siblings, 0 replies; 11+ messages in thread
From: Samuel Thibault @ 2016-05-16 19:25 UTC (permalink / raw)
To: qemu-devel, peter.maydell; +Cc: Thomas Huth, jan.kiszka, Samuel Thibault
From: Thomas Huth <thuth@redhat.com>
The slirp code does not use index() and gethostid() anymore,
so these parts can be removed without problems.
memmove() and strerror() should be available on each of the
supported platforms nowadays, too, so these wrappers are also
not needed anymore.
And we certainly also do not support Ultrix anymore, so no
need to keep the code for this platform anymore.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
slirp/misc.c | 21 ---------------------
slirp/slirp.h | 28 ----------------------------
slirp/slirp_config.h | 12 ------------
3 files changed, 61 deletions(-)
diff --git a/slirp/misc.c b/slirp/misc.c
index 2fbd048..1a0ea1b 100644
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -60,27 +60,6 @@ int add_exec(struct ex_list **ex_ptr, int do_pty, char *exec,
return 0;
}
-#ifndef HAVE_STRERROR
-
-/*
- * For systems with no strerror
- */
-
-extern int sys_nerr;
-extern char *sys_errlist[];
-
-char *
-strerror(error)
- int error;
-{
- if (error < sys_nerr)
- return sys_errlist[error];
- else
- return "Unknown error.";
-}
-
-#endif
-
#ifdef _WIN32
diff --git a/slirp/slirp.h b/slirp/slirp.h
index 203deec..5b5df59 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -23,11 +23,6 @@ typedef char *caddr_t;
# include <sys/bitypes.h>
#endif
-
-#ifndef HAVE_MEMMOVE
-#define memmove(x, y, z) bcopy(y, x, z)
-#endif
-
#ifndef _WIN32
#include <sys/uio.h>
#endif
@@ -37,17 +32,6 @@ typedef char *caddr_t;
#include <arpa/inet.h>
#endif
-/* Systems lacking strdup() definition in <string.h>. */
-#if defined(ultrix)
-char *strdup(const char *);
-#endif
-
-/* Systems lacking malloc() definition in <stdlib.h>. */
-#if defined(ultrix) || defined(hcx)
-void *malloc(size_t arg);
-void free(void *ptr);
-#endif
-
#ifndef NO_UNIX_SOCKETS
#include <sys/un.h>
#endif
@@ -259,18 +243,6 @@ void if_start(Slirp *);
void if_start(struct ttys *);
#endif
-#ifndef HAVE_STRERROR
- char *strerror(int error);
-#endif
-
-#ifndef HAVE_INDEX
- char *index(const char *, int);
-#endif
-
-#ifndef HAVE_GETHOSTID
- long gethostid(void);
-#endif
-
#ifndef _WIN32
#include <netdb.h>
#endif
diff --git a/slirp/slirp_config.h b/slirp/slirp_config.h
index a5fa36e..c59f655 100644
--- a/slirp/slirp_config.h
+++ b/slirp/slirp_config.h
@@ -34,9 +34,6 @@
#define HAVE_SYS_FILIO_H
#endif
-/* Define if you have strerror */
-#define HAVE_STRERROR
-
/* Define if you have sys/bitypes.h */
#undef HAVE_SYS_BITYPES_H
@@ -82,15 +79,6 @@
#define HAVE_INET_ATON
#endif
-/* Define if you have index() */
-#define HAVE_INDEX
-
-/* Define if you have memmove */
-#define HAVE_MEMMOVE
-
-/* Define if you have gethostid */
-#define HAVE_GETHOSTID
-
/* Define if you DON'T have unix-domain sockets */
#undef NO_UNIX_SOCKETS
#ifdef _WIN32
--
2.8.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Qemu-devel] [PULL 3/4] slirp: Remove some unused code from slirp.h
2016-05-16 19:25 [Qemu-devel] [PULL 0/4] slirp updates Samuel Thibault
2016-05-16 19:25 ` [Qemu-devel] [PULL 1/4] slirp: Clean up slirp_config.h Samuel Thibault
2016-05-16 19:25 ` [Qemu-devel] [PULL 2/4] slirp: Remove obsolete backward-compatibility cruft Samuel Thibault
@ 2016-05-16 19:25 ` Samuel Thibault
2016-05-16 19:25 ` [Qemu-devel] [PULL 4/4] slirp: Clean up osdep.h related header inclusions Samuel Thibault
2016-05-17 9:35 ` [Qemu-devel] [PULL 0/4] slirp updates Peter Maydell
4 siblings, 0 replies; 11+ messages in thread
From: Samuel Thibault @ 2016-05-16 19:25 UTC (permalink / raw)
To: qemu-devel, peter.maydell; +Cc: Thomas Huth, jan.kiszka, Samuel Thibault
From: Thomas Huth <thuth@redhat.com>
These hunks are apparently not used anymore, so let's delete them.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
slirp/slirp.h | 22 ----------------------
1 file changed, 22 deletions(-)
diff --git a/slirp/slirp.h b/slirp/slirp.h
index 5b5df59..e373876 100644
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -58,10 +58,6 @@ typedef char *caddr_t;
# include <sys/filio.h>
#endif
-#ifdef USE_PPP
-#include <ppp/slirppp.h>
-#endif
-
/* Avoid conflicting with the libc insque() and remque(), which
have different prototypes. */
#define insque slirp_insque
@@ -96,10 +92,6 @@ typedef char *caddr_t;
#include "if.h"
#include "main.h"
#include "misc.h"
-#ifdef USE_PPP
-#include "ppp/pppd.h"
-#include "ppp/ppp.h"
-#endif
#include "bootp.h"
#include "tftp.h"
@@ -237,18 +229,12 @@ extern Slirp *slirp_instance;
#define NULL (void *)0
#endif
-#ifndef FULL_BOLT
void if_start(Slirp *);
-#else
-void if_start(struct ttys *);
-#endif
#ifndef _WIN32
#include <netdb.h>
#endif
-#define DEFAULT_BAUD 115200
-
#define SO_OPTIONS DO_KEEPALIVE
#define TCP_MAXIDLE (TCPTV_KEEPCNT * TCPTV_KEEPINTVL)
@@ -306,14 +292,6 @@ int tcp_emu(struct socket *, struct mbuf *);
int tcp_ctl(struct socket *);
struct tcpcb *tcp_drop(struct tcpcb *tp, int err);
-#ifdef USE_PPP
-#define MIN_MRU MINMRU
-#define MAX_MRU MAXMRU
-#else
-#define MIN_MRU 128
-#define MAX_MRU 16384
-#endif
-
#ifndef _WIN32
#define min(x,y) ((x) < (y) ? (x) : (y))
#define max(x,y) ((x) > (y) ? (x) : (y))
--
2.8.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* [Qemu-devel] [PULL 4/4] slirp: Clean up osdep.h related header inclusions
2016-05-16 19:25 [Qemu-devel] [PULL 0/4] slirp updates Samuel Thibault
` (2 preceding siblings ...)
2016-05-16 19:25 ` [Qemu-devel] [PULL 3/4] slirp: Remove some unused code from slirp.h Samuel Thibault
@ 2016-05-16 19:25 ` Samuel Thibault
2016-05-17 9:35 ` [Qemu-devel] [PULL 0/4] slirp updates Peter Maydell
4 siblings, 0 replies; 11+ messages in thread
From: Samuel Thibault @ 2016-05-16 19:25 UTC (permalink / raw)
To: qemu-devel, peter.maydell; +Cc: Thomas Huth, jan.kiszka, Samuel Thibault
From: Thomas Huth <thuth@redhat.com>
qemu/osdep.h is included in some headers twice - one time
should be sufficient.
Also remove the inclusion of time.h since that is already
done by osdep.h, too (this makes scripts/clean-includes
happy again).
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
---
slirp/ip6_icmp.c | 1 -
slirp/ip_input.c | 1 -
slirp/udp6.c | 1 -
3 files changed, 3 deletions(-)
diff --git a/slirp/ip6_icmp.c b/slirp/ip6_icmp.c
index 09571bc..48016a9 100644
--- a/slirp/ip6_icmp.c
+++ b/slirp/ip6_icmp.c
@@ -9,7 +9,6 @@
#include "qemu/timer.h"
#include "qemu/error-report.h"
#include "qemu/log.h"
-#include <time.h>
#define NDP_Interval g_rand_int_range(slirp->grand, \
NDP_MinRtrAdvInterval, NDP_MaxRtrAdvInterval)
diff --git a/slirp/ip_input.c b/slirp/ip_input.c
index cdd5483..34fba2b 100644
--- a/slirp/ip_input.c
+++ b/slirp/ip_input.c
@@ -40,7 +40,6 @@
#include "qemu/osdep.h"
#include <slirp.h>
-#include <qemu/osdep.h>
#include "ip_icmp.h"
static struct ip *ip_reass(Slirp *slirp, struct ip *ip, struct ipq *fp);
diff --git a/slirp/udp6.c b/slirp/udp6.c
index a23026f..94efb13 100644
--- a/slirp/udp6.c
+++ b/slirp/udp6.c
@@ -6,7 +6,6 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "slirp.h"
-#include "qemu/osdep.h"
#include "udp.h"
void udp6_input(struct mbuf *m)
--
2.8.1
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [Qemu-devel] [PULL 0/4] slirp updates
2016-05-16 19:25 [Qemu-devel] [PULL 0/4] slirp updates Samuel Thibault
` (3 preceding siblings ...)
2016-05-16 19:25 ` [Qemu-devel] [PULL 4/4] slirp: Clean up osdep.h related header inclusions Samuel Thibault
@ 2016-05-17 9:35 ` Peter Maydell
4 siblings, 0 replies; 11+ messages in thread
From: Peter Maydell @ 2016-05-17 9:35 UTC (permalink / raw)
To: Samuel Thibault; +Cc: QEMU Developers, J. Kiszka
On 16 May 2016 at 20:25, Samuel Thibault <samuel.thibault@ens-lyon.org> wrote:
> Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160513-1' into staging (2016-05-13 13:39:38 +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 9892663dc486755b5534ff8a77913edc5ea28c79:
>
> slirp: Clean up osdep.h related header inclusions (2016-05-16 21:01:16 +0200)
>
> ----------------------------------------------------------------
> slirp updates
>
> ----------------------------------------------------------------
> Thomas Huth (4):
> slirp: Clean up slirp_config.h
> slirp: Remove obsolete backward-compatibility cruft
> slirp: Remove some unused code from slirp.h
> slirp: Clean up osdep.h related header inclusions
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Qemu-devel] [PULL 0/4] slirp updates
2017-07-15 12:30 Samuel Thibault
@ 2017-07-15 12:40 ` no-reply
2017-07-17 10:14 ` Peter Maydell
1 sibling, 0 replies; 11+ messages in thread
From: no-reply @ 2017-07-15 12:40 UTC (permalink / raw)
To: samuel.thibault; +Cc: famz, qemu-devel, stefanha, jan.kiszka
Hi,
This series seems to have some coding style problems. See output below for
more information:
Subject: [Qemu-devel] [PULL 0/4] slirp updates
Message-id: 20170715123057.8529-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/20170715123057.8529-1-samuel.thibault@ens-lyon.org -> patchew/20170715123057.8529-1-samuel.thibault@ens-lyon.org
Switched to a new branch 'test'
d550cce slirp: Handle error returns from sosendoob()
3ccee6a slirp: Handle error returns from slirp_send() in sosendoob()
17f0f61 slirp: fork_exec(): Don't close() a negative number in fork_exec()
861877a6 slirp: use DIV_ROUND_UP
=== OUTPUT BEGIN ===
Checking PATCH 1/4: slirp: use DIV_ROUND_UP...
Checking PATCH 2/4: slirp: fork_exec(): Don't close() a negative number in fork_exec()...
ERROR: code indent should never use tabs
#27: FILE: slirp/misc.c:115:
+^I^I^Iif (s >= 0) {$
ERROR: code indent should never use tabs
#28: FILE: slirp/misc.c:116:
+^I^I^I closesocket(s);$
ERROR: code indent should never use tabs
#29: FILE: slirp/misc.c:117:
+^I^I^I}$
total: 3 errors, 0 warnings, 10 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/4: slirp: Handle error returns from slirp_send() in sosendoob()...
ERROR: code indent should never use tabs
#35: FILE: slirp/socket.c:354:
+^I^Iuint32_t urgc = so->so_urgc;$
ERROR: code indent should never use tabs
#38: FILE: slirp/socket.c:356:
+^I^Iif (len > urgc) {$
ERROR: code indent should never use tabs
#39: FILE: slirp/socket.c:357:
+^I^I^Ilen = urgc;$
ERROR: code indent should never use tabs
#40: FILE: slirp/socket.c:358:
+^I^I}$
ERROR: code indent should never use tabs
#44: FILE: slirp/socket.c:360:
+^I^Iurgc -= len;$
ERROR: code indent should never use tabs
#45: FILE: slirp/socket.c:361:
+^I^Iif (urgc) {$
ERROR: code indent should never use tabs
#48: FILE: slirp/socket.c:363:
+^I^I^Iif (n > urgc) {$
ERROR: code indent should never use tabs
#49: FILE: slirp/socket.c:364:
+^I^I^I^In = urgc;$
ERROR: code indent should never use tabs
#50: FILE: slirp/socket.c:365:
+^I^I^I}$
ERROR: code indent should never use tabs
#56: FILE: slirp/socket.c:370:
+^I}$
ERROR: code indent should never use tabs
#61: FILE: slirp/socket.c:373:
+^Iif (n != len) {$
ERROR: code indent should never use tabs
#62: FILE: slirp/socket.c:374:
+^I^IDEBUG_ERROR((dfd, "Didn't send all data urgently XXXXX\n"));$
ERROR: code indent should never use tabs
#63: FILE: slirp/socket.c:375:
+^I}$
ERROR: code indent should never use tabs
#66: FILE: slirp/socket.c:377:
+^Iif (n < 0) {$
ERROR: code indent should never use tabs
#67: FILE: slirp/socket.c:378:
+^I^Ireturn n;$
ERROR: code indent should never use tabs
#69: FILE: slirp/socket.c:380:
+^Iso->so_urgc -= n;$
ERROR: line over 90 characters
#70: FILE: slirp/socket.c:381:
+ DEBUG_MISC((dfd, " ---2 sent %d bytes urgent data, %d urgent bytes left\n", n, so->so_urgc));
ERROR: code indent should never use tabs
#70: FILE: slirp/socket.c:381:
+^IDEBUG_MISC((dfd, " ---2 sent %d bytes urgent data, %d urgent bytes left\n", n, so->so_urgc));$
total: 18 errors, 0 warnings, 51 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 4/4: slirp: Handle error returns from sosendoob()...
ERROR: code indent should never use tabs
#27: FILE: slirp/sbuf.c:94:
+^I^I(void)sosendoob(so);$
ERROR: code indent should never use tabs
#40: FILE: slirp/socket.c:407:
+^I^Iuint32_t expected = so->so_urgc;$
ERROR: code indent should never use tabs
#41: FILE: slirp/socket.c:408:
+^I^Iif (sosendoob(so) < expected) {$
ERROR: code indent should never use tabs
#42: FILE: slirp/socket.c:409:
+^I^I^I/* Treat a short write as a fatal error too,$
ERROR: code indent should never use tabs
#43: FILE: slirp/socket.c:410:
+^I^I^I * rather than continuing on and sending the urgent$
ERROR: code indent should never use tabs
#44: FILE: slirp/socket.c:411:
+^I^I^I * data as if it were non-urgent and leaving the$
ERROR: code indent should never use tabs
#45: FILE: slirp/socket.c:412:
+^I^I^I * so_urgc count wrong.$
ERROR: code indent should never use tabs
#46: FILE: slirp/socket.c:413:
+^I^I^I */$
ERROR: code indent should never use tabs
#47: FILE: slirp/socket.c:414:
+^I^I^Igoto err_disconnected;$
ERROR: code indent should never use tabs
#48: FILE: slirp/socket.c:415:
+^I^I}$
ERROR: code indent should never use tabs
#61: FILE: slirp/socket.c:459:
+^I^Igoto err_disconnected;$
WARNING: line over 80 characters
#71: FILE: slirp/socket.c:488:
+ DEBUG_MISC((dfd, " --- sowrite disconnected, so->so_state = %x, errno = %d\n",
ERROR: code indent should never use tabs
#71: FILE: slirp/socket.c:488:
+^IDEBUG_MISC((dfd, " --- sowrite disconnected, so->so_state = %x, errno = %d\n",$
ERROR: code indent should never use tabs
#72: FILE: slirp/socket.c:489:
+^I^I so->so_state, errno));$
ERROR: code indent should never use tabs
#73: FILE: slirp/socket.c:490:
+^Isofcantsendmore(so);$
ERROR: code indent should never use tabs
#74: FILE: slirp/socket.c:491:
+^Itcp_sockclosed(sototcpcb(so));$
ERROR: code indent should never use tabs
#75: FILE: slirp/socket.c:492:
+^Ireturn -1;$
total: 16 errors, 1 warnings, 49 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
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [Qemu-devel] [PULL 0/4] slirp updates
2017-07-15 12:30 Samuel Thibault
2017-07-15 12:40 ` no-reply
@ 2017-07-17 10:14 ` Peter Maydell
1 sibling, 0 replies; 11+ messages in thread
From: Peter Maydell @ 2017-07-17 10:14 UTC (permalink / raw)
To: Samuel Thibault; +Cc: QEMU Developers, Stefan Hajnoczi, Jan Kiszka
On 15 July 2017 at 13:30, Samuel Thibault <samuel.thibault@ens-lyon.org> wrote:
> warning: redirection vers https://people.debian.org/~sthibault/qemu.git/
> The following changes since commit 4871b51b9241b10f4fd8e04bbb21577886795e25:
>
> vmgenid-test: use boot-sector infrastructure (2017-07-14 17:03:03 +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 75cb298d905030fca897ea1d80e409c7f7e3e5ea:
>
> slirp: Handle error returns from sosendoob() (2017-07-15 14:28:25 +0200)
>
> ----------------------------------------------------------------
> slirp updates
>
> ----------------------------------------------------------------
> Marc-André Lureau (1):
> slirp: use DIV_ROUND_UP
>
> Peter Maydell (3):
> slirp: fork_exec(): Don't close() a negative number in fork_exec()
> slirp: Handle error returns from slirp_send() in sosendoob()
> slirp: Handle error returns from sosendoob()
>
> slirp/ip6.h | 6 +++---
> slirp/misc.c | 4 +++-
> slirp/sbuf.c | 2 +-
> slirp/socket.c | 52 +++++++++++++++++++++++++++++++++++-----------------
> 4 files changed, 42 insertions(+), 22 deletions(-)
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 11+ messages in thread