* [PATCH] ocaml/xc: correct shutdown_reason enumeration
@ 2015-11-05 11:39 Simon Rowe
2015-11-05 11:56 ` David Scott
[not found] ` <82FF0306-707E-4AFC-BAE7-C7FEAB192CCF@recoil.org>
0 siblings, 2 replies; 3+ messages in thread
From: Simon Rowe @ 2015-11-05 11:39 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, ian.campbell, stefano.stabellini, ian.jackson,
Simon Rowe, dave
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ocaml/xc: correct shutdown_reason enumeration
2015-11-05 11:39 [PATCH] ocaml/xc: correct shutdown_reason enumeration Simon Rowe
@ 2015-11-05 11:56 ` David Scott
[not found] ` <82FF0306-707E-4AFC-BAE7-C7FEAB192CCF@recoil.org>
1 sibling, 0 replies; 3+ messages in thread
From: David Scott @ 2015-11-05 11:56 UTC (permalink / raw)
To: Simon Rowe
Cc: Wei Liu, Ian Campbell, Stefano Stabellini, xen-api, Ian Jackson,
Xen-devel
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread[parent not found: <82FF0306-707E-4AFC-BAE7-C7FEAB192CCF@recoil.org>]
* Re: [PATCH] ocaml/xc: correct shutdown_reason enumeration
[not found] ` <82FF0306-707E-4AFC-BAE7-C7FEAB192CCF@recoil.org>
@ 2015-11-16 12:07 ` Ian Campbell
0 siblings, 0 replies; 3+ messages in thread
From: Ian Campbell @ 2015-11-16 12:07 UTC (permalink / raw)
To: David Scott, Simon Rowe
Cc: Xen-devel, xen-api, Ian Jackson, Wei Liu, Stefano Stabellini
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-11-16 12:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-05 11:39 [PATCH] ocaml/xc: correct shutdown_reason enumeration Simon Rowe
2015-11-05 11:56 ` David Scott
[not found] ` <82FF0306-707E-4AFC-BAE7-C7FEAB192CCF@recoil.org>
2015-11-16 12:07 ` Ian Campbell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.