From: Mark McLoughlin <markmc@redhat.com>
To: Avi Kivity <avi@redhat.com>
Cc: kvm <kvm@vger.kernel.org>
Subject: [GIT PULL] Merge latest qemu.git
Date: Thu, 11 Jun 2009 11:52:53 +0100 [thread overview]
Message-ID: <1244717573.7752.9.camel@blaa> (raw)
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 +-
block/vpc.c | 6 +-
configure | 37 ++-
cpu-defs.h | 1 +
elf_ops.h | 6 +-
exec.c | 2 +-
gdbstub.c | 69 +++--
hw/armv7m.c | 43 ++-
hw/armv7m_nvic.c | 5 -
hw/dp8393x.c | 22 +-
hw/e1000.c | 61 ++-
hw/eepro100.c | 23 +-
hw/etraxfs_eth.c | 14 +-
hw/mcf_fec.c | 11 +-
hw/mips_jazz.c | 14 +-
hw/mips_malta.c | 14 +-
hw/mips_mipssim.c | 13 +-
hw/mips_r4k.c | 17 +-
hw/mipsnet.c | 16 +-
hw/musicpal.c | 11 +-
hw/ne2000.c | 25 +-
hw/pc.c | 53 ++-
hw/pci-hotplug.c | 7 +-
hw/pci.c | 6 -
hw/pci.h | 4 -
hw/pcnet.c | 17 +-
hw/petalogix_s3adsp1800_mmu.c | 20 +-
hw/pl061.c | 28 +-
hw/ppc405_boards.c | 29 +-
hw/ppc440_bamboo.c | 19 +-
hw/ppc_newworld.c | 25 +-
hw/ppc_oldworld.c | 25 +-
hw/ppc_prep.c | 17 +-
hw/ppce500_mpc8544ds.c | 19 +-
hw/primecell.h | 4 -
hw/qdev.c | 126 ++++++-
hw/qdev.h | 21 +-
hw/rtl8139.c | 45 ++-
hw/smc91c111.c | 18 +-
hw/stellaris.c | 119 ++++--
hw/stellaris_enet.c | 20 +-
hw/sun4m.c | 57 ++-
hw/sun4u.c | 26 +-
hw/syborg_timer.c | 14 +-
hw/sysbus.c | 33 ++-
hw/sysbus.h | 7 +
hw/usb-net.c | 18 +-
hw/virtio-net.c | 165 ++++++--
hw/virtio-net.h | 14 +-
hw/xen_nic.c | 32 +-
keymaps.c | 10 +-
kvm-all.c | 10 +-
linux-user/syscall.c | 4 +-
monitor.c | 183 ++-------
net.c | 787 +++++++++++++++++++++++---------------
net.h | 38 ++-
pc-bios/petalogix-s3adsp1800.dtb | Bin 0 -> 8259 bytes
qemu-doc.texi | 356 +-----------------
qemu-img-cmds.hx | 47 +++
qemu-img.c | 90 +++--
qemu-img.texi | 37 +-
qemu-monitor.hx | 615 +++++++++++++++++++++++++++++
qemu-option.c | 13 +
qemu-option.h | 2 +
qemu-options.hx | 2 +-
savevm.c | 2 +-
slirp/libslirp.h | 2 +-
slirp/slirp.c | 2 +-
sysemu.h | 8 +-
tap-win32.c | 8 +-
target-cris/cpu.h | 2 -
target-sparc/translate.c | 3 +-
vl.c | 215 +++++++++--
vnc.c | 2 +-
82 files changed, 2541 insertions(+), 1417 deletions(-)
mode change 100755 => 100644 microblaze-dis.c
create mode 100644 pc-bios/petalogix-s3adsp1800.dtb
create mode 100644 qemu-img-cmds.hx
create mode 100644 qemu-monitor.hx
next reply other threads:[~2009-06-11 10:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-11 10:52 Mark McLoughlin [this message]
2009-06-11 12:29 ` [GIT PULL] Merge latest qemu.git Avi Kivity
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1244717573.7752.9.camel@blaa \
--to=markmc@redhat.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.