diff -Naur qemu-0.10.6/vl.c qemu-0.10.6-option/vl.c --- qemu-0.10.6/vl.c 2009-07-16 20:56:26.000000000 -0400 +++ qemu-0.10.6-option/vl.c 2009-11-10 12:54:46.000000000 -0500 @@ -157,6 +157,8 @@ #include "exec-all.h" +#include "pcap.h" + //#define DEBUG_UNUSED_IOPORT //#define DEBUG_IOPORT //#define DEBUG_NET @@ -4099,6 +4101,9 @@ "-chroot dir Chroot to dir just before starting the VM.\n" "-runas user Change to user id user just before starting the VM.\n" #endif + "-debug-e100 print E100 debug statments\n" + "-pcap file_name\n" + " when -net user is enabled, dump packets to file_name,\n" "\n" "During emulation, the following keys are useful:\n" "ctrl-alt-f toggle full screen\n" @@ -4218,6 +4223,9 @@ QEMU_OPTION_incoming, QEMU_OPTION_chroot, QEMU_OPTION_runas, + + QEMU_OPTION_debug_e100, + QEMU_OPTION_pcap, }; typedef struct QEMUOption { @@ -4348,6 +4356,9 @@ { "incoming", HAS_ARG, QEMU_OPTION_incoming }, { "chroot", HAS_ARG, QEMU_OPTION_chroot }, { "runas", HAS_ARG, QEMU_OPTION_runas }, + + { "debug-e100", 0, QEMU_OPTION_debug_e100 }, + { "pcap", HAS_ARG, QEMU_OPTION_pcap }, { NULL }, }; @@ -4622,6 +4633,7 @@ struct passwd *pwd = NULL; const char *chroot_dir = NULL; const char *run_as = NULL; + extern int e100_debug; qemu_cache_utils_init(envp); @@ -5283,6 +5295,12 @@ case QEMU_OPTION_runas: run_as = optarg; break; + case QEMU_OPTION_debug_e100: + e100_debug = 1; + break; + case QEMU_OPTION_pcap: + pcap_dump_init(optarg); + break; } } }