Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp (revision 61441) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp (revision 61442) @@ -5,5 +5,5 @@ /* - * Copyright (C) 2006-2012 Oracle Corporation + * Copyright (C) 2006-2016 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -212,7 +212,7 @@ m_names.insert(USBControllerExpand, ":/usb_expand_16px.png"); m_names.insert(USBControllerCollapse, ":/usb_collapse_16px.png"); - m_names.insert(PCIeControllerNormal, ":/ide_16px.png"); - m_names.insert(PCIeControllerExpand, ":/ide_expand_16px.png"); - m_names.insert(PCIeControllerCollapse, ":/ide_collapse_16px.png"); + m_names.insert(NVMeControllerNormal, ":/ide_16px.png"); + m_names.insert(NVMeControllerExpand, ":/ide_expand_16px.png"); + m_names.insert(NVMeControllerCollapse, ":/ide_collapse_16px.png"); m_names.insert(FloppyControllerNormal, ":/floppy_16px.png"); m_names.insert(FloppyControllerExpand, ":/floppy_expand_16px.png"); @@ -227,6 +227,6 @@ m_names.insert(USBControllerAddEn, ":/usb_add_16px.png"); m_names.insert(USBControllerAddDis, ":/usb_add_disabled_16px.png"); - m_names.insert(PCIeControllerAddEn, ":/ide_add_16px.png"); - m_names.insert(PCIeControllerAddDis, ":/ide_add_disabled_16px.png"); + m_names.insert(NVMeControllerAddEn, ":/ide_add_16px.png"); + m_names.insert(NVMeControllerAddDis, ":/ide_add_disabled_16px.png"); m_names.insert(FloppyControllerAddEn, ":/floppy_add_16px.png"); m_names.insert(FloppyControllerAddDis, ":/floppy_add_disabled_16px.png"); @@ -292,5 +292,5 @@ break; case KStorageBus_PCIe: - mPixmaps [i] = (PixmapType)(PCIeControllerNormal + i); + mPixmaps [i] = (PixmapType)(NVMeControllerNormal + i); break; default: @@ -430,16 +430,16 @@ } -/* PCIe Controller Type */ -PCIeStorageControllerType::PCIeStorageControllerType (KStorageControllerType aSubType) +/* NVMe Controller Type */ +NVMeStorageControllerType::NVMeStorageControllerType (KStorageControllerType aSubType) : AbstractControllerType (KStorageBus_PCIe, aSubType) { } -KStorageControllerType PCIeStorageControllerType::first() const +KStorageControllerType NVMeStorageControllerType::first() const { return KStorageControllerType_NVMe; } -uint PCIeStorageControllerType::size() const +uint NVMeStorageControllerType::size() const { return 1; @@ -590,5 +590,5 @@ break; case KStorageBus_PCIe: - mCtrType = new PCIeStorageControllerType (aControllerType); + mCtrType = new NVMeStorageControllerType (aControllerType); break; @@ -1225,5 +1225,5 @@ vboxGlobal().virtualBox().GetSystemProperties().GetMaxInstancesOfStorageBus(chipsetType(), KStorageBus_USB)); } - case R_IsMorePCIeControllersPossible: + case R_IsMoreNVMeControllersPossible: { return (m_configurationAccessLevel == ConfigurationAccessLevel_Full) && @@ -1991,5 +1991,5 @@ : mStorageModel(0) , mAddCtrAction(0), mDelCtrAction(0) - , mAddIDECtrAction(0), mAddSATACtrAction(0), mAddSCSICtrAction(0), mAddSASCtrAction(0), mAddFloppyCtrAction(0), mAddUSBCtrAction(0), mAddPCIeCtrAction(0) + , mAddIDECtrAction(0), mAddSATACtrAction(0), mAddSCSICtrAction(0), mAddSASCtrAction(0), mAddFloppyCtrAction(0), mAddUSBCtrAction(0), mAddNVMeCtrAction(0) , mAddAttAction(0), mDelAttAction(0) , mAddHDAttAction(0), mAddCDAttAction(0), mAddFDAttAction(0) @@ -2032,6 +2032,6 @@ mAddUSBCtrAction->setIcon(iconPool()->icon(USBControllerAddEn, USBControllerAddDis)); - mAddPCIeCtrAction = new QAction (this); - mAddPCIeCtrAction->setIcon(iconPool()->icon(PCIeControllerAddEn, PCIeControllerAddDis)); + mAddNVMeCtrAction = new QAction (this); + mAddNVMeCtrAction->setIcon(iconPool()->icon(NVMeControllerAddEn, NVMeControllerAddDis)); mDelCtrAction = new QAction (this); @@ -2111,5 +2111,5 @@ connect (mAddFloppyCtrAction, SIGNAL (triggered (bool)), this, SLOT (addFloppyController())); connect (mAddUSBCtrAction, SIGNAL (triggered (bool)), this, SLOT (addUSBController())); - connect (mAddPCIeCtrAction, SIGNAL (triggered (bool)), this, SLOT (addPCIeController())); + connect (mAddNVMeCtrAction, SIGNAL (triggered (bool)), this, SLOT (addNVMeController())); connect (mDelCtrAction, SIGNAL (triggered (bool)), this, SLOT (delController())); connect (mAddAttAction, SIGNAL (triggered (bool)), this, SLOT (addAttachment())); @@ -2493,5 +2493,5 @@ mAddFloppyCtrAction->setText(tr("Add Floppy Controller")); mAddUSBCtrAction->setText(tr("Add USB Controller")); - mAddPCIeCtrAction->setText(tr("Add PCIe Controller")); + mAddNVMeCtrAction->setText(tr("Add NVMe Controller")); mDelCtrAction->setText(tr("Remove Controller")); mAddAttAction->setText(tr("Add Attachment")); @@ -2595,5 +2595,5 @@ menu.addAction (mAddFloppyCtrAction); menu.addAction (mAddUSBCtrAction); - menu.addAction (mAddPCIeCtrAction); + menu.addAction (mAddNVMeCtrAction); menu.exec (QCursor::pos()); } @@ -2629,7 +2629,7 @@ } -void UIMachineSettingsStorage::addPCIeController() -{ - addControllerWrapper (generateUniqueName ("PCIe"), KStorageBus_PCIe, KStorageControllerType_NVMe); +void UIMachineSettingsStorage::addNVMeController() +{ + addControllerWrapper (generateUniqueName ("NVMe"), KStorageBus_PCIe, KStorageControllerType_NVMe); } @@ -3054,5 +3054,5 @@ bool isSASPossible = mStorageModel->data (index, StorageModel::R_IsMoreSASControllersPossible).toBool(); bool isUSBPossible = mStorageModel->data (index, StorageModel::R_IsMoreUSBControllersPossible).toBool(); - bool isPCIePossible = mStorageModel->data (index, StorageModel::R_IsMorePCIeControllersPossible).toBool(); + bool isNVMePossible = mStorageModel->data (index, StorageModel::R_IsMoreNVMeControllersPossible).toBool(); bool isController = mStorageModel->data (index, StorageModel::R_IsController).toBool(); @@ -3062,5 +3062,5 @@ /* Configure "add controller" actions: */ - mAddCtrAction->setEnabled (isIDEPossible || isSATAPossible || isSCSIPossible || isFloppyPossible || isSASPossible || isUSBPossible || isPCIePossible); + mAddCtrAction->setEnabled (isIDEPossible || isSATAPossible || isSCSIPossible || isFloppyPossible || isSASPossible || isUSBPossible || isNVMePossible); mAddIDECtrAction->setEnabled (isIDEPossible); mAddSATACtrAction->setEnabled (isSATAPossible); @@ -3069,5 +3069,5 @@ mAddSASCtrAction->setEnabled (isSASPossible); mAddUSBCtrAction->setEnabled (isUSBPossible); - mAddPCIeCtrAction->setEnabled (isPCIePossible); + mAddNVMeCtrAction->setEnabled (isNVMePossible); /* Configure "add attachment" actions: */ @@ -3365,5 +3365,5 @@ break; case KStorageBus_PCIe: - Assert (mStorageModel->data (index, StorageModel::R_IsMorePCIeControllersPossible).toBool()); + Assert (mStorageModel->data (index, StorageModel::R_IsMoreNVMeControllersPossible).toBool()); break; default: Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h (revision 61441) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h (revision 61442) @@ -5,5 +5,5 @@ /* - * Copyright (C) 2006-2012 Oracle Corporation + * Copyright (C) 2006-2016 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -83,7 +83,7 @@ USBControllerExpand, USBControllerCollapse, - PCIeControllerNormal, - PCIeControllerExpand, - PCIeControllerCollapse, + NVMeControllerNormal, + NVMeControllerExpand, + NVMeControllerCollapse, FloppyControllerNormal, FloppyControllerExpand, @@ -98,6 +98,6 @@ USBControllerAddEn, USBControllerAddDis, - PCIeControllerAddEn, - PCIeControllerAddDis, + NVMeControllerAddEn, + NVMeControllerAddDis, FloppyControllerAddEn, FloppyControllerAddDis, @@ -231,10 +231,10 @@ }; -/* PCIe Controller Type */ -class PCIeStorageControllerType : public AbstractControllerType -{ -public: - - PCIeStorageControllerType (KStorageControllerType aSubType); +/* NVMe Controller Type */ +class NVMeStorageControllerType : public AbstractControllerType +{ +public: + + NVMeStorageControllerType (KStorageControllerType aSubType); private: @@ -457,5 +457,5 @@ R_IsMoreSASControllersPossible, R_IsMoreUSBControllersPossible, - R_IsMorePCIeControllersPossible, + R_IsMoreNVMeControllersPossible, R_IsMoreAttachmentsPossible, @@ -726,5 +726,5 @@ void addSASController(); void addUSBController(); - void addPCIeController(); + void addNVMeController(); void delController(); @@ -808,5 +808,5 @@ QAction *mAddFloppyCtrAction; QAction *mAddUSBCtrAction; - QAction *mAddPCIeCtrAction; + QAction *mAddNVMeCtrAction; QAction *mAddAttAction; QAction *mDelAttAction;