~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools.raring-precise.backport

« back to all changes in this revision

Viewing changes to libvmtools/vmtoolsInt.h

  • Committer: Package Import Robot
  • Author(s): Nate Muench
  • Date: 2012-01-23 16:09:45 UTC
  • mfrom: (1.4.6) (2.4.26 sid)
  • Revision ID: package-import@ubuntu.com-20120123160945-b6s0r1vkcovucpf3
Tags: 2011.12.20-562307-0ubuntu1
* Merge latest upstream git tag. Fixes building on Precise
  (LP: #898289, LP: #905612)

* Items merged from Debian unstable:
  - debian/control:
    + open-vm-tools recommends open-vm-dkms. (LP: #598933)
    + open-vm-tools now suggests open-vm-toolbox. (LP: #604998)
  (From 2011.08.21-471295-1 release)
  - Updating maintainer and uploaders fields.
  - Removing vcs fields.
  - Removing references to Daniel's old email address.
  - Updating years in copyright file.
  - Updating to standards version 3.9.2.
  - Updating to debhelper version 8.
  - Switching to source format 3.0 (quilt).
  - Removing manual chrpath setting.
  - Removing exclusion from plugins from debhelper shlibs.
  - Rediffing kvers.patch.
  (From 2011.09.23-491607-1 release)
  - Marking binary architecture-dependend packages as linux and kfreebsd
  only.
  - Removing liburiparser-dev from build-depends as upstream dropped
  unity support.
  - Building with libproc-dev on amd64 again.
  - Dropping disabling of dnet support.
  (From 2011.09.23-491607-2 release)
  - Adding doxygen to build-depends for api documentation.
  - Adding libcunit1-dev to build-depends for test suites.
  - Minimizing rules file.
  - Adding open-vm-tools-dev package, containing only the api
    documentation for now.
  (From 2011.09.23-491607-3 release)
  - Sorting overrides in rules alphabetically.
  - Compacting copyright file.
  - Adding udev rule to set timeout for vmware scsi devices
  (From 2011.12.20-562307-1 release)
  - Adding patch to correct typo in upstreams dkms configuration

* Remaining Changes:
  - Remove Stable part of version numbering.
  - debian folder:
    + Re-added open-vm-dkms.postinst & open-vm-dkms.prerm.
      * Allows dkms modules to compile upon installation.
  - debian/control:
    + Re-add open-vm-source and make into a transitional package
      for open-vm-toolbox.
    + Return dependancies that were moved to open-vm-tools back to
      open-vm-toolbox.
  - debian/rules and debian/open-vm-toolbox.lintian-overrides:
    + Make vmware-user-suid-wrapper suid-root
  - debian/rules:
    + Added CFLAGS field with -Wno-deprecated-declarations
      * Will suppress issues with glib 2.31 or later.
    + Add line to copy vmware-xdg-detect-de into place.
    + Install vmware-user.desktop through toolbox package.
  - debian/open-vm-tools.init:
    + Re-add 'modprobe [-r] vmblock'.
    + Add 'modprobe [-r] vmxnet'.
      * Incase it's not loaded during boot.
    + Remove and re-add pcnet32 module
      * Will be done before (remove) and after (readd) vmxnet module
        is added.
      * If vmxnet doesn't exist (aka modules fail to build), pcnet32 can be
        still used for network connectivity.
      * Workaround until a better fix can be done.
  - Re-add gnome-session to debian/local/xautostart.conf
  - Manpages removed (from debian/manpages):
    + vmmemctl.9
    + vmxnet3.9
    + Remove references to manpages that have been removed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
25
25
 * Internal definitions used by the vmtools library.
26
26
 */
27
27
 
 
28
#include "glibUtils.h"
28
29
#include "vmware.h"
29
30
#include "vmware/tools/utils.h"
30
31
 
39
40
 * Logging.                                                                   *
40
41
 * ************************************************************************** */
41
42
 
42
 
#define LOGGING_GROUP         "logging"
43
 
 
44
 
struct LogHandlerData;
45
 
 
46
 
typedef void (*LogErrorFn)(const gchar *domain,
47
 
                           GLogLevelFlags level,
48
 
                           const gchar *fmt,
49
 
                           ...);
50
 
typedef gboolean (*VMToolsLogFn)(const gchar *domain,
51
 
                                 GLogLevelFlags level,
52
 
                                 const gchar *message,
53
 
                                 struct LogHandlerData *data,
54
 
                                 LogErrorFn errfn);
55
 
typedef void (*LogHandlerDestroyFn)(struct LogHandlerData *data);
56
 
typedef void (*LogHandlerCopyFn)(struct LogHandlerData *current,
57
 
                                 struct LogHandlerData *old);
58
 
 
59
 
typedef struct LogHandlerData {
60
 
   VMToolsLogFn         logfn;            ///< Function that does the logging.
61
 
                                          ///  Same as GLogFunc but returns
62
 
                                          ///  whether the message was
63
 
                                          ///  successfully logged.
64
 
   gboolean             convertToLocal;   ///< Whether to config the message to the
65
 
                                          ///  local encoding before printing.
66
 
   gboolean             timestamp;        ///< Whether to include timestamps in
67
 
                                          ///  the log message.
68
 
   gboolean             shared;           ///< Whether the log output is shared
69
 
                                          ///  among various processes.
70
 
   LogHandlerCopyFn     copyfn;           ///< Copy function (optional). This is
71
 
                                          ///  used when replacing an existing
72
 
                                          ///  config with a new one for the
73
 
                                          ///  same handler.
74
 
   LogHandlerDestroyFn  dtor;             ///< Destructor for the handler data.
75
 
   /* Fields below managed by the common code. */
76
 
   guint                type;
77
 
   gchar               *domain;
78
 
   GLogLevelFlags       mask;
79
 
   guint                handlerId;
80
 
   gboolean             inherited;
81
 
} LogHandlerData;
82
 
 
83
 
 
84
 
LogHandlerData *
85
 
VMFileLoggerConfig(const gchar *defaultDomain,
86
 
                   const gchar *domain,
87
 
                   const gchar *name,
88
 
                   GKeyFile *cfg);
89
 
 
90
 
LogHandlerData *
91
 
VMStdLoggerConfig(const gchar *defaultDomain,
92
 
                  const gchar *domain,
93
 
                  const gchar *name,
94
 
                  GKeyFile *cfg);
95
 
 
96
 
#if defined(_WIN32)
97
 
LogHandlerData *
98
 
VMEventLoggerConfig(const gchar *defaultDomain,
99
 
                    const gchar *domain,
100
 
                    const gchar *name,
101
 
                    GKeyFile *cfg);
102
 
 
103
 
LogHandlerData *
104
 
VMDebugOutputConfig(const gchar *defaultDomain,
105
 
                    const gchar *domain,
106
 
                    const gchar *name,
107
 
                    GKeyFile *cfg);
108
 
#else
109
 
LogHandlerData *
110
 
VMSysLoggerConfig(const gchar *defaultDomain,
111
 
                  const gchar *domain,
112
 
                  const gchar *name,
113
 
                  GKeyFile *cfg);
114
 
#endif
115
 
 
116
 
LogHandlerData *
117
 
VMXLoggerConfig(const gchar *defaultDomain,
118
 
                const gchar *domain,
119
 
                const gchar *name,
120
 
                GKeyFile *cfg);
 
43
GlibLogger *
 
44
VMToolsCreateVMXLogger(void);
121
45
 
122
46
/* ************************************************************************** *
123
47
 * Miscelaneous.                                                              *