From abc19f497ed218c7fa62cb683ae78b508630b7f5 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 1 Dec 2014 12:57:20 +0000 Subject: [PATCH] TestSupport: allow overriding of on_* in prepareguest_part_xencfg Currently only on_reboot can be overridden Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- Osstest/TestSupport.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index ca680c0..5ac66e5 100644 --- a/Osstest/TestSupport.pm +++ b/Osstest/TestSupport.pm @@ -1462,6 +1462,8 @@ sub prepareguest_part_lvmdisk ($$$) { sub prepareguest_part_xencfg ($$$$$) { my ($ho, $gho, $ram_mb, $xopts, $cfgrest) = @_; my $onreboot= $xopts->{OnReboot} || 'restart'; + my $onpoweroff= $xopts->{OnPowerOff} || 'destroy'; + my $oncrash= $xopts->{OnCrash} || 'preserve'; my $vcpus= guest_var($gho, 'vcpus', $xopts->{DefVcpus} || 2); my $xoptcfg= $xopts->{ExtraConfig}; $xoptcfg='' unless defined $xoptcfg; @@ -1470,9 +1472,9 @@ name = '$gho->{Name}' memory = ${ram_mb} vif = [ 'type=ioemu,mac=$gho->{Ether}' ] # -on_poweroff = 'destroy' +on_poweroff = '$onpoweroff' on_reboot = '$onreboot' -on_crash = 'preserve' +on_crash = '$oncrash' # vcpus = $vcpus # -- 2.39.5