From patchwork Wed Nov 17 10:41:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 331511 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAHAiKBC006320 for ; Wed, 17 Nov 2010 10:44:21 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933738Ab0KQKjy (ORCPT ); Wed, 17 Nov 2010 05:39:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43318 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933716Ab0KQKjy (ORCPT ); Wed, 17 Nov 2010 05:39:54 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oAHAdr98022986 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 17 Nov 2010 05:39:53 -0500 Received: from dhcp-91-7.nay.redhat.com.englab.nay.redhat.com (dhcp-91-7.nay.redhat.com [10.66.91.7]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oAHAdpxg008283; Wed, 17 Nov 2010 05:39:52 -0500 Subject: [PATCH 1/2] KVM test: Support params for netdev To: autotest@test.kernel.org From: Jason Wang Cc: lmr@redhat.com, kvm@vger.kernel.org Date: Wed, 17 Nov 2010 18:41:00 +0800 Message-ID: <20101117104059.19598.85066.stgit@dhcp-91-7.nay.redhat.com.englab.nay.redhat.com> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 17 Nov 2010 10:44:21 +0000 (UTC) diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py index 72f5296..fdbaa90 100755 --- a/client/tests/kvm/kvm_vm.py +++ b/client/tests/kvm/kvm_vm.py @@ -260,11 +260,11 @@ class VM: def add_net(help, vlan, mode, ifname=None, script=None, downscript=None, tftp=None, bootfile=None, hostfwd=[], - netdev_id=None, vhost=False): + netdev_id=None, netdev_extra_params=None): if has_option(help, "netdev"): cmd = " -netdev %s,id=%s" % (mode, netdev_id) - if vhost: - cmd += ",vhost=on" + if netdev_extra_params: + cmd += ",%s" % netdev_extra_params else: cmd = " -net %s,vlan=%d" % (mode, vlan) if mode == "tap": @@ -420,7 +420,7 @@ class VM: script, downscript, tftp, nic_params.get("bootp"), redirs, self.netdev_id[vlan], - nic_params.get("vhost")=="yes") + nic_params.get("netdev_extra_params")) # Proceed to next NIC vlan += 1