Changeset 7906 in vbox for trunk/src/VBox/Additions

Timestamp:

Apr 11, 2008 11:24:36 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

29534

Message:

Solaris installer: host and guest side fixes for Solaris 10, Indiana DP2.

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuest/VBoxGuest-solaris.c (modified) (1 diff)
• solaris/Installer/postinstall.sh (modified) (1 diff)
• solaris/Installer/vboxguest.sh (modified) (6 diffs)
• solaris/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c

@@ -292 +292 @@
                 {
                     /*
-                     * Check vendor and device ID.
+                     * Map the register address space.
                      */
-                    uint16_t uVendorID = pci_config_get16(PciHandle, PCI_CONF_VENID);
-                    uint16_t uDeviceID = pci_config_get16(PciHandle, PCI_CONF_DEVID);
-                    if (   uVendorID == VMMDEV_VENDORID
-                        && uDeviceID == VMMDEV_DEVICEID)
+                    caddr_t baseAddr;
+                    ddi_device_acc_attr_t deviceAttr;
+                    deviceAttr.devacc_attr_version = DDI_DEVICE_ATTR_V0;
+                    deviceAttr.devacc_attr_endian_flags = DDI_NEVERSWAP_ACC;
+                    deviceAttr.devacc_attr_dataorder = DDI_STRICTORDER_ACC;
+                    deviceAttr.devacc_attr_access = DDI_DEFAULT_ACC;
+                    rc = ddi_regs_map_setup(pDip, 1, &baseAddr, 0, 0, &deviceAttr, &pState->PciIOHandle);
+                    if (rc == DDI_SUCCESS)
                     {
                         /*
-                         * Verify PCI class of the device (a bit paranoid).
+                         * Read size of the MMIO region.
                          */
-                        uint8_t uClass = pci_config_get8(PciHandle, PCI_CONF_BASCLASS);
-                        uint8_t uSubClass = pci_config_get8(PciHandle, PCI_CONF_SUBCLASS);
-                        if (   uClass == PCI_CLASS_PERIPH
-                            && uSubClass == PCI_PERIPH_OTHER)
+                        pState->uIOPortBase = (uintptr_t)baseAddr;
+                        rc = ddi_dev_regsize(pDip, 2, &pState->cbMMIO);
+                        if (rc == DDI_SUCCESS)
                         {
-                            /*
-                             * Map the register address space.
-                             */
-                            caddr_t baseAddr;
-                            ddi_device_acc_attr_t deviceAttr;
-                            deviceAttr.devacc_attr_version = DDI_DEVICE_ATTR_V0;
-                            deviceAttr.devacc_attr_endian_flags = DDI_NEVERSWAP_ACC;
-                            deviceAttr.devacc_attr_dataorder = DDI_STRICTORDER_ACC;
-                            deviceAttr.devacc_attr_access = DDI_DEFAULT_ACC;
-                            rc = ddi_regs_map_setup(pDip, 1, &baseAddr, 0, 0, &deviceAttr, &pState->PciIOHandle);
+                            rc = ddi_regs_map_setup(pDip, 2, &pState->pMMIOBase, 0, pState->cbMMIO, &deviceAttr,
+                                        &pState->PciMMIOHandle);
                             if (rc == DDI_SUCCESS)
                             {
                                 /*
-                                 * Read size of the MMIO region.
+                                 * Add IRQ of VMMDev.
                                  */
-                                pState->uIOPortBase = (uintptr_t)baseAddr;
-                                rc = ddi_dev_regsize(pDip, 2, &pState->cbMMIO);
+                                rc = VBoxGuestSolarisAddIRQ(pDip, pState);
                                 if (rc == DDI_SUCCESS)
                                 {
-                                    rc = ddi_regs_map_setup(pDip, 2, &pState->pMMIOBase, 0, pState->cbMMIO, &deviceAttr,
-                                                &pState->PciMMIOHandle);
-                                    if (rc == DDI_SUCCESS)
+                                    /*
+                                     * Call the common device extension initializer.
+                                     */
+                                    rc = VBoxGuestInitDevExt(&g_DevExt, pState->uIOPortBase, pState->pMMIOBase,
+                                                pState->cbMMIO, VBOXOSTYPE_Solaris);
+                                    if (RT_SUCCESS(rc))
                                     {
-                                        /*
-                                         * Add IRQ of VMMDev.
-                                         */
-                                        rc = VBoxGuestSolarisAddIRQ(pDip, pState);
+                                        rc = ddi_create_minor_node(pDip, DEVICE_NAME, S_IFCHR, instance, DDI_PSEUDO, 0);
                                         if (rc == DDI_SUCCESS)
                                         {
-                                            /*
-                                             * Call the common device extension initializer.
-                                             */
-                                            rc = VBoxGuestInitDevExt(&g_DevExt, pState->uIOPortBase, pState->pMMIOBase,
-                                                        pState->cbMMIO, VBOXOSTYPE_Solaris);
-                                            if (RT_SUCCESS(rc))
-                                            {
-                                                rc = ddi_create_minor_node(pDip, DEVICE_NAME, S_IFCHR, instance, DDI_PSEUDO, 0);
-                                                if (rc == DDI_SUCCESS)
-                                                {
-                                                    g_pDip = pDip;
-                                                    ddi_set_driver_private(pDip, pState);
-                                                    pci_config_teardown(&PciHandle);
-                                                    ddi_report_dev(pDip);
-                                                    return DDI_SUCCESS;
-                                                }
-
-                                                LogRel((DEVICE_NAME ":ddi_create_minor_node failed.\n"));
-                                            }
-                                            else
-                                                LogRel((DEVICE_NAME ":VBoxGuestInitDevExt failed.\n"));
-                                            VBoxGuestSolarisRemoveIRQ(pDip, pState);
+                                            g_pDip = pDip;
+                                            ddi_set_driver_private(pDip, pState);
+                                            pci_config_teardown(&PciHandle);
+                                            ddi_report_dev(pDip);
+                                            return DDI_SUCCESS;
                                         }
-                                        else
-                                            LogRel((DEVICE_NAME ":VBoxGuestSolarisAddIRQ failed.\n"));
-                                        ddi_regs_map_free(&pState->PciMMIOHandle);
+
+                                        LogRel((DEVICE_NAME ":ddi_create_minor_node failed.\n"));
                                     }
                                     else
-                                        LogRel((DEVICE_NAME ":ddi_regs_map_setup for MMIO region failed.\n"));
+                                        LogRel((DEVICE_NAME ":VBoxGuestInitDevExt failed.\n"));
+                                    VBoxGuestSolarisRemoveIRQ(pDip, pState);
                                 }
                                 else
-                                    LogRel((DEVICE_NAME ":ddi_dev_regsize for MMIO region failed.\n"));
-                                ddi_regs_map_free(&pState->PciIOHandle);
+                                    LogRel((DEVICE_NAME ":VBoxGuestSolarisAddIRQ failed.\n"));
+                                ddi_regs_map_free(&pState->PciMMIOHandle);
                             }
                             else
-                                LogRel((DEVICE_NAME ":ddi_regs_map_setup for IOport failed.\n"));
+                                LogRel((DEVICE_NAME ":ddi_regs_map_setup for MMIO region failed.\n"));
                         }
                         else
-                            LogRel((DEVICE_NAME ":PCI class/sub-class does not match.\n"));
+                            LogRel((DEVICE_NAME ":ddi_dev_regsize for MMIO region failed.\n"));
+                        ddi_regs_map_free(&pState->PciIOHandle);
                     }
                     else
-                        LogRel((DEVICE_NAME ":PCI vendorID, deviceID does not match.\n"));
+                        LogRel((DEVICE_NAME ":ddi_regs_map_setup for IOport failed.\n"));
                     pci_config_teardown(&PciHandle);
                 }

