← Back to branch summary

~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-precise.sid-merge1

« back to all changes in this revision

Viewing changes to lib/include/vix.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:
lib/include/vix.h
169
169
   VIX_E_NO_DISPLAY_SERVER                      = 3043,
170
170
   VIX_E_VM_NOT_RECORDING                       = 3044,
171
171
   VIX_E_VM_NOT_REPLAYING                       = 3045,
 
172
   VIX_E_TOO_MANY_LOGONS                        = 3046,
 
173
   VIX_E_INVALID_AUTHENTICATION_SESSION         = 3047,
172
174
 
173
 
   /* VM Errors */ 
 
175
   /* VM Errors */
174
176
   VIX_E_VM_NOT_FOUND                           = 4000,
175
177
   VIX_E_NOT_SUPPORTED_FOR_VM_VERSION           = 4001,
176
178
   VIX_E_CANNOT_READ_VM_CONFIG                  = 4002,
304
306
   VIX_E_NOT_A_DIRECTORY                        = 20002,
305
307
   VIX_E_NO_SUCH_PROCESS                        = 20003,
306
308
   VIX_E_FILE_NAME_TOO_LONG                     = 20004,
 
309
   VIX_E_OPERATION_DISABLED                     = 20005,
307
310
 
308
311
   /* Tools install errors */
309
312
   VIX_E_TOOLS_INSTALL_NO_IMAGE                 = 21000,
452
455
   VIX_PROPERTY_VM_SUPPORTED_FEATURES                 = 197,
453
456
   VIX_PROPERTY_VM_IS_RECORDING                       = 236,
454
457
   VIX_PROPERTY_VM_IS_REPLAYING                       = 237,
 
458
   VIX_PROPERTY_VM_SSL_ERROR                          = 293,
455
459
 
456
460
   /* Result properties; these are returned by various procedures */
457
461
   VIX_PROPERTY_JOB_RESULT_ERROR_CODE                 = 3000,
559
563
typedef int VixHostOptions;
560
564
enum {
561
565
   VIX_HOSTOPTION_USE_EVENT_PUMP        = 0x0008,
 
566
   VIX_HOSTOPTION_VERIFY_SSL_CERT       = 0x4000,
562
567
};
563
568
 
564
569
typedef int VixServiceProvider;
565
570
enum {
566
 
   VIX_SERVICEPROVIDER_DEFAULT               = 1,
567
 
   VIX_SERVICEPROVIDER_VMWARE_SERVER         = 2,
568
 
   VIX_SERVICEPROVIDER_VMWARE_WORKSTATION    = 3,
569
 
   VIX_SERVICEPROVIDER_VMWARE_PLAYER         = 4,
570
 
   VIX_SERVICEPROVIDER_VMWARE_VI_SERVER      = 10,
 
571
   VIX_SERVICEPROVIDER_DEFAULT                   = 1,
 
572
   VIX_SERVICEPROVIDER_VMWARE_SERVER             = 2,
 
573
   VIX_SERVICEPROVIDER_VMWARE_WORKSTATION        = 3,
 
574
   VIX_SERVICEPROVIDER_VMWARE_PLAYER             = 4,
 
575
   VIX_SERVICEPROVIDER_VMWARE_VI_SERVER          = 10,
 
576
   VIX_SERVICEPROVIDER_VMWARE_WORKSTATION_SHARED = 11,
571
577
};
572
578
 
573
579
/*