Re: [Xen-devel] [PATCH] OCaml build fix - remove uint32 use

[Dave Scott <Dave.Scott@xxxxxxxxxx>]

Hi,

On 8 Sep 2014, at 09:33, Ian Campbell <Ian.Campbell@xxxxxxxxxx> wrote:

> Seem plausible enough to me but CCing the Ocaml maintainer. Please
> consult the MAINTAINERS file for next time.
> 
> Ian.
> 
> On Sun, 2014-09-07 at 20:10 +0100, M A Young wrote:
>> I need the attached patch to build the OCaml bits of xen on Fedora 
>> rawhide. Fedora rawhide has backported a patch from OCaml trunk which 
>> removes OCaml's uint32 type. The patch replaces the uint32 types in 
>> tools/ocaml/libs/xb/xs_ring_stubs.c with uint32_t and adds the
>> stdint.h 
>> include to define them. This also means it is more consistent with
>> other 
>> parts of the ocaml code in xen.


Looks good to me:

Acked-by: David Scott <dave.scott@xxxxxxxxxx>

>> 
>>        Michael Young
> 
> 
>> OCaml is replacing its own uint32 type with the ISO C99 uint32_t type
>> in 4.03.0+dev. Ths patch replaces the remaining uses of uint32 with
>> uint32_t in the ocaml C code for xen.
>> 
>> Signed-off-by: Michael Young <m.a.young@xxxxxxxxxxxx>
>> 
>> --- xen-4.4.1/tools/ocaml/libs/xb/xs_ring_stubs.c.orig  2014-09-02
>> 07:20:19.000000000 +0100
>> +++ xen-4.4.1/tools/ocaml/libs/xb/xs_ring_stubs.c       2014-09-02
>> 21:42:36.164254201 +0100
>> @@ -20,6 +20,7 @@
>> #include <unistd.h>
>> #include <errno.h>
>> #include <string.h>
>> +#include <stdint.h>
>> 
>> #include <xenctrl.h>
>> #include <xen/io/xs_wire.h>
>> @@ -42,8 +43,8 @@
>>        XENSTORE_RING_IDX cons, prod; /* offsets only */
>>        int to_read;
>> 
>> -       cons = *(volatile uint32*)&intf->req_cons;
>> -       prod = *(volatile uint32*)&intf->req_prod;
>> +       cons = *(volatile uint32_t*)&intf->req_cons;
>> +       prod = *(volatile uint32_t*)&intf->req_prod;
>>        xen_mb();
>> 
>>        if ((prod - cons) > XENSTORE_RING_SIZE)
>> @@ -72,8 +73,8 @@
>>        XENSTORE_RING_IDX cons, prod;
>>        int can_write;
>> 
>> -       cons = *(volatile uint32*)&intf->rsp_cons;
>> -       prod = *(volatile uint32*)&intf->rsp_prod;
>> +       cons = *(volatile uint32_t*)&intf->rsp_cons;
>> +       prod = *(volatile uint32_t*)&intf->rsp_prod;
>>        xen_mb();
>>        if ( (prod - cons) >= XENSTORE_RING_SIZE )
>>                return 0;
> 


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