Changeset 14664 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 26, 2008 9:19:35 PM (16 years ago)

Author:

vboxsync

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

39973

Message:

Main & FEs: 3002: GUI/Main enhancements for 64 bits guests implemented.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManage.cpp (modified) (4 diffs)
• VirtualBox/ui/VBoxNewVMWzd.ui.h (modified) (2 diffs)
• VirtualBox4/src/VBoxGlobal.cpp (modified) (2 diffs)
• VirtualBox4/src/VBoxNewVMWzd.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -318 +318 @@
     {
         RTPrintf("VBoxManage createvm         -name <name>\n"
+                 "                            [-ostype <ostype>]\n"
                  "                            [-register]\n"
                  "                            [-basefolder <path> | -settingsfile <path>]\n"
@@ -1345 +1346 @@
     Bstr settingsFile;
     Bstr name;
+    Bstr osTypeId;
     RTUUID id;
     bool fRegister = false;
@@ -1372 +1374 @@
             name = argv[i];
         }
+        else if (strcmp(argv[i], "-ostype") == 0)
+        {
+            if (argc <= i + 1)
+                return errorArgument("Missing argument to '%s'", argv[i]);
+            i++;
+            osTypeId = argv[i];
+        }
         else if (strcmp(argv[i], "-uuid") == 0)
         {
@@ -1399 +1408 @@
         if (!settingsFile)
             CHECK_ERROR_BREAK(virtualBox,
-                CreateMachine(baseFolder, name, Guid(id), machine.asOutParam()));
+                CreateMachine(name, osTypeId, baseFolder, Guid(id), machine.asOutParam()));
         else
             CHECK_ERROR_BREAK(virtualBox,
-                CreateLegacyMachine(settingsFile, name, Guid(id), machine.asOutParam()));
+                CreateLegacyMachine(name, osTypeId, settingsFile, Guid(id), machine.asOutParam()));
 
         CHECK_ERROR_BREAK(machine, SaveSettings());

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxNewVMWzd.ui.h

@@ -291 +291 @@
     CVirtualBox vbox = vboxGlobal().virtualBox();
 
+    /* OS type */
+    CGuestOSType type = vboxGlobal().vmGuestOSType (cbOS->currentItem());
+    AssertMsg (!type.isNull(), ("vmGuestOSType() must return non-null type"));
+    QString typeId = type.GetId();
+
     /* create a machine with the default settings file location */
     if (mMachine.isNull())
     {
-        mMachine = vbox.CreateMachine (QString(), leName->text(), QUuid());
+        mMachine = vbox.CreateMachine (leName->text(), typeId, QString::null, QUuid());
         if (!vbox.isOk())
         {
@@ -308 +313 @@
     }
 
-    /* name is set in CreateMachine() */
-
-    /* OS type */
-    CGuestOSType type = vboxGlobal().vmGuestOSType (cbOS->currentItem());
-    AssertMsg (!type.isNull(), ("vmGuestOSType() must return non-null type"));
-    QString typeId = type.GetId();
-    mMachine.SetOSTypeId (typeId);
-
-    if (typeId == "os2warp3"  ||
-        typeId == "os2warp4"  ||
-        typeId == "os2warp45" ||
-        typeId == "ecs")
-        mMachine.SetHWVirtExEnabled (KTSBool_True);
-
     /* RAM size */
     mMachine.SetMemorySize (slRAM->value());
-
-    /* add one network adapter (NAT) by default */
-    {
-        CNetworkAdapter cadapter = mMachine.GetNetworkAdapter (0);
-#ifdef VBOX_WITH_E1000
-        /* Default to e1k on solaris */
-        if (typeId == "solaris" ||
-            typeId == "opensolaris")
-            cadapter.SetAdapterType (KNetworkAdapterType_I82540EM);
-#endif /* VBOX_WITH_E1000 */
-        cadapter.SetEnabled (true);
-        cadapter.AttachToNAT();
-        cadapter.SetMACAddress (QString::null);
-        cadapter.SetCableConnected (true);
-
-    }
 
     /* register the VM prior to attaching hard disks */

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp

@@ -5262 +5262 @@
     {
         CGuestOSTypeEnumerator en = coll.Enumerate();
+
+        /* Here we assume 'Other' type is always the first, so we
+         * remember it and will append it to the list when finish */
+        CGuestOSType otherType (en.GetNext());
+        QString otherFamilyId (otherType.GetFamilyId());
+
+        /* Fill the lists with all the available OS Types except
+         * the 'Other' one type, it will be appended. */
         while (en.HasMore())
         {
@@ -5273 +5281 @@
             mTypes [mFamilyIDs.indexOf (familyId)].append (os);
         }
+
+        /* Append the 'Other' OS Type to the end of list */
+        if (!mFamilyIDs.contains (otherFamilyId))
+        {
+            mFamilyIDs << otherFamilyId;
+            mTypes << QList <CGuestOSType> ();
+        }
+        mTypes [mFamilyIDs.indexOf (otherFamilyId)].append (otherType);
     }
 

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxNewVMWzd.cpp

@@ -303 +303 @@
     CVirtualBox vbox = vboxGlobal().virtualBox();
 
+    /* OS type */
+    CGuestOSType type = mOSTypeSelector->type();
+    AssertMsg (!type.isNull(), ("vmGuestOSType() must return non-null type"));
+    QString typeId = type.GetId();
+
     /* Create a machine with the default settings file location */
     if (mMachine.isNull())
     {
-        mMachine = vbox.CreateMachine (QString(), mLeName->text(), QUuid());
+        mMachine = vbox.CreateMachine (mLeName->text(), typeId, QString::null, QUuid());
         if (!vbox.isOk())
         {
@@ -320 +325 @@
     }
 
-    /* OS type */
-    CGuestOSType type = mOSTypeSelector->type();
-    AssertMsg (!type.isNull(), ("vmGuestOSType() must return non-null type"));
-    QString typeId = type.GetId();
-    mMachine.SetOSTypeId (typeId);
-
-    /* Dsen: move it to Main when implementing 3002: GUI/Main enhancements for 64 bits guests */
-    if (typeId == "os2warp3"  ||
-        typeId == "os2warp4"  ||
-        typeId == "os2warp45" ||
-        typeId == "ecs")
-        mMachine.SetHWVirtExEnabled (KTSBool_True);
-    /* Dsen: move it to Main when implementing 3002: GUI/Main enhancements for 64 bits guests */
-
     /* RAM size */
     mMachine.SetMemorySize (mSlRAM->value());
@@ -340 +331 @@
     mMachine.SetVRAMSize (qMax (type.GetRecommendedVRAM(),
                                 (ULONG) (VBoxGlobal::requiredVideoMemory() / _1M)));
-
-    /* Add one network adapter (NAT) by default */
-    {
-        CNetworkAdapter cadapter = mMachine.GetNetworkAdapter (0);
-#ifdef VBOX_WITH_E1000
-        /* Default to e1k on solaris */
-        if (typeId == "solaris" ||
-            typeId == "opensolaris")
-            cadapter.SetAdapterType (KNetworkAdapterType_I82540EM);
-#endif /* VBOX_WITH_E1000 */
-        cadapter.SetEnabled (true);
-        cadapter.AttachToNAT();
-        cadapter.SetMACAddress (QString::null);
-        cadapter.SetCableConnected (true);
-    }
 
     /* Register the VM prior to attaching hard disks */