From 5d8f37ad78fc66901af50c762029a501561f3b23 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Mon, 14 Sep 2009 14:32:27 -0700 Subject: Merge upstream QEMU 10.0.50 into the Android source tree. This change integrates many changes from the upstream QEMU sources. Its main purpose is to enable correct ARMv6 and ARMv7 support to the Android emulator. Due to the nature of the upstream code base, this unfortunately also required changes to many other parts of the source. Note that to ensure easier integrations in the future, some source files and directories that have heavy Android-specific customization have been renamed with an -android suffix. The original files are still there for easier integration tracking, but *never* compiled. For example: net.c net-android.c qemu-char.c qemu-char-android.c slirp/ slirp-android/ etc... Tested on linux-x86, darwin-x86 and windows host machines. --- slirp-android/ctl.h | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 slirp-android/ctl.h (limited to 'slirp-android/ctl.h') diff --git a/slirp-android/ctl.h b/slirp-android/ctl.h new file mode 100644 index 0000000..854ae9a --- /dev/null +++ b/slirp-android/ctl.h @@ -0,0 +1,10 @@ +#define CTL_CMD 0 +#define CTL_EXEC 1 +#define CTL_ALIAS 2 +#define CTL_DNS 3 +/* NOTE: DNS_ADDR_MAX addresses, starting from CTL_DNS, are reserved */ + +#define CTL_IS_DNS(x) ((unsigned)((x)-CTL_DNS) < (unsigned)dns_addr_count) + +#define CTL_SPECIAL "10.0.2.0" +#define CTL_LOCAL "10.0.2.15" -- cgit v1.1