← Back to branch summary

~ubuntu-branches/ubuntu/quantal/open-vm-tools/quantal-201210021442

« back to all changes in this revision

Viewing changes to modules/linux/shared/vmci_infrastructure.h

  • Committer: Bazaar Package Importer
  • Author(s): Serge Hallyn
  • Date: 2011-03-31 14:20:05 UTC
  • mfrom: (1.4.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110331142005-3n9red91p7ogkweo
Tags: 2011.03.28-387002-0ubuntu1
https://launchpad.net/bugs/727342
https://launchpad.net/bugs/332323
https://launchpad.net/bugs/332323
* Merge latest upstream git tag.  This has the unlocked_ioctl change
  needed to fix dkms build failures (LP: #727342)
* Changes in debian/rules:
  - work around a bug in toolbox/Makefile, where install-exec-hook is
    not happening.  This needs to get fixed the right way.
  - don't install 'vmware-user' which seems to no longer exist
  - move /etc/xdg into open-vm-toolbox (which should be done using .install)
* debian/open-vm-tools.init: add 'modprobe [-r] vmblock'. (LP: #332323)
* debian/rules and debian/open-vm-toolbox.lintian-overrides:
  - Make vmware-user-suid-wrapper suid-root (LP: #332323)

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/linux/shared/vmci_infrastructure.h
40
40
typedef enum {
41
41
   VMCIOBJ_VMX_VM = 10,
42
42
   VMCIOBJ_CONTEXT,
43
 
   VMCIOBJ_PROCESS,
44
 
   VMCIOBJ_DATAGRAM_PROCESS,
45
43
   VMCIOBJ_SOCKET,
46
44
   VMCIOBJ_NOT_SET,
47
45
} VMCIObjType;
48
46
 
 
47
/* For storing VMCI structures in file handles. */
 
48
typedef struct VMCIObj {
 
49
   void *ptr;
 
50
   VMCIObjType type;
 
51
} VMCIObj;
 
52
 
49
53
/* Guestcalls currently support a maximum of 8 uint64 arguments. */
50
54
#define VMCI_GUESTCALL_MAX_ARGS_SIZE 64
51
55
 
52
 
/* 
 
56
/*
53
57
 * Structure used for checkpointing the doorbell mappings. It is
54
58
 * written to the checkpoint as is, so changing this structure will
55
59
 * break checkpoint compatibility.