[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen stable-4.16] tools/ocaml/xenstored/store.ml: fix build error



commit 3774760ae0e3ecffb5a1d60133adc172702663b9
Author:     Edwin Török <edvin.torok@xxxxxxxxxx>
AuthorDate: Wed Nov 9 10:48:33 2022 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Mon Dec 12 11:04:12 2022 +0000

    tools/ocaml/xenstored/store.ml: fix build error
    
    Building with Dune in release mode fails with:
    ```
    File "ocaml/xenstored/store.ml", line 464, characters 13-32:
    Warning 18: this type-based record disambiguation is not principal.
    File "ocaml/xenstored/store.ml", line 1:
    Error: Some fatal warnings were triggered (1 occurrences)
    ```
    
    This is a warning to help keep the code futureproof, quoting from its
    documentation:
    > Check information path during type-checking, to make sure that all types 
are
    > derived in a principal way. When using labelled arguments and/or 
polymorphic
    > methods, this flag is required to ensure future versions of the compiler 
will
    > be able to infer types correctly, even if internal algorithms change. All
    > programs accepted in -principal mode are also accepted in the default 
mode with
    > equivalent types, but different binary signatures, and this may slow down 
type
    > checking; yet it is a good idea to use it once before publishing source 
code.
    
    Fixes: db471408edd46 "tools/ocaml/xenstored: Fix quota bypass on domain 
shutdown"
    
    Signed-off-by: Edwin Török <edvin.torok@xxxxxxxxxx>
    Acked-by: Christian Lindig <christian.lindig@xxxxxxxxxx>
    Release-acked-by: Henry Wang <Henry.Wang@xxxxxxx>
    (cherry picked from commit 124492eff8e4acdaaed939fa9406b108c55fec73)
---
 tools/ocaml/xenstored/store.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ocaml/xenstored/store.ml b/tools/ocaml/xenstored/store.ml
index 70f0c83de4..c94dbf3a62 100644
--- a/tools/ocaml/xenstored/store.ml
+++ b/tools/ocaml/xenstored/store.ml
@@ -461,7 +461,7 @@ let reset_permissions store domid =
                | Some perms ->
                        if perms <> node.perms then
                                Logging.debug "store|node" "Changed permissions 
for node %s" (Node.get_name node);
-                       Some { node with perms }
+                       Some { node with Node.perms }
        ) store.root
 
 type ops = {
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.16



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.