We look up a guest runvar GUEST_CONTEXT_timeoutfactor (according to
the usual rules for guest runvars).
Here CONTEXT can currently be `general' or `install'. (`install'
applies when the guest is being installed.) If the runvar exists, all
timeouts relating to that guest in that context are increased by the
specified factor.
Signed-off-by: Ian Jackson <ian.jack...@eu.citrix.com>
---
Osstest/TestSupport.pm | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index f1f900e..c18f4a6 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -312,6 +312,10 @@ END
sub target_adjust_timeout ($$) {
my ($ho,$timeoutref) = @_; # $ho might be a $gho
+ if ($ho->{Guest}) {
+ my $context = $ho->{TimeoutContext} // 'general';
+ $$timeoutref *= guest_var($ho,"${context}_timeoutfactor",1);
+ }
}
#---------- running commands eg on targets ----------
@@ -1604,6 +1608,8 @@ sub prepareguest ($$$$$$) {
}
}
+ $gho->{TimeoutContext} = 'install';
+
guest_find_lv($gho);
guest_find_diskimg($gho);
guest_find_ether($gho);
--
1.7.10.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
