Merge commit 'bb6e636443d49f7444f49ab64dc7ec6aae1493a7' into upstream-merge
commitaf01064c8494e6a9fbf61046935c1b24538b6b3d
authorMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 12:04:26 +0000 (28 12:04 +0000)
committerMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 12:08:12 +0000 (28 12:08 +0000)
tree336d53f19f4ae5152f6f0728020179047ef6632b
parent7d9c803b425fa13560aa332846f27b83cc4142db
parentbb6e636443d49f7444f49ab64dc7ec6aae1493a7
Merge commit 'bb6e636443d49f7444f49ab64dc7ec6aae1493a7' into upstream-merge

* commit 'bb6e636443d49f7444f49ab64dc7ec6aae1493a7':
  net: add a client type code
  net: add a vnet_hdr=on|off parameter
  net: refactor tap initialization

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
14 files changed:
hw/e1000.c
hw/eepro100.c
hw/musicpal.c
hw/ne2000-isa.c
hw/ne2000.c
hw/pcnet.c
hw/rtl8139.c
hw/smc91c111.c
hw/stellaris_enet.c
hw/virtio-net.c
hw/xilinx_ethlite.c
net.c
net.h
qemu-options.hx