ESXi-5.5-GA

This commit is contained in:
unknown 2015-10-23 18:26:03 -04:00
parent 8564209306
commit 91e0d39c98
839 changed files with 589905 additions and 680866 deletions

View file

@ -6,5 +6,5 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_PROVIDES("com.vmware.vmkplexer", "2.0");
#define VMKLNX_MY_NAMESPACE_VERSION "2.0"
VMK_NAMESPACE_PROVIDES("com.vmware.vmkplexer", "3.0");
#define VMKLNX_MY_NAMESPACE_VERSION "3.0"

View file

@ -6,4 +6,4 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.2.0");

View file

@ -6,4 +6,4 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.2.0");

View file

@ -6,4 +6,6 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.broadcom.cnic_register", "9.2.1.0");
VMK_NAMESPACE_PROVIDES("com.broadcom.bnx2", "9.2.2.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.2.0"
VMK_NAMESPACE_REQUIRED("com.broadcom.cnic_register", "9.2.2.0");

View file

@ -0,0 +1,11 @@
/*
* DO NOT EDIT THIS FILE - IT IS GENERATED BY THE DRIVER BUILD.
*
* If you need to change the driver's name spaces, look in the scons
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.broadcom.cnic", "9.2.2.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libfcoe", "9.2.2.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libfc", "9.2.2.0");

View file

@ -6,5 +6,6 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.broadcom.cnic", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.iscsi_linux", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.broadcom.cnic", "9.2.2.0");
VMK_NAMESPACE_REQUIRED("com.broadcom.cnic_register", "9.2.2.0");
VMK_NAMESPACE_REQUIRED("com.vmware.iscsi_linux", "9.2.2.0");

View file

@ -6,4 +6,6 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.broadcom.cnic_register", "9.2.1.0");
VMK_NAMESPACE_PROVIDES("com.broadcom.bnx2x", "9.2.2.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.2.0"
VMK_NAMESPACE_REQUIRED("com.broadcom.cnic_register", "9.2.2.0");

View file

@ -6,6 +6,6 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_PROVIDES("com.broadcom.cnic", "9.2.1.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.1.0"
VMK_NAMESPACE_REQUIRED("com.broadcom.cnic_register", "9.2.1.0");
VMK_NAMESPACE_PROVIDES("com.broadcom.cnic", "9.2.2.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.2.0"
VMK_NAMESPACE_REQUIRED("com.broadcom.cnic_register", "9.2.2.0");

View file

@ -6,5 +6,5 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_PROVIDES("com.broadcom.cnic_register", "9.2.1.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.1.0"
VMK_NAMESPACE_PROVIDES("com.broadcom.cnic_register", "9.2.2.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.2.0"

View file

@ -6,5 +6,5 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.vmware.libfc", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libfcoe", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libfc", "9.2.2.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libfcoe", "9.2.2.0");

View file

@ -6,4 +6,4 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.vmware.ipmi", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.ipmi", "9.2.2.0");

View file

@ -6,5 +6,5 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_PROVIDES("com.vmware.ipmi", "9.2.1.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.1.0"
VMK_NAMESPACE_PROVIDES("com.vmware.ipmi", "9.2.2.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.2.0"

View file

@ -6,4 +6,4 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.vmware.ipmi", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.ipmi", "9.2.2.0");

View file

@ -6,5 +6,5 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_PROVIDES("com.lsi.megaraid_mbox", "9.2.1.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.1.0"
VMK_NAMESPACE_PROVIDES("com.lsi.megaraid_mbox", "9.2.2.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.2.0"

View file

@ -0,0 +1,10 @@
/*
* DO NOT EDIT THIS FILE - IT IS GENERATED BY THE DRIVER BUILD.
*
* If you need to change the driver's name spaces, look in the scons
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_PROVIDES("com.mellanox.mlx4_core", "9.2.2.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.2.0"

View file

@ -0,0 +1,9 @@
/*
* DO NOT EDIT THIS FILE - IT IS GENERATED BY THE DRIVER BUILD.
*
* If you need to change the driver's name spaces, look in the scons
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.mellanox.mlx4_core", "9.2.2.0");

View file

@ -6,5 +6,5 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_PROVIDES("com.netxen.nx_nic", "9.2.1.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.1.0"
VMK_NAMESPACE_PROVIDES("com.netxen.nx_nic", "9.2.2.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.2.0"

View file

@ -6,4 +6,4 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.2.0");

View file

@ -6,4 +6,4 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.2.0");

View file

@ -6,4 +6,4 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.2.0");

View file

@ -6,4 +6,4 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.2.0");

View file

@ -6,4 +6,4 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.2.0");

View file

@ -6,4 +6,4 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.2.0");

View file

@ -6,4 +6,4 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.2.0");

View file

@ -6,4 +6,4 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.2.0");

View file

@ -6,6 +6,6 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_PROVIDES("com.vmware.qla4xxx", "9.2.1.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.1.0"
VMK_NAMESPACE_REQUIRED("com.vmware.iscsi_linux", "9.2.1.0");
VMK_NAMESPACE_PROVIDES("com.vmware.qla4xxx", "9.2.2.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.2.0"
VMK_NAMESPACE_REQUIRED("com.vmware.iscsi_linux", "9.2.2.0");

View file

@ -6,5 +6,5 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_PROVIDES("com.vmware.random", "9.2.1.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.1.0"
VMK_NAMESPACE_PROVIDES("com.vmware.random", "9.2.2.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.2.0"

View file

@ -6,4 +6,4 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.2.0");

View file

@ -6,4 +6,4 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.2.0");

View file

@ -6,4 +6,4 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.2.0");

View file

@ -6,4 +6,4 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.2.0");

View file

@ -6,4 +6,4 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.2.0");

View file

@ -6,5 +6,5 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_PROVIDES("com.broadcom.tg3", "9.2.1.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.1.0"
VMK_NAMESPACE_PROVIDES("com.broadcom.tg3", "9.2.2.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.2.0"

View file

@ -44,7 +44,9 @@ static inline struct task_struct *get_current(void)
* Pointer to current task of type task_struct
*
*/
/* _VMKLNX_CODECHECK_: current */
/* If the macro 'current' or its comments are changed please
* update the documentation for 'current' in vmkdrivers/src_92/doc/dummyDefs.doc
*/
#define current get_current()
#else

View file

@ -185,11 +185,16 @@ static inline void * phys_to_virt(unsigned long address)
/**
* page_to_phys - page handle to machine address
* @maddr : machine address
* @page : page handle
*
* Gets the machine address that corresponds to the page parameter
*
* ESX Deviation Notes:
* None.
*
* RETURN VALUE:
* A machine address
*
*/
/* _VMKLNX_CODECHECK_: page_to_phys */
#define page_to_phys(page) ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT)

View file

@ -352,9 +352,6 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
/* _VMKLNX_CODECHECK_: rmb */
#define rmb() asm volatile("lfence":::"memory")
#ifdef CONFIG_UNORDERED_IO
#define wmb() asm volatile("sfence" ::: "memory")
#else
/**
* wmb - write memory barrier
*
@ -368,9 +365,16 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
* RETURN VALUE:
* NONE
*/
/*
* VMware : 2013
*
* As mentioned in PR 891237, CONFIG_UNORDERED_IO was removed from Linux
* on 03/25/2006 by Andi Kleen ("x86_64: Remove CONFIG_UNORDERED_IO"). Here
* wmb() is being changed to a real sfence instead of just a compile barrier.
*/
/* _VMKLNX_CODECHECK_: wmb */
#define wmb() asm volatile("" ::: "memory")
#endif
#define wmb() asm volatile("sfence" ::: "memory")
#define read_barrier_depends() do {} while(0)
#define set_mb(var, value) do { (void) xchg(&var, value); } while (0)

View file

@ -6,5 +6,5 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.vmware.usb", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.usbnet", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.usb", "9.2.2.0");
VMK_NAMESPACE_REQUIRED("com.vmware.usbnet", "9.2.2.0");

View file

@ -6,4 +6,4 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.vmware.usb", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.usb", "9.2.2.0");

