From: Ian Campbell <ian.campbell@citrix.com>
To: ian.jackson@eu.citrix.com
Cc: Ian Campbell <ian.campbell@citrix.com>, xen-devel@lists.xen.org
Subject: [PATCH OSSTEST v2 06/15] TestSupport: allow overring of on_* in prepareguest_part_xencfg
Date: Mon, 28 Apr 2014 11:41:27 +0100 [thread overview]
Message-ID: <1398681696-2773-6-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1398681672.29700.55.camel@kazak.uk.xensource.com>
Currently only on_reboot can be overridden
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
Osstest/TestSupport.pm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index b283e07..132e8e9 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -1416,6 +1416,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;
@@ -1424,9 +1426,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
#
--
1.9.0
next prev parent reply other threads:[~2014-04-28 10:41 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-28 10:41 [PATCH OSSTEST v2 00/15] add distro domU testing flight Ian Campbell
2014-04-28 10:41 ` [PATCH OSSTEST v2 01/15] cr-external-linux: remove Ian Campbell
2014-05-02 11:19 ` Ian Jackson
2014-04-28 10:41 ` [PATCH OSSTEST v2 02/15] Build against liblzma to support .xz compressed kernels Ian Campbell
2014-05-02 11:19 ` Ian Jackson
2014-04-28 10:41 ` [PATCH OSSTEST v2 03/15] mg-debian-installer-update: grab Xen PV domU capable images too Ian Campbell
2014-05-02 11:22 ` Ian Jackson
2014-04-28 10:41 ` [PATCH OSSTEST v2 04/15] TestSupport: Add helper to fetch a URL on a host Ian Campbell
2014-05-02 11:25 ` Ian Jackson
2014-05-02 12:16 ` Ian Campbell
2014-04-28 10:41 ` [PATCH OSSTEST v2 05/15] TestSupport: Add helper to wait for a guest to shutdown Ian Campbell
2014-05-02 11:24 ` Ian Jackson
2014-04-28 10:41 ` Ian Campbell [this message]
2014-05-02 11:26 ` [PATCH OSSTEST v2 06/15] TestSupport: allow overring of on_* in prepareguest_part_xencfg Ian Jackson
2014-04-28 10:41 ` [PATCH OSSTEST v2 07/15] TestSupport: allow caller of prepareguest_part_xencfg to specify viftype Ian Campbell
2014-05-02 11:28 ` Ian Jackson
2014-05-02 12:21 ` Ian Campbell
2014-04-28 10:41 ` [PATCH OSSTEST v2 08/15] Debian: add preseed_create_guest helper Ian Campbell
2014-05-02 11:33 ` Ian Jackson
2014-05-02 12:23 ` Ian Campbell
2014-04-28 10:41 ` [PATCH OSSTEST v2 09/15] distros: add support for installing Debian PV guests via d-i, flight and jobs Ian Campbell
2014-05-02 11:46 ` Ian Jackson
2014-05-02 12:28 ` Ian Campbell
2014-05-02 14:14 ` Ian Jackson
2014-05-02 15:19 ` Ian Campbell
2014-04-28 10:41 ` [PATCH OSSTEST v2 10/15] distros: support booting Debian PV (d-i installed) guests with pvgrub Ian Campbell
2014-05-02 13:03 ` Ian Jackson
2014-05-02 13:18 ` Ian Campbell
2014-05-02 14:18 ` Ian Jackson
2014-05-02 15:22 ` Ian Campbell
2014-05-02 15:40 ` Ian Jackson
2014-04-28 10:41 ` [PATCH OSSTEST v2 11/15] distros: attempt pvgrub support for PV Wheezy too Ian Campbell
2014-05-02 13:11 ` Ian Jackson
2014-05-02 13:20 ` Ian Campbell
2014-05-02 14:19 ` Ian Jackson
2014-05-02 15:23 ` Ian Campbell
2014-04-28 10:41 ` [PATCH OSSTEST v2 12/15] distros: support PV guest install from Debian netinst media Ian Campbell
2014-05-02 14:01 ` Ian Jackson
2014-05-02 14:07 ` Ian Campbell
2014-05-02 14:20 ` Ian Jackson
2014-04-28 10:41 ` [PATCH OSSTEST v2 13/15] Test pygrub and pvgrub on the regular flights Ian Campbell
2014-05-02 14:02 ` Ian Jackson
2014-05-02 14:07 ` Ian Campbell
2014-04-28 10:41 ` [PATCH OSSTEST v2 14/15] distros: add branch infrastructure Ian Campbell
2014-05-02 14:04 ` Ian Jackson
2014-05-02 14:09 ` Ian Campbell
2014-05-02 14:30 ` Ian Jackson
2014-05-02 15:25 ` Ian Campbell
2014-04-28 10:41 ` [PATCH OSSTEST v2 15/15] distros: Run a flight over the weekend Ian Campbell
2014-05-02 14:05 ` Ian Jackson
2014-04-28 11:30 ` [PATCH OSSTEST v2 00/15] add distro domU testing flight Fabio Fantoni
2014-04-28 11:32 ` Ian Campbell
2014-04-28 12:59 ` Fabio Fantoni
2014-05-15 9:14 ` Ian Campbell
2014-05-16 17:08 ` Ian Jackson
2014-05-19 9:02 ` Ian Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1398681696-2773-6-git-send-email-ian.campbell@citrix.com \
--to=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).