retire PPN, TPPN, PageNum, PageCnt types

This change retires 32-bit PPN, TPPN, PageNum, PageCnt types and
introduces temporary PPNTMP type for tools (graphics, pvscsi, balloon),
so that driver owners can work on PPN64 conversion at their own
pace and can easily identify places that require attention.

diff --git a/open-vm-tools/lib/include/vm_basic_types.h b/open-vm-tools/lib/include/vm_basic_types.h
index d679510238331523b038c96d29f1d62de98cdb7b..77e00fea0144fb48090eedf669c950ce3c4c8dcb 100644 (file)
--- a/open-vm-tools/lib/include/vm_basic_types.h
+++ b/open-vm-tools/lib/include/vm_basic_types.h
@@ -490,10 +490,9 @@ typedef uintptr_t VA;
 typedef uintptr_t VPN;
 
 typedef uint64    PA;
-typedef uint32    PPN;
+typedef uint32    PPNTMP;
 
 typedef uint64    TPA;
-typedef uint32    TPPN;
 
 typedef uint64    PhysMemOff;
 typedef uint64    PhysMemSize;
@@ -508,9 +507,7 @@ typedef uint64    BPN;
 #define UINT64_2_BPN(u) ((BPN)(u))
 #define BPN_2_UINT64(b) ((uint64)(b))
 
-typedef uint32    PageCnt;
 typedef uint64    PgCnt64;
-typedef uint32    PageNum;
 typedef uint64    PgNum64;
 typedef unsigned      MemHandle;
 typedef unsigned int  IoHandle;
@@ -662,7 +659,7 @@ typedef void * UserVA;
 #define INVALID_LPN       ((LPN)-1)
 #define INVALID_VPN       ((VPN)-1)
 #define INVALID_LPN64     ((LPN64)-1)
-#define INVALID_PAGENUM   ((PageNum)-1)
+#define INVALID_PAGENUM   ((uint32)-1)
 
 /*
  * Format modifier for printing VA, LA, and VPN.

diff --git a/open-vm-tools/modules/shared/vmmemctl/vmballoon.c b/open-vm-tools/modules/shared/vmmemctl/vmballoon.c
index e0d78ebf2a66245987d59c727250e12cb36e069b..85251801fe2ed05f2dbce2e9357bd5efaaf6a8bd 100644 (file)
--- a/open-vm-tools/modules/shared/vmmemctl/vmballoon.c
+++ b/open-vm-tools/modules/shared/vmmemctl/vmballoon.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2000-2017 VMware, Inc. All rights reserved.
+ * Copyright (C) 2000-2018 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -1141,7 +1141,7 @@ BalloonLock(Balloon *b,       // IN/OUT
             int isLargePage,  // IN
             uint32 *target)   // OUT
 {
-   PPN pagePPN;
+   PPNTMP pagePPN;
    BalloonChunk *chunk;
    int status;
 
@@ -1216,7 +1216,7 @@ BalloonUnlock(Balloon *b,      // IN/OUT
               int isLargePage, // IN
               uint32 *target)  // OUT
 {
-   PPN pagePPN = PA_2_PPN(OS_ReservedPageGetPA(b->pageHandle));
+   PPNTMP pagePPN = PA_2_PPN(OS_ReservedPageGetPA(b->pageHandle));
    int status = Backdoor_MonitorUnlockPage(b, pagePPN, target);
 
    ASSERT(!isLargePage);