Merge remote-tracking branch 'bonzini/hw-dirs' into staging

* bonzini/hw-dirs:
  exec: remove useless declarations from memory-internal.h
  memory: move core typedefs to qemu/typedefs.h
  include: avoid useless includes of exec/ headers
  sysemu: avoid proliferation of include/ subdirectories
  tpm: reorganize headers and split hardware part
  configure: fix TPM logic
  acpi.h: make it self contained
  acpi: move declarations from pc.h to acpi.h
  hw: Add lost ARM core again
  Fix failure to create q35 machine
  Add linux-headers to QEMU_INCLUDES
  arm: fix location of some include files

Conflicts:
	configure

aliguori: trivial conflict in configure output

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --cc configure
index c5fa609efb5db6a28358e61329d21853f359a3b0,1c1e3694e8e622bbe449cd3a9292edd6a91599cb..0788e27951630be056a8c5320d1d2ab1b2752ce6
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -3517,7 -3445,7 +3527,8 @@@ echo "virtio-blk-data-plane $virtio_blk
  echo "gcov              $gcov_tool"
  echo "gcov enabled      $gcov"
  echo "TPM support       $tpm"
 +echo "libssh2 support   $libssh2"
+ echo "TPM passthrough   $tpm_passthrough"
  
  if test "$sdl_too_old" = "yes"; then
  echo "-> Your SDL version is too old - please upgrade to have SDL support"

diff --cc hmp.c
Simple merge

diff --cc monitor.c
Simple merge

diff --cc qemu-char.c
Simple merge

diff --cc vl.c
Simple merge