* [PATCH] tools/ocaml: remove uint32 use added by 674ad2b
@ 2015-02-08 17:11 M A Young
2015-02-08 18:55 ` Dave Scott
0 siblings, 1 reply; 3+ messages in thread
From: M A Young @ 2015-02-08 17:11 UTC (permalink / raw)
To: xen-devel
Cc: Wei Liu, Ian Campbell, Ian Jackson, David Scott,
Stefano Stabellini
>From 73bab9cb1cb95f35080fadaf1193cbe45327a89c Mon Sep 17 00:00:00 2001
From: Michael Young <m.a.young@durham.ac.uk>
Date: Sun, 8 Feb 2015 15:54:23 +0000
Subject: [PATCH] tools/ocaml: remove uint32 use added by 674ad2b
In 674ad2b (xenstore: extend the xenstore ring with a 'closing' signal)
two uses of uint32 are added to tools/ocaml/libs/xb/xs_ring_stubs.c .
As of ocaml 4.03.0+dev the uint32 type is no longer supported. This patch
replaces the uses of uint32 with uint32_t .
Signed-off-by: Michael Young <m.a.young@durham.ac.uk>
---
tools/ocaml/libs/xb/xs_ring_stubs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/ocaml/libs/xb/xs_ring_stubs.c b/tools/ocaml/libs/xb/xs_ring_stubs.c
index fc9b0c5..fd561a2 100644
--- a/tools/ocaml/libs/xb/xs_ring_stubs.c
+++ b/tools/ocaml/libs/xb/xs_ring_stubs.c
@@ -55,7 +55,7 @@ CAMLprim value ml_interface_read(value ml_interface,
cons = *(volatile uint32_t*)&intf->req_cons;
prod = *(volatile uint32_t*)&intf->req_prod;
- connection = *(volatile uint32*)&intf->connection;
+ connection = *(volatile uint32_t*)&intf->connection;
if (connection != XENSTORE_CONNECTED)
caml_raise_constant(*caml_named_value("Xb.Reconnect"));
@@ -105,7 +105,7 @@ CAMLprim value ml_interface_write(value ml_interface,
cons = *(volatile uint32_t*)&intf->rsp_cons;
prod = *(volatile uint32_t*)&intf->rsp_prod;
- connection = *(volatile uint32*)&intf->connection;
+ connection = *(volatile uint32_t*)&intf->connection;
if (connection != XENSTORE_CONNECTED)
caml_raise_constant(*caml_named_value("Xb.Reconnect"));
--
2.1.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] tools/ocaml: remove uint32 use added by 674ad2b
2015-02-08 17:11 [PATCH] tools/ocaml: remove uint32 use added by 674ad2b M A Young
@ 2015-02-08 18:55 ` Dave Scott
2015-02-19 17:19 ` Ian Campbell
0 siblings, 1 reply; 3+ messages in thread
From: Dave Scott @ 2015-02-08 18:55 UTC (permalink / raw)
To: M A Young
Cc: Dave Scott, Wei Liu, Ian Campbell, xen-devel@lists.xen.org,
Stefano Stabellini, Ian Jackson
> On 8 Feb 2015, at 17:11, M A Young <m.a.young@durham.ac.uk> wrote:
>
> From 73bab9cb1cb95f35080fadaf1193cbe45327a89c Mon Sep 17 00:00:00 2001
> From: Michael Young <m.a.young@durham.ac.uk>
> Date: Sun, 8 Feb 2015 15:54:23 +0000
> Subject: [PATCH] tools/ocaml: remove uint32 use added by 674ad2b
>
> In 674ad2b (xenstore: extend the xenstore ring with a 'closing' signal)
> two uses of uint32 are added to tools/ocaml/libs/xb/xs_ring_stubs.c .
> As of ocaml 4.03.0+dev the uint32 type is no longer supported. This patch
> replaces the uses of uint32 with uint32_t .
Oops, my fault.
This looks good to me —
Acked-by: David Scott <dave.scott@citrix.com>
>
> Signed-off-by: Michael Young <m.a.young@durham.ac.uk>
> ---
> tools/ocaml/libs/xb/xs_ring_stubs.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/ocaml/libs/xb/xs_ring_stubs.c b/tools/ocaml/libs/xb/xs_ring_stubs.c
> index fc9b0c5..fd561a2 100644
> --- a/tools/ocaml/libs/xb/xs_ring_stubs.c
> +++ b/tools/ocaml/libs/xb/xs_ring_stubs.c
> @@ -55,7 +55,7 @@ CAMLprim value ml_interface_read(value ml_interface,
>
> cons = *(volatile uint32_t*)&intf->req_cons;
> prod = *(volatile uint32_t*)&intf->req_prod;
> - connection = *(volatile uint32*)&intf->connection;
> + connection = *(volatile uint32_t*)&intf->connection;
>
> if (connection != XENSTORE_CONNECTED)
> caml_raise_constant(*caml_named_value("Xb.Reconnect"));
> @@ -105,7 +105,7 @@ CAMLprim value ml_interface_write(value ml_interface,
>
> cons = *(volatile uint32_t*)&intf->rsp_cons;
> prod = *(volatile uint32_t*)&intf->rsp_prod;
> - connection = *(volatile uint32*)&intf->connection;
> + connection = *(volatile uint32_t*)&intf->connection;
>
> if (connection != XENSTORE_CONNECTED)
> caml_raise_constant(*caml_named_value("Xb.Reconnect"));
> --
> 2.1.0
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] tools/ocaml: remove uint32 use added by 674ad2b
2015-02-08 18:55 ` Dave Scott
@ 2015-02-19 17:19 ` Ian Campbell
0 siblings, 0 replies; 3+ messages in thread
From: Ian Campbell @ 2015-02-19 17:19 UTC (permalink / raw)
To: Dave Scott
Cc: Ian Jackson, xen-devel@lists.xen.org, Stefano Stabellini, Wei Liu,
M A Young
On Sun, 2015-02-08 at 18:55 +0000, Dave Scott wrote:
>
> > On 8 Feb 2015, at 17:11, M A Young <m.a.young@durham.ac.uk> wrote:
> >
> > From 73bab9cb1cb95f35080fadaf1193cbe45327a89c Mon Sep 17 00:00:00 2001
> > From: Michael Young <m.a.young@durham.ac.uk>
> > Date: Sun, 8 Feb 2015 15:54:23 +0000
> > Subject: [PATCH] tools/ocaml: remove uint32 use added by 674ad2b
> >
> > In 674ad2b (xenstore: extend the xenstore ring with a 'closing' signal)
> > two uses of uint32 are added to tools/ocaml/libs/xb/xs_ring_stubs.c .
> > As of ocaml 4.03.0+dev the uint32 type is no longer supported. This patch
> > replaces the uses of uint32 with uint32_t .
>
> Oops, my fault.
>
> This looks good to me —
>
> Acked-by: David Scott <dave.scott@citrix.com>
Applied, thanks.
_______________________________________________
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-02-19 17:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-08 17:11 [PATCH] tools/ocaml: remove uint32 use added by 674ad2b M A Young
2015-02-08 18:55 ` Dave Scott
2015-02-19 17:19 ` 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.