[Qemu-devel] [PATCH 16/27] slirp: remove qemu timer.h dependency

Marc-André Lureau posted 27 patches 6 years, 8 months ago
Maintainers: Paolo Bonzini <pbonzini@redhat.com>, Jason Wang <jasowang@redhat.com>, Jan Kiszka <jan.kiszka@siemens.com>, Samuel Thibault <samuel.thibault@ens-lyon.org>
[Qemu-devel] [PATCH 16/27] slirp: remove qemu timer.h dependency
Posted by Marc-André Lureau 6 years, 8 months ago
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 slirp/util.h     | 2 ++
 slirp/if.c       | 1 -
 slirp/ip6_icmp.c | 1 -
 slirp/slirp.c    | 1 -
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/slirp/util.h b/slirp/util.h
index e3332cdcd60..4664e8159ba 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);
diff --git a/slirp/if.c b/slirp/if.c
index 73e3705740f..90b9078687f 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 e72c57a81dc..682597e6762 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 9e38d3f8cb3..8067b624eaf 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"
-- 
2.20.1.98.gecbdaf0899


Re: [Qemu-devel] [PATCH 16/27] slirp: remove qemu timer.h dependency
Posted by Samuel Thibault 6 years, 8 months ago
Marc-André Lureau, le jeu. 17 janv. 2019 15:43:48 +0400, a ecrit:
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Applied, thanks!