cpus: Change qemu_kvm_wait_io_event() argument to CPUState

[qemu.git] / slirp / misc.h

diff --git a/slirp/misc.h b/slirp/misc.h
index da68d099501a8c127b3484f28bf1dbab7165b483..ba8beb1b17e3d708119cd135421cbe1bcd423042 100644 (file)
--- a/slirp/misc.h
+++ b/slirp/misc.h
@@ -20,8 +20,6 @@ struct ex_list {
 char *strdup(const char *);
 #endif
 
-void do_wait(int);
-
 #define EMU_NONE 0x0
 
 /* TCP emulations */
@@ -37,36 +35,23 @@ void do_wait(int);
 #define EMU_NOCONNECT 0x10     /* Don't connect */
 
 struct tos_t {
-       u_int16_t lport;
-       u_int16_t fport;
-       u_int8_t tos;
-       u_int8_t emu;
+    uint16_t lport;
+    uint16_t fport;
+    uint8_t tos;
+    uint8_t emu;
 };
 
 struct emu_t {
-       u_int16_t lport;
-       u_int16_t fport;
-       u_int8_t tos;
-       u_int8_t emu;
-       struct emu_t *next;
+    uint16_t lport;
+    uint16_t fport;
+    uint8_t tos;
+    uint8_t emu;
+    struct emu_t *next;
 };
 
-extern int x_port, x_server, x_display;
-
-int show_x(char *, struct socket *);
-void redir_x(u_int32_t, int, int, int);
 void slirp_insque(void *, void *);
 void slirp_remque(void *);
 int add_exec(struct ex_list **, int, char *, struct in_addr, int);
-int slirp_openpty(int *, int *);
 int fork_exec(struct socket *so, const char *ex, int do_pty);
-void snooze_hup(int);
-void snooze(void);
-void relay(int);
-void add_emu(char *);
-void u_sleep(int);
-void fd_nonblock(int);
-void fd_block(int);
-int rsh_exec(struct socket *, struct socket *, char *, char *, char *);
 
 #endif