Merge branch 'upstream-merge' into next

Merge branch 'upstream-merge' into next

* upstream-merge: (176 commits)
  Make hpet/pit interface close to upstream
  Update OpenBIOS images
  apic: qdev conversion cleanup
  apic: convert to qdev
  apic: avoid using CPUState internals
  apic: avoid passing CPUState from CPU code
  apic: avoid passing CPUState from devices
  ioapic: convert to qdev
  ioapic: unexport ioapic_set_irq
  Usermode exec-stack fix
  Strace mprotect flags.
  GDB exit status for semihosting
  cris: Move sign extension.
  cris: Centralize fetching
  cris: Make the CRISv32 insn decoders return signed int.
  tcg: Optionally sign-extend 32-bit arguments for 64-bit hosts.
  Fix comparison which always returned false
  xen: Fix build error due to missing include
  block: fix a warning and possible truncation
  blockdev: Give drives internal linkage
  ...

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