aboutsummaryrefslogtreecommitdiffstats
path: root/android/main.c
diff options
context:
space:
mode:
authorVladimir Chtchetkine <vchtchetkine@google.com>2010-08-27 09:09:45 -0700
committerVladimir Chtchetkine <vchtchetkine@google.com>2010-09-01 07:05:46 -0700
commit318f17a0050e729bce8545463b657c1d62835b5e (patch)
tree5bb39290ba092e29be8504c88264fb5159837b5d /android/main.c
parente13168648d5947955e0fd4fbf396f891ae53921f (diff)
downloadexternal_qemu-318f17a0050e729bce8545463b657c1d62835b5e.zip
external_qemu-318f17a0050e729bce8545463b657c1d62835b5e.tar.gz
external_qemu-318f17a0050e729bce8545463b657c1d62835b5e.tar.bz2
Fixed dependency ob core data in android/help.c
Also moved along -tcpdump option Change-Id: I9fc53e0dc6a86e9a880d6127bf2da3ac1d7ec58a
Diffstat (limited to 'android/main.c')
-rw-r--r--android/main.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/android/main.c b/android/main.c
index 03d0ffd..c03280d 100644
--- a/android/main.c
+++ b/android/main.c
@@ -61,7 +61,6 @@
#include "hw/goldfish_nand.h"
#include "android/globals.h"
-#include "tcpdump.h"
#include "android/qemulator.h"
#include "android/display.h"
@@ -1153,12 +1152,6 @@ int main(int argc, char **argv)
opts->trace = tracePath;
}
- if (opts->tcpdump) {
- if (qemu_tcpdump_start(opts->tcpdump) < 0) {
- dwarning( "could not start packet capture: %s", strerror(errno));
- }
- }
-
if (opts->no_cache)
opts->cache = 0;
@@ -1190,6 +1183,11 @@ int main(int argc, char **argv)
}
}
+ if (opts->tcpdump) {
+ args[n++] = "-tcpdump";
+ args[n++] = opts->tcpdump;
+ }
+
#ifdef CONFIG_NAND_LIMITS
if (opts->nand_limits) {
args[n++] = "-nand-limits";