View file

@ -6,5 +6,5 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.vmware.libfcoe", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libfc", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libfcoe", "9.2.2.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libfc", "9.2.2.0");

View file

@ -6,6 +6,6 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_PROVIDES("com.vmware.usbhid", "9.2.1.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.1.0"
VMK_NAMESPACE_REQUIRED("com.vmware.usb", "9.2.1.0");
VMK_NAMESPACE_PROVIDES("com.vmware.usbhid", "9.2.2.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.2.0"
VMK_NAMESPACE_REQUIRED("com.vmware.usb", "9.2.2.0");

View file

@ -8,4 +8,4 @@
VMK_NAMESPACE_PROVIDES("com.vmware.iscsi_linux", "9.2.0.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.0.0"
VMK_NAMESPACE_REQUIRED("com.vmware.iscsi_linux", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.iscsi_linux", "9.2.2.0");

View file

@ -0,0 +1,11 @@
/*
* DO NOT EDIT THIS FILE - IT IS GENERATED BY THE DRIVER BUILD.
*
* If you need to change the driver's name spaces, look in the scons
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_PROVIDES("com.vmware.iscsi_linux", "9.2.1.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.1.0"
VMK_NAMESPACE_REQUIRED("com.vmware.iscsi_linux", "9.2.2.0");

View file

@ -6,5 +6,5 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_PROVIDES("com.vmware.libata", "9.2.1.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.1.0"
VMK_NAMESPACE_PROVIDES("com.vmware.libata", "9.2.2.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.2.0"

View file

@ -8,4 +8,4 @@
VMK_NAMESPACE_PROVIDES("com.vmware.libata", "9.2.0.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.0.0"
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.2.0");

View file

@ -0,0 +1,11 @@
/*
* DO NOT EDIT THIS FILE - IT IS GENERATED BY THE DRIVER BUILD.
*
* If you need to change the driver's name spaces, look in the scons
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_PROVIDES("com.vmware.libata", "9.2.1.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.1.0"
VMK_NAMESPACE_REQUIRED("com.vmware.libata", "9.2.2.0");

View file

@ -6,5 +6,5 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_PROVIDES("com.vmware.libfc", "9.2.1.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.1.0"
VMK_NAMESPACE_PROVIDES("com.vmware.libfc", "9.2.2.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.2.0"

View file

@ -8,4 +8,4 @@
VMK_NAMESPACE_PROVIDES("com.vmware.libfc", "9.2.0.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.0.0"
VMK_NAMESPACE_REQUIRED("com.vmware.libfc", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libfc", "9.2.2.0");

View file

@ -0,0 +1,11 @@
/*
* DO NOT EDIT THIS FILE - IT IS GENERATED BY THE DRIVER BUILD.
*
* If you need to change the driver's name spaces, look in the scons
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_PROVIDES("com.vmware.libfc", "9.2.1.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.1.0"
VMK_NAMESPACE_REQUIRED("com.vmware.libfc", "9.2.2.0");

View file

@ -6,6 +6,6 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_PROVIDES("com.vmware.libfcoe", "9.2.1.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.1.0"
VMK_NAMESPACE_REQUIRED("com.vmware.libfc", "9.2.1.0");
VMK_NAMESPACE_PROVIDES("com.vmware.libfcoe", "9.2.2.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.2.0"
VMK_NAMESPACE_REQUIRED("com.vmware.libfc", "9.2.2.0");

View file

@ -8,4 +8,4 @@
VMK_NAMESPACE_PROVIDES("com.vmware.libfcoe", "9.2.0.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.0.0"
VMK_NAMESPACE_REQUIRED("com.vmware.libfcoe", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.libfcoe", "9.2.2.0");

View file

@ -0,0 +1,11 @@
/*
* DO NOT EDIT THIS FILE - IT IS GENERATED BY THE DRIVER BUILD.
*
* If you need to change the driver's name spaces, look in the scons
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_PROVIDES("com.vmware.libfcoe", "9.2.1.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.1.0"
VMK_NAMESPACE_REQUIRED("com.vmware.libfcoe", "9.2.2.0");

View file

@ -6,4 +6,4 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.vmware.usb", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.usb", "9.2.2.0");

View file

@ -6,6 +6,6 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_PROVIDES("com.vmware.usbstorage", "9.2.1.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.1.0"
VMK_NAMESPACE_REQUIRED("com.vmware.usb", "9.2.1.0");
VMK_NAMESPACE_PROVIDES("com.vmware.usbstorage", "9.2.2.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.2.0"
VMK_NAMESPACE_REQUIRED("com.vmware.usb", "9.2.2.0");

View file

@ -6,4 +6,4 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_REQUIRED("com.vmware.usb", "9.2.1.0");
VMK_NAMESPACE_REQUIRED("com.vmware.usb", "9.2.2.0");

View file

@ -6,5 +6,5 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_PROVIDES("com.vmware.usb", "9.2.1.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.1.0"
VMK_NAMESPACE_PROVIDES("com.vmware.usb", "9.2.2.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.2.0"

View file

@ -6,6 +6,6 @@
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_PROVIDES("com.vmware.usbnet", "9.2.1.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.1.0"
VMK_NAMESPACE_REQUIRED("com.vmware.usb", "9.2.1.0");
VMK_NAMESPACE_PROVIDES("com.vmware.usbnet", "9.2.2.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.2.0"
VMK_NAMESPACE_REQUIRED("com.vmware.usb", "9.2.2.0");

View file

@ -8,4 +8,4 @@
VMK_NAMESPACE_PROVIDES("com.vmware.driverAPI", "9.2");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2"
VMK_NAMESPACE_REQUIRED("com.vmware.vmkplexer", "2.0");
VMK_NAMESPACE_REQUIRED("com.vmware.vmkplexer", "3.0");

View file

@ -0,0 +1,11 @@
/*
* DO NOT EDIT THIS FILE - IT IS GENERATED BY THE DRIVER BUILD.
*
* If you need to change the driver's name spaces, look in the scons
* files for the driver's defineVmkDriver() rule.
*/
VMK_NAMESPACE_PROVIDES("com.vmware.driverAPI", "9.2.2.0");
#define VMKLNX_MY_NAMESPACE_VERSION "9.2.2.0"
VMK_NAMESPACE_REQUIRED("com.vmware.driverAPI", "9.2");

View file

@ -129,7 +129,7 @@ static inline void vmk_AtomicDec64(
{
vmk_AtomicPrologue();
__asm__ __volatile__(
"lock; decl %0"
"lock; decq %0"
: "+m" (*var)
:
: "cc"
@ -158,7 +158,7 @@ static inline void vmk_AtomicAdd64(
__asm__ __volatile__(
"lock; addq %1, %0"
: "+m" (*var)
: "ri" (val)
: "re" (val)
: "cc"
);
vmk_AtomicEpilogue();
@ -184,7 +184,7 @@ static inline void vmk_AtomicSub64(
__asm__ __volatile__(
"lock; subq %1, %0"
: "+m" (*var)
: "ri" (val)
: "re" (val)
: "cc"
);
vmk_AtomicEpilogue();
@ -211,7 +211,7 @@ static inline void vmk_AtomicOr64(
__asm__ __volatile__(
"lock; orq %1, %0"
: "+m" (*var)
: "ri" (val)
: "re" (val)
: "cc"
);
vmk_AtomicEpilogue();
@ -237,7 +237,7 @@ static inline void vmk_AtomicAnd64(
__asm__ __volatile__(
"lock; andq %1, %0"
: "+m" (*var)
: "ri" (val)
: "re" (val)
: "cc"
);
vmk_AtomicEpilogue();
@ -263,7 +263,7 @@ static inline void vmk_AtomicXor64(
__asm__ __volatile__(
"lock; xorq %1, %0"
: "+m" (*var)
: "ri" (val)
: "re" (val)
: "cc"
);
vmk_AtomicEpilogue();

View file

@ -1,5 +1,5 @@
/* **********************************************************
* Copyright 1998 - 2010 VMware, Inc. All rights reserved.
* Copyright 1998 - 2010,2012 VMware, Inc. All rights reserved.
* **********************************************************/
/*
@ -51,8 +51,11 @@
/** \brief Don't block for file operations. */
#define VMK_CHARDEV_OFLAG_NONBLOCK 0x00000800
/** \brief Synchronous file operations. */
#define VMK_CHARDEV_OFLAG_SYNC 0x00001000
/** \brief File integerity for synchronous file I/O. */
#define VMK_CHARDEV_OFLAG_SYNC 0x00101000
/** \brief Data integrity for synchronous file I/O. */
#define VMK_CHARDEV_OFLAG_DSYNC 0x00001000
/** \brief Use direct I/O. */
#define VMK_CHARDEV_OFLAG_DIRECT 0x00004000
@ -106,16 +109,6 @@ typedef struct vmk_CharDevFdAttr {
/* across open/ioctl/close calls */
} vmk_CharDevFdAttr;
/**
* \brief Opaque handle to a character device.
*/
typedef struct vmkCharDevInt* vmk_CharDev;
/**
* \brief A default initialization value for a vmk_CharDev.
*/
#define VMK_INVALID_CHARDEV (NULL)
/**
* \brief Opaque poll token handle.
*/
@ -126,6 +119,26 @@ typedef void *vmk_PollToken;
*/
typedef void *vmk_PollContext;
/**
* \brief Identifier for logical graphics devices.
*/
#define VMK_CHARDEV_IDENTIFIER_GRAPHICS "com.vmware.graphics"
/**
* \brief Character device driver's entry points.
*/
struct vmk_CharDevOps;
/** \brief Character device registration data. */
typedef struct vmk_CharDevRegData {
/** \brief Module creating this device. */
vmk_ModuleID moduleID;
/** \brief Device operations. */
const struct vmk_CharDevOps *fileOps;
/** \brief Device private data. */
vmk_AddrCookie devicePrivate;
} vmk_CharDevRegData;
/**
***********************************************************************
* vmk_CharDevOpenFn -- */ /**
@ -330,93 +343,6 @@ typedef struct vmk_CharDevOps {
vmk_CharDevWriteFn write;
} vmk_CharDevOps;
/**
***********************************************************************
* vmk_CharDevCleanupFn -- */ /**
*
* \brief Prototype for a character device driver's cleanup callback.
*
* \param[in] private Optional private data to be used by the callback
*
* \retval VMK_OK The cleanup function executed correctly.
* This is not an indicator of the success or failure of
* the operations in the function, but merely that they
* ran. Any other return value is not allowed.
*
***********************************************************************
*/
typedef VMK_ReturnStatus (*vmk_CharDevCleanupFn)(vmk_AddrCookie private);
/*
***********************************************************************
* vmk_CharDevRegister -- */ /**
*
* \brief Register the specified character device, to be invoked from
* user-space.
*
* \param[in] module Module that owns the character device.
* \param[in] name The name of the device - this must be unique.
* \param[in] fileOps Table of the driver file operations.
* Neither open nor close can be supplied
* without the other.
* If read or write operations are supplied,
* then open and close must also be supplied.
* \param[in] cleanup Function automatically invoked to clean up
* after all file ops have ceased and the
* device has been unregistered. May be NULL.
* \param[in] devicePrivate Data given to the driver for each file
* op and cleaned up after unregistration.
* \param[out] assignedHandle Handle to the registered character device.
*
* \retval VMK_EXISTS A device with that name is already registered
* \retval VMK_FAILURE Unable to allocate internal slot for the device
* \retval VMK_NO_MEMORY Unable to allocate memory for device metadata
* \retval VMK_BAD_PARAM Module ID was invalid, name was invalid,
* or one or more specified driver ops are NULL
*
***********************************************************************
*/
VMK_ReturnStatus vmk_CharDevRegister(
vmk_ModuleID module,
const char *name,
const vmk_CharDevOps *fileOps,
vmk_CharDevCleanupFn cleanup,
vmk_AddrCookie devicePrivate,
vmk_CharDev *assignedHandle);
/*
***********************************************************************
* vmk_CharDevUnregister -- */ /**
*
* \brief Unregister a character device.
*
* The character device will be unregistered automatically by
* the kernel only after all open files to the device have been
* closed. If no files are open when vmk_CharDevUnregister is
* called, the device may be unregistered immediately and have the
* cleanup function registered with it invoked. If the device has
* files open, vmk_CharDevUnregister internally defers the device for
* later automatic removal and returns to the caller immediately. When
* the last file is closed, the device will then be destroyed and the
* cleanup function invoked.
*
* \note No new open files to the device can be created after calling
* vmk_CharDevUnregister.
* \note The vmkernel will prevent a module from being unloaded while
* it has open files associated with a character device, even
* if that device has been requested to be unregistered.
*
* \param[in] deviceHandle Handle of device assigned during registration.
*
* \retval VMK_NOT_FOUND The device does not exist.
* \retval VMK_OK The device was either unregistered or internally
* deferred for unregistration once all associated files
* close.
*
***********************************************************************
*/
VMK_ReturnStatus vmk_CharDevUnregister(vmk_CharDev deviceHandle);
/*
***********************************************************************
* vmk_CharDevWakePollers -- */ /**

View file

@ -0,0 +1,131 @@
/* **********************************************************
* Copyright 2012 VMware, Inc. All rights reserved.
* **********************************************************/
/*
* @VMKAPIMOD_LICENSE@
*/
/*
***********************************************************************
* Character Devices */ /**
* \addtogroup CharDev
*
* Interfaces that allow registration of generic vmkernel character
* device nodes.
*
* @{
***********************************************************************
*/
#ifndef _VMKAPI_CHAR_LEGACY_H_
#define _VMKAPI_CHAR_LEGACY_H_
/** \cond never */
#ifndef VMK_HEADER_INCLUDED_FROM_VMKAPI_H
#error This vmkapi file should never be included directly but only via vmkapi.h
#endif
/** \endcond never */
/**
* \brief Opaque handle to a character device.
*/
typedef struct vmkCharDevInt* vmk_CharDev;
/**
* \brief A default initialization value for a vmk_CharDev.
*/
#define VMK_INVALID_CHARDEV (NULL)
/**
***********************************************************************
* vmk_CharDevCleanupFn -- */ /**
*
* \brief Prototype for a character device driver's cleanup callback.
*
* \param[in] private Optional private data to be used by the callback
*
* \retval VMK_OK The cleanup function executed correctly.
* This is not an indicator of the success or failure of
* the operations in the function, but merely that they
* ran. Any other return value is not allowed.
*
***********************************************************************
*/
typedef VMK_ReturnStatus (*vmk_CharDevCleanupFn)(vmk_AddrCookie private);
/*
***********************************************************************
* vmk_CharDevRegister -- */ /**
*
* \brief Register the specified character device, to be invoked from
* user-space.
*
* \nativedriversdisallowed
*
* \param[in] module Module that owns the character device.
* \param[in] name The name of the device - this must be unique.
* \param[in] fileOps Table of the driver file operations.
* Neither open nor close can be supplied
* without the other.
* If read or write operations are supplied,
* then open and close must also be supplied.
* \param[in] cleanup Function automatically invoked to clean up
* after all file ops have ceased and the
* device has been unregistered. May be NULL.
* \param[in] devicePrivate Data given to the driver for each file
* op and cleaned up after unregistration.
* \param[out] assignedHandle Handle to the registered character device.
*
* \retval VMK_EXISTS A device with that name is already registered
* \retval VMK_FAILURE Unable to allocate internal slot for the device
* \retval VMK_NO_MEMORY Unable to allocate memory for device metadata
* \retval VMK_BAD_PARAM Module ID was invalid, name was invalid,
* or one or more specified driver ops are NULL
*
***********************************************************************
*/
VMK_ReturnStatus vmk_CharDevRegister(
vmk_ModuleID module,
const char *name,
const vmk_CharDevOps *fileOps,
vmk_CharDevCleanupFn cleanup,
vmk_AddrCookie devicePrivate,
vmk_CharDev *assignedHandle);
/*
***********************************************************************
* vmk_CharDevUnregister -- */ /**
*
* \brief Unregister a character device.
*
* The character device will be unregistered automatically by
* the kernel only after all open files to the device have been
* closed. If no files are open when vmk_CharDevUnregister is
* called, the device may be unregistered immediately and have the
* cleanup function registered with it invoked. If the device has
* files open, vmk_CharDevUnregister internally defers the device for
* later automatic removal and returns to the caller immediately. When
* the last file is closed, the device will then be destroyed and the
* cleanup function invoked.
*
* \nativedriversdisallowed
* \note No new open files to the device can be created after calling
* vmk_CharDevUnregister.
* \note The vmkernel will prevent a module from being unloaded while
* it has open files associated with a character device, even
* if that device has been requested to be unregistered.
*
* \param[in] deviceHandle Handle of device assigned during registration.
*
* \retval VMK_NOT_FOUND The device does not exist.
* \retval VMK_OK The device was either unregistered or internally
* deferred for unregistration once all associated files
* close.
*
***********************************************************************
*/
VMK_ReturnStatus vmk_CharDevUnregister(vmk_CharDev deviceHandle);
#endif /* _VMKAPI_CHAR_LEGACY_H_ */
/** @} */

View file

@ -188,6 +188,31 @@ VMK_ReturnStatus vmk_HeapCreate(vmk_HeapCreateProps *props,
*/
void vmk_HeapDestroy(vmk_HeapID heap);
/*
***********************************************************************
* vmk_HeapDestroySync -- */ /**
*
* \brief Destroy a dynamic heap. If the heap is non-empty, wait
* for it to become empty before destroying.
*
* \note This function may block if the heap is non-empty.
*
* \param[in] heap Heap to destroy.
* \param[in] timeoutMS Timeout in milliseconds. Zero means no timeout.
*
* \retval VMK_OK Heap was destroyed successfully.
* \retval VMK_DEATH_PENDING World was killed while waiting and the
* heap was not destroyed.
* \retval VMK_WAIT_INTERRUPTED The wait was interrupted and the heap
* was not destroyed.
* \retval VMK_TIMEOUT The wait timed out and the heap was
* not destroyed.
*
***********************************************************************
*/
VMK_ReturnStatus vmk_HeapDestroySync(vmk_HeapID heap,
vmk_int64 timeoutMS);
/*
***********************************************************************
* vmk_HeapFree -- */ /**

View file

@ -202,6 +202,20 @@ VMK_ReturnStatus vmk_LogRegister(
VMK_ReturnStatus vmk_LogUnregister(
vmk_LogComponent handle);
/*
***********************************************************************
* vmk_LogHeapAllocSize -- */ /**
*
* \brief Amount of heap space needed per registered log component
*
* \note This function will not block.
*
* \retval Number of bytes to set aside in a heap per log component
*
***********************************************************************
*/
vmk_ByteCount vmk_LogHeapAllocSize(void);
/*
***********************************************************************
* vmk_LogGetName -- */ /**
@ -311,7 +325,7 @@ vmk_int32 vmk_LogGetCurrentLogLevel(
#define vmk_Warning(handle, fmt, args...) \
vmk_LogLevel(VMK_LOG_URGENCY_WARNING, \
handle, vmk_LogGetCurrentLogLevel(handle), \
"%s: %s:%d:" fmt "\n", vmk_LogGetName(handle), \
"%s: %s:%d: " fmt "\n", vmk_LogGetName(handle), \
__FUNCTION__, __LINE__, ##args)
/*
@ -335,7 +349,7 @@ vmk_int32 vmk_LogGetCurrentLogLevel(
#define vmk_Alert(handle, fmt, args...) \
vmk_LogLevel(VMK_LOG_URGENCY_ALERT, \
handle, vmk_LogGetCurrentLogLevel(handle), \
"%s: %s:%d:" fmt "\n", vmk_LogGetName(handle), \
"%s: %s:%d: " fmt "\n",