pc: acpi: SRAT: create only valid processor lapic entries

[qemu.git] / slirp / slirp.h

diff --git a/slirp/slirp.h b/slirp/slirp.h
index dfc3e3a2b869ed8c0e40111b3e1b493c2443c619..07c13b4725e20d424c91f7fbfee165d30c4f46cb 100644 (file)
--- a/slirp/slirp.h
+++ b/slirp/slirp.h
@@ -1,11 +1,9 @@
 #ifndef __COMMON_H__
 #define __COMMON_H__
 
 #ifndef __COMMON_H__
 #define __COMMON_H__
 

-#include "config-host.h"

 #include "slirp_config.h"
 
 #ifdef _WIN32
 #include "slirp_config.h"
 
 #ifdef _WIN32

-# include <inttypes.h>

 
 typedef char *caddr_t;
 
 
 typedef char *caddr_t;
 


@@ -23,43 +21,31 @@ typedef char *caddr_t;
 # endif
 #endif
 
 # endif
 #endif
 

-#include <sys/types.h>

 #ifdef HAVE_SYS_BITYPES_H
 # include <sys/bitypes.h>
 #endif
 
 #ifdef HAVE_SYS_BITYPES_H
 # include <sys/bitypes.h>
 #endif
 

-#include <sys/time.h>

 
 #ifdef HAVE_UNISTD_H
 
 #ifdef HAVE_UNISTD_H

-# include <unistd.h>

 #endif
 
 #ifdef HAVE_STDLIB_H
 #endif
 
 #ifdef HAVE_STDLIB_H

-# include <stdlib.h>

 #endif
 
 #endif
 

-#include <stdio.h>
-#include <errno.h>

 
 #ifndef HAVE_MEMMOVE
 #define memmove(x, y, z) bcopy(y, x, z)
 #endif
 
 #if TIME_WITH_SYS_TIME
 
 #ifndef HAVE_MEMMOVE
 #define memmove(x, y, z) bcopy(y, x, z)
 #endif
 
 #if TIME_WITH_SYS_TIME

-# include <sys/time.h>
-# include <time.h>

 #else
 # ifdef HAVE_SYS_TIME_H
 #else
 # ifdef HAVE_SYS_TIME_H

-#  include <sys/time.h>

 # else
 # else

-#  include <time.h>

 # endif
 #endif
 
 #ifdef HAVE_STRING_H
 # endif
 #endif
 
 #ifdef HAVE_STRING_H

-# include <string.h>

 #else
 #else

-# include <strings.h>

 #endif
 
 #ifndef _WIN32
 #endif
 
 #ifndef _WIN32


@@ -82,11 +68,9 @@ void *malloc(size_t arg);
 void free(void *ptr);
 #endif
 
 void free(void *ptr);
 #endif
 

-#include <fcntl.h>

 #ifndef NO_UNIX_SOCKETS
 #include <sys/un.h>
 #endif
 #ifndef NO_UNIX_SOCKETS
 #include <sys/un.h>
 #endif

-#include <signal.h>

 #ifdef HAVE_SYS_SIGNAL_H
 # include <sys/signal.h>
 #endif
 #ifdef HAVE_SYS_SIGNAL_H
 # include <sys/signal.h>
 #endif


@@ -115,12 +99,10 @@ void free(void *ptr);
 #endif
 
 #ifdef __STDC__
 #endif
 
 #ifdef __STDC__

-#include <stdarg.h>

 #else
 #include <varargs.h>
 #endif
 
 #else
 #include <varargs.h>
 #endif
 

-#include <sys/stat.h>

 
 /* Avoid conflicting with the libc insque() and remque(), which
    have different prototypes. */
 
 /* Avoid conflicting with the libc insque() and remque(), which
    have different prototypes. */


@@ -135,6 +117,7 @@ void free(void *ptr);
 
 #include "qemu/queue.h"
 #include "qemu/sockets.h"
 
 #include "qemu/queue.h"
 #include "qemu/sockets.h"

+#include "net/eth.h"

 
 #include "libslirp.h"
 #include "ip.h"
 
 #include "libslirp.h"
 #include "ip.h"


@@ -158,12 +141,6 @@ void free(void *ptr);
 #include "bootp.h"
 #include "tftp.h"
 
 #include "bootp.h"
 #include "tftp.h"
 

-#define ETH_ALEN 6
-#define ETH_HLEN 14
-
-#define ETH_P_IP  0x0800        /* Internet Protocol packet  */
-#define ETH_P_ARP 0x0806        /* Address Resolution packet */
-

 #define ARPOP_REQUEST 1         /* ARP request */
 #define ARPOP_REPLY   2         /* ARP reply   */
 
 #define ARPOP_REQUEST 1         /* ARP request */
 #define ARPOP_REPLY   2         /* ARP reply   */
 


@@ -203,6 +180,9 @@ bool arp_table_search(Slirp *slirp, uint32_t ip_addr,
 
 struct Slirp {
     QTAILQ_ENTRY(Slirp) entry;
 
 struct Slirp {
     QTAILQ_ENTRY(Slirp) entry;

+    u_int time_fasttimo;
+    u_int last_slowtimo;
+    bool do_slowtimo;

 
     /* virtual network configuration */
     struct in_addr vnetwork_addr;
 
     /* virtual network configuration */
     struct in_addr vnetwork_addr;


@@ -215,7 +195,6 @@ struct Slirp {
     char client_hostname[33];
 
     int restricted;
     char client_hostname[33];
 
     int restricted;

-    struct timeval tt;

     struct ex_list *exec_list;
 
     /* mbuf states */
     struct ex_list *exec_list;
 
     /* mbuf states */


@@ -285,8 +264,6 @@ void if_start(struct ttys *);
  long gethostid(void);
 #endif
 
  long gethostid(void);
 #endif
 

-void lprint(const char *, ...) GCC_FMT_ATTR(1, 2);
-

 #ifndef _WIN32
 #include <netdb.h>
 #endif
 #ifndef _WIN32
 #include <netdb.h>
 #endif


@@ -332,7 +309,7 @@ void tcp_respond(struct tcpcb *, register struct tcpiphdr *, register struct mbu
 struct tcpcb * tcp_newtcpcb(struct socket *);
 struct tcpcb * tcp_close(register struct tcpcb *);
 void tcp_sockclosed(struct tcpcb *);
 struct tcpcb * tcp_newtcpcb(struct socket *);
 struct tcpcb * tcp_close(register struct tcpcb *);
 void tcp_sockclosed(struct tcpcb *);

-int tcp_fconnect(struct socket *);
+int tcp_fconnect(struct socket *, unsigned short af);

 void tcp_connect(struct socket *);
 int tcp_attach(struct socket *);
 uint8_t tcp_tos(struct socket *);
 void tcp_connect(struct socket *);
 int tcp_attach(struct socket *);
 uint8_t tcp_tos(struct socket *);