From mboxrd@z Thu Jan  1 00:00:00 1970
From: Lucas Meneghel Rodrigues <lmr@redhat.com>
Subject: Re: [KVM-AUTOTEST PATCH] tests/kvm: fix -net syntax for
	new qemu
Date: Mon, 13 Sep 2010 23:02:35 -0300
Message-ID: <1284429755.3842.179.camel@freedom>
References: <20100913174322.GA19009@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Cc: autotest@test.kernel.org, kvm@vger.kernel.org
To: "Michael S. Tsirkin" <mst@redhat.com>
Return-path: <autotest-bounces@test.kernel.org>
In-Reply-To: <20100913174322.GA19009@redhat.com>
List-Unsubscribe: <http://test.kernel.org/cgi-bin/mailman/listinfo/autotest>,
	<mailto:autotest-request@test.kernel.org?subject=unsubscribe>
List-Archive: <http://test.kernel.org/pipermail/autotest>
List-Post: <mailto:autotest@test.kernel.org>
List-Help: <mailto:autotest-request@test.kernel.org?subject=help>
List-Subscribe: <http://test.kernel.org/cgi-bin/mailman/listinfo/autotest>,
	<mailto:autotest-request@test.kernel.org?subject=subscribe>
Sender: autotest-bounces@test.kernel.org
Errors-To: autotest-bounces@test.kernel.org
List-Id: kvm.vger.kernel.org

On Mon, 2010-09-13 at 19:43 +0200, Michael S. Tsirkin wrote:
> netdev option in new qemu is mutually exclusive with vlan.
> Only pass vlan if netdev option is missing.

Looks good to me, applied, thanks!

http://autotest.kernel.org/changeset/4783

> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> 
> ---
> 
> 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
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html