Revert "Merge remote branch 'cros/upstream' into tempbranch2"

client/tests/kvm/kvm_vm.py

 #!/usr/bin/python
 """
 Utility classes and functions to handle Virtual Machine creation using qemu.
 
 @copyright: 2008-2009 Red Hat Inc.
 """
 
 import time, socket, os, logging, fcntl, re, commands, glob
 import kvm_utils, kvm_subprocess, kvm_monitor, rss_file_transfer
 from autotest_lib.client.common_lib import error
@@ skipping 217 matching lines @@
             if index is not None: cmd += ",index=%s" % index
             if format: cmd += ",if=%s" % format
             if cache: cmd += ",cache=%s" % cache
             if werror: cmd += ",werror=%s" % werror
             if serial: cmd += ",serial='%s'" % serial
             if snapshot: cmd += ",snapshot=on"
             if boot: cmd += ",boot=on"
             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 = " -net nic,netdev=%s" % netdev_id
-            else:
-                cmd = " -net nic,vlan=%d" % vlan
+                cmd +=",netdev=%s" % netdev_id
             if model: cmd += ",model=%s" % model
             if mac: cmd += ",macaddr='%s'" % mac
             return cmd
 
         def add_net(help, vlan, mode, ifname=None, script=None,
                     downscript=None, tftp=None, bootfile=None, hostfwd=[],
                     netdev_id=None):
             if has_option(help, "netdev"):
                 cmd = " -netdev %s,id=%s" % (mode, netdev_id)
             else:
@@ skipping 935 matching lines @@
         finally:
             session.close()
 
 
     def get_current_memory_size(self):
         """
         Get current memory size of the VM, rather than bootup memory.
         """
         cmd = self.params.get("mem_chk_cur_cmd")
         return self.get_memory_size(cmd)