VirtualBox

Changeset 21412 in vbox for trunk


Ignore:
Timestamp:
Jul 8, 2009 9:18:57 PM (16 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
49791
Message:

Add,++: Switch to common addition kernel module.

Location:
trunk
Files:
1 deleted
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r21338 r21412  
    415415# Enables the Python<->XPCOM and Python<->COM bindings.
    416416VBOX_WITH_PYTHON ?= 1
    417 # Build multiple Python<->XPCOM bridges for different Python version 
     417# Build multiple Python<->XPCOM bridges for different Python version
    418418ifn1of ($(KBUILD_TARGET), darwin)
    419419 VBOX_WITH_MULTIVERSION_PYTHON ?= 1
    … …  
    34203420 TEMPLATE_VBOXGUESTR3EXE_LIBS     = $(TEMPLATE_VBOXR3EXE_LIBS) iconv
    34213421endif
    3422 ifdef VBOX_WITH_COMMON_VBOXGUEST_ON_LINUX ## tempoary, remove soon.
    3423  TEMPLATE_VBOXGUESTR3EXE_DEFS    += VBOX_WITH_COMMON_VBOXGUEST_ON_LINUX
    3424 endif
    34253422
    34263423

  • trunk/include/VBox/VBoxGuest.h

    r21227 r21412  
    3838#include <VBox/VMMDev2.h>
    3939#include <VBox/VBoxGuest2.h>
    40 #if 0
    41 #include <VBox/VMMDev.h> /* Temporarily. */
    42 #endif
    4340
    4441
    … …  
    6966# define VBOXGUEST_DEVICE_NAME_DOS      L"\\DosDevices\\VBoxGuest"
    7067
    71 #elif defined(RT_OS_LINUX) && !defined(VBOX_WITH_COMMON_VBOXGUEST_ON_LINUX)
    72 # define VBOXGUEST_DEVICE_NAME          "/dev/vboxadd"
    73 # define VBOXGUEST_USER_DEVICE_NAME     "/dev/vboxuser"
    74 
    75 #else /* PORTME */
     68#else /* (PORTME) */
    7669# define VBOXGUEST_DEVICE_NAME          "/dev/vboxguest"
    7770# if defined(RT_OS_LINUX)
    … …  
    396389#endif /* !defined(IN_RC) && !defined(IN_RING0_AGNOSTIC) && !defined(IPRT_NO_CRT) */
    397390
    398 
    399 #if 0 /*def IN_RING3*/
    400 # include <VBox/VBoxGuestLib.h> /** @todo eliminate this. */
    401 #endif /* IN_RING3 */
    402 
    403 #endif
    404 
     391#endif
     392

  • trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk

    r21118 r21412  
    118118 endif # FreeBSD
    119119
     120endif # enabled
    120121
    121  ifeq ($(KBUILD_TARGET),linux)
    122   #
    123   # Install the source files and script(s).
    124   #
    125   include $(PATH_SUB_CURRENT)/linux/files_vboxguest
    126   # sources and stuff.
    127   INSTALLS += vboxguest-src
    128   vboxguest-src_INST     = $(INST_ADDITIONS)src/vboxguest/
    129   vboxguest-src_MODE     = a+r,u+w
    130   vboxguest-src_SOURCES  = $(subst ",,$(FILES_VBOXGUEST_NOBIN))
    131   vboxguest-src_SOURCES += $(if $(VBOX_OSE),,$(vboxguest-sh_0_OUTDIR)/dkms.conf)
    132   vboxguest-src_CLEAN    = $(vboxguest-sh_0_OUTDIR)/dkms.conf
     122ifeq ($(KBUILD_TARGET),linux)
     123 #
     124 # Install the source files and script(s).
     125 #
     126 include $(PATH_SUB_CURRENT)/linux/files_vboxguest
     127 # sources and stuff.
     128 INSTALLS += vboxguest-src
     129 vboxguest-src_INST     = $(INST_ADDITIONS)src/vboxguest/
     130 vboxguest-src_MODE     = a+r,u+w
     131 vboxguest-src_SOURCES  = $(subst ",,$(FILES_VBOXGUEST_NOBIN))
     132 vboxguest-src_SOURCES += $(if $(VBOX_OSE),,$(vboxguest-sh_0_OUTDIR)/dkms.conf)
     133 vboxguest-src_CLEAN    = $(vboxguest-sh_0_OUTDIR)/dkms.conf
    133134
    134   $$(vboxguest-sh_0_OUTDIR)/dkms.conf: \
    135                 $(PATH_SUB_CURRENT)/linux/dkms.conf \
    136                 $(VBOX_VERSION_STAMP) \
    137                 | $$(dir $$@)
    138         $(call MSG_TOOL,Creating,,$@)
    139         $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" --output $@ $<
     135 $$(vboxguest-sh_0_OUTDIR)/dkms.conf: \
     136        $(PATH_SUB_CURRENT)/linux/dkms.conf \
     137        $(VBOX_VERSION_STAMP) \
     138        | $$(dir $$@)
     139       $(call MSG_TOOL,Creating,,$@)
     140       $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" --output $@ $<
    140141
    141   # scripts.
    142   INSTALLS += vboxguest-sh
    143   vboxguest-sh_INST      = $(INST_ADDITIONS)src/vboxguest/
    144   vboxguest-sh_MODE      = a+rx,u+w
    145   vboxguest-sh_SOURCES   = $(subst ",,$(FILES_VBOXGUEST_BIN))
    146   vboxguest-sh_SOURCES  += $(if $(VBOX_OSE),,$(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers)
    147   vboxguest-sh_SOURCES  += $(vboxguest-sh_0_OUTDIR)/build_in_tmp
    148   vboxguest-sh_CLEAN     = $(vboxguest-sh_0_OUTDIR)/build_in_tmp
     142 # scripts.
     143 INSTALLS += vboxguest-sh
     144 vboxguest-sh_INST      = $(INST_ADDITIONS)src/vboxguest/
     145 vboxguest-sh_MODE      = a+rx,u+w
     146 vboxguest-sh_SOURCES   = $(subst ",,$(FILES_VBOXGUEST_BIN))
     147 vboxguest-sh_SOURCES  += $(if $(VBOX_OSE),,$(PATH_ROOT)/src/VBox/HostDrivers/linux/do_Module.symvers)
     148 vboxguest-sh_SOURCES  += $(vboxguest-sh_0_OUTDIR)/build_in_tmp
     149 vboxguest-sh_CLEAN     = $(vboxguest-sh_0_OUTDIR)/build_in_tmp
    149150
    150   $$(vboxguest-sh_0_OUTDIR)/build_in_tmp: \
    151                 $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
    152                 $(VBOX_VERSION_STAMP) \
    153                 | $$(dir $$@)
    154         $(call MSG_TOOL,Creating,,$@)
    155         $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxguest;g" --output $@ $<
    156         $(QUIET)$(CHMOD) 0755 $@
     151 $$(vboxguest-sh_0_OUTDIR)/build_in_tmp: \
     152        $(PATH_ROOT)/src/VBox/HostDrivers/linux/build_in_tmp \
     153        $(VBOX_VERSION_STAMP) \
     154        | $$(dir $$@)
     155       $(call MSG_TOOL,Creating,,$@)
     156       $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g; s;_MODULE_;vboxguest;g" --output $@ $<
     157       $(QUIET)$(CHMOD) 0755 $@
    157158
    158  endif # Linux
    159 
    160 endif # enabled
     159endif # Linux
    161160
    162161include $(KBUILD_PATH)/subfooter.kmk

  • trunk/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp

    r21272 r21412  
    3030#ifdef VBGL_VBOXGUEST
    3131
    32 #if !defined (RT_OS_WINDOWS) \
    33  && (!defined (RT_OS_LINUX) || defined (VBOX_WITH_COMMON_VBOXGUEST_ON_LINUX))
     32#if !defined (RT_OS_WINDOWS)
    3433# include <iprt/memobj.h>
    3534#endif
    … …  
    9190        }
    9291    }
    93 
    94 #elif defined (RT_OS_LINUX) && !defined (VBOX_WITH_COMMON_VBOXGUEST_ON_LINUX)
    95     /** @todo r=frank: Linux: pv is at least in some cases, e.g. with VBoxMapFolder,
    96      *  an R0 address -- the memory was allocated with kmalloc(). I don't know
    97      *  if this is true in any case.
    98      * r=michael: on Linux, we sometimes have R3 addresses (e.g. shared
    99      *  clipboard) and sometimes R0 (e.g. shared folders).  We really ought
    100      *  to have two separate paths here - at any rate, Linux R0 shouldn't
    101      *  end up calling this API.  In practice, Linux R3 does it's own thing
    102      *  before winding up in the R0 path - which calls this stub API.
    103      *
    104      * bird: this will soon be obsoleted.
    105      */
    106     NOREF(ppvCtx);
    107     NOREF(pv);
    108     NOREF(u32Size);
    109     NOREF(fFlags);
    11092
    11193#else
    … …  
    148130    }
    149131
    150 #elif defined (RT_OS_LINUX) && !defined (VBOX_WITH_COMMON_VBOXGUEST_ON_LINUX)
    151     NOREF(pvCtx);
    152 
    153132#else
    154133    RTR0MEMOBJ MemObj = (RTR0MEMOBJ)pvCtx;
    … …  
    160139
    161140#else  /* !VBGL_VBOXGUEST */
    162 
    163 # if defined (RT_OS_LINUX) && !defined (__KERNEL__) /** @todo r=bird: What is this for?????? */
    164 #  include <unistd.h>
    165 #  include <errno.h>
    166 #  include <sys/fcntl.h>
    167 #  include <sys/ioctl.h>
    168 # endif
    169 
    170 # if defined (RT_OS_LINUX) && !defined (VBOX_WITH_COMMON_VBOXGUEST_ON_LINUX)
    171 RT_C_DECLS_BEGIN
    172 extern DECLVBGL(void *) vboxadd_cmc_open (void);
    173 extern DECLVBGL(void) vboxadd_cmc_close (void *);
    174 extern DECLVBGL(int) vboxadd_cmc_call (void *opaque, uint32_t func, void *data);
    175 RT_C_DECLS_END
    176 # endif /* RT_OS_LINUX */
    177141
    178142# ifdef RT_OS_OS2
    … …  
    188152
    189153# if !defined(RT_OS_OS2) \
    190   && !defined(RT_OS_WINDOWS) \
    191   && (!defined (RT_OS_LINUX) || defined (VBOX_WITH_COMMON_VBOXGUEST_ON_LINUX))
     154  && !defined(RT_OS_WINDOWS)
    192155RT_C_DECLS_BEGIN
    193156extern DECLVBGL(void *) VBoxGuestIDCOpen (uint32_t *pu32Version);
    … …  
    219182    Log(("vbglDriverOpen VBoxGuest failed with ntstatus=%x\n", rc));
    220183    return rc;
    221 
    222 # elif defined (RT_OS_LINUX) && !defined (VBOX_WITH_COMMON_VBOXGUEST_ON_LINUX)
    223 
    224     void *opaque;
    225 
    226     opaque = (void *) vboxadd_cmc_open ();
    227     if (!opaque)
    228     {
    229         return VERR_NOT_IMPLEMENTED;
    230     }
    231     pDriver->opaque = opaque;
    232     return VINF_SUCCESS;
    233184
    234185# elif defined (RT_OS_OS2)
    … …  
    340291    return NT_SUCCESS(rc)? VINF_SUCCESS: VERR_VBGL_IOCTL_FAILED;
    341292
    342 # elif defined (RT_OS_LINUX) && !defined (VBOX_WITH_COMMON_VBOXGUEST_ON_LINUX)
    343     return vboxadd_cmc_call (pDriver->opaque, u32Function, pvData);
    344 
    345293# elif defined (RT_OS_OS2)
    346294    if (    pDriver->u32Session
    … …  
    362310    ObDereferenceObject (pDriver->pFileObject);
    363311
    364 # elif defined (RT_OS_LINUX) && !defined (VBOX_WITH_COMMON_VBOXGUEST_ON_LINUX)
    365     vboxadd_cmc_close (pDriver->opaque);
    366 
    367312# elif defined (RT_OS_OS2)
    368313    pDriver->u32Session = 0;

  • trunk/src/VBox/Additions/common/VBoxGuestLib/SysHlp.h

    r21339 r21412  
    5656    PDEVICE_OBJECT pDeviceObject;
    5757    PFILE_OBJECT pFileObject;
    58 #elif defined (RT_OS_LINUX) && !defined(VBOX_WITH_COMMON_VBOXGUEST_ON_LINUX)
    59     void *opaque;
    6058#elif defined (RT_OS_OS2)
    6159    uint32_t u32Session; /**< just for sanity checking. */

  • trunk/src/VBox/Additions/linux/Makefile

    r21411 r21412  
    2323
    2424all:
    25         @echo "*** Building 'vboxadd' module ***"
    26         @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxadd
    27         @cp vboxadd/vboxadd.*o .
     25        @echo "*** Building 'vboxguest' module ***"
     26        @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxguest
     27        @cp vboxguest/vboxguest.*o .
    2828        @echo
    29         @if [ -d vboxguest ]; then \
    30             if [ -f vboxadd/Module.symvers ]; then \
    31                 cp vboxadd/Module.symvers vboxguest; \
    32             fi; \
    33             echo "*** Building 'vboxguest' module ***"; \
    34             $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxguest; \
    35             cp vboxguest/vboxguest.*o .; \
    36             echo; \
    37         fi
    3829        @if [ -d vboxvfs ]; then \
    39             if [ -f vboxadd/Module.symvers ]; then \
    40                 cp vboxadd/Module.symvers vboxvfs; \
     30            if [ -f vboxguest/Module.symvers ]; then \
     31                cp vboxguest/Module.symvers vboxvfs; \
    4132            fi; \
    4233            echo "*** Building 'vboxvfs' module ***"; \
    … …  
    4738
    4839install:
    49         @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxadd install
     40        @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxguest install
    5041        @if [ -d vboxvfs ]; then \
    5142            $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxvfs install; \
    … …  
    5344
    5445clean:
    55         @$(MAKE) -C vboxadd clean
    56         @if [ -d vboxguest ]; then \
    57             $(MAKE) -C vboxguest clean; \
    58         fi
     46        @$(MAKE) -C vboxguest clean
    5947        @if [ -d vboxvfs ]; then \
    6048            $(MAKE) -C vboxvfs clean; \
    6149        fi
    62         rm -f vboxadd.ko vboxvfs.ko
     50        rm -f vboxguest.ko vboxvfs.ko
    6351
    6452load:
    6553        @/sbin/rmmod vboxvfs || true
    66         @/sbin/rmmod vboxadd || true
    67         @/sbin/insmod vboxadd.ko
     54        @/sbin/rmmod vboxguest || true
     55        @/sbin/insmod vboxguest.ko
    6856        @if [ -f vboxvfs.ko ]; then /sbin/insmod vboxvfs.ko; fi

  • trunk/src/VBox/Additions/linux/Makefile.kmk

    r19517 r21412  
    2626# Include sub-makefiles.
    2727#
    28 include $(PATH_SUB_CURRENT)/module/Makefile.kmk
    2928include $(PATH_SUB_CURRENT)/sharedfolders/Makefile.kmk
    3029include $(PATH_SUB_CURRENT)/drm/Makefile.kmk

  • trunk/src/VBox/Additions/linux/export_modules

    r8155 r21412  
    3030FILE_OUT="`cd \`dirname $1\`; pwd`/`basename $1`"
    3131PATH_ROOT="`cd \`dirname $0\`/../../../..; pwd`"
    32 PATH_VBOXADD="$PATH_ROOT/src/VBox/Additions/linux/module"
     32PATH_VBOXGUEST="$PATH_ROOT/src/VBox/Additions/common/VBoxGuest"
    3333PATH_VBOXVFS="$PATH_ROOT/src/VBox/Additions/linux/sharedfolders"
    3434
    … …  
    3737VBOX_VERSION_BUILD=`sed -e "s/^ *VBOX_VERSION_BUILD *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Config.kmk`
    3838
    39 . $PATH_VBOXADD/files_vboxadd
     39. $PATH_VBOXGUEST/linux/files_vboxguest
    4040. $PATH_VBOXVFS/files_vboxvfs
    4141
    … …  
    5454echo "#endif" >> $PATH_TMP/version-generated.h
    5555
    56 # vboxadd (VirtualBox guest kernel module)
    57 mkdir $PATH_TMP/vboxadd || exit 1
    58 for f in $FILES_VBOXADD_NOBIN; do
    59     install -D -m 0644 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxadd/`echo $f|cut -d'>' -f2`"
     56# vboxguest (VirtualBox guest kernel module)
     57mkdir $PATH_TMP/vboxguest || exit 1
     58for f in $FILES_VBOXGUEST_NOBIN; do
     59    install -D -m 0644 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxguest/`echo $f|cut -d'>' -f2`"
    6060done
    61 for f in $FILES_VBOXADD_BIN; do
    62     install -D -m 0755 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxadd/`echo $f|cut -d'>' -f2`"
     61for f in $FILES_VBOXGUEST_BIN; do
     62    install -D -m 0755 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxguest/`echo $f|cut -d'>' -f2`"
    6363done
    6464

  • trunk/src/VBox/Additions/linux/installer/90-vboxguest.fdi

    r18265 r21412  
    2626        <append key="info.capabilities" type="strlist">input.mouse</append>
    2727        <merge key="input.x11_driver" type="string">vboxmouse</merge>
    28         <merge key="input.device" type="string">/dev/vboxadd</merge>
     28        <merge key="input.device" type="string">/dev/vboxguest</merge>
    2929      </match>
    3030    </match>

  • trunk/src/VBox/Additions/linux/installer/vboxadd-service.sh

    r19587 r21412  
    245245
    246246vboxaddrunning() {
    247     lsmod | grep -q "vboxadd[^_-]"
     247    lsmod | grep -q "vboxguest[^_-]"
    248248}
    249249

  • trunk/src/VBox/Additions/linux/installer/vboxadd.sh

    r18265 r21412  
    11#! /bin/sh
    22# Sun VirtualBox
    3 # Linux Additions kernel module init script
     3# Linux Additions kernel module init script ($Revision$)
     4#
     5
    46#
    57# Copyright (C) 2006-2009 Sun Microsystems, Inc.
    … …  
    3234
    3335PATH=$PATH:/bin:/sbin:/usr/sbin
    34 BUILDVBOXADD=`/bin/ls /usr/src/vboxadd*/build_in_tmp 2>/dev/null|cut -d' ' -f1`
     36BUILDVBOXGUEST=`/bin/ls /usr/src/vboxguest*/build_in_tmp 2>/dev/null|cut -d' ' -f1`
    3537BUILDVBOXVFS=`/bin/ls /usr/src/vboxvfs*/build_in_tmp 2>/dev/null|cut -d' ' -f1`
    3638BUILDVBOXVIDEO=`/bin/ls /usr/src/vboxvideo*/build_in_tmp 2>/dev/null|cut -d' ' -f1`
    … …  
    142144fi
    143145
    144 dev=/dev/vboxadd
     146dev=/dev/vboxguest
    145147userdev=/dev/vboxuser
    146148owner=vboxadd
    … …  
    158160}
    159161
    160 running_vboxadd()
    161 {
    162     lsmod | grep -q "vboxadd[^_-]"
     162running_vboxguest()
     163{
     164    lsmod | grep -q "vboxguest[^_-]"
    163165}
    164166
    … …  
    171173{
    172174    begin "Starting VirtualBox Additions ";
    173     running_vboxadd || {
     175    running_vboxguest || {
    174176        rm -f $dev || {
    175177            fail "Cannot remove $dev"
    … …  
    180182        }
    181183
    182         modprobe vboxadd >/dev/null 2>&1 || {
    183             fail "modprobe vboxadd failed"
     184        modprobe vboxguest >/dev/null 2>&1 || {
     185            fail "modprobe vboxguest failed"
    184186        }
    185187        sleep .5
    186188    }
    187189    if [ ! -c $dev ]; then
    188         maj=`sed -n 's;\([0-9]\+\) vboxadd;\1;p' /proc/devices`
     190        maj=`sed -n 's;\([0-9]\+\) vboxguest;\1;p' /proc/devices`
    189191        if [ ! -z "$maj" ]; then
    190192            min=0
    191193        else
    192             min=`sed -n 's;\([0-9]\+\) vboxadd;\1;p' /proc/misc`
     194            min=`sed -n 's;\([0-9]\+\) vboxguest;\1;p' /proc/misc`
    193195            if [ ! -z "$min" ]; then
    194196                maj=10
    … …  
    196198        fi
    197199        test -z "$maj" && {
    198             rmmod vboxadd 2>/dev/null
     200            rmmod vboxguest 2>/dev/null
    199201            fail "Cannot locate the VirtualBox device"
    200202        }
    201203
    202204        mknod -m 0664 $dev c $maj $min || {
    203             rmmod vboxadd 2>/dev/null
     205            rmmod vboxguest 2>/dev/null
    204206            fail "Cannot create device $dev with major $maj and minor $min"
    205207        }
    … …  
    208210        rm -f $dev 2>/dev/null
    209211        rm -f $userdev 2>/dev/null
    210         rmmod vboxadd 2>/dev/null
     212        rmmod vboxguest 2>/dev/null
    211213        fail "Cannot change owner $owner:$group for device $dev"
    212214    }
    … …  
    218220            mknod -m 0666 $userdev c $maj $min || {
    219221                rm -f $dev 2>/dev/null
    220                 rmmod vboxadd 2>/dev/null
     222                rmmod vboxguest 2>/dev/null
    221223                fail "Cannot create device $userdev with major $maj and minor $min"
    222224            }
    … …  
    224226                rm -f $dev 2>/dev/null
    225227                rm -f $userdev 2>/dev/null
    226                 rmmod vboxadd 2>/dev/null
     228                rmmod vboxguest 2>/dev/null
    227229                fail "Cannot change owner $owner:$group for device $userdev"
    228230            }
    … …  
    263265        fi
    264266    fi
    265     if running_vboxadd; then
    266         rmmod vboxadd 2>/dev/null || fail "Cannot unload module vboxadd"
     267    if running_vboxguest; then
     268        rmmod vboxguest 2>/dev/null || fail "Cannot unload module vboxguest"
    267269        rm -f $userdev || fail "Cannot unlink $userdev"
    268270        rm -f $dev || fail "Cannot unlink $dev"
    … …  
    286288        succ_msg
    287289    fi
    288     if find /lib/modules/`uname -r` -name "vboxadd\.*" 2>/dev/null|grep -q vboxadd; then
    289         begin "Removing old VirtualBox vboxadd kernel module"
    290         find /lib/modules/`uname -r` -name "vboxadd\.*" 2>/dev/null|xargs rm -f 2>/dev/null
     290    if find /lib/modules/`uname -r` -name "vboxguest\.*" 2>/dev/null|grep -q vboxguest; then
     291        begin "Removing old VirtualBox vboxguest kernel module"
     292        find /lib/modules/`uname -r` -name "vboxguest\.*" 2>/dev/null|xargs rm -f 2>/dev/null
    291293        succ_msg
    292294    fi
    293295    begin "Recompiling VirtualBox kernel modules"
    294     if ! $BUILDVBOXADD \
    295         --save-module-symvers /tmp/vboxadd-Module.symvers \
     296    if ! $BUILDVBOXGUEST \
     297        --save-module-symvers /tmp/vboxguest-Module.symvers \
    296298        --no-print-directory install > $LOG 2>&1; then
    297299        fail "Look at $LOG to find out what went wrong"
    … …  
    299301    if [ -n "$BUILDVBOXVFS" ]; then
    300302        if ! $BUILDVBOXVFS \
    301             --use-module-symvers /tmp/vboxadd-Module.symvers \
     303            --use-module-symvers /tmp/vboxguest-Module.symvers \
    302304            --no-print-directory install >> $LOG 2>&1; then
    303305            fail "Look at $LOG to find out what went wrong"
    … …  
    306308    if [ -n "$BUILDVBOXVIDEO" ]; then
    307309        if ! $BUILDVBOXVIDEO \
    308             --use-module-symvers /tmp/vboxadd-Module.symvers \
     310            --use-module-symvers /tmp/vboxguest-Module.symvers \
    309311            --no-print-directory install >> $LOG 2>&1; then
    310312            fail "Look at $LOG to find out what went wrong"
    … …  
    319321dmnstatus()
    320322{
    321     if running_vboxadd; then
     323    if running_vboxguest; then
    322324        echo "The VirtualBox Additions are currently running."
    323325    else

  • trunk/src/VBox/Additions/linux/sharedfolders/Makefile.kmk

    r21339 r21412  
    5959vboxvfs_DEFS            = \
    6060        MODULE IN_RT_R0 VBOXGUEST VBOX_WITH_HGCM \
    61         $(if-expr defined(VBOX_WITH_COMMON_VBOXGUEST_ON_LINUX),VBOX_WITH_COMMON_VBOXGUEST_ON_LINUX,) \
    6261        KBUILD_MODNAME=KBUILD_STR\(vboxvfs\) \
    6362        KBUILD_BASENAME=KBUILD_STR\(vboxvfs\)
    … …  
    109108                | $$(dir $$@)
    110109        $(call MSG_TOOL,Creating,,$@)
    111         $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" \
    112                 $(if-expr defined(VBOX_WITH_COMMON_VBOXGUEST_ON_LINUX), -e 's/vboxadd/vboxguest/',) \
    113                 --output $@ $<
     110        $(QUIET)$(SED) -e "s;_VERSION_;${VBOX_VERSION_STRING};g" --output $@ $<
    114111
    115112include $(KBUILD_PATH)/subfooter.kmk

  • trunk/src/VBox/Additions/linux/sharedfolders/Makefile.module

    r21411 r21412  
    7676        HGCM.o \
    7777        VBoxCalls.o
    78 ifndef VBOX_WITH_COMMON_VBOXGUEST_ON_LINUX
    79 OBJS  += \
    80         r0drv/alloc-r0drv.o \
    81         r0drv/memobj-r0drv.o \
    82         r0drv/linux/alloc-r0drv-linux.o \
    83         r0drv/linux/memobj-r0drv-linux.o \
    84         r0drv/linux/memuserkernel-r0drv-linux.o \
    85         r0drv/linux/process-r0drv-linux.o \
    86         r0drv/linux/semevent-r0drv-linux.o \
    87         r0drv/linux/semfastmutex-r0drv-linux.o
    88 endif
    8978ifeq ($(BUILD_TARGET_ARCH),x86)
    9079OBJS  += \
    … …  
    202191 KFLAGS  += -DDEBUG
    203192endif
    204 ifdef VBOX_WITH_COMMON_VBOXGUEST_ON_LINUX
    205  KFLAGS  += -DVBOX_WITH_COMMON_VBOXGUEST_ON_LINUX
    206 endif
    207193
    208194ifeq ($(KERN_VERSION), 24)

  • trunk/src/VBox/Additions/linux/sharedfolders/dkms.conf

    r14655 r21412  
    55AUTOINSTALL=yes
    66CLEAN="make -C $dkms_tree/$module/$module_version/build clean"
    7 PRE_BUILD="do_Module.symvers vboxadd restore $dkms_tree/$module/$module_version/build/Module.symvers"
     7PRE_BUILD="do_Module.symvers vboxguest restore $dkms_tree/$module/$module_version/build/Module.symvers"

  • trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c

    r21319 r21412  
    441441#endif
    442442
    443 #if 0
    444 extern int CMC_API
    445 vboxadd_cmc_ctl_guest_filter_mask (uint32_t or_mask, uint32_t not_mask);
    446 #endif
    447 
    448443/* Module initialization/finalization handlers */
    449444static int __init
    … …  
    471466        }
    472467
    473 #if 0
    474         if (vboxadd_cmc_ctl_guest_filter_mask (VMMDEV_EVENT_HGCM, 0)) {
    475                 rcRet = -EINVAL;
    476                 goto fail0;
    477         }
    478 #endif
    479 
    480468        rcVBox = vboxInit ();
    481469        if (RT_FAILURE (rcVBox)) {
    … …  
    510498        vboxUninit ();
    511499 fail0:
    512 #if 0
    513         vboxadd_cmc_ctl_guest_filter_mask (0, VMMDEV_EVENT_HGCM);
    514 #endif
    515500        unregister_filesystem (&vboxsf_fs_type);
    516501        return rcRet;
    … …  
    524509        vboxDisconnect (&client_handle);
    525510        vboxUninit ();
    526 #if 0
    527         vboxadd_cmc_ctl_guest_filter_mask (0, VMMDEV_EVENT_HGCM);
    528 #endif
    529511        unregister_filesystem (&vboxsf_fs_type);
    530512}

  • trunk/src/VBox/Additions/x11/Installer/x11config15suse.pl

    r18265 r21412  
    134134            print TMP "        Identifier  \"VBoxMouse\"\n";
    135135            print TMP "        Driver      \"$mousedrv\"\n";
    136             print TMP "        Option      \"Device\"     \"\/dev\/vboxadd\"\n";
     136            print TMP "        Option      \"Device\"     \"\/dev\/vboxguest\"\n";
    137137            print TMP "        Option      \"SendCoreEvents\"  \"on\"\n";
    138138            print TMP "EndSection\n";

  • trunk/src/VBox/Additions/x11/vboxmouse/VBoxUtils_68.c

    r21227 r21412  
    3535#endif
    3636
    37 #ifdef RT_OS_SOLARIS        /** @todo later Linux should also use R3 lib for this */
     37#ifndef RT_OS_LINUX        /** @todo later Linux should also use R3 lib for this */
    3838int VBoxMouseInit(void)
    3939{
    … …  
    8282    return rc;
    8383}
    84 #else
    85 /* the vboxadd module file handle */
    86 static int g_vboxaddHandle = -1;
     84#else  /* RT_OS_LINUX */
     85/* the vboxguest module file handle */
     86static int g_vboxguestHandle = -1;
    8787/* the request structure */
    8888static VMMDevReqMouseStatus *g_vmmreqMouseStatus = NULL;
    … …  
    9797
    9898    /* return immediately if already initialized */
    99     if (g_vboxaddHandle != -1)
     99    if (g_vboxguestHandle != -1)
    100100        return 0;
    101101
    102102    /* open the driver */
    103     g_vboxaddHandle = open(VBOXGUEST_DEVICE_NAME, O_RDWR, 0);
    104     if (g_vboxaddHandle < 0)
     103    g_vboxguestHandle = open(VBOXGUEST_DEVICE_NAME, O_RDWR, 0);
     104    if (g_vboxguestHandle < 0)
    105105    {
    106106        ErrorF("Unable to open the virtual machine device: %s\n",
    … …  
    124124    req.pointerYPos = 0;
    125125/** @todo r=bird: Michael, I thought we decided a long time ago that all these should be replaced by VbglR3. I assume this is just a leftover... */
    126     if (ioctl(g_vboxaddHandle, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(req)), (void*)&req) < 0)
     126    if (ioctl(g_vboxguestHandle, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(req)), (void*)&req) < 0)
    127127    {
    128128        ErrorF("Error sending mouse pointer capabilities to VMM! rc = %d (%s)\n",
    … …  
    145145{
    146146    /* If we failed to initialise, say that we don't want absolute co-ordinates. */
    147     if (g_vboxaddHandle < 0)
     147    if (g_vboxguestHandle < 0)
    148148        return 1;
    149149    /* perform VMM request */
    150150/** @todo r=bird: Michael, ditto. */
    151     if (ioctl(g_vboxaddHandle, VBOXGUEST_IOCTL_VMMREQUEST(vmmdevGetRequestSize(VMMDevReq_GetMouseStatus)), (void*)g_vmmreqMouseStatus) >= 0)
     151    if (ioctl(g_vboxguestHandle, VBOXGUEST_IOCTL_VMMREQUEST(vmmdevGetRequestSize(VMMDevReq_GetMouseStatus)), (void*)g_vmmreqMouseStatus) >= 0)
    152152    {
    153153        if (RT_SUCCESS(g_vmmreqMouseStatus->header.rc))
    … …  
    177177    VMMDevReqMouseStatus req;
    178178    /* If we are not initialised, there is nothing to do */
    179     if (g_vboxaddHandle < 0)
     179    if (g_vboxguestHandle < 0)
    180180        return 0;
    181181    /* tell VMM that we no longer support absolute mouse handling */
    … …  
    185185    req.pointerYPos = 0;
    186186/** @todo r=bird: Michael, ditto. */
    187     if (ioctl(g_vboxaddHandle, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(req)), (void*)&req) < 0)
    188     {
    189         ErrorF("ioctl to vboxadd module failed, rc = %d (%s)\n",
     187    if (ioctl(g_vboxguestHandle, VBOXGUEST_IOCTL_VMMREQUEST(sizeof(req)), (void*)&req) < 0)
     188    {
     189        ErrorF("ioctl to vboxguest module failed, rc = %d (%s)\n",
    190190               errno, strerror(errno));
    191191    }
    … …  
    193193    free(g_vmmreqMouseStatus);
    194194    g_vmmreqMouseStatus = NULL;
    195     close(g_vboxaddHandle);
    196     g_vboxaddHandle = -1;
     195    close(g_vboxguestHandle);
     196    g_vboxguestHandle = -1;
    197197    return 0;
    198198}
    199 #endif  /* !RT_OS_SOLARIS */
    200 
     199#endif  /* RT_OS_LINUX */
     200

  • trunk/src/VBox/Additions/x11/vboxmouse/vboxmouse_15.c

    r21227 r21412  
    195195
    196196    device = xf86CheckStrOption(dev->commonOptions, "Device",
    197                                 "/dev/vboxadd");
     197                                "/dev/vboxguest");
    198198
    199199    xf86Msg(X_CONFIG, "%s: Device: \"%s\"\n", pInfo->name, device);

  • trunk/src/VBox/Runtime/common/misc/assert.cpp

    r21337 r21412  
    4444
    4545
    46 #if defined(IN_GUEST_R0) \
    47  && (  (defined(RT_OS_LINUX) && !defined(VBOX_WITH_COMMON_VBOXGUEST_ON_LINUX)) \
    48      || defined(RT_OS_WINDOWS))
     46#if defined(IN_GUEST_R0) && defined(RT_OS_WINDOWS) /** @todo remove this, see defect XYZ. */
    4947/*
    5048 * This is legacy that should be eliminated. OS specific code deals with
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette