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

Timestamp:

Oct 1, 2009 5:16:30 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: Session Information Dialog: Support for Multi-Storage-Controllers.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxVMInformationDlg.h (modified) (5 diffs)
• src/VBoxVMInformationDlg.cpp (modified) (18 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxVMInformationDlg.h

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2008 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -32 +32 @@
 class QTimer;
 
-class VBoxVMInformationDlg : public QIWithRetranslateUI2<QIMainDialog>,
-                             public Ui::VBoxVMInformationDlg
+class VBoxVMInformationDlg : public QIWithRetranslateUI2 <QIMainDialog>, public Ui::VBoxVMInformationDlg
 {
     Q_OBJECT;
@@ -39 +38 @@
 public:
 
-    typedef QMap<QString, QString> DataMapType;
-    typedef QMap<QString, QStringList> LinksMapType;
-    struct CounterElementType {QString type; DataMapType list;};
+    typedef QMap <QString, QString> DataMapType;
+    typedef QMap <QString, QStringList> LinksMapType;
+    struct CounterElementType { QString type; DataMapType list; };
     typedef QMap <QString, VBoxVMInformationDlg*> InfoDlgMap;
 
-    static void createInformationDlg (const CSession &aSession,
-                                      VBoxConsoleView *aConsole);
-
-    VBoxVMInformationDlg (VBoxConsoleView *aConsole, const CSession &aSession,
-                          Qt::WindowFlags aFlags);
-    ~VBoxVMInformationDlg();
+    static void createInformationDlg (const CSession &aSession, VBoxConsoleView *aConsole);
 
 protected:
+
+    VBoxVMInformationDlg (VBoxConsoleView *aConsole, const CSession &aSession, Qt::WindowFlags aFlags);
+   ~VBoxVMInformationDlg();
 
     void retranslateUi();
@@ -64 +61 @@
     void processStatistics();
     void onPageChanged (int aIndex);
-    void suicide();
 
 private:
@@ -72 +68 @@
 
     QString formatValue (const QString &aValueName, const QString &aValue, int aMaxSize);
-    QString formatHardDisk (const QString &ctlName, LONG aChannel, LONG aDevice, const QString &aBelongsTo);
+    QString formatMedium (const QString &aCtrName, LONG aPort, LONG aDevice, const QString &aBelongsTo);
     QString formatAdapter (ULONG aSlot, const QString &aBelongsTo);
 
-    QString composeArticle (const QString &aBelongsTo);
+    QString composeArticle (const QString &aBelongsTo, int aSpacesCount = 0);
 
     static InfoDlgMap  mSelfArray;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxVMInformationDlg.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2008 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -21 +21 @@
  */
 
+/* Global Includes */
+#include <QTimer>
+
+/* Local Includes */
 #include <VBoxVMInformationDlg.h>
 #include <VBoxGlobal.h>
 #include <VBoxConsoleView.h>
 
-/* Qt includes */
-#include <QTimer>
-
 VBoxVMInformationDlg::InfoDlgMap VBoxVMInformationDlg::mSelfArray = InfoDlgMap();
 
-void VBoxVMInformationDlg::createInformationDlg (const CSession &aSession,
-                                                 VBoxConsoleView *aConsole)
+void VBoxVMInformationDlg::createInformationDlg (const CSession &aSession, VBoxConsoleView *aConsole)
 {
     CMachine machine = aSession.GetMachine();
@@ -37 +37 @@
     {
         /* Creating new information dialog if there is no one existing */
-        VBoxVMInformationDlg *id = new VBoxVMInformationDlg (aConsole,
-                                                             aSession, Qt::Window);
+        VBoxVMInformationDlg *id = new VBoxVMInformationDlg (aConsole, aSession, Qt::Window);
         id->centerAccording (aConsole);
         connect (vboxGlobal().mainWindow(), SIGNAL (closing()), id, SLOT (close()));
@@ -52 +51 @@
 }
 
-
-VBoxVMInformationDlg::VBoxVMInformationDlg (VBoxConsoleView *aConsole,
-                                            const CSession &aSession,
-                                            Qt::WindowFlags aFlags)
+VBoxVMInformationDlg::VBoxVMInformationDlg (VBoxConsoleView *aConsole, const CSession &aSession, Qt::WindowFlags aFlags)
 #ifdef Q_WS_MAC
-    : QIWithRetranslateUI2<QIMainDialog> (aConsole, aFlags)
+    : QIWithRetranslateUI2 <QIMainDialog> (aConsole, aFlags)
 #else /* Q_WS_MAC */
-    : QIWithRetranslateUI2<QIMainDialog> (NULL, aFlags)
+    : QIWithRetranslateUI2 <QIMainDialog> (0, aFlags)
 #endif /* Q_WS_MAC */
     , mIsPolished (false)
@@ -70 +66 @@
 
 #ifdef Q_WS_MAC
-    /* No icon for this window on the mac, cause this would act as proxy icon
-     * which isn't necessary here. */
+    /* No icon for this window on the mac, cause this would act as proxy icon which isn't necessary here. */
     setWindowIcon (QIcon());
 #else
@@ -90 +85 @@
     mStatisticText->viewport()->setAutoFillBackground (false);
 
-    /* For further tuning can be used setViewportMargins method of
-     * QRichTextEdit extended class: */
-#if 0
+    /* Setup margins */
     mDetailsText->setViewportMargins (5, 5, 5, 5);
-#endif
-    mStatisticText->setViewportMargins (0, 0, 5, 0);
+    mStatisticText->setViewportMargins (5, 5, 5, 5);
 
     /* Setup handlers */
-    connect (mInfoStack, SIGNAL (currentChanged (int)),
-             this, SLOT (onPageChanged (int)));
-    connect (&vboxGlobal(), SIGNAL (mediumEnumFinished (const VBoxMediaList &)),
-             this, SLOT (updateDetails()));
-    connect (mConsole, SIGNAL (mediaDriveChanged (VBoxDefs::MediaType)),
-             this, SLOT (updateDetails()));
-    connect (mConsole, SIGNAL (sharedFoldersChanged()),
-             this, SLOT (updateDetails()));
-    connect (mStatTimer, SIGNAL (timeout()),
-             this, SLOT (processStatistics()));
-    connect (mConsole, SIGNAL (resizeHintDone()),
-             this, SLOT (processStatistics()));
+    connect (mInfoStack, SIGNAL (currentChanged (int)), this, SLOT (onPageChanged (int)));
+    connect (&vboxGlobal(), SIGNAL (mediumEnumFinished (const VBoxMediaList &)), this, SLOT (updateDetails()));
+    connect (mConsole, SIGNAL (mediaDriveChanged (VBoxDefs::MediaType)), this, SLOT (updateDetails()));
+    connect (mConsole, SIGNAL (sharedFoldersChanged()), this, SLOT (updateDetails()));
+    connect (mStatTimer, SIGNAL (timeout()), this, SLOT (processStatistics()));
+    connect (mConsole, SIGNAL (resizeHintDone()), this, SLOT (processStatistics()));
 
     /* Loading language constants */
@@ -122 +108 @@
 
     /* Preload dialog attributes for this vm */
-    QString dlgsize =
-        mSession.GetMachine().GetExtraData (VBoxDefs::GUI_InfoDlgState);
+    QString dlgsize = mSession.GetMachine().GetExtraData (VBoxDefs::GUI_InfoDlgState);
     if (dlgsize.isEmpty())
     {
@@ -132 +117 @@
     else
     {
-        QStringList list = dlgsize.split(',');
+        QStringList list = dlgsize.split (',');
         mWidth = list [0].toInt(), mHeight = list [1].toInt();
         mMax = list [2] == "max";
@@ -175 +160 @@
     mLinksMap.clear();
 
-    /* IDE HD statistics: */
-    for (int i = 0; i < 2; ++ i)
-        for (int j = 0; j < 2; ++ j)
-        {
-            /* Names */
-            mNamesMap [QString ("/Devices/ATA%1/Unit%2/*DMA")
-                .arg (i).arg (j)] = tr ("DMA Transfers");
-            mNamesMap [QString ("/Devices/ATA%1/Unit%2/*PIO")
-                .arg (i).arg (j)] = tr ("PIO Transfers");
-            mNamesMap [QString ("/Devices/ATA%1/Unit%2/ReadBytes")
-                .arg (i).arg (j)] = tr ("Data Read");
-            mNamesMap [QString ("/Devices/ATA%1/Unit%2/WrittenBytes")
-                .arg (i).arg (j)] = tr ("Data Written");
-
-            /* Units */
-            mUnitsMap [QString ("/Devices/ATA%1/Unit%2/*DMA")
-                .arg (i).arg (j)] = "[B]";
-            mUnitsMap [QString ("/Devices/ATA%1/Unit%2/*PIO")
-                .arg (i).arg (j)] = "[B]";
-            mUnitsMap [QString ("/Devices/ATA%1/Unit%2/ReadBytes")
-                .arg (i).arg (j)] = "B";
-            mUnitsMap [QString ("/Devices/ATA%1/Unit%2/WrittenBytes")
-                .arg (i).arg (j)] = "B";
-
-            /* Belongs to */
-            mLinksMap [QString ("IDE%1%2").arg (i).arg (j)] = QStringList()
-                << QString ("/Devices/ATA%1/Unit%2/*DMA").arg (i).arg (j)
-                << QString ("/Devices/ATA%1/Unit%2/*PIO").arg (i).arg (j)
-                << QString ("/Devices/ATA%1/Unit%2/ReadBytes").arg (i).arg (j)
-                << QString ("/Devices/ATA%1/Unit%2/WrittenBytes").arg (i).arg (j);
-        }
-
-    /* SATA HD statistics: */
-    for (int i = 0; i < 30; ++ i)
-    {
-        /* Names */
-        mNamesMap [QString ("/Devices/SATA/Port%1/DMA").arg (i)]
-            = tr ("DMA Transfers");
-        mNamesMap [QString ("/Devices/SATA/Port%1/ReadBytes").arg (i)]
-            = tr ("Data Read");
-        mNamesMap [QString ("/Devices/SATA/Port%1/WrittenBytes").arg (i)]
-            = tr ("Data Written");
-
-        /* Units */
-        mUnitsMap [QString ("/Devices/SATA/Port%1/DMA").arg (i)] = "[B]";
-        mUnitsMap [QString ("/Devices/SATA/Port%1/ReadBytes").arg (i)] = "B";
-        mUnitsMap [QString ("/Devices/SATA/Port%1/WrittenBytes").arg (i)] = "B";
-
-        /* Belongs to */
-        mLinksMap [QString ("SATA%1").arg (i)] = QStringList()
-            << QString ("/Devices/SATA/Port%1/DMA").arg (i)
-            << QString ("/Devices/SATA/Port%1/ReadBytes").arg (i)
-            << QString ("/Devices/SATA/Port%1/WrittenBytes").arg (i);
-    }
-
-    /* SCSI HD statistics: */
-    for (int i = 0; i < 16; ++ i)
-    {
-        /* Names */
-        mNamesMap [QString ("/Devices/SCSI/%1/ReadBytes").arg (i)]
-            = tr ("Data Read");
-        mNamesMap [QString ("/Devices/SCSI/%1/WrittenBytes").arg (i)]
-            = tr ("Data Written");
-
-        /* Units */
-        mUnitsMap [QString ("/Devices/SCSI/%1/ReadBytes").arg (i)] = "B";
-        mUnitsMap [QString ("/Devices/SCSI/%1/WrittenBytes").arg (i)] = "B";
-
-        /* Belongs to */
-        mLinksMap [QString ("SCSI%1").arg (i)] = QStringList()
-            << QString ("/Devices/SCSI/%1/ReadBytes").arg (i)
-            << QString ("/Devices/SCSI/%1/WrittenBytes").arg (i);
-    }
-
-    /* Network Adapters statistics: */
-    ulong count = vboxGlobal().virtualBox()
-        .GetSystemProperties().GetNetworkAdapterCount();
+    /* Storage statistics */
+    CSystemProperties sp = vboxGlobal().virtualBox().GetSystemProperties();
+    CStorageControllerVector controllers = mSession.GetMachine().GetStorageControllers();
+    int ideCount = 0, sataCount = 0, scsiCount = 0;
+    foreach (const CStorageController &controller, controllers)
+    {
+        switch (controller.GetBus())
+        {
+            case KStorageBus_IDE:
+            {
+                for (ULONG i = 0; i < sp.GetMaxPortCountForStorageBus (KStorageBus_IDE); ++ i)
+                {
+                    for (ULONG j = 0; j < sp.GetMaxDevicesPerPortForStorageBus (KStorageBus_IDE); ++ j)
+                    {
+                        /* Names */
+                        mNamesMap [QString ("/Devices/IDE%1/ATA%2/Unit%3/*DMA")
+                            .arg (ideCount).arg (i).arg (j)] = tr ("DMA Transfers");
+                        mNamesMap [QString ("/Devices/IDE%1/ATA%2/Unit%3/*PIO")
+                            .arg (ideCount).arg (i).arg (j)] = tr ("PIO Transfers");
+                        mNamesMap [QString ("/Devices/IDE%1/ATA%2/Unit%3/ReadBytes")
+                            .arg (ideCount).arg (i).arg (j)] = tr ("Data Read");
+                        mNamesMap [QString ("/Devices/IDE%1/ATA%2/Unit%3/WrittenBytes")
+                            .arg (ideCount).arg (i).arg (j)] = tr ("Data Written");
+
+                        /* Units */
+                        mUnitsMap [QString ("/Devices/IDE%1/ATA%2/Unit%3/*DMA")
+                            .arg (ideCount).arg (i).arg (j)] = "[B]";
+                        mUnitsMap [QString ("/Devices/IDE%1/ATA%2/Unit%3/*PIO")
+                            .arg (ideCount).arg (i).arg (j)] = "[B]";
+                        mUnitsMap [QString ("/Devices/IDE%1/ATA%2/Unit%3/ReadBytes")
+                            .arg (ideCount).arg (i).arg (j)] = "B";
+                        mUnitsMap [QString ("/Devices/IDE%1/ATA%2/Unit%3/WrittenBytes")
+                            .arg (ideCount).arg (i).arg (j)] = "B";
+
+                        /* Belongs to */
+                        mLinksMap [QString ("/Devices/IDE%1/ATA%2/Unit%3").arg (ideCount).arg (i).arg (j)] = QStringList()
+                                << QString ("/Devices/IDE%1/ATA%2/Unit%3/*DMA").arg (ideCount).arg (i).arg (j)
+                                << QString ("/Devices/IDE%1/ATA%2/Unit%3/*PIO").arg (ideCount).arg (i).arg (j)
+                                << QString ("/Devices/IDE%1/ATA%2/Unit%3/ReadBytes").arg (ideCount).arg (i).arg (j)
+                                << QString ("/Devices/IDE%1/ATA%2/Unit%3/WrittenBytes").arg (ideCount).arg (i).arg (j);
+                    }
+                }
+                ++ ideCount;
+                break;
+            }
+            case KStorageBus_SATA:
+            {
+                for (ULONG i = 0; i < sp.GetMaxPortCountForStorageBus (KStorageBus_SATA); ++ i)
+                {
+                    for (ULONG j = 0; j < sp.GetMaxDevicesPerPortForStorageBus (KStorageBus_SATA); ++ j)
+                    {
+                        /* Names */
+                        mNamesMap [QString ("/Devices/SATA%1/Port%2/DMA").arg (sataCount).arg (i)]
+                            = tr ("DMA Transfers");
+                        mNamesMap [QString ("/Devices/SATA%1/Port%2/ReadBytes").arg (sataCount).arg (i)]
+                            = tr ("Data Read");
+                        mNamesMap [QString ("/Devices/SATA%1/Port%2/WrittenBytes").arg (sataCount).arg (i)]
+                            = tr ("Data Written");
+
+                        /* Units */
+                        mUnitsMap [QString ("/Devices/SATA%1/Port%2/DMA").arg (sataCount).arg (i)] = "[B]";
+                        mUnitsMap [QString ("/Devices/SATA%1/Port%2/ReadBytes").arg (sataCount).arg (i)] = "B";
+                        mUnitsMap [QString ("/Devices/SATA%1/Port%2/WrittenBytes").arg (sataCount).arg (i)] = "B";
+
+                        /* Belongs to */
+                        mLinksMap [QString ("/Devices/SATA%1/Port%2").arg (sataCount).arg (i)] = QStringList()
+                                << QString ("/Devices/SATA%1/Port%2/DMA").arg (sataCount).arg (i)
+                                << QString ("/Devices/SATA%1/Port%2/ReadBytes").arg (sataCount).arg (i)
+                                << QString ("/Devices/SATA%1/Port%2/WrittenBytes").arg (sataCount).arg (i);
+                    }
+                }
+                ++ sataCount;
+                break;
+            }
+            case KStorageBus_SCSI:
+            {
+                for (ULONG i = 0; i < sp.GetMaxPortCountForStorageBus (KStorageBus_SCSI); ++ i)
+                {
+                    for (ULONG j = 0; j < sp.GetMaxDevicesPerPortForStorageBus (KStorageBus_SCSI); ++ j)
+                    {
+                        /* Names */
+                        mNamesMap [QString ("/Devices/SCSI%1/%2/ReadBytes").arg (scsiCount).arg (i)]
+                            = tr ("Data Read");
+                        mNamesMap [QString ("/Devices/SCSI%1/%2/WrittenBytes").arg (scsiCount).arg (i)]
+                            = tr ("Data Written");
+
+                        /* Units */
+                        mUnitsMap [QString ("/Devices/SCSI%1/%2/ReadBytes").arg (scsiCount).arg (i)] = "B";
+                        mUnitsMap [QString ("/Devices/SCSI%1/%2/WrittenBytes").arg (scsiCount).arg (i)] = "B";
+
+                        /* Belongs to */
+                        mLinksMap [QString ("/Devices/SCSI%1/%2").arg (scsiCount).arg (i)] = QStringList()
+                                << QString ("/Devices/SCSI%1/%2/ReadBytes").arg (scsiCount).arg (i)
+                                << QString ("/Devices/SCSI%1/%2/WrittenBytes").arg (scsiCount).arg (i);
+                    }
+                }
+                ++ scsiCount;
+                break;
+            }
+            default:
+                break;
+        }
+    }
+
+    /* Network statistics: */
+    ulong count = vboxGlobal().virtualBox().GetSystemProperties().GetNetworkAdapterCount();
     for (ulong i = 0; i < count; ++ i)
     {
@@ -347 +361 @@
 {
     /* Details page update */
-    mDetailsText->setText (
-        vboxGlobal().detailsReport (mSession.GetMachine(), false /* aWithLinks */));
+    mDetailsText->setText (vboxGlobal().detailsReport (mSession.GetMachine(), false /* aWithLinks */));
 }
 
@@ -357 +370 @@
 
     /* Process selected statistics: */
-    for (DataMapType::const_iterator it = mNamesMap.begin();
-         it != mNamesMap.end(); ++ it)
+    for (DataMapType::const_iterator it = mNamesMap.begin(); it != mNamesMap.end(); ++ it)
     {
         dbg.GetStats (it.key(), true, info);
@@ -373 +385 @@
     mInfoStack->widget (aIndex)->setFocus();
 }
-
-/**
- * Opposing to deleteLater() slot this one makes it immediately.
- */
-void VBoxVMInformationDlg::suicide()
-{
-    delete this;
-}
-
 
 QString VBoxVMInformationDlg::parseStatistics (const QString &aText)
@@ -393 +396 @@
 
     ULONG64 summa = 0;
-    for (QStringList::Iterator lineIt = wholeList.begin();
-         lineIt != wholeList.end(); ++ lineIt)
+    for (QStringList::Iterator lineIt = wholeList.begin(); lineIt != wholeList.end(); ++ lineIt)
     {
         QString text = *lineIt;
@@ -435 +437 @@
     CMachine m = mSession.GetMachine();
 
-    /* Screen & VT-X Runtime Parameters */
+    /* Runtime Information */
     {
         CConsole console = mSession.GetConsole();
@@ -466 +468 @@
         valuesList << resolution << virtualization << nested << addVerisonStr << osType;
         int maxLength = 0;
-        foreach (QString value, valuesList)
+        foreach (const QString &value, valuesList)
             maxLength = maxLength < fontMetrics().width (value) ?
                         fontMetrics().width (value) : maxLength;
@@ -479 +481 @@
     }
 
-    /* Hard Disk Statistics */
-    {
-        QString hdStat;
-        const QString ideCtl = QString("IDE Controller");
-        const QString sataCtl = QString("SATA");
-
-        result += hdrRow.arg (":/hd_16px.png").arg (tr ("Hard Disk Statistics"));
-
-        /* IDE Hard Disk (Primary Master) */
-        if (!m.GetMedium(ideCtl, 0, 0).isNull())
-        {
-            hdStat += formatHardDisk (ideCtl, 0, 0, "IDE00");
-            hdStat += paragraph;
-        }
-
-        /* IDE Hard Disk (Primary Slave) */
-        if (!m.GetMedium(ideCtl, 0, 1).isNull())
-        {
-            hdStat += formatHardDisk (ideCtl, 0, 1, "IDE01");
-            hdStat += paragraph;
-        }
-
-        /* IDE Hard Disk (Secondary Slave) */
-        if (!m.GetMedium(ideCtl, 1, 1).isNull())
-        {
-            hdStat += formatHardDisk (ideCtl, 1, 1, "IDE11");
-            hdStat += paragraph;
-        }
-
-        /* SATA Hard Disks */
-        for (int i = 0; i < 30; ++ i)
-        {
-            if (!m.GetMedium(sataCtl, i, 0).isNull())
+    /* Storage statistics */
+    {
+        QString storageStat;
+
+        result += hdrRow.arg (":/attachment_16px.png").arg (tr ("Storage Statistics"));
+
+        CStorageControllerVector controllers = mSession.GetMachine().GetStorageControllers();
+        int ideCount = 0, sataCount = 0, scsiCount = 0;
+        foreach (const CStorageController &controller, controllers)
+        {
+            QString ctrName = controller.GetName();
+            KStorageBus busType = controller.GetBus();
+            CMediumAttachmentVector attachments = mSession.GetMachine().GetMediumAttachmentsOfController (ctrName);
+            if (!attachments.isEmpty() && busType != KStorageBus_Floppy)
             {
-                hdStat += formatHardDisk (sataCtl, i, 0,
-                                          QString ("SATA%1").arg (i));
-                hdStat += paragraph;
-            }
-        }
-
-        /* @todo Rework if more than one additional
-         * controller is allowed.
-         */
-        const QString scsiCtl = QString("SCSI");
-
-        if (!m.GetStorageControllerByName(scsiCtl).isNull())
-        {
-            /* SCSI Hard Disks */
-            for (int i = 0; i < 16; ++ i)
-            {
-                if (!m.GetMedium(scsiCtl, i, 0).isNull())
+                QString header = "<tr><td></td><td colspan=2><nobr><u>%1</u></nobr></td></tr>";
+                storageStat += header.arg (ctrName);
+                int scsiIndex = 0;
+                foreach (const CMediumAttachment &attachment, attachments)
                 {
-                    hdStat += formatHardDisk (scsiCtl, i, 0,
-                                              QString ("SCSI%1").arg (i));
-                    hdStat += paragraph;
+                    LONG attPort = attachment.GetPort();
+                    LONG attDevice = attachment.GetDevice();
+                    switch (busType)
+                    {
+                        case KStorageBus_IDE:
+                        {
+                            storageStat += formatMedium (ctrName, attPort, attDevice,
+                                                         QString ("/Devices/IDE%1/ATA%2/Unit%3").arg (ideCount).arg (attPort).arg (attDevice));
+                            break;
+                        }
+                        case KStorageBus_SATA:
+                        {
+                            storageStat += formatMedium (ctrName, attPort, attDevice,
+                                                         QString ("/Devices/SATA%1/Port%2").arg (sataCount).arg (attPort));
+                            break;
+                        }
+                        case KStorageBus_SCSI:
+                        {
+                            storageStat += formatMedium (ctrName, attPort, attDevice,
+                                                         QString ("/Devices/SCSI%1/%2").arg (scsiCount).arg (scsiIndex));
+                            ++ scsiIndex;
+                            break;
+                        }
+                        default:
+                            break;
+                    }
+                    storageStat += paragraph;
                 }
             }
+
+            switch (busType)
+            {
+                case KStorageBus_IDE:
+                {
+                    ++ ideCount;
+                    break;
+                }
+                case KStorageBus_SATA:
+                {
+                    ++ sataCount;
+                    break;
+                }
+                case KStorageBus_SCSI:
+                {
+                    ++ scsiCount;
+                    break;
+                }
+                default:
+                    break;
+            }
         }
 
         /* If there are no Hard Disks */
-        if (hdStat.isNull())
-        {
-            hdStat = composeArticle (tr ("No Hard Disks"));
-            hdStat += paragraph;
-        }
-
-        result += hdStat;
-
-        /* CD/DVD-ROM (Secondary Master) */
-        result += hdrRow.arg (":/cd_16px.png").arg (tr ("CD/DVD-ROM Statistics"));
-        result += formatHardDisk (ideCtl, 1, 0, "IDE10");
-        result += paragraph;
+        if (storageStat.isNull())
+        {
+            storageStat = composeArticle (tr ("No Storage Devices"));
+            storageStat += paragraph;
+        }
+
+        result += storageStat;
     }
 
     /* Network Adapters Statistics */
     {
-        QString naStat;
-
-        result += hdrRow.arg (":/nw_16px.png")
-            .arg (tr ("Network Adapter Statistics"));
+        QString networkStat;
+
+        result += hdrRow.arg (":/nw_16px.png").arg (tr ("Network Statistics"));
 
         /* Network Adapters list */
-        ulong count = vboxGlobal().virtualBox()
-            .GetSystemProperties().GetNetworkAdapterCount();
+        ulong count = vboxGlobal().virtualBox().GetSystemProperties().GetNetworkAdapterCount();
         for (ulong slot = 0; slot < count; ++ slot)
         {
             if (m.GetNetworkAdapter (slot).GetEnabled())
             {
-                naStat += formatAdapter (slot, QString ("NA%1").arg (slot));
-                naStat += paragraph;
+                networkStat += formatAdapter (slot, QString ("NA%1").arg (slot));
+                networkStat += paragraph;
             }
         }
 
         /* If there are no Network Adapters */
-        if (naStat.isNull())
-        {
-            naStat = composeArticle (tr ("No Network Adapters"));
-            naStat += paragraph;
-        }
-
-        result += naStat;
+        if (networkStat.isNull())
+        {
+            networkStat = composeArticle (tr ("No Network Adapters"));
+            networkStat += paragraph;
+        }
+
+        result += networkStat;
     }
 
@@ -606 +614 @@
 }
 
-QString VBoxVMInformationDlg::formatHardDisk (const QString &ctlName,
-                                              LONG aChannel,
-                                              LONG aDevice,
-                                              const QString &aBelongsTo)
+QString VBoxVMInformationDlg::formatMedium (const QString &aCtrName,
+                                            LONG aPort, LONG aDevice,
+                                            const QString &aBelongsTo)
 {
     if (mSession.isNull())
         return QString::null;
 
-    CStorageController ctl = mSession.GetMachine().GetStorageControllerByName (ctlName);
-
-    CMedium hd = mSession.GetMachine().GetMedium (ctlName, aChannel, aDevice);
-    QString header = "<tr><td></td><td colspan=2><nobr><u>%1</u></nobr></td></tr>";
-    QString name = vboxGlobal().toString (StorageSlot (ctl.GetBus(), aChannel, aDevice));
-    QString result = hd.isNull() ? QString::null : header.arg (name);
-    result += composeArticle (aBelongsTo);
-    return result;
+    QString header = "<tr><td></td><td colspan=2><nobr>&nbsp;%1:</nobr></td></tr>";
+    CStorageController ctr = mSession.GetMachine().GetStorageControllerByName (aCtrName);
+    QString name = vboxGlobal().toString (StorageSlot (ctr.GetBus(), aPort, aDevice));
+    return header.arg (name) + composeArticle (aBelongsTo, 2);
 }
 
@@ -632 +635 @@
     QString header = "<tr><td></td><td colspan=2><nobr><u>%1</u></nobr></td></tr>";
     QString name = VBoxGlobal::tr ("Adapter %1", "details report (network)").arg (aSlot + 1);
-    QString result = header.arg (name);
-    result += composeArticle (aBelongsTo);
-    return result;
-}
-
-QString VBoxVMInformationDlg::composeArticle (const QString &aBelongsTo)
-{
-    QString body = "<tr><td></td><td width=50%><nobr>%1</nobr></td>"
-                   "<td align=right><nobr>%2%3</nobr></td></tr>";
+    return header.arg (name) + composeArticle (aBelongsTo, 1);
+}
+
+QString VBoxVMInformationDlg::composeArticle (const QString &aBelongsTo, int aSpacesCount)
+{
+    QString body = "<tr><td></td><td width=50%><nobr>%1%2</nobr></td>"
+                   "<td align=right><nobr>%3%4</nobr></td></tr>";
+    QString indent;
+    for (int i = 0; i < aSpacesCount; ++ i)
+        indent += "&nbsp;";
+    body = body.arg (indent);
+
     QString result;
 
     if (mLinksMap.contains (aBelongsTo))
     {
-        QStringList keyList = mLinksMap [aBelongsTo];
-        for (QStringList::Iterator it = keyList.begin(); it != keyList.end(); ++ it)
+        QStringList keys = mLinksMap [aBelongsTo];
+        foreach (const QString &key, keys)
         {
             QString line (body);
-            QString key = *it;
-            if (mNamesMap.contains (key) &&
-                mValuesMap.contains (key) &&
-                mUnitsMap.contains (key))
+            if (mNamesMap.contains (key) && mValuesMap.contains (key) && mUnitsMap.contains (key))
             {
-                line = line.arg (mNamesMap [key])
-                           .arg (QString ("%L1")
-                           .arg (mValuesMap [key].toULongLong()));
+                line = line.arg (mNamesMap [key]).arg (QString ("%L1").arg (mValuesMap [key].toULongLong()));
                 line = mUnitsMap [key].contains (QRegExp ("\\[\\S+\\]")) ?
                     line.arg (QString ("<img src=:/tpixel.png width=%1 height=1>")