I'm not too fond of the schema change but thus far haven't found a way to condense it. Suggestions welcomed :-).

>From a27589eb861fd487cb07e537b5da25125599e8a5 Mon Sep 17 00:00:00 2001 From: Jim Fehlig <jfehlig(a)novell.com&gt; Date: Thu, 29 Jul 2010 12:21:47 -0600 Subject: [PATCH] Add actions to virDomainLifecycle enum Xen supports on_crash actions coredump-{destroy,restart}. libvirt cannot parse config returned by xend that contains either of these actions xen52 # xm li -l test | grep on_crash (on_crash coredump-restart) xen52 # virsh dumpxml test error: internal error unknown lifecycle type coredump-restart This patch includes these additional actions in virDomainLifecycle enum. Docs have also been updated, although the schema changes might be further collapsed. --- docs/formatdomain.html.in | 14 ++++++++++++++ docs/schemas/domain.rng | 24 +++++++++++++++++++++++-

+ <p> + on_crash supports these additional actions.

+ </p> + + <dl> + <dt><code>coredump-destroy</code></dt> + <dd>The crashed domain's core will be dumped, and then the + domain will be terminated completely and all resources + released</dd> + <dt><code>coredump-restart</code></dt> + <dd>The crashed domain's core will be dumped, and then the + domain will be restarted with the same configuration</dd> + </dl> + <h3><a name="elementsFeatures">Hypervisor features</a></h3> <p> diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng index b2783b0..d384652 100644 --- a/docs/schemas/domain.rng +++ b/docs/schemas/domain.rng @@ -1177,7 +1177,7 @@ </optional> <optional> <element name="on_crash"> - <ref name="offOptions"/> + <ref name="crashOptions"/> </element> </optional> </interleave> @@ -1199,6 +1199,28 @@ </choice> </define> <!-- + Options when a domain crashes: + destroy: The domain is cleaned up + restart: A new domain is started in place of the old one + preserve: The domain will remain in memory until it is destroyed manually + rename-restart: a variant of the previous one but where the old domain is + renamed before being saved to allow a restart + coredump-destroy: The crashed domain's core will be dumped, and then the + domain will be terminated completely and all resources + released + coredump-restart: The crashed domain's core will be dumped, and then the domain will be restarted with the same configuration + --> + <define name="crashOptions"> + <choice> + <value>destroy</value> + <value>restart</value> + <value>preserve</value> + <value>rename-restart</value> + <value>coredump-destroy</value> + <value>coredump-restart</value> + </choice> + </define>

+++ b/src/conf/domain_conf.c @@ -81,7 +81,9 @@ VIR_ENUM_IMPL(virDomainLifecycle, VIR_DOMAIN_LIFECYCLE_LAST, "destroy", "restart", "rename-restart", - "preserve") + "preserve", + "coredump-destroy", + "coredump-restart")

On 08/12/2010 11:15 AM, Jim Fehlig wrote: >>> +++ b/src/conf/domain_conf.c >>> @@ -81,7 +81,9 @@ VIR_ENUM_IMPL(virDomainLifecycle, VIR_DOMAIN_LIFECYCLE_LAST, >>> "destroy", >>> "restart", >>> "rename-restart", >>> - "preserve") >>> + "preserve", >>> + "coredump-destroy", >>> + "coredump-restart") >>> >>> >> Hmm. These two new values are only valid for on_crash, but I don't see >> any code that rejects them for on_reboot or on_poweroff. Do we need a >> separate enum here, or do we just need to add better checking to the >> remaining clients to detect enum values they can't support? >> >> > Good point. I moved these new options into a new enum and adjusted the > code accordingly. > > V2 attached. > ACK. I went ahead and added the <since> tag, then pushed (here's what I squashed in): diff --git i/docs/formatdomain.html.in w/docs/formatdomain.html.in index df5e53d..edee933 100644 --- i/docs/formatdomain.html.in +++ w/docs/formatdomain.html.in @@ -367,7 +367,8 @@ </dl> <p> - on_crash supports these additional actions. + on_crash supports these additional + actions <span class="since">since 0.8.4</span>. </p>