[PATCH] ocaml/xc: correct shutdown_reason enumeration

[PATCH] ocaml/xc: correct shutdown_reason enumeration

[Simon Rowe]

As defined by the Xen public header the fifth value of
shutdown_reason is watchdog.

Signed-off-by: Simon Rowe <simon.rowe@eu.citrix.com>
---
 tools/ocaml/libs/xc/xenctrl.ml  |    2 +-
 tools/ocaml/libs/xc/xenctrl.mli |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml
index b7ba8b7..beb95b8 100644
--- a/tools/ocaml/libs/xc/xenctrl.ml
+++ b/tools/ocaml/libs/xc/xenctrl.ml
@@ -89,7 +89,7 @@ type compile_info =
 	compile_date : string;
 }
 
-type shutdown_reason = Poweroff | Reboot | Suspend | Crash | Halt
+type shutdown_reason = Poweroff | Reboot | Suspend | Crash | Watchdog
 
 type domain_create_flag = CDF_HVM | CDF_HAP
 
diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli
index bc4af56..8928a2e 100644
--- a/tools/ocaml/libs/xc/xenctrl.mli
+++ b/tools/ocaml/libs/xc/xenctrl.mli
@@ -61,7 +61,7 @@ type compile_info = {
   compile_domain : string;
   compile_date : string;
 }
-type shutdown_reason = Poweroff | Reboot | Suspend | Crash | Halt
+type shutdown_reason = Poweroff | Reboot | Suspend | Crash | Watchdog
 
 type domain_create_flag = CDF_HVM | CDF_HAP
 
-- 
1.7.10.4

Re: [PATCH] ocaml/xc: correct shutdown_reason enumeration

[David Scott]

> On 5 Nov 2015, at 11:39, Simon Rowe <simon.rowe@eu.citrix.com> wrote:
> 
> As defined by the Xen public header the fifth value of
> shutdown_reason is watchdog.

I’ve always been a bit suspicious about having both “Poweroff” and “Halt” there. Perhaps there was some confusion between what could be written to ‘control/shutdown’ in xenstore and legal arguments to `xc_domain_shutdown` and `SCHEDOP_shutdown`?

Anyway you’re clearly right, `Watchdog` is the 5th value. So I think this is fine.

Acked-by: David Scott <dave@recoil.org>

I happen to notice there’s a type with the same name in “xenopsd”[1], so I’ve cc:d xen-api@lists as a heads-up.

Thanks,
Dave

[1] https://github.com/xapi-project/xenopsd/blob/7818ab896d9969c5f5462a2f0d0ae62703b104b6/xc/domain.ml#L268

> 
> Signed-off-by: Simon Rowe <simon.rowe@eu.citrix.com>
> ---
> tools/ocaml/libs/xc/xenctrl.ml  |    2 +-
> tools/ocaml/libs/xc/xenctrl.mli |    2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml
> index b7ba8b7..beb95b8 100644
> --- a/tools/ocaml/libs/xc/xenctrl.ml
> +++ b/tools/ocaml/libs/xc/xenctrl.ml
> @@ -89,7 +89,7 @@ type compile_info =
> 	compile_date : string;
> }
> 
> -type shutdown_reason = Poweroff | Reboot | Suspend | Crash | Halt
> +type shutdown_reason = Poweroff | Reboot | Suspend | Crash | Watchdog
> 
> type domain_create_flag = CDF_HVM | CDF_HAP
> 
> diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli
> index bc4af56..8928a2e 100644
> --- a/tools/ocaml/libs/xc/xenctrl.mli
> +++ b/tools/ocaml/libs/xc/xenctrl.mli
> @@ -61,7 +61,7 @@ type compile_info = {
>   compile_domain : string;
>   compile_date : string;
> }
> -type shutdown_reason = Poweroff | Reboot | Suspend | Crash | Halt
> +type shutdown_reason = Poweroff | Reboot | Suspend | Crash | Watchdog
> 
> type domain_create_flag = CDF_HVM | CDF_HAP
> 
> -- 
> 1.7.10.4
> 


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [PATCH] ocaml/xc: correct shutdown_reason enumeration

[Ian Campbell]

On Thu, 2015-11-05 at 11:56 +0000, David Scott wrote:
> > On 5 Nov 2015, at 11:39, Simon Rowe <simon.rowe@eu.citrix.com> wrote:
> > 
> > As defined by the Xen public header the fifth value of
> > shutdown_reason is watchdog.
> 
> I’ve always been a bit suspicious about having both “Poweroff” and “Halt”
> there. Perhaps there was some confusion between what could be written to
> ‘control/shutdown’ in xenstore and legal arguments to
> `xc_domain_shutdown` and `SCHEDOP_shutdown`?
> 
> Anyway you’re clearly right, `Watchdog` is the 5th value. So I think this
> is fine.
> 
> Acked-by: David Scott <dave@recoil.org>

Applied.

> 
> I happen to notice there’s a type with the same name in “xenopsd”[1], so
> I’ve cc:d xen-api@lists as a heads-up.
> 
> Thanks,
> Dave
> 
> [1] https://github.com/xapi-project/xenopsd/blob/7818ab896d9969c5f5462a2f
> 0d0ae62703b104b6/xc/domain.ml#L268
> 
> > 
> > Signed-off-by: Simon Rowe <simon.rowe@eu.citrix.com>
> > ---
> > tools/ocaml/libs/xc/xenctrl.ml  |    2 +-
> > tools/ocaml/libs/xc/xenctrl.mli |    2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/tools/ocaml/libs/xc/xenctrl.ml
> > b/tools/ocaml/libs/xc/xenctrl.ml
> > index b7ba8b7..beb95b8 100644
> > --- a/tools/ocaml/libs/xc/xenctrl.ml
> > +++ b/tools/ocaml/libs/xc/xenctrl.ml
> > @@ -89,7 +89,7 @@ type compile_info =
> > 	compile_date : string;
> > }
> > 
> > -type shutdown_reason = Poweroff | Reboot | Suspend | Crash | Halt
> > +type shutdown_reason = Poweroff | Reboot | Suspend | Crash | Watchdog
> > 
> > type domain_create_flag = CDF_HVM | CDF_HAP
> > 
> > diff --git a/tools/ocaml/libs/xc/xenctrl.mli
> > b/tools/ocaml/libs/xc/xenctrl.mli
> > index bc4af56..8928a2e 100644
> > --- a/tools/ocaml/libs/xc/xenctrl.mli
> > +++ b/tools/ocaml/libs/xc/xenctrl.mli
> > @@ -61,7 +61,7 @@ type compile_info = {
> >   compile_domain : string;
> >   compile_date : string;
> > }
> > -type shutdown_reason = Poweroff | Reboot | Suspend | Crash | Halt
> > +type shutdown_reason = Poweroff | Reboot | Suspend | Crash | Watchdog
> > 
> > type domain_create_flag = CDF_HVM | CDF_HAP
> > 

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel