From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: [KVM-AUTOTEST PATCH] tests/kvm: fix -net syntax for new qemu Date: Mon, 13 Sep 2010 19:43:22 +0200 Message-ID: <20100913174322.GA19009@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: autotest@test.kernel.org, kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:47047 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753062Ab0IMRtW (ORCPT ); Mon, 13 Sep 2010 13:49:22 -0400 Content-Disposition: inline Sender: kvm-owner@vger.kernel.org List-ID: netdev option in new qemu is mutually exclusive with vlan. Only pass vlan if netdev option is missing. Signed-off-by: Michael S. Tsirkin --- diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py index bdc9aab..7e76ed5 100755 --- a/client/tests/kvm/kvm_vm.py +++ b/client/tests/kvm/kvm_vm.py @@ -235,9 +235,10 @@ class VM: return cmd def add_nic(help, vlan, model=None, mac=None, netdev_id=None): - cmd = " -net nic,vlan=%d" % vlan if has_option(help, "netdev"): - cmd +=",netdev=%s" % netdev_id + cmd = " -net nic,netdev=%s" % netdev_id + else: + cmd = " -net nic,vlan=%d" % vlan if model: cmd += ",model=%s" % model if mac: cmd += ",macaddr='%s'" % mac return cmd