From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH OSSTEST v2 07/15] TestSupport: allow caller of prepareguest_part_xencfg to specify viftype Date: Mon, 28 Apr 2014 11:41:28 +0100 Message-ID: <1398681696-2773-7-git-send-email-ian.campbell@citrix.com> References: <1398681672.29700.55.camel@kazak.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1398681672.29700.55.camel@kazak.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: ian.jackson@eu.citrix.com Cc: Ian Campbell , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org Signed-off-by: Ian Campbell --- Osstest/TestSupport.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 132e8e9..9d5762f 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -1419,12 +1419,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= "type=$xopts->{viftype}," if $xopts->{DefVcpus}; my $xoptcfg= $xopts->{ExtraConfig}; $xoptcfg='' unless defined $xoptcfg; my $xencfg= <{Ether}' ] +vif = [ '${viftype}mac=$gho->{Ether}' ] # on_poweroff = '$onpoweroff' on_reboot = '$onreboot' @@ -1519,6 +1520,7 @@ END $cfg .= "bios='$bios'\n"; } + $xopts{'viftype'} ||= "ioemu"; my $cfgpath= prepareguest_part_xencfg($ho, $gho, $ram_mb, \%xopts, $cfg); target_cmd_root($ho, <{Guest}.vncpw -- 1.9.0