OvmfPkg/XenBusDxe: In XenStore, replace type of Len from UINTN to UINT32.

Since a message to XenStore have a lenght of type UINT32, have
XenStore.c deal only with UINT32 instead of a mixmatch with UINTN.

This patch replaces the type of Len in WRITE_REQUEST and the type of the
argument Len of XenStoreWriteStore and XenStoreReadStore.

This patch should avoid to have type cast were it does not make sense to
have them.

Contributed-under: TianoCore Contribution Agreement 1.0

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Build-tested-by: Scott Duplichan <scott@notabs.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16390 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/XenBusDxe/XenStore.c b/OvmfPkg/XenBusDxe/XenStore.c
index f176b95a4ded24d095ed6929a9d26f8b12d648a8..7c272b36efeaa034b4a1494b06d512e663f6e147 100644 (file)
--- a/OvmfPkg/XenBusDxe/XenStore.c
+++ b/OvmfPkg/XenBusDxe/XenStore.c
@@ -69,7 +69,7 @@
 \r
 typedef struct {\r
   CONST VOID  *Data;\r
-  UINTN       Len;\r
+  UINT32      Len;\r
 } WRITE_REQUEST;\r
 \r
 /* Register callback to watch subtree (node) in the XenStore. */\r
@@ -456,7 +456,7 @@ STATIC
 XENSTORE_STATUS\r
 XenStoreWriteStore (\r
   IN CONST VOID *DataPtr,\r
-  IN UINTN      Len\r
+  IN UINT32     Len\r
   )\r
 {\r
   XENSTORE_RING_IDX Cons, Prod;\r
@@ -535,7 +535,7 @@ STATIC
 XENSTORE_STATUS\r
 XenStoreReadStore (\r
   OUT VOID *DataPtr,\r
-  IN  UINTN Len\r
+  IN  UINT32 Len\r
   )\r
 {\r
   XENSTORE_RING_IDX Cons, Prod;\r
@@ -883,7 +883,7 @@ XenStoreSingle (
   WRITE_REQUEST WriteRequest;\r
 \r
   WriteRequest.Data = (VOID *) Body;\r
-  WriteRequest.Len = AsciiStrSize (Body);\r
+  WriteRequest.Len = (UINT32)AsciiStrSize (Body);\r
 \r
   return XenStoreTalkv (Transaction, RequestType, &WriteRequest, 1,\r
                         LenPtr, Result);\r
@@ -912,9 +912,9 @@ XenStoreWatch (
   WRITE_REQUEST WriteRequest[2];\r
 \r
   WriteRequest[0].Data = (VOID *) Path;\r
-  WriteRequest[0].Len = AsciiStrSize (Path);\r
+  WriteRequest[0].Len = (UINT32)AsciiStrSize (Path);\r
   WriteRequest[1].Data = (VOID *) Token;\r
-  WriteRequest[1].Len = AsciiStrSize (Token);\r
+  WriteRequest[1].Len = (UINT32)AsciiStrSize (Token);\r
 \r
   return XenStoreTalkv (XST_NIL, XS_WATCH, WriteRequest, 2, NULL, NULL);\r
 }\r
@@ -938,9 +938,9 @@ XenStoreUnwatch (
   WRITE_REQUEST WriteRequest[2];\r
 \r
   WriteRequest[0].Data = (VOID *) Path;\r
-  WriteRequest[0].Len = AsciiStrSize (Path);\r
+  WriteRequest[0].Len = (UINT32)AsciiStrSize (Path);\r
   WriteRequest[1].Data = (VOID *) Token;\r
-  WriteRequest[1].Len = AsciiStrSize (Token);\r
+  WriteRequest[1].Len = (UINT32)AsciiStrSize (Token);\r
 \r
   return XenStoreTalkv (XST_NIL, XS_UNWATCH, WriteRequest, 2, NULL, NULL);\r
 }\r
@@ -1245,9 +1245,9 @@ XenStoreWrite (
   Path = XenStoreJoin (DirectoryPath, Node);\r
 \r
   WriteRequest[0].Data = (VOID *) Path;\r
-  WriteRequest[0].Len = AsciiStrSize (Path);\r
+  WriteRequest[0].Len = (UINT32)AsciiStrSize (Path);\r
   WriteRequest[1].Data = (VOID *) Str;\r
-  WriteRequest[1].Len = AsciiStrLen (Str);\r
+  WriteRequest[1].Len = (UINT32)AsciiStrLen (Str);\r
 \r
   Status = XenStoreTalkv (Transaction, XS_WRITE, WriteRequest, 2, NULL, NULL);\r
   FreePool (Path);\r