OvmfPkg/XenBusDxe: fix VS2010 build failures

[mirror_edk2.git] / OvmfPkg / XenBusDxe / XenBus.c

diff --git a/OvmfPkg/XenBusDxe/XenBus.c b/OvmfPkg/XenBusDxe/XenBus.c
index a569cfa088fa44406f282e74680185aac50f1df0..f69c27dd184a1272a03ccbfa8dd85849f0452e3a 100644 (file)
--- a/OvmfPkg/XenBusDxe/XenBus.c
+++ b/OvmfPkg/XenBusDxe/XenBus.c
@@ -45,13 +45,19 @@
 STATIC XENBUS_PRIVATE_DATA gXenBusPrivateData;\r
 \r
 STATIC XENBUS_DEVICE_PATH gXenBusDevicePathTemplate = {\r
-  .Vendor.Header.Type = HARDWARE_DEVICE_PATH,\r
-  .Vendor.Header.SubType = HW_VENDOR_DP,\r
-  .Vendor.Header.Length[0] = (UINT8) sizeof (XENBUS_DEVICE_PATH),\r
-  .Vendor.Header.Length[1] = (UINT8) (sizeof (XENBUS_DEVICE_PATH) >> 8),\r
-  .Vendor.Guid = XENBUS_PROTOCOL_GUID,\r
-  .Type = 0,\r
-  .DeviceId = 0\r
+  {                                                 // Vendor\r
+    {                                               // Vendor.Header\r
+      HARDWARE_DEVICE_PATH,                         // Vendor.Header.Type\r
+      HW_VENDOR_DP,                                 // Vendor.Header.SubType\r
+      {\r
+        (UINT8) (sizeof (XENBUS_DEVICE_PATH)),      // Vendor.Header.Length[0]\r
+        (UINT8) (sizeof (XENBUS_DEVICE_PATH) >> 8), // Vendor.Header.Length[1]\r
+      }\r
+    },\r
+    XENBUS_PROTOCOL_GUID,                           // Vendor.Guid\r
+  },\r
+  0,                                                // Type\r
+  0                                                 // DeviceId\r
 };\r
 \r
 \r
@@ -176,7 +182,7 @@ XenBusAddDevice (
     Private->XenBusIo.Type = AsciiStrDup (Type);\r
     Private->XenBusIo.Node = AsciiStrDup (DevicePath);\r
     Private->XenBusIo.Backend = BackendPath;\r
-    Private->XenBusIo.DeviceId = AsciiStrDecimalToUintn (Id);\r
+    Private->XenBusIo.DeviceId = (UINT16)AsciiStrDecimalToUintn (Id);\r
     Private->Dev = Dev;\r
 \r
     TempXenBusPath = AllocateCopyPool (sizeof (XENBUS_DEVICE_PATH),\r
@@ -268,7 +274,7 @@ XenBusEnumerateDeviceType (
     XenBusAddDevice (Dev, Type, Directory[Index]);\r
   }\r
 \r
-  FreePool (Directory);\r
+  FreePool ((VOID*)Directory);\r
 }\r
 \r
 \r
@@ -304,7 +310,7 @@ XenBusEnumerateBus (
     XenBusEnumerateDeviceType (Dev, Types[Index]);\r
   }\r
 \r
-  FreePool (Types);\r
+  FreePool ((VOID*)Types);\r
 \r
   return XENSTORE_STATUS_SUCCESS;\r
 }\r
@@ -348,28 +354,33 @@ Out:
 }\r
 \r
 STATIC XENBUS_PRIVATE_DATA gXenBusPrivateData = {\r
-  .Signature = XENBUS_PRIVATE_DATA_SIGNATURE,\r
-\r
-  .XenBusIo.XsRead = XenBusXenStoreRead,\r
-  .XenBusIo.XsBackendRead = XenBusXenStoreBackendRead,\r
-  .XenBusIo.XsPrintf = XenBusXenStoreSPrint,\r
-  .XenBusIo.XsRemove = XenBusXenStoreRemove,\r
-  .XenBusIo.XsTransactionStart = XenBusXenStoreTransactionStart,\r
-  .XenBusIo.XsTransactionEnd = XenBusXenStoreTransactionEnd,\r
-  .XenBusIo.SetState = XenBusSetState,\r
-  .XenBusIo.GrantAccess = XenBusGrantAccess,\r
-  .XenBusIo.GrantEndAccess = XenBusGrantEndAccess,\r
-  .XenBusIo.EventChannelAllocate = XenBusEventChannelAllocate,\r
-  .XenBusIo.EventChannelNotify = XenBusEventChannelNotify,\r
-  .XenBusIo.EventChannelClose = XenBusEventChannelClose,\r
-  .XenBusIo.RegisterWatch = XenBusRegisterWatch,\r
-  .XenBusIo.RegisterWatchBackend = XenBusRegisterWatchBackend,\r
-  .XenBusIo.UnregisterWatch = XenBusUnregisterWatch,\r
-  .XenBusIo.WaitForWatch = XenBusWaitForWatch,\r
-\r
-  .XenBusIo.Type = NULL,\r
-  .XenBusIo.Node = NULL,\r
-  .XenBusIo.Backend = NULL,\r
-\r
-  .Dev = NULL\r
+  XENBUS_PRIVATE_DATA_SIGNATURE,    // Signature\r
+  { NULL, NULL },                   // Link\r
+  NULL,                             // Handle\r
+  {                                 // XenBusIo\r
+    XenBusXenStoreRead,             // XenBusIo.XsRead\r
+    XenBusXenStoreBackendRead,      // XenBusIo.XsBackendRead\r
+    XenBusXenStoreSPrint,           // XenBusIo.XsPrintf\r
+    XenBusXenStoreRemove,           // XenBusIo.XsRemove\r
+    XenBusXenStoreTransactionStart, // XenBusIo.XsTransactionStart\r
+    XenBusXenStoreTransactionEnd,   // XenBusIo.XsTransactionEnd\r
+    XenBusSetState,                 // XenBusIo.SetState\r
+    XenBusGrantAccess,              // XenBusIo.GrantAccess\r
+    XenBusGrantEndAccess,           // XenBusIo.GrantEndAccess\r
+    XenBusEventChannelAllocate,     // XenBusIo.EventChannelAllocate\r
+    XenBusEventChannelNotify,       // XenBusIo.EventChannelNotify\r
+    XenBusEventChannelClose,        // XenBusIo.EventChannelClose\r
+    XenBusRegisterWatch,            // XenBusIo.RegisterWatch\r
+    XenBusRegisterWatchBackend,     // XenBusIo.RegisterWatchBackend\r
+    XenBusUnregisterWatch,          // XenBusIo.UnregisterWatch\r
+    XenBusWaitForWatch,             // XenBusIo.WaitForWatch\r
+\r
+    NULL,                           // XenBusIo.Type\r
+    0,                              // XenBusIo.DeviceId\r
+    NULL,                           // XenBusIo.Node\r
+    NULL,                           // XenBusIo.Backend\r
+  },\r
+\r
+  NULL,                             // Dev\r
+  NULL                              // DevicePath\r
 };\r