From: Lucas Meneghel Rodrigues <lmr@redhat.com>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: autotest@test.kernel.org, kvm@vger.kernel.org
Subject: Re: [KVM-AUTOTEST PATCH] tests/kvm: fix -net syntax for new qemu
Date: Mon, 13 Sep 2010 23:02:35 -0300 [thread overview]
Message-ID: <1284429755.3842.179.camel@freedom> (raw)
In-Reply-To: <20100913174322.GA19009@redhat.com>
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
prev parent reply other threads:[~2010-09-14 2:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-13 17:43 [KVM-AUTOTEST PATCH] tests/kvm: fix -net syntax for new qemu Michael S. Tsirkin
2010-09-14 0:55 ` Amos Kong
2010-09-14 11:55 ` Michael S. Tsirkin
2010-09-14 2:02 ` Lucas Meneghel Rodrigues [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1284429755.3842.179.camel@freedom \
--to=lmr@redhat.com \
--cc=autotest@test.kernel.org \
--cc=kvm@vger.kernel.org \
--cc=mst@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox