Changeset 7442 in vbox for trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsDlg.ui.h

Timestamp:

Mar 13, 2008 2:33:18 PM (17 years ago)

Author:

vboxsync

Message:

Main: Applied SATA changes from #2406. Increased XML settings version format from 1.2 to 1.3.pre.

File:

• trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsDlg.ui.h (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox4/ui/VBoxVMSettingsDlg.ui.h

@@ -1718 +1718 @@
         struct
         {
-            KDiskControllerType ctl;
+            KStorageBus bus;
+            LONG channel;
             LONG dev;
             struct {
@@ -1729 +1730 @@
         diskSet[] =
         {
-            { KDiskControllerType_IDE0, 0, {grbHDA, cbHDA, txHDA, &uuidHDA} },
-            { KDiskControllerType_IDE0, 1, {grbHDB, cbHDB, txHDB, &uuidHDB} },
-            { KDiskControllerType_IDE1, 1, {grbHDD, cbHDD, txHDD, &uuidHDD} },
+            { KStorageBus_IDE, 0, 0, {grbHDA, cbHDA, txHDA, &uuidHDA} },
+            { KStorageBus_IDE, 0, 1, {grbHDB, cbHDB, txHDB, &uuidHDB} },
+            { KStorageBus_IDE, 1, 1, {grbHDD, cbHDD, txHDD, &uuidHDD} },
         };
 
@@ -1745 +1746 @@
             for (uint i = 0; i < SIZEOF_ARRAY (diskSet); i++)
             {
-                if (diskSet [i].ctl == hda.GetController() &&
-                    diskSet [i].dev == hda.GetDeviceNumber())
+                if (diskSet [i].bus == hda.GetBus() &&
+                    diskSet [i].channel == hda.GetChannel() &&
+                    diskSet [i].dev == hda.GetDevice())
                 {
                     CHardDisk hd = hda.GetHardDisk();
@@ -2101 +2103 @@
         struct
         {
-            KDiskControllerType ctl;
+            KStorageBus bus;
+            LONG channel;
             LONG dev;
             struct {
@@ -2110 +2113 @@
         diskSet[] =
         {
-            { KDiskControllerType_IDE0, 0, {grbHDA, &uuidHDA} },
-            { KDiskControllerType_IDE0, 1, {grbHDB, &uuidHDB} },
-            { KDiskControllerType_IDE1, 1, {grbHDD, &uuidHDD} }
+            { KStorageBus_IDE, 0, 0, {grbHDA, &uuidHDA} },
+            { KStorageBus_IDE, 0, 1, {grbHDB, &uuidHDB} },
+            { KStorageBus_IDE, 1, 1, {grbHDD, &uuidHDD} }
         };
 
@@ -2126 +2129 @@
             for (uint i = 0; i < SIZEOF_ARRAY (diskSet); i++)
             {
-                if (diskSet [i].ctl == hda.GetController() &&
-                    diskSet [i].dev == hda.GetDeviceNumber())
+                if (diskSet [i].bus == hda.GetBus() &&
+                    diskSet [i].channel == hda.GetChannel() &&
+                    diskSet [i].dev == hda.GetDevice())
                 {
-                    cmachine.DetachHardDisk (diskSet [i].ctl, diskSet [i].dev);
+                    cmachine.DetachHardDisk (diskSet [i].bus, diskSet [i].channel, diskSet [i].dev);
                     if (!cmachine.isOk())
                         vboxProblem().cannotDetachHardDisk (
-                            this, cmachine, diskSet [i].ctl, diskSet [i].dev);
+                            this, cmachine, diskSet [i].bus, diskSet [i].channel, diskSet [i].dev);
                 }
             }
@@ -2143 +2147 @@
             if (diskSet [i].data.grb->isChecked() && !(*newId).isNull())
             {
-                cmachine.AttachHardDisk (*newId, diskSet [i].ctl, diskSet [i].dev);
+                cmachine.AttachHardDisk (*newId, diskSet [i].bus, diskSet [i].channel, diskSet [i].dev);
                 if (!cmachine.isOk())
                     vboxProblem().cannotAttachHardDisk (
-                        this, cmachine, *newId, diskSet [i].ctl, diskSet [i].dev);
+                        this, cmachine, *newId, diskSet [i].bus, diskSet [i].channel, diskSet [i].dev);
             }
         }