Merge commit 'c69ea0dff27ccc6663f8ecb4a70f762f4559672c' into upstream-merge

Merge commit 'c69ea0dff27ccc6663f8ecb4a70f762f4559672c' into upstream-merge

* commit 'c69ea0dff27ccc6663f8ecb4a70f762f4559672c': (27 commits)
  Compile acpi_piix4, apm and pm_smbus only once
  block: Remove special case for vvfat
  Fix docs for block stats monitor command
  use qemu_free() instead of free()
  block/vdi: Fix image opening and creation for odd disk sizes
  dmg: use qemu block API
  dmg: use pread
  dmg: fix reading of uncompressed chunks
  block/vpc: Fix conversion from size to disk geometry
  parallels: use qemu block API
  parallels: use pread
  block/vdi: Allow disk images of size 0
  block: Fix bdrv_commit
  block: Fix protocol detection for Windows devices
  block: Avoid unchecked casts for AIOCBs
  bochs: use qemu block API
  bochs: use pread
  ide: Fix ide_dma_cancel
  cloop: use qemu block API
  cloop: use pread
  ...

Conflicts:
	Makefile.objs
	Makefile.target

acpi and acpi_piix4 moved back to Makefile.target due to cpu hotplug.

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