Changeset 23223 in vbox for trunk/src/VBox/Main/testcase/tstVBoxAPILinux.cpp

Timestamp:

Sep 22, 2009 3:50:03 PM (15 years ago)

Author:

vboxsync

Message:

API: big medium handling change and lots of assorted other cleanups and fixes

File:

• trunk/src/VBox/Main/testcase/tstVBoxAPILinux.cpp (modified) (5 diffs)

trunk/src/VBox/Main/testcase/tstVBoxAPILinux.cpp

@@ -295 +295 @@
      * Create a virtual harddisk
      */
-    nsCOMPtr<IHardDisk> hardDisk = 0;
+    nsCOMPtr<IMedium> hardDisk = 0;
     rc = virtualBox->CreateHardDisk(NS_LITERAL_STRING("VDI").get(),
                                     NS_LITERAL_STRING("TestHardDisk.vdi").get(),
@@ -312 +312 @@
         nsCOMPtr <IProgress> progress;
         rc = hardDisk->CreateBaseStorage(100,                                // size in megabytes
-                                         HardDiskVariant_Standard,
+                                         MediumVariant_Standard,
                                          getter_AddRefs(progress));          // optional progress object
         if (NS_FAILED(rc))
@@ -342 +342 @@
                 nsXPIDLString vdiUUID;
                 hardDisk->GetId(getter_Copies(vdiUUID));
-                rc = machine->AttachHardDisk(vdiUUID,
-                                             NS_LITERAL_STRING("IDE").get(), // controler identifier
-                                             0,                              // channel number on the controller
-                                             0);                             // device number on the controller
+                rc = machine->AttachDevice(NS_LITERAL_STRING("IDE").get(), // controler identifier
+                                           0,                              // channel number on the controller
+                                           0,                              // device number on the controller
+                                           DeviceType_HardDisk,
+                                           vdiUUID);
                 if (NS_FAILED(rc))
                 {
@@ -360 +361 @@
      * as the boot device.
      */
-    nsCOMPtr<IDVDImage> dvdImage;
-
-    rc = virtualBox->OpenDVDImage(NS_LITERAL_STRING("/home/achimha/isoimages/winnt4ger.iso").get(),
+    nsCOMPtr<IMedium> dvdImage;
+
+    rc = virtualBox->OpenDVDImage(NS_LITERAL_STRING("/home/vbox/isos/winnt4ger.iso").get(),
                                   nsnull, /* NULL UUID, i.e. a new one will be created */
                                   getter_AddRefs(dvdImage));
@@ -376 +377 @@
         nsXPIDLString isoUUID;
         dvdImage->GetId(getter_Copies(isoUUID));
-        nsCOMPtr<IDVDDrive> dvdDrive;
-        machine->GetDVDDrive(getter_AddRefs(dvdDrive));
-        rc = dvdDrive->MountImage(isoUUID);
+        rc = machine->MountMedium(NS_LITERAL_STRING("IDE").get(), // controler identifier
+                                  2,                              // channel number on the controller
+                                  0,                              // device number on the controller
+                                  isoUUID);
         if (NS_FAILED(rc))
         {