Merge commit 'qemu-svn/stable_0_10' into maint/2.6.30
commit6187f5a11b7cb4ea12e78778db8402bf42d1f65a
authorAvi Kivity <avi@redhat.com>
Thu, 26 Mar 2009 09:59:13 +0000 (26 11:59 +0200)
committerAvi Kivity <avi@redhat.com>
Thu, 26 Mar 2009 10:06:43 +0000 (26 12:06 +0200)
tree1c83b8dc8b1de47fd48f1c6bbfbc0db26d2f42ea
parent8d890e234cdf5860395c4cb93b831ae37aab41e9
parent0f31aac44f3fdd0707810fcb0db5b17a4bf49f24
Merge commit 'qemu-svn/stable_0_10' into maint/2.6.30

* commit 'qemu-svn/stable_0_10': (92 commits)
  configure sensitive to user locale (Andreas Faerber)
  Fix VGA issue introduced by r6349 (malc)
  Update version for release
  Restore old stable branch
  Add release_0_10_1 tag
  Update Changelog
  virtio: Allow guest to defer VIRTIO_F_NOTIFY_ON_EMPTY (Alex Williamson)
  e1000: Fix RX descriptor low threshold interrupt logic (Alex Williamson)
  x86: Add NULL check to lsl (Jan Kiszka)
  temporarily disable logging around pci config writes (Avi Kivity)
  stop dirty logging while updating cirrus bank memory (Glauber Costa)
  Update changelog
  qemu:virtio-net: Check return size on the correct sg list (Alex Williamson)
  make qemu_announce_self handle non contiguous net tables (Marcelo Tosatti)
  Revert r6404
  Revert r6405
  Revert r6406
  Revert r6407
  Revert r6408
  qemu-img: fix help message
  ...

Conflicts:
qemu/configure
qemu/cpu-defs.h
qemu/hw/vga.c
qemu/pc-bios/bios.bin
qemu/vl.c

Signed-off-by: Avi Kivity <avi@redhat.com>
28 files changed:
Makefile.target
block-raw-posix.c
block.c
block_int.h
configure
cpu-defs.h
cpu-exec.c
exec.c
hw/acpi.c
hw/boards.h
hw/cirrus_vga.c
hw/device-hotplug.c
hw/e1000.c
hw/pc.c
hw/pc.h
hw/pci.h
hw/vga.c
hw/virtio-net.c
hw/virtio.c
linux-user/main.c
monitor.c
net.c
qemu-doc.texi
qemu-kvm.h
savevm.c
target-i386/helper.c
target-ppc/cpu.h
vl.c