Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 345145 | Differences between
and this patch

Collapse All | Expand All

(-)./vsock-only/include/compat_completion.h.old (-1 / +1 lines)
Lines 159-165 Link Here
159 

          159
          

        

        

          160
          
#include "compat_semaphore.h"

          160
          
#include "compat_semaphore.h"

        

        

          161
          
#define compat_completion struct semaphore 

          161
          
#define compat_completion struct semaphore 

        

          
            

              162
              
#define compat_init_completion(comp) init_MUTEX_LOCKED(comp)


              162
              
#define compat_init_completion(comp) sema_init(comp, 0)

            

        

          163
          
#define COMPAT_DECLARE_COMPLETION(comp) DECLARE_MUTEX_LOCKED(comp) 

          163
          
#define COMPAT_DECLARE_COMPLETION(comp) DECLARE_MUTEX_LOCKED(comp) 

        

        

          164
          

          164
          

        

        

          165
          
#define compat_wait_for_completion(comp) do { \

          165
          
#define compat_wait_for_completion(comp) do { \

        



(-)./vmmon-only/include/compat_completion.h.old
      (-1 / +1 lines)




  

    
      
            Lines 159-165
          
      
      
        Link Here
      
    
  

        

          159
          

          159
          

        

        

          160
          
#include "compat_semaphore.h"

          160
          
#include "compat_semaphore.h"

        

        

          161
          
#define compat_completion struct semaphore 

          161
          
#define compat_completion struct semaphore 

        

          
            

              162
              
#define compat_init_completion(comp) init_MUTEX_LOCKED(comp)


              162
              
#define compat_init_completion(comp) sema_init(comp, 0)

            

        

          163
          
#define COMPAT_DECLARE_COMPLETION(comp) DECLARE_MUTEX_LOCKED(comp) 

          163
          
#define COMPAT_DECLARE_COMPLETION(comp) DECLARE_MUTEX_LOCKED(comp) 

        

        

          164
          

          164
          

        

        

          165
          
#define compat_wait_for_completion(comp) do { \

          165
          
#define compat_wait_for_completion(comp) do { \

        



(-)./vmci-only/linux/driver.c.old
      (-1 / +1 lines)




  

    
      
            Lines 360-366
          
      
      
        Link Here
      
    
  

        

          360
          
   memset(vmciLinux, 0, sizeof *vmciLinux);

          360
          
   memset(vmciLinux, 0, sizeof *vmciLinux);

        

        

          361
          
   vmciLinux->ctType = VMCIOBJ_NOT_SET;

          361
          
   vmciLinux->ctType = VMCIOBJ_NOT_SET;

        

        

          362
          
#if defined(HAVE_COMPAT_IOCTL) || defined(HAVE_UNLOCKED_IOCTL)

          362
          
#if defined(HAVE_COMPAT_IOCTL) || defined(HAVE_UNLOCKED_IOCTL)

        

          
            

              363
              
   init_MUTEX(&vmciLinux->lock);


              363
              
   sema_init(&vmciLinux->lock, 1);

            

        

          364
          
#endif

          364
          
#endif

        

        

          365
          

          365
          

        

        

          366
          
   filp->private_data = vmciLinux;

          366
          
   filp->private_data = vmciLinux;

        



(-)./vmblock-only/include/compat_completion.h.old
      (-1 / +1 lines)




  

    
      
            Lines 159-165
          
      
      
        Link Here
      
    
  

        

          159
          

          159
          

        

        

          160
          
#include "compat_semaphore.h"

          160
          
#include "compat_semaphore.h"

        

        

          161
          
#define compat_completion struct semaphore 

          161
          
#define compat_completion struct semaphore 

        

          
            

              162
              
#define compat_init_completion(comp) init_MUTEX_LOCKED(comp)


              162
              
#define compat_init_completion(comp) sema_init(comp, 0)

            

        

          163
          
#define COMPAT_DECLARE_COMPLETION(comp) DECLARE_MUTEX_LOCKED(comp) 

          163
          
#define COMPAT_DECLARE_COMPLETION(comp) DECLARE_MUTEX_LOCKED(comp) 

        

        

          164
          

          164
          

        

        

          165
          
#define compat_wait_for_completion(comp) do { \

          165
          
#define compat_wait_for_completion(comp) do { \

        



(-)./vmnet-only/filter.c.old
      (-1 / +1 lines)




  

    
      
            Lines 76-82
          
      
      
        Link Here
      
    
  

        

          76
          
RuleSet *activeRule = NULL;   /* actual rule set for filter callback to use */

          76
          
RuleSet *activeRule = NULL;   /* actual rule set for filter callback to use */

        

        

          77
          

          77
          

        

        

          78
          
/* locks to protect against concurrent accesses. */

          78
          
/* locks to protect against concurrent accesses. */

        

          
            

              79
              
static DECLARE_MUTEX(filterIoctlSem);   /* serialize ioctl()s from user space. */


              79
              
static DEFINE_SEMAPHORE(filterIoctlSem);   /* serialize ioctl()s from user space. */

            

        

          80
          
/*

          80
          
/*

        

        

          81
          
 * user/netfilter hook concurrency lock.

          81
          
 * user/netfilter hook concurrency lock.

        

        

          82
          
 * This spinlock doesn't scale well if/when in the future the netfilter

          82
          
 * This spinlock doesn't scale well if/when in the future the netfilter

        



(-)./vsock-only/linux/af_vsock.c.old
      (-1 / +1 lines)




  

    
      
            Lines 421-427
          
      
      
        Link Here
      
    
  

        

          421
          
   VSockPacket pkt;

          421
          
   VSockPacket pkt;

        

        

          422
          
} VSockRecvPktInfo;

          422
          
} VSockRecvPktInfo;

        

        

          423
          

          423
          

        

          
            

              424
              
static DECLARE_MUTEX(registrationMutex);


              424
              
static DEFINE_SEMAPHORE(registrationMutex);

            

        

          425
          
static int devOpenCount = 0;

          425
          
static int devOpenCount = 0;

        

        

          426
          
static int vsockVmciSocketCount = 0;

          426
          
static int vsockVmciSocketCount = 0;

        

        

          427
          
#ifdef VMX86_TOOLS

          427
          
#ifdef VMX86_TOOLS

        



(-)vmnet-only/driver.c.old
      (-1 / +1 lines)




  

    
      
            Lines 117-123
          
      
      
        Link Here
      
    
  

        

          117
          
 * For change to peer field you must own both

          117
          
 * For change to peer field you must own both

        

        

          118
          
 * vnetStructureSemaphore and vnetPeerLock for write.

          118
          
 * vnetStructureSemaphore and vnetPeerLock for write.

        

        

          119
          
 */

          119
          
 */

        

          
            

              120
              
DECLARE_MUTEX(vnetStructureSemaphore);


              120
              
DEFINE_SEMAPHORE(vnetStructureSemaphore);

            

        

          121
          

          121
          

        

        

          122
          
#if defined(VM_X86_64) && !defined(HAVE_COMPAT_IOCTL)

          122
          
#if defined(VM_X86_64) && !defined(HAVE_COMPAT_IOCTL)

        

        

          123
          
/*

          123
          
/*

        






  

  Return to bug 345145