Merge commit 'd918f23efaf486293b96418fe5deaff8a5583304' into upstream-merge

* commit 'd918f23efaf486293b96418fe5deaff8a5583304':
  slirp: Kill slirp_is_inited
  slirp: Clean up updtime
  slirp: Make IP packet ID consistent
  slirp: Factor out one-time initialization
  slirp: tftp: Rework filename handling
  slirp: tftp: Refactor tftp_handle_rrq
  slirp: tftp: Clean up tftp_send_error
  slirp: tftp: Cleanup tftp_prefix check
  slirp: Drop unused icmp_var.h
  slirp: Cleanup and basic reanimation of debug code
  slirp: Drop statistic code
  slirp: Drop dead code

Conflicts:
	vl.c

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 1 insertions, 13 deletions

diff --git a/net.c b/net.c
index 27f3f33d9..8152726ed 100644
--- a/net.c
+++ b/net.c
@@ -121,9 +121,7 @@
 #include "qemu_socket.h"
 #include "qemu-log.h"
 
-#if defined(CONFIG_SLIRP)
-#include "libslirp.h"
-#endif
+#include "slirp/libslirp.h"
 
 
 static VLANState *first_vlan;
@@ -732,11 +730,6 @@ void slirp_output(const uint8_t *pkt, int pkt_len)
     qemu_send_packet(slirp_vc, pkt, pkt_len);
 }
 
-int slirp_is_inited(void)
-{
-    return slirp_inited;
-}
-
 static ssize_t slirp_receive(VLANClientState *vc, const uint8_t *buf, size_t size)
 {
 #ifdef DEBUG_SLIRP
@@ -1132,11 +1125,6 @@ void net_slirp_smb(const char *exported_dir)
 
 #endif /* !defined(_WIN32) */
 
-void do_info_slirp(Monitor *mon)
-{
-    slirp_stats();
-}
-
 struct GuestFwd {
     CharDriverState *hd;
     struct in_addr server;