VirtualBox

Changeset 57809 in vbox


Ignore:
Timestamp:
Sep 17, 2015 4:12:55 PM (10 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
102755
Message:

Reverted bad commit r102754.

Location:
trunk
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/log.h

    r57808 r57809  
    156156    /** Virtio PCI Device group. */
    157157    LOG_GROUP_DEV_VIRTIO,
    158     /** Virtio GPU Device group. */
    159     LOG_GROUP_DEV_VIRTIO_GPU,
    160158    /** Virtio Network Device group. */
    161159    LOG_GROUP_DEV_VIRTIO_NET,
    … …  
    851849    "DEV_VGA",      \
    852850    "DEV_VIRTIO",   \
    853     "DEV_VIRTIO_GPU", \
    854851    "DEV_VIRTIO_NET", \
    855852    "DEV_VMM",      \

  • trunk/src/VBox/Devices/Makefile.kmk

    r57808 r57809  
    311311 endif
    312312
    313  ifdef VBOX_WITH_VIRTIO_GPU
    314   VBoxDD_DEFS           += VBOX_WITH_VIRTIO_GPU
    315   VBoxDD_SOURCES        += Graphics/DevVirtioGpu.cpp
    316  endif
    317 
    318313 ifdef VBOX_WITH_PXE_ROM
    319314  VBoxDD_DEFS           += VBOX_WITH_PXE_ROM

  • trunk/src/VBox/Devices/Network/DevVirtioNet.cpp

    r57808 r57809  
    4848#ifdef IN_RING3
    4949
     50#define VNET_PCI_SUBSYSTEM_ID        1 + VIRTIO_NET_ID
    5051#define VNET_PCI_CLASS               0x0200
    5152#define VNET_N_QUEUES                3
    … …  
    5455#if 0
    5556/* Virtio Block Device */
     57#define VNET_PCI_SUBSYSTEM_ID        1 + VIRTIO_BLK_ID
    5658#define VNET_PCI_CLASS               0x0180
    5759#define VNET_N_QUEUES                2
    … …  
    19491951    pThis->VPCI.IBase.pfnQueryInterface    = vnetQueryInterface;
    19501952    rc = vpciConstruct(pDevIns, &pThis->VPCI, iInstance,
    1951                        VNET_NAME_FMT, VIRTIO_NET_ID,
    1952                        VNET_PCI_CLASS, VNET_N_QUEUES, false);
     1953                       VNET_NAME_FMT, VNET_PCI_SUBSYSTEM_ID,
     1954                       VNET_PCI_CLASS, VNET_N_QUEUES);
    19531955    pThis->pRxQueue  = vpciAddQueue(&pThis->VPCI, 256, vnetQueueReceive,  "RX ");
    19541956    pThis->pTxQueue  = vpciAddQueue(&pThis->VPCI, 256, vnetQueueTransmit, "TX ");

  • trunk/src/VBox/Devices/VirtIO/Virtio.cpp

    r57808 r57809  
    769769 *
    770770 * @param   pci          Reference to PCI device structure.
    771  * @param   uDeviceId    VirtiO Device Id
     771 * @param   uSubsystemId PCI Subsystem Id
    772772 * @param   uClass       Class of PCI device (network, etc)
    773  * @param   fVersion1    Is this a virtio version 1 device?
    774773 * @thread  EMT
    775774 */
    776775static DECLCALLBACK(void) vpciConfigure(PCIDEVICE& pci,
    777                                         uint16_t uDeviceId,
    778                                         uint16_t uClass,
    779                                         bool fVersion1)
     776                                        uint16_t uSubsystemId,
     777                                        uint16_t uClass)
    780778{
    781779    /* Configure PCI Device, assume 32-bit mode ******************************/
    782780    PCIDevSetVendorId(&pci, DEVICE_PCI_VENDOR_ID);
    783     if (fVersion1)
    784         PCIDevSetDeviceId(&pci, DEVICE_PCI_BASE_ID_V1 + uDeviceId);
    785     else
    786         PCIDevSetDeviceId(&pci, DEVICE_PCI_BASE_ID + uDeviceId);
     781    PCIDevSetDeviceId(&pci, DEVICE_PCI_DEVICE_ID);
    787782    vpciCfgSetU16(pci, VBOX_PCI_SUBSYSTEM_VENDOR_ID, DEVICE_PCI_SUBSYSTEM_VENDOR_ID);
    788     if (fVersion1)
    789         vpciCfgSetU16(pci, VBOX_PCI_SUBSYSTEM_ID, DEVICE_PCI_SUBSYSTEM_BASE_ID_V1 + uDeviceId);
    790     else
    791         vpciCfgSetU16(pci, VBOX_PCI_SUBSYSTEM_ID, DEVICE_PCI_SUBSYSTEM_BASE_ID + uDeviceId);
     783    vpciCfgSetU16(pci, VBOX_PCI_SUBSYSTEM_ID, uSubsystemId);
    792784
    793785    /* ABI version, must be equal 0 as of 2.6.30 kernel. */
    794     vpciCfgSetU8( pci, VBOX_PCI_REVISION_ID,          fVersion1 ? 0x01 : 0x00);
     786    vpciCfgSetU8( pci, VBOX_PCI_REVISION_ID,          0x00);
    795787    /* Ethernet adapter */
    796788    vpciCfgSetU8( pci, VBOX_PCI_CLASS_PROG,           0x00);
    … …  
    820812int vpciConstruct(PPDMDEVINS pDevIns, VPCISTATE *pState,
    821813                  int iInstance, const char *pcszNameFmt,
    822                   uint16_t uDeviceId, uint16_t uClass,
    823                   uint32_t nQueues, bool fVersion1)
     814                  uint16_t uSubsystemId, uint16_t uClass,
     815                  uint32_t nQueues)
    824816{
    825817    /* Init handles and log related stuff. */
    … …  
    840832
    841833    /* Set PCI config registers */
    842     vpciConfigure(pState->pciDevice, uDeviceId, uClass, fVersion1);
     834    vpciConfigure(pState->pciDevice, uSubsystemId, uClass);
    843835    /* Register PCI device */
    844836    rc = PDMDevHlpPCIRegister(pDevIns, &pState->pciDevice);

  • trunk/src/VBox/Devices/VirtIO/Virtio.h

    r57808 r57809  
    3333
    3434#define DEVICE_PCI_VENDOR_ID                0x1AF4
    35 #define DEVICE_PCI_BASE_ID                  0x1000
    36 #define DEVICE_PCI_BASE_ID_V1               0x1040
     35#define DEVICE_PCI_DEVICE_ID                0x1000
    3736#define DEVICE_PCI_SUBSYSTEM_VENDOR_ID      0x1AF4
    38 #define DEVICE_PCI_SUBSYSTEM_BASE_ID       1
    39 #define DEVICE_PCI_SUBSYSTEM_BASE_ID_V1    0x40
    4037
    4138#define VIRTIO_MAX_NQUEUES                  3
    … …  
    155152    VIRTIO_NET_ID = 0,
    156153    VIRTIO_BLK_ID = 1,
    157     VIRTIO_GPU_ID = 16,
    158154    VIRTIO_32BIT_HACK = 0x7fffffff
    159155};
    … …  
    264260int   vpciLoadExec(PVPCISTATE pState, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass, uint32_t nQueues);
    265261int   vpciConstruct(PPDMDEVINS pDevIns, VPCISTATE *pState, int iInstance, const char *pcszNameFmt,
    266                     uint16_t uDeviceId, uint16_t uClass, uint32_t nQueues, bool fVersion1);
     262                    uint16_t uSubsystemId, uint16_t uClass, uint32_t nQueues);
    267263int   vpciDestruct(VPCISTATE* pState);
    268264void  vpciRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta);

  • trunk/src/VBox/Devices/build/VBoxDD.cpp

    r57808 r57809  
    9595    if (RT_FAILURE(rc))
    9696        return rc;
    97 #ifdef VBOX_WITH_VIRTIO_GPU
    98     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceVirtioGpu);
    99     if (RT_FAILURE(rc))
    100         return rc;
    101 #endif
    10297    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceVMMDev);
    10398    if (RT_FAILURE(rc))

  • trunk/src/VBox/Devices/build/VBoxDD.h

    r57808 r57809  
    4242extern const PDMDEVREG g_DeviceFloppyController;
    4343extern const PDMDEVREG g_DeviceVga;
    44 #ifdef VBOX_WITH_VIRTIO_GPU
    45 extern const PDMDEVREG g_DeviceVirtioGpu;
    46 #endif
    4744extern const PDMDEVREG g_DeviceVMMDev;
    4845extern const PDMDEVREG g_DevicePCNet;

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp

    r57808 r57809  
    112112UIMenu* UIAction::menu() const
    113113{
    114     return QAction::menu() ? qobject_cast<UIMenu*>(QAction::menu()) : NULL;
     114    return qobject_cast<UIMenu*>(QAction::menu());
    115115}
    116116
    117117UIActionPolymorphic* UIAction::toActionPolymorphic()
    118118{
    119     return this ? qobject_cast<UIActionPolymorphic*>(this) : NULL;
     119    return qobject_cast<UIActionPolymorphic*>(this);
    120120}
    121121
    122122UIActionPolymorphicMenu* UIAction::toActionPolymorphicMenu()
    123123{
    124     return this ? qobject_cast<UIActionPolymorphicMenu*>(this) : NULL;
     124    return qobject_cast<UIActionPolymorphicMenu*>(this);
    125125}
    126126
    … …  
    890890UIActionPoolRuntime* UIActionPool::toRuntime()
    891891{
    892     return this ? qobject_cast<UIActionPoolRuntime*>(this) : NULL;
     892    return qobject_cast<UIActionPoolRuntime*>(this);
    893893}
    894894
    895895UIActionPoolSelector* UIActionPool::toSelector()
    896896{
    897     return this ? qobject_cast<UIActionPoolSelector*>(this) : NULL;
     897    return qobject_cast<UIActionPoolSelector*>(this);
    898898}
    899899
    … …  
    959959{
    960960    /* Make sure menu is valid: */
    961     AssertPtrReturnVoid(sender());
    962961    UIMenu *pMenu = qobject_cast<UIMenu*>(sender());
     962    AssertPtrReturnVoid(pMenu);
    963963    /* Make sure action is valid: */
    964     AssertPtrReturnVoid(pMenu->menuAction());
    965964    UIAction *pAction = qobject_cast<UIAction*>(pMenu->menuAction());
     965    AssertPtrReturnVoid(pAction);
    966966
    967967    /* Determine action index: */

  • trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupStack.cpp

    r57808 r57809  
    314314{
    315315    /* Menu-bar can exist only on QMainWindow sub-class: */
    316     if (pParent)
    317     {
    318         QMainWindow *pMainWindow = qobject_cast<QMainWindow*>(pParent);
    319 
     316    if (QMainWindow *pMainWindow = qobject_cast<QMainWindow*>(pParent))
     317    {
    320318        /* Search for existing menu-bar child: */
    321319        if (QMenuBar *pMenuBar = pMainWindow->findChild<QMenuBar*>())
    … …  
    330328{
    331329    /* Status-bar can exist only on QMainWindow sub-class: */
    332     if (pParent)
    333     {
    334         QMainWindow *pMainWindow = qobject_cast<QMainWindow*>(pParent);
    335 
     330    if (QMainWindow *pMainWindow = qobject_cast<QMainWindow*>(pParent))
     331    {
    336332        /* Search for existing status-bar child: */
    337333        if (QStatusBar *pStatusBar = pMainWindow->findChild<QStatusBar*>())

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

    r57808 r57809  
    210210          ExtensionPacks/VNC/ExtPack-license.rtf \
    211211          ExtensionPacks/VNC/ExtPack-license.txt,) \
    212         postinst-common.sh \
    213         prerm-common.sh \
    214         routines.sh \
    215212        VBoxSysInfo.sh \
    216213        vboxautostart-service.sh \

  • trunk/src/VBox/Installer/linux/install.sh

    r57808 r57809  
    348348    fi
    349349
    350     cp uninstall.sh $INSTALLATION_DIR
     350    cp uninstall.sh routines.sh $INSTALLATION_DIR
     351    echo "routines.sh" >> $CONFIG_DIR/$CONFIG_FILES
    351352    echo "uninstall.sh" >> $CONFIG_DIR/$CONFIG_FILES
    352353

  • trunk/src/VBox/Installer/linux/prerm-common.sh

    r57808 r57809  
    5050remove_init_script vboxweb-service
    5151# Stop kernel module and uninstall runlevel script
    52 stop_init_script vboxdrv 2>/dev/null
     52stop_init_script vboxdrv
    5353delrunlevel vboxdrv
    5454remove_init_script vboxdrv

  • trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

    r57808 r57809  
    171171  mv accessible $RPM_BUILD_ROOT/usr/lib/virtualbox
    172172fi
    173 mv vboxdrv.sh $RPM_BUILD_ROOT/usr/lib/virtualbox
    174 ln -sf /usr/lib/virtualbox/vboxdrv.sh $RPM_BUILD_ROOT/sbin/rcvboxdrv
    175 mv vboxballoonctrl-service.sh $RPM_BUILD_ROOT/usr/lib/virtualbox
    176 ln -sf /usr/lib/virtualbox/vboxballoonctrl-service.sh $RPM_BUILD_ROOT/sbin/rcvboxballoonctrl-service
    177 mv vboxautostart-service.sh $RPM_BUILD_ROOT/usr/lib/virtualbox
    178 ln -sf /usr/lib/virtualbox/vboxautostart-service.sh $RPM_BUILD_ROOT/sbin/rcvboxautostart-service
    179 mv vboxweb-service.sh $RPM_BUILD_ROOT/usr/lib/virtualbox
    180 ln -sf /usr/lib/virtualbox/vboxweb-service.sh $RPM_BUILD_ROOT/sbin/rcvboxweb-service
    181 mv postinst-common.sh $RPM_BUILD_ROOT/usr/lib/virtualbox
    182 mv prerm-common.sh $RPM_BUILD_ROOT/usr/lib/virtualbox
    183 mv routines.sh $RPM_BUILD_ROOT/usr/lib/virtualbox
     173install -D -m 755 vboxdrv.init $RPM_BUILD_ROOT%{_initrddir}/vboxdrv
     174ln -sf %{_initrddir}/vboxdrv $RPM_BUILD_ROOT/sbin/rcvboxdrv
     175install -D -m 755 vboxballoonctrl-service.init $RPM_BUILD_ROOT%{_initrddir}/vboxballoonctrl-service
     176install -D -m 755 vboxautostart-service.init $RPM_BUILD_ROOT%{_initrddir}/vboxautostart-service
     177install -D -m 755 vboxweb-service.init $RPM_BUILD_ROOT%{_initrddir}/vboxweb-service
     178%if %{?rpm_suse:1}%{!?rpm_suse:0}
     179ln -sf ../etc/init.d/vboxballoonctrl-service $RPM_BUILD_ROOT/sbin/rcvboxballoonctrl-service
     180ln -sf ../etc/init.d/vboxautostart-service $RPM_BUILD_ROOT/sbin/rcvboxautostart-service
     181ln -sf ../etc/init.d/vboxweb-service $RPM_BUILD_ROOT/sbin/rcvboxweb-service
     182%endif
    184183ln -s VBox $RPM_BUILD_ROOT/usr/bin/VirtualBox
    185184ln -s VBox $RPM_BUILD_ROOT/usr/bin/virtualbox
    … …  
    205204
    206205%pre
    207 set -x
    208 echo Running pre...
    209206# defaults
    210207[ -r /etc/default/virtualbox ] && . /etc/default/virtualbox
     208
     209# check for active VMs of the installed (old) package
     210VBOXSVC_PID=`pidof VBoxSVC 2>/dev/null || true`
     211if [ -n "$VBOXSVC_PID" ]; then
     212  # executed before the new package is installed!
     213  if [ -f /etc/init.d/vboxballoonctrl-service ]; then
     214    # try graceful termination; terminate the balloon control service first
     215    /etc/init.d/vboxballoonctrl-service stop 2>/dev/null || true
     216  fi
     217  if [ -f /etc/init.d/vboxautostart-service ]; then
     218    # try graceful termination; terminate the autostart service first
     219    /etc/init.d/vboxautostart-service stop 2>/dev/null || true
     220  fi
     221  if [ -f /etc/init.d/vboxweb-service ]; then
     222    # try graceful termination; terminate the webservice first
     223    /etc/init.d/vboxweb-service stop 2>/dev/null || true
     224  fi
     225  # ask the daemon to terminate immediately
     226  kill -USR1 $VBOXSVC_PID
     227  sleep 1
     228  if pidof VBoxSVC > /dev/null 2>&1; then
     229    echo "A copy of VirtualBox is currently running.  Please close it and try again."
     230    echo "Please note that it can take up to ten seconds for VirtualBox (in particular"
     231    echo "the VBoxSVC daemon) to finish running."
     232    exit 1
     233  fi
     234fi
    211235
    212236# check for old installation
    … …  
    222246fi
    223247
    224 # check for active VMs of the installed (old) package
    225 # Execute the installed packages pre-uninstaller if present.
    226 /usr/lib/virtualbox/prerm-common.sh 2>/dev/null
    227 # Stop services from older versions without pre-uninstaller.
    228 /etc/init.d/vboxballoonctrl-service stop 2>/dev/null
    229 /etc/init.d/vboxautostart-service stop 2>/dev/null
    230 /etc/init.d/vboxweb-service stop 2>/dev/null
    231 VBOXSVC_PID=`pidof VBoxSVC 2>/dev/null || true`
    232 if [ -n "$VBOXSVC_PID" ]; then
    233   # ask the daemon to terminate immediately
    234   kill -USR1 $VBOXSVC_PID
    235   sleep 1
    236   if pidof VBoxSVC > /dev/null 2>&1; then
    237     echo "A copy of VirtualBox is currently running.  Please close it and try again."
    238     echo "Please note that it can take up to ten seconds for VirtualBox (in particular"
    239     echo "the VBoxSVC daemon) to finish running."
    240     exit 1
    241   fi
    242 fi
    243 
    244248# XXX remove old modules from previous versions (disable with INSTALL_NO_VBOXDRV=1 in /etc/default/virtualbox)
    245249if [ "$INSTALL_NO_VBOXDRV" != "1" ]; then
    … …  
    252256
    253257%post
    254 set -x
    255 echo Running post...
    256258#include installer-common.sh
    257259
    … …  
    288290# and /dev/vboxdrv and /dev/vboxusb/*/* device nodes
    289291install_device_node_setup root 0600 /usr/share/virtualbox "${usb_group}"
     292%if %{?rpm_redhat:1}%{!?rpm_redhat:0}
     293/sbin/chkconfig --add vboxdrv
     294/sbin/chkconfig --add vboxballoonctrl-service
     295/sbin/chkconfig --add vboxautostart-service
     296/sbin/chkconfig --add vboxweb-service
     297%endif
     298%if %{?rpm_suse:1}%{!?rpm_suse:0}
     299%{fillup_and_insserv -f -y -Y vboxdrv vboxballoonctrl-service vboxautostart-service vboxweb-service}
     300%endif
    290301%if %{?rpm_mdv:1}%{!?rpm_mdv:0}
    291302/sbin/ldconfig
     303%_post_service vboxdrv
     304%_post_service vboxballoonctrl-service
     305%_post_service vboxautostart-service
     306%_post_service vboxweb-service
    292307%update_menus
    293308%endif
    … …  
    320335fi
    321336if [ $BUILD_MODULES -eq 1 ]; then
    322   /sbin/rcvboxdrv setup || true
     337  /etc/init.d/vboxdrv setup || true
    323338else
    324339  if lsmod | grep -q "vboxdrv[^_-]"; then
    325     /sbin/rcvboxdrv stop || true
     340    /etc/init.d/vboxdrv stop || true
    326341  fi
    327342  if [ $REGISTER_MODULES -eq 1 ]; then
    … …  
    331346    fi
    332347  fi
    333 fi
    334 # Install and start the new service scripts.
    335 /usr/lib/virtualbox/prerm-common.sh
    336 /usr/lib/virtualbox/postinst-common.sh /usr/lib/virtualbox --start > /dev/null
     348  /etc/init.d/vboxdrv start > /dev/null
     349fi
     350/etc/init.d/vboxballoonctrl-service start > /dev/null
     351/etc/init.d/vboxautostart-service start > /dev/null
     352/etc/init.d/vboxweb-service start > /dev/null
    337353
    338354
    339355%preun
    340 set -x
    341 echo Running preun...
    342356# $1==0: remove the last version of the package
    343357# $1==1: install the first time
    344358# $1>=2: upgrade
     359%if %{?rpm_suse:1}%{!?rpm_suse:0}
     360%stop_on_removal vboxballoonctrl-service
     361%stop_on_removal vboxautostart-service
     362%stop_on_removal vboxweb-service
     363%endif
     364%if %{?rpm_mdv:1}%{!?rpm_mdv:0}
     365%_preun_service vboxballoonctrl-service
     366%_preun_service vboxautostart-service
     367%_preun_service vboxweb-service
     368%endif
     369%if %{?rpm_redhat:1}%{!?rpm_redhat:0}
    345370if [ "$1" = 0 ]; then
    346   /usr/lib/virtualbox/prerm-common.sh || exit 1
     371  /sbin/service vboxballoonctrl-service stop > /dev/null
     372  /sbin/chkconfig --del vboxballoonctrl-service
     373  /sbin/service vboxautostart-service stop > /dev/null
     374  /sbin/chkconfig --del vboxautostart-service
     375  /sbin/service vboxweb-service stop > /dev/null
     376  /sbin/chkconfig --del vboxweb-service
     377fi
     378%endif
     379
     380if [ "$1" = 0 ]; then
     381  # check for active VMs
     382  VBOXSVC_PID=`pidof VBoxSVC 2>/dev/null || true`
     383  if [ -n "$VBOXSVC_PID" ]; then
     384    kill -USR1 $VBOXSVC_PID
     385    sleep 1
     386    if pidof VBoxSVC > /dev/null 2>&1; then
     387      echo "A copy of VirtualBox is currently running.  Please close it and try again."
     388      echo "Please note that it can take up to ten seconds for VirtualBox (in particular"
     389      echo "the VBoxSVC daemon) to finish running."
     390      exit 1
     391    fi
     392  fi
     393fi
     394%if %{?rpm_suse:1}%{!?rpm_suse:0}
     395%stop_on_removal vboxdrv
     396%endif
     397%if %{?rpm_mdv:1}%{!?rpm_mdv:0}
     398%_preun_service vboxdrv
     399%endif
     400if [ "$1" = 0 ]; then
     401%if %{?rpm_redhat:1}%{!?rpm_redhat:0}
     402  /sbin/service vboxdrv stop > /dev/null
     403  /sbin/chkconfig --del vboxdrv
     404%endif
    347405  rm -f /etc/udev/rules.d/60-vboxdrv.rules
    348406  rm -f /etc/vbox/license_agreed
    … …  
    356414
    357415%postun
    358 set -x
    359 echo Running postun...
     416%if %{?rpm_redhat:1}%{!?rpm_redhat:0}
     417if [ "$1" -ge 1 ]; then
     418  /sbin/service vboxdrv restart > /dev/null 2>&1
     419  /sbin/service vboxballoonctrl-service restart > /dev/null 2>&1
     420  /sbin/service vboxautostart-service restart > /dev/null 2>&1
     421  /sbin/service vboxweb-service restart > /dev/null 2>&1
     422fi
     423%endif
     424%if %{?rpm_suse:1}%{!?rpm_suse:0}
     425%restart_on_update vboxdrv vboxballoonctrl-service vboxautostart-service vboxweb-service
     426%insserv_cleanup
     427%endif
    360428%if %{?rpm_mdv:1}%{!?rpm_mdv:0}
    361429/sbin/ldconfig
    … …  
    379447%doc UserManual*.pdf
    380448%doc %{!?is_ose: VirtualBox*.chm}
     449%{_initrddir}/vboxdrv
     450%{_initrddir}/vboxballoonctrl-service
     451%{_initrddir}/vboxautostart-service
     452%{_initrddir}/vboxweb-service
    381453%{?rpm_suse: %{py_sitedir}/*}
    382454%{!?rpm_suse: %{python_sitelib}/*}
    383455/sbin/rcvboxdrv
    384 /sbin/rcvboxballoonctrl-service
    385 /sbin/rcvboxautostart-service
    386 /sbin/rcvboxweb-service
     456%{?rpm_suse: /sbin/rcvboxballoonctrl-service}
     457%{?rpm_suse: /sbin/rcvboxautostart-service}
     458%{?rpm_suse: /sbin/rcvboxweb-service}
    387459/etc/vbox
    388460/usr/bin/*

  • trunk/src/VBox/Installer/linux/rpm/rules

    r57808 r57809  
    249249            -e "s|%VERSION%|$(VBOX_VERSION_STRING)|g" \
    250250            -e "s|%GROUP%|$(if $(VBOX_WITHOUT_HARDENING),vboxusers,root)|g" \
    251             vboxdrv.sh.in > $(archdir)/vboxdrv.sh
    252         cp vboxballoonctrl-service.sh $(archdir)
    253         cp vboxautostart-service.sh $(archdir)
    254         cp vboxweb-service.sh $(archdir)
     251            vboxdrv.sh.in > $(archdir)/vboxdrv.init
     252        cp vboxballoonctrl-service.sh $(archdir)/vboxballoonctrl-service.init
     253        cp vboxautostart-service.sh $(archdir)/vboxautostart-service.init
     254        cp vboxweb-service.sh $(archdir)/vboxweb-service.init
    255255        cp VBox.sh $(archdir)
    256256        mv rpm/VirtualBox-$(ver) rpm/$(rpmname)

  • trunk/src/VBox/Main/Makefile.kmk

    r57808 r57809  
    6464        $(if $(VBOX_WITH_VMSVGA),VBOX_WITH_VMSVGA,) \
    6565        $(if $(VBOX_WITH_VMSVGA3D),VBOX_WITH_VMSVGA3D,) \
    66         $(if $(VBOX_WITH_VIRTIO_GPU),VBOX_WITH_VIRTIO_GPU,) \
    6766        $(if $(VBOX_WITH_NETFLT),VBOX_WITH_NETFLT,) \
    6867        $(if $(VBOX_WITH_COPYTOGUEST),VBOX_WITH_COPYTOGUEST,) \

  • trunk/src/VBox/Main/src-client/BusAssignmentManager.cpp

    r57808 r57809  
    5656    /* VGA controller */
    5757    {"vga",           0,  2, 0,  0},
    58     {"virtio-gpu",    0, 15, 0,  0},
    5958
    6059    /* VMM device */

  • trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

    r57808 r57809  
    35133513        }
    35143514#endif
    3515 #ifdef VBOX_WITH_VIRTIO_GPU
    3516         PCFGMNODE pDevVirtioGpu = NULL;          /* Virtio GPU device */
    3517         PCFGMNODE pInstVirtioGpu = NULL;
    3518         const char *pszVirtioGpuDevice = "virtio-gpu";
    3519         InsertConfigNode(pDevices,      pszVirtioGpuDevice, &pDevVirtioGpu);
    3520         InsertConfigNode(pDevVirtioGpu, "0", &pInstVirtioGpu);
    3521         hrc = pBusMgr->assignPCIDevice(pszVirtioGpuDevice, pInstVirtioGpu);                 H();
    3522 #endif /* VBOX_WITH_VIRTIO_GPU */
    35233515
    35243516        /* Custom VESA mode list */

  • trunk/src/VBox/Main/src-client/DisplayImpl.cpp

    r57808 r57809  
    13151315            rectFramebuffer.xRight  = rectFramebuffer.xLeft + pFBInfo->w;
    13161316            rectFramebuffer.yBottom = rectFramebuffer.yTop  + pFBInfo->h;
    1317             LogRel2(("%s: Calculated frame-buffer rectangle (%d, %d, %d, %d), screen %u\n", __PRETTY_FUNCTION__,
    1318                     (int)rectFramebuffer.xLeft, (int)rectFramebuffer.yTop,
    1319                     (int)rectFramebuffer.xRight, (int)rectFramebuffer.yBottom,
    1320                     uScreenId
    1321                    ));
    13221317
    13231318            uint32_t cRectVisibleRegion = 0;
    … …  
    13281323                if (displayIntersectRect(&pVisibleRegion[cRectVisibleRegion], &pRect[i], &rectFramebuffer))
    13291324                {
    1330                     LogRel2(("%s: Adding rectangle (%d, %d, %d, %d), screen %u\n", __PRETTY_FUNCTION__,
    1331                             (int)pRect[i].xLeft, (int)pRect[i].yTop, (int)pRect[i].xRight, (int)pRect[i].yBottom,
    1332                             uScreenId
    1333                            ));
    13341325                    pVisibleRegion[cRectVisibleRegion].xLeft -= rectFramebuffer.xLeft;
    13351326                    pVisibleRegion[cRectVisibleRegion].yTop -= rectFramebuffer.yTop;
    … …  
    13391330                    cRectVisibleRegion++;
    13401331                }
    1341                 else
    1342                     LogRel2(("%s: Skipping rectangle (%d, %d, %d, %d), screen %u\n", __PRETTY_FUNCTION__,
    1343                             (int)pRect[i].xLeft, (int)pRect[i].yTop, (int)pRect[i].xRight, (int)pRect[i].yBottom,
    1344                             uScreenId
    1345                            ));
    13461332            }
    13471333            pFBInfo->pFramebuffer->SetVisibleRegion((BYTE *)pVisibleRegion, cRectVisibleRegion);

  • trunk/src/VBox/Runtime/common/log/log.cpp

    r57808 r57809  
    28722872     */
    28732873#ifndef IN_RC
    2874     if (0)
    2875 //    if (RT_UNLIKELY(   (pLogger->fFlags & RTLOGFLAGS_RESTRICT_GROUPS)
    2876 //                    && iGroup < pLogger->cGroups
    2877 //                    && (pLogger->afGroups[iGroup] & RTLOGGRPFLAGS_RESTRICT)
    2878 //                    && ++pLogger->pInt->pacEntriesPerGroup[iGroup] >= pLogger->pInt->cMaxEntriesPerGroup ))
     2874    if (RT_UNLIKELY(   (pLogger->fFlags & RTLOGFLAGS_RESTRICT_GROUPS)
     2875                    && iGroup < pLogger->cGroups
     2876                    && (pLogger->afGroups[iGroup] & RTLOGGRPFLAGS_RESTRICT)
     2877                    && ++pLogger->pInt->pacEntriesPerGroup[iGroup] >= pLogger->pInt->cMaxEntriesPerGroup ))
    28792878    {
    28802879        uint32_t cEntries = pLogger->pInt->pacEntriesPerGroup[iGroup];

  • trunk/src/bldprogs/Makefile.kmk

    r57808 r57809  
    6262endif
    6363
    64 ifeq ($(KBUILD_TARGET),win)
    65  BLDPROGS += VBoxPeSetVersion
    66 endif
     64BLDPROGS.win += VBoxPeSetVersion
    6765VBoxPeSetVersion_TEMPLATE = VBoxBldProg
    6866VBoxPeSetVersion_SOURCES  = VBoxPeSetVersion.cpp

  • trunk/src/bldprogs/VBoxPeSetVersion.cpp

    r57808 r57809  
    2020*   Header Files                                                                                                                 *
    2121*********************************************************************************************************************************/
    22 #ifdef RT_OS_WINDOWS
    23 # include <Windows.h>
    24 #else
    25 # include <iprt/stdint.h>
    26 
    27 typedef struct _IMAGE_DOS_HEADER
    28 {
    29   uint16_t e_magic;
    30   uint16_t e_cblp;
    31   uint16_t e_cp;
    32   uint16_t e_crlc;
    33   uint16_t e_cparhdr;
    34   uint16_t e_minalloc;
    35   uint16_t e_maxalloc;
    36   uint16_t e_ss;
    37   uint16_t e_sp;
    38   uint16_t e_csum;
    39   uint16_t e_ip;
    40   uint16_t e_cs;
    41   uint16_t e_lfarlc;
    42   uint16_t e_ovno;
    43   uint16_t e_res[4];
    44   uint16_t e_oemid;
    45   uint16_t e_oeminfo;
    46   uint16_t e_res2[10];
    47   int32_t e_lfanew;
    48 } IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER;
    49 
    50 typedef struct _IMAGE_FILE_HEADER
    51 {
    52     uint16_t Machine;
    53     uint16_t NumberOfSections;
    54     uint32_t TimeDateStamp;
    55     uint32_t PointerToSymbolTable;
    56     uint32_t NumberOfSymbols;
    57     uint16_t SizeOfOptionalHeader;
    58     uint16_t Characteristics;
    59 } IMAGE_FILE_HEADER,*PIMAGE_FILE_HEADER;
    60 
    61 typedef struct _IMAGE_DATA_DIRECTORY
    62 {
    63     uint32_t VirtualAddress;
    64     uint32_t Size;
    65 } IMAGE_DATA_DIRECTORY,*PIMAGE_DATA_DIRECTORY;
    66 
    67 # define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16
    68 
    69 typedef struct _IMAGE_OPTIONAL_HEADER
    70 {
    71     uint16_t Magic;
    72     uint8_t MajorLinkerVersion;
    73     uint8_t MinorLinkerVersion;
    74     uint32_t SizeOfCode;
    75     uint32_t SizeOfInitializedData;
    76     uint32_t SizeOfUninitializedData;
    77     uint32_t AddressOfEntryPoint;
    78     uint32_t BaseOfCode;
    79     uint32_t BaseOfData;
    80     uint32_t ImageBase;
    81     uint32_t SectionAlignment;
    82     uint32_t FileAlignment;
    83     uint16_t MajorOperatingSystemVersion;
    84     uint16_t MinorOperatingSystemVersion;
    85     uint16_t MajorImageVersion;
    86     uint16_t MinorImageVersion;
    87     uint16_t MajorSubsystemVersion;
    88     uint16_t MinorSubsystemVersion;
    89     uint32_t Win32VersionValue;
    90     uint32_t SizeOfImage;
    91     uint32_t SizeOfHeaders;
    92     uint32_t CheckSum;
    93     uint16_t Subsystem;
    94     uint16_t DllCharacteristics;
    95     uint32_t SizeOfStackReserve;
    96     uint32_t SizeOfStackCommit;
    97     uint32_t SizeOfHeapReserve;
    98     uint32_t SizeOfHeapCommit;
    99     uint32_t LoaderFlags;
    100     uint32_t NumberOfRvaAndSizes;
    101     IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES];
    102 } IMAGE_OPTIONAL_HEADER32,*PIMAGE_OPTIONAL_HEADER32;
    103 
    104 typedef struct _IMAGE_NT_HEADERS
    105 {
    106     uint32_t Signature;
    107     IMAGE_FILE_HEADER FileHeader;
    108     IMAGE_OPTIONAL_HEADER32 OptionalHeader;
    109 } IMAGE_NT_HEADERS32,*PIMAGE_NT_HEADERS32;
    110 
    111 # define IMAGE_NT_SIGNATURE 0x00004550
    112 # define IMAGE_NT_OPTIONAL_HDR32_MAGIC 0x10b
    113 # define IMAGE_FILE_MACHINE_I386 0x014c
    114 
    115 #endif
     22#include <Windows.h>
    11623#include <stdio.h>
    11724#include <string.h>
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