On Mon, 2010-08-23 at 17:07 +0800, Amos Kong wrote: > It's more clear to use 'nic_mode + nic_index + vnc_port' than 'tap0', > It's also unique for one guest.
There was some concern that this string could exceed 14 characters, and therefore, be no good for qemu-kvm consumption. However, the worst case scenario I could come up with was 12 characters. So I thing we're fine and this patch looks good. > Signed-off-by: Amos Kong <[email protected]> > --- > 0 files changed, 0 insertions(+), 0 deletions(-) > > diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py > index 6812c98..e4f216c 100755 > --- a/client/tests/kvm/kvm_vm.py > +++ b/client/tests/kvm/kvm_vm.py > @@ -428,7 +428,7 @@ class VM: > if tftp: > tftp = kvm_utils.get_path(root_dir, tftp) > qemu_cmd += add_net(help, vlan, nic_params.get("nic_mode", > "user"), > - nic_params.get("nic_ifname"), > + self.get_ifname(vlan), > script, downscript, tftp, > nic_params.get("bootp"), redirs, > self.netdev_id[vlan]) > @@ -960,6 +960,24 @@ class VM: > "redirected" % port) > return self.redirs.get(port) > > + def get_ifname(self, nic_index=0): > + """ > + Return the ifname of tap device for the guest nic. > + > + The vnc_port is unique for each VM, nic_index is unique for each nic > + of one VM, it can avoid repeated ifname. > + > + @param nic_index: Index of the NIC > + """ > + nics = kvm_utils.get_sub_dict_names(self.params, "nics") > + nic_name = nics[nic_index] > + nic_params = kvm_utils.get_sub_dict(self.params, nic_name) > + if nic_params.get("nic_ifname"): > + return nic_params.get("nic_ifname") > + else: > + return "%s_%s_%s" % (nic_params.get("nic_model"), > + nic_index, self.vnc_port) > + > def get_macaddr(self, nic_index=0): > """ > Return the macaddr of guest nic. > > _______________________________________________ > Autotest mailing list > [email protected] > http://test.kernel.org/cgi-bin/mailman/listinfo/autotest _______________________________________________ Autotest mailing list [email protected] http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
