Merge commit 'fd42deeb4cb42f90084046e3ebdb4383953195e3' into upstream-merge

Merge commit 'fd42deeb4cb42f90084046e3ebdb4383953195e3' into upstream-merge

* commit 'fd42deeb4cb42f90084046e3ebdb4383953195e3':
  Add exit notifiers.
  acpi_piix4: save gpe and pci hotplug slot status
  qemu-option: Reject anti-social IDs
  qdev: Revert the hack to let -net nic and pci_add set qdev ID
  Clarify error message when a PCI slot is already in use (v2)
  virtio-blk: simplify multiwrite calling conventions
  virtio-blk: stop tracking old_bs
  un-register kbd driver in case of USB kbd unplug.
  make qemu_thread_create block all signals
  migration-tcp: call migrate_fd_error() instead of close() and free().
  migration: use qemu_free() instead of free().
  etrax-ser: Support the uart rx fifo.

Conflicts:
	vl.c

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