aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-04-23 09:58:54 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-04-23 09:58:54 -0500
commit53878a132aaadbedbe8fe0e44afa032a4ed73aea (patch)
treed487f4157b2d8b394575cd04a22183222ef20bd1 /configure
parent6b03296606c665beb570eaa53a71f7688a43b9e7 (diff)
parent4c9f8d1b4eb0e1a7e69df6373e9c2d40a929494d (diff)
downloadqemu-53878a132aaadbedbe8fe0e44afa032a4ed73aea.zip
qemu-53878a132aaadbedbe8fe0e44afa032a4ed73aea.tar.gz
qemu-53878a132aaadbedbe8fe0e44afa032a4ed73aea.tar.bz2
Merge remote-tracking branch 'sstabellini/build_fix' into staging
* sstabellini/build_fix: xen: add a dummy xc_hvm_inject_msi for Xen < 4.2 xen,configure: detect Xen 4.2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure25
1 files changed, 25 insertions, 0 deletions
diff --git a/configure b/configure
index 03b49f6..8ed5a03 100755
--- a/configure
+++ b/configure
@@ -1398,6 +1398,31 @@ int main(void) {
xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0);
xc_gnttab_open(NULL, 0);
xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0);
+ xc_hvm_inject_msi(xc, 0, 0xf0000000, 0x00000000);
+ return 0;
+}
+EOF
+ compile_prog "" "$xen_libs"
+ ) ; then
+ xen_ctrl_version=420
+ xen=yes
+
+ elif (
+ cat > $TMPC <<EOF
+#include <xenctrl.h>
+#include <xs.h>
+#include <stdint.h>
+#include <xen/hvm/hvm_info_table.h>
+#if !defined(HVM_MAX_VCPUS)
+# error HVM_MAX_VCPUS not defined
+#endif
+int main(void) {
+ xc_interface *xc;
+ xs_daemon_open();
+ xc = xc_interface_open(0, 0, 0);
+ xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0);
+ xc_gnttab_open(NULL, 0);
+ xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0);
return 0;
}
EOF