From: VMware, Inc <>
Date: Thu, 24 Feb 2011 22:48:09 +0000 (-0800)
Subject: Retire VMCIQueuePair_AllocPriv
X-Git-Tag: 2011.02.23-368700~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=336796e20fb19b2ddb37b3becba645b0515475b7;p=thirdparty%2Fopen-vm-tools.git

Retire VMCIQueuePair_AllocPriv

Nothing uses VMCIQueuePair_Alloc anymore, since we got rid of
the non-privilege public version (VMCIQPair_Alloc always takes
privilege flags). This change deletes the old version of
VMCIQueuePair_Alloc and renames VMCIQueuePair_AllocPriv to
VMCIQueuePair_Alloc.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/modules/linux/vmci/vmciQPair.c b/open-vm-tools/modules/linux/vmci/vmciQPair.c
index c29289a12..329bed627 100644
--- a/open-vm-tools/modules/linux/vmci/vmciQPair.c
+++ b/open-vm-tools/modules/linux/vmci/vmciQPair.c
@@ -147,14 +147,14 @@ VMCIQPair_Alloc(VMCIQPair **qpair,            // OUT
    myQPair->flags = flags;
    myQPair->privFlags = privFlags;
 
-   retval = VMCIQueuePair_AllocPriv(handle,
-                                    &myQPair->produceQ,
-                                    myQPair->produceQSize,
-                                    &myQPair->consumeQ,
-                                    myQPair->consumeQSize,
-                                    myQPair->peer,
-                                    myQPair->flags,
-                                    myQPair->privFlags);
+   retval = VMCIQueuePair_Alloc(handle,
+                                &myQPair->produceQ,
+                                myQPair->produceQSize,
+                                &myQPair->consumeQ,
+                                myQPair->consumeQSize,
+                                myQPair->peer,
+                                myQPair->flags,
+                                myQPair->privFlags);
 
    if (retval < VMCI_SUCCESS) {
       VMCI_FreeKernelMem(myQPair, sizeof *myQPair);
diff --git a/open-vm-tools/modules/linux/vmci/vmciQueuePair.c b/open-vm-tools/modules/linux/vmci/vmciQueuePair.c
index 1a15b5a60..91cbd3325 100644
--- a/open-vm-tools/modules/linux/vmci/vmciQueuePair.c
+++ b/open-vm-tools/modules/linux/vmci/vmciQueuePair.c
@@ -424,44 +424,16 @@ QueuePairList_GetHead(void)
  *
  * VMCIQueuePair_Alloc --
  *
- *      Allocates a VMCI QueuePair. Only checks validity of input arguments.
- *      Real work is done in the OS-specific helper routine.
- *
- * Results:
- *      Success or failure.
- *
- * Side effects:
- *      Memory is allocated.
- *
- *-----------------------------------------------------------------------------
- */
-
-int
-VMCIQueuePair_Alloc(VMCIHandle *handle,     // IN/OUT:
-                    VMCIQueue  **produceQ,  // OUT:
-                    uint64     produceSize, // IN:
-                    VMCIQueue  **consumeQ,  // OUT:
-                    uint64     consumeSize, // IN:
-                    VMCIId     peer,        // IN:
-                    uint32     flags)       // IN:
-{
-   ASSERT_ON_COMPILE(sizeof(VMCIQueueHeader) <= PAGE_SIZE);
-
-   return VMCIQueuePair_AllocPriv(handle, produceQ, produceSize, consumeQ, consumeSize, peer, flags, VMCI_NO_PRIVILEGE_FLAGS);
-}
-
-
-/*
- *-----------------------------------------------------------------------------
- *
- * VMCIQueuePair_AllocPriv --
- *
- *      Provided for compatibility with the host API. Always returns an error
- *      since requesting privileges from the guest is not allowed. Use
- *      VMCIQueuePair_Alloc instead.
+ *      Allocates a VMCI QueuePair. Only checks validity of input
+ *      arguments.  Real work is done in the OS-specific helper
+ *      routine. The privilege flags argument is present to provide
+ *      compatibility with the host API; anything other than
+ *      VMCI_NO_PRIVILEGE_FLAGS will result in the error
+ *      VMCI_ERROR_NO_ACCESS, since requesting privileges from the
+ *      guest is not allowed.
  *
  * Results:
- *      An error.
+ *      VMCI_SUCCESS on success, appropriate error code otherwise.
  *
  * Side effects:
  *      None.
@@ -470,14 +442,14 @@ VMCIQueuePair_Alloc(VMCIHandle *handle,     // IN/OUT:
  */
 
 int
-VMCIQueuePair_AllocPriv(VMCIHandle *handle,           // IN/OUT:
-                        VMCIQueue  **produceQ,        // OUT:
-                        uint64     produceSize,       // IN:
-                        VMCIQueue  **consumeQ,        // OUT:
-                        uint64     consumeSize,       // IN:
-                        VMCIId     peer,              // IN:
-                        uint32     flags,             // IN:
-                        VMCIPrivilegeFlags privFlags) // IN:
+VMCIQueuePair_Alloc(VMCIHandle *handle,           // IN/OUT:
+                    VMCIQueue  **produceQ,        // OUT:
+                    uint64     produceSize,       // IN:
+                    VMCIQueue  **consumeQ,        // OUT:
+                    uint64     consumeSize,       // IN:
+                    VMCIId     peer,              // IN:
+                    uint32     flags,             // IN:
+                    VMCIPrivilegeFlags privFlags) // IN:
 {
    if (privFlags != VMCI_NO_PRIVILEGE_FLAGS) {
       return VMCI_ERROR_NO_ACCESS;
diff --git a/open-vm-tools/modules/linux/vmci/vmciQueuePairInt.h b/open-vm-tools/modules/linux/vmci/vmciQueuePairInt.h
index 24db38d02..7b013f4cf 100644
--- a/open-vm-tools/modules/linux/vmci/vmciQueuePairInt.h
+++ b/open-vm-tools/modules/linux/vmci/vmciQueuePairInt.h
@@ -33,11 +33,8 @@ void VMCIQueuePair_Exit(void);
 void VMCIQueuePair_Sync(void);
 int VMCIQueuePair_Alloc(VMCIHandle *handle, VMCIQueue **produceQ,
                         uint64 produceSize, VMCIQueue **consumeQ,
-                        uint64 consumeSize, VMCIId peer, uint32 flags);
-int VMCIQueuePair_AllocPriv(VMCIHandle *handle, VMCIQueue **produceQ,
-                            uint64 produceSize, VMCIQueue **consumeQ,
-                            uint64 consumeSize, VMCIId peer, uint32 flags,
-                            VMCIPrivilegeFlags privFlags);
+                        uint64 consumeSize, VMCIId peer, uint32 flags,
+                        VMCIPrivilegeFlags privFlags);
 int VMCIQueuePair_Detach(VMCIHandle handle);
 
 void VMCIQueuePair_Convert(Bool toLocal, Bool deviceReset);