From: "Michael S. Tsirkin" <mst@redhat.com>
To: autotest@test.kernel.org, kvm@vger.kernel.org
Subject: [KVM-AUTOTEST PATCH] tests/kvm: fix -net syntax for new qemu
Date: Mon, 13 Sep 2010 19:43:22 +0200 [thread overview]
Message-ID: <20100913174322.GA19009@redhat.com> (raw)
netdev option in new qemu is mutually exclusive with vlan.
Only pass vlan if netdev option is missing.
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
next reply other threads:[~2010-09-13 17:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-13 17:43 Michael S. Tsirkin [this message]
2010-09-14 0:55 ` [KVM-AUTOTEST PATCH] tests/kvm: fix -net syntax for new qemu Amos Kong
2010-09-14 11:55 ` Michael S. Tsirkin
2010-09-14 2:02 ` Lucas Meneghel Rodrigues
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=20100913174322.GA19009@redhat.com \
--to=mst@redhat.com \
--cc=autotest@test.kernel.org \
--cc=kvm@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.