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

« back to all changes in this revision

Viewing changes to lib/include/loglevel_user.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
* 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:
63
63
   LOGLEVEL_VAR(extcfgdevice), \
64
64
   LOGLEVEL_VAR(flashram), \
65
65
   LOGLEVEL_VAR(efinv), \
 
66
   LOGLEVEL_VAR(pvnvram), \
66
67
   LOGLEVEL_VAR(pci), \
67
68
   LOGLEVEL_VAR(pci_vide), \
68
69
   LOGLEVEL_VAR(pci_uhci), \
87
88
   LOGLEVEL_VAR(vide), \
88
89
   LOGLEVEL_VAR(ideCdrom), \
89
90
   LOGLEVEL_VAR(hostonly), \
90
 
   LOGLEVEL_VAR(backdoorAbsMouse), \
91
91
   LOGLEVEL_VAR(oprom), \
92
92
   LOGLEVEL_VAR(http), \
93
93
   LOGLEVEL_VAR(vmci), \
122
122
   LOGLEVEL_VAR(mksClient), \
123
123
   LOGLEVEL_VAR(mksServer), \
124
124
   LOGLEVEL_VAR(mksKeyboard), \
 
125
   LOGLEVEL_VAR(keymap), \
125
126
   LOGLEVEL_VAR(mksMouse), \
 
127
   LOGLEVEL_VAR(mksHostCursor), \
126
128
   LOGLEVEL_VAR(mksHostOps), \
127
129
   LOGLEVEL_VAR(mksGLManager), \
128
130
   LOGLEVEL_VAR(mksGLShader), \
233
235
   LOGLEVEL_VAR(guestAppMonitor), \
234
236
   LOGLEVEL_VAR(syncWaitQ), \
235
237
   LOGLEVEL_VAR(sg), /* lib/sg */ \
 
238
   LOGLEVEL_VAR(ftcpt), \
236
239
   LOGLEVEL_VAR(wrapLib),  \
237
 
   LOGLEVEL_VAR(digestlib) \
 
240
   LOGLEVEL_VAR(bluetooth),  \
 
241
   LOGLEVEL_VAR(digestlib), \
 
242
   LOGLEVEL_VAR(svgadevtap), \
 
243
   LOGLEVEL_VAR(ssl), \
 
244
   LOGLEVEL_VAR(vmrc), \
 
245
   /* end of list */
238
246
 
239
247
LOGLEVEL_EXTENSION_DECLARE(LOGLEVEL_USER);
240
248