Merge remote-tracking branch 'remotes/sstabellini/xen-20140801' into staging

[qemu.git] / net / hub.h

diff --git a/net/hub.h b/net/hub.h
index 9973da3bb9dad4993e0173e34b8fe3f4a81af98f..a625effe002a63afd5d9abe61c454a0e53284678 100644 (file)
--- a/net/hub.h
+++ b/net/hub.h
@@ -17,12 +17,10 @@
 
 #include "qemu-common.h"
 
-int net_init_hubport(const NetClientOptions *opts, const char *name,
-                     VLANClientState *peer);
-VLANClientState *net_hub_add_port(int hub_id, const char *name);
-VLANClientState *net_hub_find_client_by_name(int hub_id, const char *name);
+NetClientState *net_hub_add_port(int hub_id, const char *name);
+NetClientState *net_hub_find_client_by_name(int hub_id, const char *name);
 void net_hub_info(Monitor *mon);
-int net_hub_id_for_client(VLANClientState *nc, int *id);
 void net_hub_check_clients(void);
+bool net_hub_flush(NetClientState *nc);
 
 #endif /* NET_HUB_H */