[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH OSSTEST v3 04/19] TestSupport: allow caller of prepareguest_part_xencfg to specify viftype
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx> -- v3: Use CamelCase for xopts, use the correct condition --- Osstest/TestSupport.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 3074568..5edb2fd 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -1460,12 +1460,13 @@ sub prepareguest_part_xencfg ($$$$$) { my $onpoweroff= $xopts->{OnPowerOff} || 'destroy'; my $oncrash= $xopts->{OnCrash} || 'preserve'; my $vcpus= guest_var($gho, 'vcpus', $xopts->{DefVcpus} || 2); + my $viftype= $xopts->{VifType} ? "type=$xopts->{VifType}," : ""; my $xoptcfg= $xopts->{ExtraConfig}; $xoptcfg='' unless defined $xoptcfg; my $xencfg= <<END; name = '$gho->{Name}' memory = ${ram_mb} -vif = [ 'type=ioemu,mac=$gho->{Ether}' ] +vif = [ '${viftype}mac=$gho->{Ether}' ] # on_poweroff = '$onpoweroff' on_reboot = '$onreboot' @@ -1560,6 +1561,7 @@ END $cfg .= "bios='$bios'\n"; } + $xopts{VifType} ||= "ioemu"; my $cfgpath= prepareguest_part_xencfg($ho, $gho, $ram_mb, \%xopts, $cfg); target_cmd_root($ho, <<END); (echo $passwd; echo $passwd) | vncpasswd $gho->{Guest}.vncpw -- 2.1.1 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |