diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-26 15:05:45 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-26 15:05:45 -0500 |
| commit | 3978f4612e7aa90469f6b1e0a04524833e77fbc6 (patch) | |
| tree | f8e7cae29d2cbebf78018554c5388afd3c41160a /hw/xen_common.h | |
| parent | 7a542b67b32742ff5fe286f819df891d1df7bf56 (diff) | |
| parent | e108a3c110506faf3ef43448be3e0d39ef0ead8f (diff) | |
Merge remote-tracking branch 'sstabellini/compile-xs' into staging
* sstabellini/compile-xs:
xenstore: Use <xenstore.h>
xen: Reorganize includes of Xen headers.
Diffstat (limited to 'hw/xen_common.h')
| -rw-r--r-- | hw/xen_common.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/hw/xen_common.h b/hw/xen_common.h index 03b0bb1ea9..727757afb4 100644 --- a/hw/xen_common.h +++ b/hw/xen_common.h @@ -7,7 +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" |