aboutsummaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-01-24 07:50:50 -0800
committerandroid code review <noreply-gerritcodereview@google.com>2012-01-24 07:50:51 -0800
commit828b135787a028f6befe56470e7233329cc45e3f (patch)
tree65b5ce54530e79547e4a2c9923ab78e9e6be2ad7 /android
parent2ae501556f90647e40466b6a1948f6f7f51cf251 (diff)
parente4a3c7801e0075a49674c79972394ad962b338f2 (diff)
downloadexternal_qemu-828b135787a028f6befe56470e7233329cc45e3f.zip
external_qemu-828b135787a028f6befe56470e7233329cc45e3f.tar.gz
external_qemu-828b135787a028f6befe56470e7233329cc45e3f.tar.bz2
Merge "New files to add HAX support"
Diffstat (limited to 'android')
-rw-r--r--android/config/target-x86/config.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/android/config/target-x86/config.h b/android/config/target-x86/config.h
index 242d45d..f9a3b81 100644
--- a/android/config/target-x86/config.h
+++ b/android/config/target-x86/config.h
@@ -5,3 +5,14 @@
#ifdef CONFIG_LINUX
#define CONFIG_KVM 1
#endif
+
+/*
+ * HAX is supported in darwin and windows host
+ */
+#ifdef CONFIG_DARWIN
+#define CONFIG_HAX 1
+#endif
+
+#ifdef CONFIG_WIN32
+#define CONFIG_HAX 1
+#endif