The following changes since commit 4bb26682f70a5f626cad3e0ac82bf4b6252ea7a4:
Merge branch 'master' of git.qemu.org:/pub/git/qemu (2012-10-07 18:42:18 +0000) are available in the git repository at: git://github.com/stefanha/qemu.git net for you to fetch changes up to a245fc18352fe286ba45ae0661a73b3841514889: net: consolidate NetClientState header files into one (2012-10-08 13:59:40 +0200) ---------------------------------------------------------------- Amos Kong (2): e1000: update nc.link_down in e1000_post_load() virtio-net: update nc.link_down in virtio_net_load() Jason Wang (1): rtl8139: implement 8139cp link status Paolo Bonzini (1): net: consolidate NetClientState header files into one hw/e1000.c | 12 ++++++++++++ hw/rtl8139.c | 24 ++++++++++++++++++++++-- hw/virtio-net.c | 5 +++++ net.c | 11 ++++------- net/{socket.h => clients.h} | 28 +++++++++++++++++++++++++--- net/dump.c | 2 +- net/dump.h | 33 --------------------------------- net/hub.c | 1 + net/hub.h | 2 -- net/slirp.c | 3 ++- net/slirp.h | 3 --- net/socket.c | 3 +-- net/tap-win32.c | 2 +- net/tap.c | 3 ++- net/tap.h | 6 ------ net/vde.c | 3 +-- net/vde.h | 37 ------------------------------------- 17 files changed, 77 insertions(+), 101 deletions(-) rename net/{socket.h => clients.h} (62%) delete mode 100644 net/dump.h delete mode 100644 net/vde.h -- 1.7.11.4