vbox的更動 6915 路徑 trunk/src/VBox/Devices/VMMDev

時間撮記:

2008-2-11 下午11:35:37 (17 年 以前)

作者:

vboxsync

訊息:

Pass mapping sizes in uint32_t instead of size_t to avoid warnings. (PGMR3MapPT, PGMR3MappingsSize and PGMR3MappingsFix.)

檔案:

• trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp (修改) (2 筆差異)

trunk/src/VBox/Devices/VMMDev/VBoxDev.cpp

@@ -719 +719 @@
                 VMMDevReqHypervisorInfo *hypervisorInfo = (VMMDevReqHypervisorInfo*)pRequestHeader;
                 PVM pVM = PDMDevHlpGetVM(pDevIns);
-                size_t hypervisorSize = 0;
-                pRequestHeader->rc = PGMR3MappingsSize(pVM, &hypervisorSize);
-                hypervisorInfo->hypervisorSize = (uint32_t)hypervisorSize;
-                Assert(hypervisorInfo->hypervisorSize == hypervisorSize);
+                pRequestHeader->rc = PGMR3MappingsSize(pVM, &hypervisorInfo->hypervisorSize);
             }
             break;
@@ -742 +739 @@
                 PVM pVM = PDMDevHlpGetVM(pDevIns);
                 if (hypervisorInfo->hypervisorStart == 0)
-                {
                     pRequestHeader->rc = PGMR3MappingsUnfix(pVM);
-                } else
+                else
                 {
                     /* only if the client has queried the size before! */
-                    size_t mappingsSize;
+                    uint32_t mappingsSize;
                     pRequestHeader->rc = PGMR3MappingsSize(pVM, &mappingsSize);
-                    if (VBOX_SUCCESS(pRequestHeader->rc) && (hypervisorInfo->hypervisorSize == mappingsSize))
+                    if (VBOX_SUCCESS(pRequestHeader->rc) && hypervisorInfo->hypervisorSize == mappingsSize)
                     {
                         /* new reservation */
                         pRequestHeader->rc = PGMR3MappingsFix(pVM, hypervisorInfo->hypervisorStart,
-                                                             hypervisorInfo->hypervisorSize);
+                                                              hypervisorInfo->hypervisorSize);
                         LogRel(("Guest reported fixed hypervisor window at 0x%p (size = 0x%x, rc = %Vrc)\n",
                                 hypervisorInfo->hypervisorStart,