From patchwork Wed Jul  7 10:32:16 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Michael Goldish <mgoldish@redhat.com>
X-Patchwork-Id: 110607
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o67AWVSl003340
	for <patchwork-kvm@patchwork.kernel.org>; Wed, 7 Jul 2010 10:32:31 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754541Ab0GGKc2 (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Wed, 7 Jul 2010 06:32:28 -0400
Received: from mx1.redhat.com ([209.132.183.28]:28576 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753867Ab0GGKc2 (ORCPT <rfc822;kvm@vger.kernel.org>);
	Wed, 7 Jul 2010 06:32:28 -0400
Received: from int-mx01.intmail.prod.int.phx2.redhat.com
	(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o67AWRAe009036
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
	Wed, 7 Jul 2010 06:32:27 -0400
Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199])
	by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id o67AWQDs021575; Wed, 7 Jul 2010 06:32:27 -0400
Received: from localhost.localdomain (dhcp-1-188.tlv.redhat.com
	[10.35.1.188])
	by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id o67AWOQF026807;
	Wed, 7 Jul 2010 06:32:25 -0400
From: Michael Goldish <mgoldish@redhat.com>
To: autotest@test.kernel.org, kvm@vger.kernel.org
Cc: Michael Goldish <mgoldish@redhat.com>
Subject: [KVM-AUTOTEST PATCH] KVM test: kvm_vm.py: do not check nic_mode
	when adding -tftp option
Date: Wed,  7 Jul 2010 13:32:16 +0300
Message-Id: <1278498738-2622-1-git-send-email-mgoldish@redhat.com>
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Wed, 07 Jul 2010 10:32:31 +0000 (UTC)


diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py
index 603576f..e631a3a 100755
--- a/client/tests/kvm/kvm_vm.py
+++ b/client/tests/kvm/kvm_vm.py
@@ -432,7 +432,7 @@ class VM:
             qemu_cmd += add_floppy(help, floppy)
 
         tftp = params.get("tftp")
-        if tftp and nic_params.get("nic_mode") == "user":
+        if tftp:
             tftp = kvm_utils.get_path(root_dir, tftp)
             qemu_cmd += add_tftp(help, tftp)