[PATCH] kvm-userspace: Cleanup redundant prototypes

[PATCH] kvm-userspace: Cleanup redundant prototypes

[Jan Kiszka]

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

 qemu/block.h       |    2 --
 qemu/console.h     |    2 --
 qemu/net.h         |    4 +---
 qemu/qemu_socket.h |    2 --
 qemu/sysemu.h      |    4 ----
 5 files changed, 1 insertions(+), 13 deletions(-)

diff --git a/qemu/block.h b/qemu/block.h
index c9419a7..c3314a1 100644
--- a/qemu/block.h
+++ b/qemu/block.h
@@ -111,8 +111,6 @@ int bdrv_is_allocated(BlockDriverState *bs, int64_t sector_num, int nb_sectors,
 #define BIOS_ATA_TRANSLATION_LARGE  3
 #define BIOS_ATA_TRANSLATION_RECHS  4
 
-void bdrv_flush_all(void);
-
 void bdrv_set_geometry_hint(BlockDriverState *bs,
                             int cyls, int heads, int secs);
 void bdrv_set_type_hint(BlockDriverState *bs, int type);
diff --git a/qemu/console.h b/qemu/console.h
index 9d6c5e1..6ee40cc 100644
--- a/qemu/console.h
+++ b/qemu/console.h
@@ -192,8 +192,6 @@ extern uint8_t _translate_keycode(const int key);
    does not need to include console.h  */
 /* monitor.c */
 void monitor_init(CharDriverState *hd, int show_banner);
-void monitor_suspend(void);
-void monitor_resume(void);
 void term_puts(const char *str);
 void term_vprintf(const char *fmt, va_list ap);
 void term_printf(const char *fmt, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
diff --git a/qemu/net.h b/qemu/net.h
index a776604..ff11c91 100644
--- a/qemu/net.h
+++ b/qemu/net.h
@@ -48,9 +48,6 @@ void do_info_network(void);
 int tap_has_vnet_hdr(void *opaque);
 void tap_using_vnet_hdr(void *opaque, int using_vnet_hdr);
 
-int net_client_init(const char *device, const char *opts);
-void net_client_uninit(NICInfo *nd);
-
 /* NIC info */
 
 #define MAX_NICS 8
@@ -89,6 +86,7 @@ void net_checksum_calculate(uint8_t *data, int length);
 
 /* from net.c */
 int net_client_init(const char *device, const char *p);
+void net_client_uninit(NICInfo *nd);
 int net_client_parse(const char *str);
 void net_slirp_smb(const char *exported_dir);
 void net_slirp_redir(const char *redir_str);
diff --git a/qemu/qemu_socket.h b/qemu/qemu_socket.h
index a23d578..c8ca07e 100644
--- a/qemu/qemu_socket.h
+++ b/qemu/qemu_socket.h
@@ -49,6 +49,4 @@ int parse_host_src_port(struct sockaddr_in *haddr,
                         struct sockaddr_in *saddr,
                         const char *str);
 
-int parse_host_port(struct sockaddr_in *saddr, const char *str);
-
 #endif /* QEMU_SOCKET_H */
diff --git a/qemu/sysemu.h b/qemu/sysemu.h
index 5abda5c..fdbefd7 100644
--- a/qemu/sysemu.h
+++ b/qemu/sysemu.h
@@ -51,10 +51,6 @@ void do_loadvm(const char *name);
 void do_delvm(const char *name);
 void do_info_snapshots(void);
 
-int check_params(char *buf, int buf_size, const char * const *params, const char *str);
-int get_param_value(char *buf, int buf_size, const char *tag,
-                    const char *str);
-
 void qemu_announce_self(void);
 
 void main_loop_wait(int timeout);

Re: [PATCH] kvm-userspace: Cleanup redundant prototypes

[Avi Kivity]

Jan Kiszka wrote:


Applied, thanks.  I see you even checked to make sure you remove the 
ones that aren't in upstream.

-- 
error compiling committee.c: too many arguments to function