Merge commit 'f711df67d611e4762966a249742a5f7499e19f99' into upstream-merge

Merge commit 'f711df67d611e4762966a249742a5f7499e19f99' into upstream-merge

* commit 'f711df67d611e4762966a249742a5f7499e19f99': (41 commits)
  microblaze: target-ify target_ucontext
  virtio-pci: Convert fprintf() to error_report()
  virtio-net: Convert fprintf() to error_report()
  virtio: Convert fprintf() to error_report()
  virtio-blk: Convert fprintf() to error_report()
  vgabios update: handle compatibility with older qemu versions
  pcnet: Do not receive external frames in loopback mode
  piix4 acpi: convert io BAR to type-safe ioport callbacks
  Type-safe ioport callbacks
  trace: Trace vm_start()/vm_stop()
  virtfs: enable MSI-X
  pc: add 0.13 pc machine type
  trace: Use fprintf_function (format checking)
  slirp: Remove unused code for bad sprintf
  pc: disable the BOCHS BIOS panic port
  optionrom: fix bugs in signrom.sh
  Makefile: Fix check dependency breakage
  block migration: do not submit multiple AIOs for same sector
  block: set sector dirty on AIO write completion
  block: fix shift in dirty bitmap calculation
  ...

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>