Merge commit '00a1555e0cff5d710ea63145b18e2915b84b58de' into upstream-merge

Merge commit '00a1555e0cff5d710ea63145b18e2915b84b58de' into upstream-merge

* commit '00a1555e0cff5d710ea63145b18e2915b84b58de': (32 commits)
  move around definitions in kvm.h that do not require CPUState
  move targphys.h and hw/poison.h inclusion to cpu-common.h
  move two variable declarations out of vl.c
  move socket_init to qemu-sockets.c
  Make virtio-pci building conditional again
  target-mips: Fix one more format specifier for cpu_fprintf
  target-i386: Fix variable in (disabled) debugging code
  Debugcon: Fix debugging printf
  target-i386: Fix compiler warning
  remove TARGET_* defines from translate-all.c
  e1000: fix build on Ubuntu with _FORTIFY_SOURCE
  smc91c111: allow access to reserved register
  smc91c111: mask register offset
  baum: add destroy hook
  target-arm: fix neon vmon/vmvn with modified immediate
  fix function signature of qemu_chr_open_pty on !linux
  Shrink tb_jmp_offset to two entries, the other two are never used.
  tcg-hppa: Don't try to calls to non-constant addresses.
  tcg-hppa: Fix in/out register overlap in add2/sub2.
  tcg-hppa: Finish the port.
  ...

Conflicts:
	kvm.h

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