summaryrefslogtreecommitdiffstats
path: root/net/hub.h
diff options
context:
space:
mode:
authorPeter Maydell2018-01-29 15:29:17 +0100
committerPeter Maydell2018-01-29 15:29:17 +0100
commit0d1442912b3d6591a57ee45fbf28bc91e58d9e76 (patch)
tree5150b12645c0d413fe8f3b1da83e607ffa497f4f /net/hub.h
parentMerge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.12-20180129' int... (diff)
parentMAINTAINERS: update Dmitry Fleytman email (diff)
downloadqemu-0d1442912b3d6591a57ee45fbf28bc91e58d9e76.tar.gz
qemu-0d1442912b3d6591a57ee45fbf28bc91e58d9e76.tar.xz
qemu-0d1442912b3d6591a57ee45fbf28bc91e58d9e76.zip
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Mon 29 Jan 2018 08:14:19 GMT # gpg: using RSA key 0xEF04965B398D6211 # gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>" # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211 * remotes/jasowang/tags/net-pull-request: MAINTAINERS: update Dmitry Fleytman email qemu-doc: Get rid of "vlan=X" example in the documentation net: Allow netdevs to be used with 'hostfwd_add' and 'hostfwd_remove' net: Allow hubports to connect to other netdevs colo: compare the packet based on the tcp sequence number colo: modified the payload compare function Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net/hub.h')
-rw-r--r--net/hub.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/hub.h b/net/hub.h
index a625effe00..6a16f0487a 100644
--- a/net/hub.h
+++ b/net/hub.h
@@ -17,7 +17,8 @@
#include "qemu-common.h"
-NetClientState *net_hub_add_port(int hub_id, const char *name);
+NetClientState *net_hub_add_port(int hub_id, const char *name,
+ NetClientState *hubpeer);
NetClientState *net_hub_find_client_by_name(int hub_id, const char *name);
void net_hub_info(Monitor *mon);
void net_hub_check_clients(void);