tree f01b1c7db332622eaee8c47cad7e3010c02db6ae
parent c9c217977a97452aea54740c2b49e919f3c66b8d
parent a9c3c65b9f7cd7ba49e28a95c902378e3f2c4228
author Avi Kivity <avi@redhat.com> 1286967311 +0200
committer Avi Kivity <avi@redhat.com> 1286967311 +0200

Merge branch 'upstream-merge' into stable-0.13

* upstream-merge: (39 commits)
  vnc: check fd before calling qemu_set_fd_handler2() in vnc_client_write()
  disable guest-provided stats on "info balloon" command
  Revert "Make default invocation of block drivers safer (v3)"
  QEMUFileBuffered: indicate that we're ready when the underlying file is ready
  sparc escc IUS improvements (SunOS 4.1.4 fix)
  fix last cpu timer initialization
  QMP/README: Update QMP homepage address
  disable guest-provided stats on "info balloon" command
  QMP: Update README file
  QMP doc: Add 'Stability Considerations' section
  QMP/monitor: update do_info_version() to output broken down version string
  QMP: update 'query-version' documentation
  savevm: Reset last block info at beginning of each save
  set proper migration status on ->write error (v5)
  migration: Accept 'cont' only after successful incoming migration
  Update for v0.13.0-rc3
  Update version for 0.13.0-rc2
  Fix ivshmem build on 32-bit hosts
  hw/ivshmem.c don't check for negative values on unsigned data types
  Disable build of ivshmem on non-KVM systems
  ...

Signed-off-by: Avi Kivity <avi@redhat.com>