diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-04 08:20:06 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-03-04 08:20:06 -0600 |
commit | bf5363efcff81226d779d1cc1117cb277b458ecb (patch) | |
tree | 6ddc5b835994a9d2fc463b914211b1bebf70f609 /include | |
parent | 806f352d3d6f7b326b0ab3a49c622b124459dc8d (diff) | |
parent | af347aa5a521555f5342e67993eb717d4f542ba8 (diff) |
Merge remote-tracking branch 'stefanha/net' into staging
# By Jason Wang (2) and others
# Via Stefan Hajnoczi
* stefanha/net:
qmp: netdev_add is like -netdev, not -net, fix documentation
doc: document -netdev hubport
net: reduce the unnecessary memory allocation of multiqueue
tap: set IFF_ONE_QUEUE per default
tap: forbid creating multiqueue tap when hub is used
net: fix unbounded NetQueue
net: fix qemu_flush_queued_packets() in presence of a hub
Diffstat (limited to 'include')
-rw-r--r-- | include/net/net.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/net.h b/include/net/net.h index 43a045e052..cb049a16a3 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -72,7 +72,7 @@ struct NetClientState { }; typedef struct NICState { - NetClientState ncs[MAX_QUEUE_NUM]; + NetClientState *ncs; NICConf *conf; void *opaque; bool peer_deleted; |