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

« back to all changes in this revision

Viewing changes to modules/linux/vsock/linux/notifyQState.c

  • 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:
1
1
/*********************************************************
2
 
 * Copyright (C) 2009 VMware, Inc. All rights reserved.
 
2
 * Copyright (C) 2009-2011 VMware, Inc. All rights reserved.
3
3
 *
4
4
 * This program is free software; you can redistribute it and/or modify it
5
5
 * under the terms of the GNU General Public License as published by the
339
339
 
340
340
static int32
341
341
VSockVmciNotifyPktPollIn(struct sock *sk,    // IN
342
 
                         int target,         // IN
 
342
                         size_t target,      // IN
343
343
                         Bool *dataReadyNow) // IN
344
344
{
345
345
   VSockVmciSock *vsk;
386
386
 
387
387
static int32
388
388
VSockVmciNotifyPktPollOut(struct sock *sk,     // IN
389
 
                          int target,          // IN
 
389
                          size_t target,       // IN
390
390
                          Bool *spaceAvailNow) // IN
391
391
{
392
392
   int64 produceQFreeSpace;
432
432
 
433
433
static int32
434
434
VSockVmciNotifyPktRecvInit(struct sock *sk,               // IN
435
 
                           int target,                    // IN
 
435
                           size_t target,                 // IN
436
436
                           VSockVmciRecvNotifyData *data) // IN
437
437
{
438
438
   VSockVmciSock *vsk;
492
492
 
493
493
static int32
494
494
VSockVmciNotifyPktRecvPreBlock(struct sock *sk,               // IN
495
 
                               int target,                    // IN
 
495
                               size_t target,                 // IN
496
496
                               VSockVmciRecvNotifyData *data) // IN
497
497
{
498
498
   int err;
534
534
 
535
535
static int32
536
536
VSockVmciNotifyPktRecvPostDequeue(struct sock *sk,               // IN
537
 
                                  int target,                    // IN
 
537
                                  size_t target,                 // IN
538
538
                                  ssize_t copied,                // IN
539
539
                                  Bool dataRead,                 // IN
540
540
                                  VSockVmciRecvNotifyData *data) // IN