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

Timestamp:

Jan 9, 2020 4:31:04 AM (5 years ago)

Author:

vboxsync

Message:

Network/DevVirtioNet_1_0.cpp: Ported skeletal framwork from VirtIO 0.9 to VirtIO 1.0 semantics. Builds but not working. See BugRef(8561) Comment #49 for details

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManageInfo.cpp (modified) (1 diff)
• VBoxManage/VBoxManageModifyVM.cpp (modified) (1 diff)
• VBoxShell/vboxshell.py (modified) (1 diff)
• VirtualBox/src/converter/UIConverterBackendCOM.cpp (modified) (1 diff)
• VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp (modified) (1 diff)
• VirtualBox/src/widgets/UIApplianceEditorWidget.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -1457 +1457 @@
 #ifdef VBOX_WITH_VIRTIO
                     case NetworkAdapterType_Virtio:     pszNICType = "virtio";      break;
+
+#endif
+#ifdef VBOX_WITH_VIRTIO_NET_1_0
+                    case NetworkAdapterType_Virtio_1_0: pszNICType = "virtio_1.0";  break;
 #endif
                     default: AssertFailed();            pszNICType = "unknown";     break;

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -1498 +1498 @@
                 }
 #endif /* VBOX_WITH_VIRTIO */
+#ifdef VBOX_WITH_VIRTIO_NET_1_0
+                else if (!RTStrICmp(ValueUnion.psz, "virtio_1.0"))
+                {
+                    CHECK_ERROR(nic, COMSETTER(AdapterType)(NetworkAdapterType_Virtio_1_0));
+                }
+#endif /* VBOX_WITH_VIRTIO_NET_1_0 */
                 else
                 {

trunk/src/VBox/Frontends/VBoxShell/vboxshell.py

@@ -1657 +1657 @@
     elif (natype == ctx['global'].constants.NetworkAdapterType_Virtio):
         return "virtio"
+    elif (natype == ctx['global'].constants.NetworkAdapterType_Virtio_1_0):
+        return "virtio_1.0"
     elif (natype == ctx['global'].constants.NetworkAdapterType_Null):
         return None

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp

@@ -365 +365 @@
         case KNetworkAdapterType_Virtio:    return QApplication::translate("UICommon", "Paravirtualized Network (virtio-net)", "NetworkAdapterType");
 #endif /* VBOX_WITH_VIRTIO */
+        case KNetworkAdapterType_Virtio_1_0: return QApplication::translate("UICommon", "Paravirtualized Network (virtio-net-1-dot-0)", "NetworkAdapterType");
         case KNetworkAdapterType_Am79C960:  return QApplication::translate("UICommon", "PCnet-ISA (Am79C960)", "NetworkAdapterType");
         default: AssertMsgFailed(("No text for %d", type)); break;

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp

@@ -696 +696 @@
             ++iAdapterTypeIndex;
         }
+#ifdef VBOX_WITH_VIRTIO_1_0
+        m_pAdapterTypeCombo->insertItem(iAdapterTypeIndex, gpConverter->toString(KNetworkAdapterType_Virtio_1_0));
+        m_pAdapterTypeCombo->setItemData(iAdapterTypeIndex, KNetworkAdapterType_Virtio_1_0);
+        m_pAdapterTypeCombo->setItemData(iAdapterTypeIndex, m_pAdapterTypeCombo->itemText(iAdapterTypeIndex), Qt::ToolTipRole);
+        ++iAdapterTypeIndex;
+#endif /* VBOX_WITH_VIRTIO_1_0 */
 
         /* Choose requested adapter type: */

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp

@@ -841 +841 @@
                 }
                 /* Pass editor back: */
+#ifdef VBOX_WITH_VIRTIO_NET_1_0
+                pComboBox->addItem(gpConverter->toString(KNetworkAdapterType_Virtio_1_0), KNetworkAdapterType_Virtio_1_0);
+#endif /* VBOX_WITH_VIRTIO */
                 pEditor = pComboBox;
                 break;