trunk/src/VBox/Additions/solaris/Installer/postinstall.sh

@@ -84 +84 @@
 
     # Some distros like Indiana have no xorg.conf, deal with this
-    if ! (test -f '/etc/X11/xorg.conf' -o -f '/etc/X11/.xorg.conf'); then
+    if test ! -f '/etc/X11/xorg.conf' && test ! -f '/etc/X11/.xorg.conf'; then
         mv -f $vboxadditions_path/solaris_xorg.conf /etc/X11/.xorg.conf
     fi

trunk/src/VBox/Additions/solaris/Installer/vboxguest.sh

@@ -1 @@
-#!/bin/bash
+#!/bin/sh
 # innotek VirtualBox
 # VirtualBox Guest Additions kernel module control script for Solaris.
@@ -62 +62 @@
 check_root()
 {
-    if test `id -u` -ne 0; then
+    if test `/usr/xpg4/bin/id -u` -ne 0; then
         abort "This program must be run with administrator privileges.  Aborting"
     fi
 }
 
-start()
+start_module()
 {
     if module_loaded; then
@@ -73 +73 @@
     else
         /usr/sbin/add_drv -i'pci80ee,cafe' -m'* 0666 root sys' vboxguest
-        if ! module_loaded; then
+        if test ! module_loaded; then
             abort "Failed to load vboxguest."
         elif test -c "/devices/pci@0,0/pci80ee,cafe@4:vboxguest"; then
@@ -84 +84 @@
 }
 
-stop()
+stop_module()
 {
     if module_loaded; then
@@ -94 +94 @@
 }
 
-restart()
+restart_module()
 {
-    stop
+    stop_module
     sync
-    start
+    start_module
     return 0
 }
 
-status()
+status_module()
 {
     if module_loaded; then
@@ -121 +121 @@
 case "$1" in
 start)
-    start
+    start_module
     ;;
 stop)
-    stop
+    stop_module
     ;;
 restart)
-    restart
+    restart_module
     ;;
 status)
-    status
+    status_module
     ;;
 *)

trunk/src/VBox/Additions/solaris/Makefile.kmk

@@ -101 +101 @@
         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vboxdevlink.sed                  $(SOLARISINSTDIR)/etc/devlink.tab
         $(call MSG_L1,Creating install package: $@)
-        $(QUIET)$(SOLARISINSTDIR)/makepackage.sh $(SOLARISINSTDIR) $(PKGFILENAME)
+        $(QUIET)$(SOLARISINSTDIR)/makepackage.sh $(SOLARISINSTDIR) $(PKGFILENAME) 1>/dev/null 2>/dev/null
         $(QUIET)$(INSTALL) -m 0644 $(SOLARISINSTDIR)/$(PKGFILENAME) $(PATH_BIN)/additions/$(PKGFILENAME)