From: Avi Kivity <a...@redhat.com> * qemu-cvs: (33 commits) Fix bug in omap_sx1.c introduced by r6344 Fix tosa_dac_recv warning Fix cpu_arm_handle_mmu_fault warning SH4: fix TMU init SH7750/51: add register BCR3, BCR4, PCR, RTCOR, RTCNT, RTCSR, SDMR2, SDMR3 and fix BCR2 support Add it_shift Fix VGA RAM offsets Fix SIGSEGV crash in slirp networking code Add savevm and reset support for OpenPic Revert part of 6531, fix build failure Replace exit() in oom_check with abort() Revert changes to fmopl.c qemu:virtio-net: Add VLAN filtering (Alex Williamson) qemu:virtio-net: Add additional MACs via a filter table (Alex Williamson) qemu:virtio-net: Enable filtering based on MAC, promisc, broadcast and allmulti (Alex Williamson) qemu:virtio-net: Add promiscuous and all-multicast mode bits (Alex Williamson) qemu:virtio-net: Add a virtqueue for control commands from the guest (Alex Williamson) qemu:virtio-net: Define ETH_ALEN for use when manipulating MAC addresses (Alex Williamson) qemu:virtio-net: Allow setting the MAC address via set_config (Alex Williamson) qemu:virtio-net: Save status and add some save infrastructure (Alex Williamson) ...
Conflicts: qemu/hw/virtio-net.c Signed-off-by: Avi Kivity <a...@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe kvm-commits" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html