Hi Avi,
The conflicts with the networking changes just pushed to qemu.git are
fairly involved to resolve, so I thought I'd try and save you the pain.
Below is a pull request which merges in the latest, and does it in the
way we recently discussed - each conflict is resolved in a separate
merge commit.
I've build tested the x86_64-softmmu target and done some light
networking testing.
HTH,
Mark.
The following changes since commit b6810dec0ea5c9e90e90404424458918972853d8:
Avi Kivity (1):
Regenerate bios for MADT/RSDT fixes
are available in the git repository at:
git://git.et.redhat.com/qemu-net.git for-avi
Alex Williamson (7):
virtio-net: Add version_id 7 placeholder for vnet header support
virtio-net: Use a byte to store RX mode flags
virtio-net: reorganize receive_filter()
virtio-net: Fix MAC filter overflow handling
virtio-net: MAC filter optimization
virtio-net: Add new RX filter controls
virtio-net: Increase filter and control limits
Anthony Liguori (2):
Merge branch 'net-queue'
Fix build breakage when using VDE introduced by 4f1c942
Blue Swirl (11):
Use hxtool to generate monitor documentation and C structures
Fix generation of CONFIG_KVM
Register reset functions for e1000 and rtl8139
Update irqs on reset and device load
Remove unused and misnamed field and variable
Fix warning
microblaze-dis.c does not need to be executable
Fix Sparse warning
Clean up generated qemu-img-cmds.h
Fix Sparse warning
Use snprintf to avoid OpenBSD warning
Edgar E. Iglesias (2):
microblaze: Fix loading of petalogix s3adsp1800 dtb.
CRIS: Remove duplicated flag defines.
Gerd Hoffmann (6):
qdev: kill DeviceState-name
qdev: add monitor command to dump the tree.
xen: net backend doesn't need linux headers.
xen nic: use qemu_malloc
xen nic: use XC_PAGE_SIZE instead of PAGE_SIZE.
qdev: c99 initilaizers for bus_type_names
Jan Kiszka (7):
kvm: Improve upgrade notes when facing unsupported kernels
net: Don't deliver to disabled interfaces in qemu_sendv_packet
net: Fix and improved ordered packet delivery
slirp: Avoid zombie processes after fork_exec
net: Real fix for check_params users
net: Improve parameter error reporting
slirp: Reorder initialization
Kevin Wolf (2):
qemu-img: Print available options with -o ?
Document changes in qemu-img interface
Luiz Capitulino (5):
monitor: Remove uneeded goto
monitor: Remove uneeded 'return' statement
monitor: Remove unused variable
monitor: Introduce get_command_name()
Fix defined but not used warning
Mark McLoughlin (22):
Revert Fix output of uninitialized strings
net: fix error reporting for some net parameter checks
net: factor tap_read_packet() out of tap_send()
net: move the tap buffer into TAPState
net: vlan clients with no fd_can_read() can always receive
net: only read from tapfd when we can send
net: add fd_readv() handler to qemu_new_vlan_client() args
net: re-name vc-fd_read() to vc-receive()
net: pass VLANClientState* as first arg to receive handlers
net: add return value to packet receive handler
net: return status from qemu_deliver_packet()
net: split out packet queueing and flushing into separate functions
net: add qemu_send_packet_async()
net: make use of async packet sending API in tap client
virtio-net: implement rx packet queueing
Merge branch 'master' of git://git.sv.gnu.org/qemu
Merge branch 'master' of git://git.sv.gnu.org/qemu
Merge branch 'master' of git://git.sv.gnu.org/qemu
Merge branch 'master' of git://git.sv.gnu.org/qemu
Merge branch 'master' of git://git.sv.gnu.org/qemu
Merge branch 'master' of git://git.sv.gnu.org/qemu
Merge branch 'master' of git://git.sv.gnu.org/qemu
Nathan Froyd (1):
fix gdbstub support for multiple threads in usermode, v3
Paul Brook (9):
Use relative path for bios
Implement multiple samplers on stellaris ADC
Stellaris qdev conversion
Add --enable-debug
Remove ARM NVIC initialization hack
Fix elf loader range checking
Record device property types
Fix typo
Use correct type for SPARC cpu_cc_op
Stefan Weil (2):
Fix spelling in comment.
doc: Update information on supported network adapters.
Stuart Brady (1):
Use hxtool for qemu-img command list
.gitignore |2 +
Makefile | 22 +-
Makefile.target |8 +-
block/cow.c | 12 +-
block/qcow.c | 18 +-
block/qcow2.c| 30 ++-
block/raw-posix.c|6 +-
block/raw-win32.c|6 +-
block/vmdk.c | 18 +-
