yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
5d360b
From def99e39e5f759343634b0f0047343744a0e0c36 Mon Sep 17 00:00:00 2001
5d360b
From: Xiao Wang <jasowang@redhat.com>
5d360b
Date: Mon, 27 Nov 2017 07:07:54 +0100
5d360b
Subject: [PATCH 3/9] slirp: cleanup leftovers from misc.h
5d360b
5d360b
RH-Author: Xiao Wang <jasowang@redhat.com>
5d360b
Message-id: <1511766477-29559-2-git-send-email-jasowang@redhat.com>
5d360b
Patchwork-id: 77897
5d360b
O-Subject: [RHEL7.5 qemu-kvm PATCH 1/4] slirp: cleanup leftovers from misc.h
5d360b
Bugzilla: 1508745
5d360b
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
5d360b
RH-Acked-by: wexu@redhat.com
5d360b
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
5d360b
5d360b
From: Michael Tokarev <mjt@tls.msk.ru>
5d360b
5d360b
There are quite a few leftover declarations in slirp/misc.h.
5d360b
Remove them.
5d360b
5d360b
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
5d360b
(cherry picked from commit a9c34e4485ef0a8a61e88f1c9f9bb87f00ba2c72)
5d360b
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
5d360b
---
5d360b
 slirp/misc.h | 14 --------------
5d360b
 1 file changed, 14 deletions(-)
5d360b
5d360b
diff --git a/slirp/misc.h b/slirp/misc.h
5d360b
index cc36aeb..ba8beb1 100644
5d360b
--- a/slirp/misc.h
5d360b
+++ b/slirp/misc.h
5d360b
@@ -20,8 +20,6 @@ struct ex_list {
5d360b
 char *strdup(const char *);
5d360b
 #endif
5d360b
 
5d360b
-void do_wait(int);
5d360b
-
5d360b
 #define EMU_NONE 0x0
5d360b
 
5d360b
 /* TCP emulations */
5d360b
@@ -51,21 +49,9 @@ struct emu_t {
5d360b
     struct emu_t *next;
5d360b
 };
5d360b
 
5d360b
-extern int x_port, x_server, x_display;
5d360b
-
5d360b
-int show_x(char *, struct socket *);
5d360b
-void redir_x(uint32_t, int, int, int);
5d360b
 void slirp_insque(void *, void *);
5d360b
 void slirp_remque(void *);
5d360b
 int add_exec(struct ex_list **, int, char *, struct in_addr, int);
5d360b
-int slirp_openpty(int *, int *);
5d360b
 int fork_exec(struct socket *so, const char *ex, int do_pty);
5d360b
-void snooze_hup(int);
5d360b
-void snooze(void);
5d360b
-void relay(int);
5d360b
-void add_emu(char *);
5d360b
-void fd_nonblock(int);
5d360b
-void fd_block(int);
5d360b
-int rsh_exec(struct socket *, struct socket *, char *, char *, char *);
5d360b
 
5d360b
 #endif
5d360b
-- 
5d360b
1.8.3.1
5d360b