Fixed dependency ob core data in android/help.c

Also moved along -tcpdump option

Change-Id: I9fc53e0dc6a86e9a880d6127bf2da3ac1d7ec58a

1 files changed, 14 insertions, 0 deletions

diff --git a/vl-android.c b/vl-android.c
index cdaeb64..07ef4e2 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -57,6 +57,7 @@
 #include "android/globals.h"
 #include "android/utils/bufprint.h"
 #include "targphys.h"
+#include "tcpdump.h"
 
 #ifdef CONFIG_MEMCHECK
 #include "memcheck/memcheck.h"
@@ -387,6 +388,9 @@ char* android_op_netdelay = NULL;
 /* -netfast option value. */
 int android_op_netfast = 0;
 
+/* -tcpdump option value. */
+char* android_op_tcpdump = NULL;
+
 extern int android_display_width;
 extern int android_display_height;
 extern int android_display_bpp;
@@ -5958,6 +5962,9 @@ int main(int argc, char **argv, char **envp)
                 android_op_netfast = 1;
                 break;
 
+            case QEMU_OPTION_tcpdump:
+                android_op_tcpdump = (char*)optarg;
+                break;
 
 #ifdef CONFIG_MEMCHECK
             case QEMU_OPTION_android_memcheck:
@@ -6040,6 +6047,13 @@ int main(int argc, char **argv, char **envp)
         qemu_net_max_latency = 0;
     }
 
+    /* Initialize TCP dump */
+    if (android_op_tcpdump) {
+        if (qemu_tcpdump_start(android_op_tcpdump) < 0) {
+            fprintf(stdout, "could not start packet capture: %s\n", strerror(errno));
+        }
+    }
+
     /* Initialize modem */
     if (android_op_radio) {
         CharDriverState*  cs = qemu_chr_open("radio", android_op_radio, NULL);