Merge remote-tracking branch 'sstabellini/compile-xs' into staging

* sstabellini/compile-xs:
  xenstore: Use <xenstore.h>
  xen: Reorganize includes of Xen headers.

diff --combined configure
index 4e4ae8c23a5a0f1645a7497a2c3917845947a7b6,c4e49602b97da4ada91ad9590099a0f0bf8cee6a..3a2fbb9a39d846338d8ba582f42b1726b1b9b4df
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -137,7 -137,6 +137,7 @@@ vnc_png="
  vnc_thread="no"
  xen=""
  xen_ctrl_version=""
 +xen_pci_passthrough=""
  linux_aio=""
  cap_ng=""
  attr=""
@@@ -685,10 -684,6 +685,10 @@@ for opt d
    ;;
    --enable-xen) xen="yes"
    ;;
 +  --disable-xen-pci-passthrough) xen_pci_passthrough="no"
 +  ;;
 +  --enable-xen-pci-passthrough) xen_pci_passthrough="yes"
 +  ;;
    --disable-brlapi) brlapi="no"
    ;;
    --enable-brlapi) brlapi="yes"
@@@ -1036,8 -1031,6 +1036,8 @@@ echo "                           (affec
  echo "  --enable-mixemu          enable mixer emulation"
  echo "  --disable-xen            disable xen backend driver support"
  echo "  --enable-xen             enable xen backend driver support"
 +echo "  --disable-xen-pci-passthrough"
 +echo "  --enable-xen-pci-passthrough"
  echo "  --disable-brlapi         disable BrlAPI"
  echo "  --enable-brlapi          enable BrlAPI"
  echo "  --disable-vnc-tls        disable TLS encryption for VNC server"
@@@ -1388,7 -1381,7 +1388,7 @@@ EO
    elif (
        cat > $TMPC <<EOF
  #include <xenctrl.h>
- #include <xs.h>
+ #include <xenstore.h>
  #include <stdint.h>
  #include <xen/hvm/hvm_info_table.h>
  #if !defined(HVM_MAX_VCPUS)
@@@ -1514,25 -1507,6 +1514,25 @@@ EO
    fi
  fi
  
 +if test "$xen_pci_passthrough" != "no"; then
 +  if test "$xen" = "yes" && test "$linux" = "yes" &&
 +    test "$xen_ctrl_version" -ge 340; then
 +    xen_pci_passthrough=yes
 +  else
 +    if test "$xen_pci_passthrough" = "yes"; then
 +      echo "ERROR"
 +      echo "ERROR: User requested feature Xen PCI Passthrough"
 +      echo "ERROR: but this feature require /sys from Linux"
 +      if test "$xen_ctrl_version" -lt 340; then
 +        echo "ERROR: This feature does not work with Xen 3.3"
 +      fi
 +      echo "ERROR"
 +      exit 1;
 +    fi
 +    xen_pci_passthrough=no
 +  fi
 +fi
 +
  ##########################################
  # pkg-config probe
  
@@@ -3705,7 -3679,7 +3705,7 @@@ symlink "$source_path/Makefile.target" 
  
  
  case "$target_arch2" in
 -  alpha | sparc* | xtensa*)
 +  alpha | sparc* | xtensa* | ppc*)
      echo "CONFIG_TCG_PASS_AREG0=y" >> $config_target_mak
    ;;
  esac
@@@ -3728,9 -3702,6 +3728,9 @@@ case "$target_arch2" i
      if test "$xen" = "yes" -a "$target_softmmu" = "yes" ; then
        target_phys_bits=64
        echo "CONFIG_XEN=y" >> $config_target_mak
 +      if test "$xen_pci_passthrough" = yes; then
 +        echo "CONFIG_XEN_PCI_PASSTHROUGH=y" >> "$config_target_mak"
 +      fi
      else
        echo "CONFIG_NO_XEN=y" >> $config_target_mak
      fi

diff --combined hw/xen_common.h
index 03b0bb1ea96ff07ad0a2b3215f20abcfc077f84b,cc99204e8bd28e5a1d9b831d0606814a577edea9..727757afb44677db7ceda542eb2ad40b8b253685
--- 1/hw/xen_common.h
--- 2/hw/xen_common.h
+++ b/hw/xen_common.h
@@@ -7,7 -7,11 +7,11 @@@
  #include <inttypes.h>
  
  #include <xenctrl.h>
- #include <xs.h>
+ #if CONFIG_XEN_CTRL_INTERFACE_VERSION < 420
+ #  include <xs.h>
+ #else
+ #  include <xenstore.h>
+ #endif
  #include <xen/io/xenbus.h>
  
  #include "hw.h"
@@@ -150,7 -154,4 +154,7 @@@ static inline int xen_xc_hvm_inject_msi
  
  void destroy_hvm_domain(bool reboot);
  
 +/* shutdown/destroy current domain because of an error */
 +void xen_shutdown_fatal_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
 +
  #endif /* QEMU_HW_XEN_COMMON_H */