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

Timestamp:

Oct 27, 2008 2:04:18 PM (16 years ago)

Author:

vboxsync

Message:

Ported s2 branch (r37120:38456).

File:

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

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

@@ -113 +113 @@
      * Get the list of all registered VMs
      */
-    IMachineCollection *collection = nsnull;
-    IMachineEnumerator *enumerator = nsnull;
-    rc = virtualBox->GetMachines(&collection);
+    IMachine **machines = NULL;
+    PRUint32 machineCnt = 0;
+
+    rc = virtualBox->GetMachines2(&machineCnt, &machines);
     if (NS_SUCCEEDED(rc))
-        rc = collection->Enumerate(&enumerator);
-    if (NS_SUCCEEDED(rc))
     {
         /*
          * Iterate through the collection
          */
-        PRBool hasMore = false;
-        while (enumerator->HasMore(&hasMore), hasMore)
-        {
-            IMachine *machine = nsnull;
-            rc = enumerator->GetNext(&machine);
-            if ((NS_SUCCEEDED(rc)) && machine)
+        for (PRUint32 i = 0; i < machineCnt; ++ i)
+        {
+            IMachine *machine = machines [i];
+            if (machine)
             {
                 PRBool isAccessible = PR_FALSE;
@@ -177 +174 @@
                 }
 
+                /* don't forget to release the objects in the array... */
                 machine->Release();
             }
@@ -182 +180 @@
     }
     printf("----------------------------------------------------\n\n");
-    /* don't forget to release the objects... */
-    if (enumerator)
-        enumerator->Release();
-    if (collection)
-        collection->Release();
 }
 
@@ -305 +298 @@
      * Create a virtual harddisk
      */
-    nsCOMPtr<IHardDisk> hardDisk = 0;
-    nsCOMPtr<IVirtualDiskImage> vdi = 0;
-    rc = virtualBox->CreateHardDisk(HardDiskStorageType::VirtualDiskImage,
-                                    getter_AddRefs(hardDisk));
-    if (NS_SUCCEEDED (rc))
-    {
-        rc = hardDisk->QueryInterface(NS_GET_IID(IVirtualDiskImage),
-                                      (void **)(getter_AddRefs(vdi)));
-        if (NS_SUCCEEDED (rc))
-            rc = vdi->SetFilePath(NS_LITERAL_STRING("TestHardDisk.vdi").get());
-    }
-
+    nsCOMPtr<IHardDisk2> hardDisk = 0;
+    rc = virtualBox->CreateHardDisk2(NS_LITERAL_STRING("VDI").get(),
+                                     NS_LITERAL_STRING("TestHardDisk.vdi").get(),
+                                     getter_AddRefs(hardDisk));
     if (NS_FAILED(rc))
     {
@@ -329 +314 @@
          */
         nsCOMPtr <IProgress> progress;
-        rc = vdi->CreateDynamicImage(100,                                             // size in megabytes
-                                     getter_AddRefs(progress));                       // optional progress object
+        rc = hardDisk->CreateDynamicStorage(100,                                // size in megabytes
+                                            getter_AddRefs(progress));          // optional progress object
         if (NS_FAILED(rc))
         {
@@ -353 +338 @@
             {
                 /*
-                 * Now we have to register the new hard disk with VirtualBox.
+                 * Now that it's created, we can assign it to the VM. This is done
+                 * by UUID, so query that one fist. The UUID has been assigned automatically
+                 * when we've created the image.
                  */
-                rc = virtualBox->RegisterHardDisk(hardDisk);
+                nsID *vdiUUID = nsnull;
+                hardDisk->GetId(&vdiUUID);
+                rc = machine->AttachHardDisk2(*vdiUUID,
+                                              StorageBus::IDE, // controler identifier
+                                              0,               // channel number on the controller
+                                              0);              // device number on the controller
+                nsMemory::Free(vdiUUID);
                 if (NS_FAILED(rc))
                 {
-                    printf("Error: could not register hard disk! rc=%08X\n", rc);
-                }
-                else
-                {
-                    /*
-                     * Now that it's registered, we can assign it to the VM. This is done
-                     * by UUID, so query that one fist. The UUID has been assigned automatically
-                     * when we've created the image.
-                     */
-                    nsID *vdiUUID = nsnull;
-                    hardDisk->GetId(&vdiUUID);
-                    rc = machine->AttachHardDisk(*vdiUUID,
-                                                StorageBus::IDE, // controler identifier
-                                                0,               // channel number on the controller
-                                                0);              // device number on the controller
-                    nsMemory::Free(vdiUUID);
-                    if (NS_FAILED(rc))
-                    {
-                        printf("Error: could not attach hard disk! rc=%08X\n", rc);
-                    }
+                    printf("Error: could not attach hard disk! rc=%08X\n", rc);
                 }
             }
@@ -390 +364 @@
      */
     nsID uuid = {0};
-    nsCOMPtr<IDVDImage> dvdImage;
+    nsCOMPtr<IDVDImage2> dvdImage;
 
     rc = virtualBox->OpenDVDImage(NS_LITERAL_STRING("/home/achimha/isoimages/winnt4ger.iso").get(),
@@ -402 +376 @@
     {
         /*
-         * Register it with VBox
-         */
-        rc = virtualBox->RegisterDVDImage(dvdImage);
-        if (NS_FAILED(rc))
-        {
-            printf("Error: could not register CD image! rc=%08X\n", rc);
+         * Now assign it to our VM
+         */
+        nsID *isoUUID = nsnull;
+        dvdImage->GetId(&isoUUID);
+        nsCOMPtr<IDVDDrive> dvdDrive;
+        machine->GetDVDDrive(getter_AddRefs(dvdDrive));
+        rc = dvdDrive->MountImage(*isoUUID);
+        nsMemory::Free(isoUUID);
+        if (NS_FAILED(rc))
+        {
+            printf("Error: could not mount ISO image! rc=%08X\n", rc);
         }
         else
         {
             /*
-             * Now assign it to our VM
+             * Last step: tell the VM to boot from the CD.
              */
-            nsID *isoUUID = nsnull;
-            dvdImage->GetId(&isoUUID);
-            nsCOMPtr<IDVDDrive> dvdDrive;
-            machine->GetDVDDrive(getter_AddRefs(dvdDrive));
-            rc = dvdDrive->MountImage(*isoUUID);
-            nsMemory::Free(isoUUID);
+            rc = machine->SetBootOrder (1, DeviceType::DVD);
             if (NS_FAILED(rc))
             {
-                printf("Error: could not mount ISO image! rc=%08X\n", rc);
-            }
-            else
-            {
-                /*
-                 * Last step: tell the VM to boot from the CD.
-                 */
-                rc = machine->SetBootOrder (1, DeviceType::DVD);
-                if (NS_FAILED(rc))
-                {
-                    printf("Could not set boot device! rc=%08X\n", rc);
-                }
+                printf("Could not set boot device! rc=%08X\n", rc);
             }
         }