Merge branch 'upstream-merge' into next

Merge branch 'upstream-merge' into next

* upstream-merge: (92 commits)
  qemu-img create: Fix displayed default cluster size
  bdrv_img_create: Fix segfault
  qcow2: Fix memory leaks in error cases
  rbd: Add bdrv_truncate implementation
  rbd: check return values when scheduling aio
  rbd: allow configuration of rados from the rbd filename
  rbd: use the higher level librbd instead of just librados
  block/raw-posix: get right partition size
  block/raw-posix: use a character device if a block device is given
  vmdk: fix endianness bugs
  block: clarify the meaning of BDRV_O_NOCACHE
  ide/core: Remove explicit setting of BM_STATUS_INT
  virtio: Move virtio-pci to hw library
  target-i386: Make x86 mfence and lfence illegal without SSE2
  m68k: Replace gen_im32() by tcg_const_i32()
  slirp: fix guestfwd id
  Fix compilation warning due to missing header for sigaction (followup)
  Fix compilation warning due to missing header for sigaction
  Add an isa device for SGA
  json-parser: add handling for NULL token list
  ...

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