← Back to branch summary

~ubuntu-branches/ubuntu/vivid/virtualbox-ose/vivid

« back to all changes in this revision

Viewing changes to src/VBox/Devices/Network/slirp/slirp_state.h

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-03-11 17:16:37 UTC
  • mfrom: (0.3.4 upstream) (0.4.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100311171637-43z64ia3ccpj8vqn
Tags: 3.1.4-dfsg-2ubuntu1
https://launchpad.net/bugs/528561
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/535297
* Merge from Debian unstable (LP: #528561), remaining changes:
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
  - Replace *-source packages with transitional packages for *-dkms
* Fix crash in vboxvideo_drm with kernel 2.6.33 / backported drm code
  (LP: #535297)
* Add a list of linux-headers packages to the apport hook
* Update debian/patches/u02-lp-integration.dpatch with a
  DEP-3 compliant header
* Add ${misc:Depends} to virtualbox-ose-source and virtualbox-ose-guest-source
  Depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Devices/Network/slirp/slirp_state.h
444
444
        int rc;                                                       \
445
445
        /* Assert(strcmp(RTThreadSelfName(), "EMT") != 0); */         \
446
446
        rc = RTCritSectEnter(&VBOX_X(queue) ## _mutex);               \
447
 
        AssertReleaseRC(rc);                                          \
 
447
        AssertRC(rc);                                                 \
448
448
    } while (0)
449
449
# define QSOCKET_UNLOCK(queue)                                        \
450
450
    do {                                                              \
451
451
        int rc;                                                       \
452
452
        rc = RTCritSectLeave(&VBOX_X(queue) ## _mutex);               \
453
 
        AssertReleaseRC(rc);                                          \
 
453
        AssertRC(rc);                                                 \
454
454
    } while (0)
455
455
# define QSOCKET_LOCK_CREATE(queue)                                   \
456
456
    do {                                                              \
457
457
        int rc;                                                       \
458
458
        rc = RTCritSectInit(&pData->queue ## _mutex);                 \
459
 
        AssertReleaseRC(rc);                                          \
 
459
        AssertRC(rc);                                                 \
460
460
    } while (0)
461
461
# define QSOCKET_LOCK_DESTROY(queue)                                  \
462
462
    do {                                                              \
463
463
        int rc = RTCritSectDelete(&pData->queue ## _mutex);           \
464
 
        AssertReleaseRC(rc);                                          \
 
464
        AssertRC(rc);                                                 \
465
465
    } while (0)
466
466
 
467
467
# define QSOCKET_FOREACH(so, sonext, label)                           \
506
506
        PRTREQ pReq = NULL;                                             \
507
507
        int rc;                                                         \
508
508
        rc = RTReqAlloc((data)->pReqQueue, &pReq, RTREQTYPE_INTERNAL);  \
509
 
        AssertReleaseRC(rc);                                            \
 
509
        AssertRC(rc);                                                   \
510
510
        pReq->u.Internal.pfn      = (PFNRT)tcp_output;                  \
511
511
        pReq->u.Internal.cArgs    = 2;                                  \
512
512
        pReq->u.Internal.aArgs[0] = (uintptr_t)(data);                  \