VirtualBox

Changeset 94478 in vbox


Ignore:
Timestamp:
Apr 5, 2022 7:57:15 PM (3 years ago)
Author:
vboxsync
Message:

VBox/ostypes.h+Main/Global,Appliance+FE/Qt: Some Solaris OStype cleanup:
the Solaris 10 10/09 OStype was accidentally entwined with OpenSolaris in
the Global::sOSTypes[] table so separate them into a Solaris 10U8
(10/09) OS type and an OpenSolaris/Illumos/OpenIndiana OS type. Also
update the GUI icon and regex matching for these and other Solaris
versions.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/ostypes.h

    r94460 r94478  
    216216    VBOXOSTYPE_NetBSD_x64       = 0x62100,
    217217    VBOXOSTYPE_Netware          = 0x70000,
    218     VBOXOSTYPE_Solaris          = 0x80000,
    219     VBOXOSTYPE_Solaris_x64      = 0x80100,
     218    VBOXOSTYPE_Solaris          = 0x80000,  // Solaris 10U7 (5/09) and earlier
     219    VBOXOSTYPE_Solaris_x64      = 0x80100,  // Solaris 10U7 (5/09) and earlier
     220    VBOXOSTYPE_Solaris10U8_or_later     = 0x80001,
     221    VBOXOSTYPE_Solaris10U8_or_later_x64 = 0x80101,
    220222    VBOXOSTYPE_OpenSolaris      = 0x81000,
    221223    VBOXOSTYPE_OpenSolaris_x64  = 0x81100,

  • trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

    r94460 r94478  
    275275        case VBOXOSTYPE_Netware:                          pszOs = "Netware";        break;
    276276        case VBOXOSTYPE_Solaris:                          pszOs = "Solaris";        break;
     277        case VBOXOSTYPE_Solaris10U8_or_later:             pszOs = "Solaris 10";     break;
    277278        case VBOXOSTYPE_OpenSolaris:                      pszOs = "OpenSolaris";    break;
    278279        case VBOXOSTYPE_Solaris11_x64 & ~VBOXOSTYPE_x64:  pszOs = "Solaris 11";     break;

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

    r94460 r94478  
    491491    m_guestOSTypeIconNames.insert("Solaris",         ":/os_solaris.png");
    492492    m_guestOSTypeIconNames.insert("Solaris_64",      ":/os_solaris_64.png");
     493    m_guestOSTypeIconNames.insert("Solaris10U8_or_later",    ":/os_solaris.png");
     494    m_guestOSTypeIconNames.insert("Solaris10U8_or_later_64", ":/os_solaris_64.png");
    493495    m_guestOSTypeIconNames.insert("OpenSolaris",     ":/os_oraclesolaris.png");
    494496    m_guestOSTypeIconNames.insert("OpenSolaris_64",  ":/os_oraclesolaris_64.png");

  • trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp

    r94460 r94478  
    8383
    8484    /* Solaris: */
    85     { QRegularExpression("Sol.*11",                                                  QRegularExpression::CaseInsensitiveOption), "Solaris11_64" },
    86     { QRegularExpression("((Op.*Sol)|(os20[01][0-9])|(Sol.*10)|(India)|(Neva)).*64", QRegularExpression::CaseInsensitiveOption), "OpenSolaris_64" },
    87     { QRegularExpression("((Op.*Sol)|(os20[01][0-9])|(Sol.*10)|(India)|(Neva)).*32", QRegularExpression::CaseInsensitiveOption), "OpenSolaris" },
    88     { QRegularExpression("Sol.*64",                                                  QRegularExpression::CaseInsensitiveOption), "Solaris_64" },
    89     { QRegularExpression("Sol.*32",                                                  QRegularExpression::CaseInsensitiveOption), "Solaris" },
     85    { QRegularExpression("((Op.*Sol)|(os20[01][0-9])|(India)|(Illum)|(Neva)).*64",   QRegularExpression::CaseInsensitiveOption), "OpenSolaris_64" },
     86    { QRegularExpression("((Op.*Sol)|(os20[01][0-9])|(India)|(Illum)|(Neva)).*32",   QRegularExpression::CaseInsensitiveOption), "OpenSolaris" },
     87    { QRegularExpression("(Sol.*10.*(10/09)|(9/10)|(8/11)|(1/13)).*64",              QRegularExpression::CaseInsensitiveOption), "Solaris10U8_or_later_64" },
     88    { QRegularExpression("(Sol.*10.*(10/09)|(9/10)|(8/11)|(1/13)).*32",              QRegularExpression::CaseInsensitiveOption), "Solaris10U8_or_later" },
     89    { QRegularExpression("(Sol.*10.*(U[89])|(U1[01])).*64",                          QRegularExpression::CaseInsensitiveOption), "Solaris10U8_or_later_64" },
     90    { QRegularExpression("(Sol.*10.*(U[89])|(U1[01])).*32",                          QRegularExpression::CaseInsensitiveOption), "Solaris10U8_or_later" },
     91    { QRegularExpression("(Sol.*10.*(1/06)|(6/06)|(11/06)|(8/07)|(5/08)|(10/08)|(5/09)).*64",  QRegularExpression::CaseInsensitiveOption), "Solaris_64" }, // Solaris 10U7 (5/09) or earlier
     92    { QRegularExpression("(Sol.*10.*(1/06)|(6/06)|(11/06)|(8/07)|(5/08)|(10/08)|(5/09)).*32",  QRegularExpression::CaseInsensitiveOption), "Solaris" }, // Solaris 10U7 (5/09) or earlier
     93    { QRegularExpression("((Sol.*10.*U[1-7])|(Sol.*10)).*64",                        QRegularExpression::CaseInsensitiveOption), "Solaris_64" }, // Solaris 10U7 (5/09) or earlier
     94    { QRegularExpression("((Sol.*10.*U[1-7])|(Sol.*10)).*32",                        QRegularExpression::CaseInsensitiveOption), "Solaris" }, // Solaris 10U7 (5/09) or earlier
     95    { QRegularExpression("((Sol.*11)|(Sol.*)).*64",                                  QRegularExpression::CaseInsensitiveOption), "Solaris11_64" },
    9096
    9197    /* OS/2: */
    … …  
    218224    { QRegularExpression("Xa.*64",                            QRegularExpression::CaseInsensitiveOption), "Xandros_64" },
    219225    { QRegularExpression("Xa.*32",                            QRegularExpression::CaseInsensitiveOption), "Xandros" },
    220     { QRegularExpression("((Or)|(oel)|(ol)).*64",             QRegularExpression::CaseInsensitiveOption), "Oracle_64" },
    221     { QRegularExpression("((Or)|(oel)|(ol)).*32",             QRegularExpression::CaseInsensitiveOption), "Oracle" },
     226    { QRegularExpression("((Or)|(oel)|(^ol)).*64",            QRegularExpression::CaseInsensitiveOption), "Oracle_64" },
     227    { QRegularExpression("((Or)|(oel)|(^ol)).*32",            QRegularExpression::CaseInsensitiveOption), "Oracle" },
    222228    { QRegularExpression("Knoppix",                           QRegularExpression::CaseInsensitiveOption), "Linux26" },
    223229    { QRegularExpression("Dsl",                               QRegularExpression::CaseInsensitiveOption), "Linux24" },

  • trunk/src/VBox/Main/src-all/Global.cpp

    r94460 r94478  
    410410      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    411411
    412     { "Solaris", "Solaris",           "OpenSolaris",        "Oracle Solaris 10 10/09 and later (32-bit)",
     412    { "Solaris", "Solaris",           "Solaris10U8_or_later",        "Oracle Solaris 10 10/09 and later (32-bit)",
     413      VBOXOSTYPE_Solaris10U8_or_later,     VBOXOSHINT_USBTABLET,
     414      1, 1024,  16, 32 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
     415      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
     416
     417    { "Solaris", "Solaris",           "Solaris10U8_or_later_64",     "Oracle Solaris 10 10/09 and later (64-bit)",
     418      VBOXOSTYPE_Solaris10U8_or_later_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
     419      1, 2048,  16, 32 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
     420      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
     421
     422    { "Solaris", "Solaris",           "Solaris11_64",       "Oracle Solaris 11 (64-bit)",
     423      VBOXOSTYPE_Solaris11_x64,   VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_RTCUTC,
     424      1, 4096,  16, 32 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
     425      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
     426
     427    { "Solaris", "Solaris",           "OpenSolaris",        "OpenSolaris / Illumos / OpenIndiana (32-bit)",
    413428      VBOXOSTYPE_OpenSolaris,     VBOXOSHINT_USBTABLET,
    414429      1, 1024,  16, 32 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
    415430      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    416431
    417     { "Solaris", "Solaris",           "OpenSolaris_64",     "Oracle Solaris 10 10/09 and later (64-bit)",
     432    { "Solaris", "Solaris",           "OpenSolaris_64",     "OpenSolaris / Illumos / OpenIndiana (64-bit)",
    418433      VBOXOSTYPE_OpenSolaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
    419434      1, 2048,  16, 32 * _1G64, GraphicsControllerType_VBoxVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
    420       StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    421 
    422     { "Solaris", "Solaris",           "Solaris11_64",       "Oracle Solaris 11 (64-bit)",
    423       VBOXOSTYPE_Solaris11_x64,   VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_RTCUTC,
    424       1, 4096,  16, 32 * _1G64, GraphicsControllerType_VMSVGA, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
    425435      StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, IommuType_None, AudioControllerType_AC97, AudioCodecType_STAC9700  },
    426436

  • trunk/src/VBox/Main/src-server/ApplianceImpl.cpp

    r94460 r94478  
    9898    { ovf::CIMOSType_CIMOS_NovellOES,                            VBOXOSTYPE_Netware },
    9999    { ovf::CIMOSType_CIMOS_Solaris,                              VBOXOSTYPE_Solaris },
     100    { ovf::CIMOSType_CIMOS_Solaris_64,                           VBOXOSTYPE_Solaris_x64 },
     101    { ovf::CIMOSType_CIMOS_Solaris,                              VBOXOSTYPE_Solaris10U8_or_later },
     102    { ovf::CIMOSType_CIMOS_Solaris_64,                           VBOXOSTYPE_Solaris10U8_or_later_x64 },
    100103    { ovf::CIMOSType_CIMOS_SunOS,                                VBOXOSTYPE_Solaris },
    101104    { ovf::CIMOSType_CIMOS_FreeBSD,                              VBOXOSTYPE_FreeBSD },
    … …  
    141144    { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64,             VBOXOSTYPE_RedHat7_x64 }, // 64-bit only
    142145    { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64,             VBOXOSTYPE_RedHat8_x64 }, // 64-bit only
    143     { ovf::CIMOSType_CIMOS_Solaris_64,                           VBOXOSTYPE_Solaris_x64 },
    144146    { ovf::CIMOSType_CIMOS_SUSE,                                 VBOXOSTYPE_OpenSUSE },
    145147    { ovf::CIMOSType_CIMOS_SLES,                                 VBOXOSTYPE_SUSE_LE },
Note: See TracChangeset for help on using the changeset viewer.

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