[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULLv4 19/32] slirp: remove qemu timer.h dependency
From: |
Samuel Thibault |
Subject: |
[Qemu-devel] [PULLv4 19/32] slirp: remove qemu timer.h dependency |
Date: |
Thu, 7 Feb 2019 16:03:03 +0200 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Signed-off-by: Samuel Thibault <address@hidden>
---
slirp/if.c | 1 -
slirp/ip6_icmp.c | 1 -
slirp/slirp.c | 1 -
slirp/util.h | 2 ++
4 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/slirp/if.c b/slirp/if.c
index 73e3705740..90b9078687 100644
--- a/slirp/if.c
+++ b/slirp/if.c
@@ -7,7 +7,6 @@
#include "qemu/osdep.h"
#include "slirp.h"
-#include "qemu/timer.h"
static void
ifs_insque(struct mbuf *ifm, struct mbuf *ifmhead)
diff --git a/slirp/ip6_icmp.c b/slirp/ip6_icmp.c
index e72c57a81d..682597e676 100644
--- a/slirp/ip6_icmp.c
+++ b/slirp/ip6_icmp.c
@@ -6,7 +6,6 @@
#include "qemu/osdep.h"
#include "slirp.h"
#include "ip6_icmp.h"
-#include "qemu/timer.h"
#include "qemu/error-report.h"
#include "qemu/log.h"
diff --git a/slirp/slirp.c b/slirp/slirp.c
index b5c4788489..7a5d97c77f 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -23,7 +23,6 @@
*/
#include "qemu/osdep.h"
#include "qemu-common.h"
-#include "qemu/timer.h"
#include "qemu/error-report.h"
#include "migration/register.h"
#include "slirp.h"
diff --git a/slirp/util.h b/slirp/util.h
index 586517bb30..922077435e 100644
--- a/slirp/util.h
+++ b/slirp/util.h
@@ -48,6 +48,8 @@
# define SLIRP_PACKED __attribute__((packed))
#endif
+#define SCALE_MS 1000000
+
#ifdef _WIN32
int slirp_closesocket(int fd);
int slirp_ioctlsocket(int fd, int req, void *val);
--
2.20.1
- [Qemu-devel] [PULLv4 01/32] slirp: Avoid unaligned 16bit memory access, (continued)
- [Qemu-devel] [PULLv4 01/32] slirp: Avoid unaligned 16bit memory access, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 20/32] slirp: remove now useless QEMU headers inclusions, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 07/32] net/slirp: fix leaks on forwarding rule registration error, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 24/32] slirp: Move g_spawn_async_with_fds_qemu compatibility to slirp/, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 05/32] net/slirp: simplify checking for cmd: prefix, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 06/32] net/slirp: free forwarding rules on cleanup, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 11/32] slirp: replace most qemu socket utilities with slirp own version, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 15/32] slirp: move QEMU state saving to a separate unit, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 21/32] slirp: replace net/eth.h inclusion with own defines, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 04/32] slirp: generalize guestfwd with a callback based approach, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 19/32] slirp: remove qemu timer.h dependency,
Samuel Thibault <=
- [Qemu-devel] [PULLv4 16/32] slirp: do not include qemu headers in libslirp.h public API header, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 31/32] slirp: pass opaque to all callbacks, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 18/32] slirp: add slirp own version of pstrcpy, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 25/32] slirp: replace remaining qemu headers dependency, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 30/32] slirp: use polling callbacks, drop glib requirement, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 22/32] slirp: replace qemu qtailq with slirp own copy, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 26/32] slirp: prefer c99 types over BSD kind, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 32/32] slirp: API is extern C, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 28/32] slirp: replace global polling with per-instance & notifier, Samuel Thibault, 2019/02/07
- [Qemu-devel] [PULLv4 12/32] slirp: replace qemu_set_nonblock(), Samuel Thibault, 2019/02/07