Resolved 1.7 machine type conflicts and added Aurelien's ne2k endianness fix.
The following changes since commit df7131623daf4823e087eb1128f6c1c351519774: Merge remote-tracking branch 'bonzini/iommu-for-anthony' into staging (2013-09-05 13:38:53 -0500) are available in the git repository at: git://github.com/stefanha/qemu.git net for you to fetch changes up to 45d883dcf208160e2db308d1b368beb74f37dc7e: ne2000: mark I/O as LITTLE_ENDIAN (2013-09-06 17:27:40 +0200) ---------------------------------------------------------------- Aurelien Jarno (1): ne2000: mark I/O as LITTLE_ENDIAN Brad Smith (2): tap: Use numbered tap/tun devices on all *BSD OS's vmxnet3: Eliminate __packed redefined warning Jan Kiszka (1): net: Rename send_queue to incoming_queue Vincenzo Maffione (1): e1000: add interrupt mitigation support hw/i386/pc_piix.c | 16 ++++++- hw/i386/pc_q35.c | 15 +++++- hw/net/e1000.c | 131 +++++++++++++++++++++++++++++++++++++++++++++++++-- hw/net/ne2000.c | 2 +- hw/net/vmxnet3.h | 2 - include/hw/i386/pc.h | 8 ++++ include/net/net.h | 2 +- net/hub.c | 2 +- net/net.c | 14 +++--- net/tap-bsd.c | 11 ----- 10 files changed, 174 insertions(+), 29 deletions(-) -- 1.8.3.1