On Mon, 2010-05-17 at 16:29 +0300, Michael Goldish wrote: > To disable tcpdump, set 'run_tcpdump = no' in a config file. > If 'run_tcpdump' isn't set at all, it defaults to 'yes'. > > (Currently TAP mode cannot be used without tcpdump.) Ok, I agree with your reasoning, commited as: http://autotest.kernel.org/changeset/4562 Copying Ryan. > Signed-off-by: Michael Goldish <mgoldish@xxxxxxxxxx> > --- > client/tests/kvm/kvm_preprocessing.py | 2 +- > client/tests/kvm/tests_base.cfg.sample | 1 + > 2 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/client/tests/kvm/kvm_preprocessing.py b/client/tests/kvm/kvm_preprocessing.py > index 50db65c..e11207a 100644 > --- a/client/tests/kvm/kvm_preprocessing.py > +++ b/client/tests/kvm/kvm_preprocessing.py > @@ -196,7 +196,7 @@ def preprocess(test, params, env): > if "tcpdump" in env and not env["tcpdump"].is_alive(): > env["tcpdump"].close() > del env["tcpdump"] > - if "tcpdump" not in env: > + if "tcpdump" not in env and params.get("run_tcpdump", "yes") == "yes": > command = "/usr/sbin/tcpdump -npvi any 'dst port 68'" > logging.debug("Starting tcpdump (%s)...", command) > env["tcpdump"] = kvm_subprocess.kvm_tail( > diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample > index c9dfd0b..1276267 100644 > --- a/client/tests/kvm/tests_base.cfg.sample > +++ b/client/tests/kvm/tests_base.cfg.sample > @@ -46,6 +46,7 @@ nic_mode = user > #nic_mode = tap > nic_script = scripts/qemu-ifup > address_index = 0 > +run_tcpdump = yes > > # Misc > run_kvm_stat = yes -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
