On Tue, Sep 14, 2010 at 08:55:57AM +0800, Amos Kong wrote: > On Mon, Sep 13, 2010 at 07:43:22PM +0200, Michael S. Tsirkin wrote: > > 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@xxxxxxxxxx> > > This fix looks good for me. > Reviewed-by: Amos Kong <akong@xxxxxxxxxx> > > BTW, we try to produce three kinds of cmdline, possible combinations: > 1. Old way: -net nic,model=e1000,vlan=1 -net tap,vlan=1 > 2. Semi-new: -device e1000,vlan=1 -net tap,vlan=1 > 3. Best way: -netdev type=tap,id=netdev1 -device e1000,id=netdev1 > > If you think this is good, I'll sent a patch to upstream. I don't think we care about the Semi-new way. > > --- > > > > 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@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
