Merge commit 'eb47d7c5d96060040931c42773ee07e61e547af9' into upstream-merge

Merge commit 'eb47d7c5d96060040931c42773ee07e61e547af9' into upstream-merge

* commit 'eb47d7c5d96060040931c42773ee07e61e547af9': (103 commits)
  hw/9118.c: Implement active-low interrupt support
  Introduce format string for pid_t
  smc91c111: qdevify reset
  Command line support for altering the log file location
  Allow nested qemu_bh_poll() after BH deletion
  ide: Clear error_status after restarting flush
  ide: add TRIM support
  ide: allow other dma comands than read and write
  make dma_bdrv_io available to drivers
  ide: Add forgotten VMSTATE_END_OF_LIST in subsection
  ide: Fix ide_drive_pio_state_needed()
  ide: Split error status from status register
  qcow2: Fix in-flight list after qcow2_cache_put failure
  Replaced tabs with spaces in block.h and block_int.h
  vdi: Avoid direct AIO callback
  qcow: Avoid direct AIO callback
  qcow2: Avoid direct AIO callback
  kvm: Enable CPU SMEP feature
  kvm: Add CPUID support for VIA CPU
  usb-ccid: Plug memory leak on qdev exit()
  ...

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