From: Anthony Liguori Date: Thu, 1 Nov 2012 16:13:59 +0000 (-0500) Subject: Merge remote-tracking branch 'stefanha/net' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d971919f08ca300e7b3595a4c5ddaea2ce8fc3ba;p=qemu.git Merge remote-tracking branch 'stefanha/net' into staging * stefanha/net: e1000: pre-initialize RAH/RAL registers net: Reject non-netdevs in qmp_netdev_del() net: use "socket" model name for UDP sockets e1000: drop check_rxov, always treat RX ring with RDH == RDT as empty Signed-off-by: Anthony Liguori --- d971919f08ca300e7b3595a4c5ddaea2ce8fc3ba