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

Timestamp:

Mar 9, 2021 12:28:53 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

143170

Message:

VBoxManage/modifyvm: Don't try to always helpfully enable a NIC when
changing its attachment, only do that if it's not already enabled.

For a VM in a saved state the attachment can be changed, but the NIC
status cannot, so it was impossible to change NIC attachments from the
command line in that case. Of course, the setter also should not
freak out about a no-op request to enable an already enabled NIC and
that should be fixed, but better be twice shy...

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (2 diffs)

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

@@ -1633 +1633 @@
                 ASSERT(nic);
 
+                /*
+                 * Check if the NIC is already enabled.  Do not try to
+                 * enable it if it already is.  That makes a
+                 * difference for saved VMs for which you can change
+                 * the NIC attachment, but can't change the NIC
+                 * enabled status (yes, the setter also should not
+                 * freak out about a no-op request).
+                 */
+                BOOL fEnabled;;
+                CHECK_ERROR(nic, COMGETTER(Enabled)(&fEnabled));
+
                 if (!RTStrICmp(ValueUnion.psz, "none"))
                 {
-                    CHECK_ERROR(nic, COMSETTER(Enabled)(FALSE));
+                    if (!!fEnabled)
+                        CHECK_ERROR(nic, COMSETTER(Enabled)(FALSE));
                 }
                 else if (!RTStrICmp(ValueUnion.psz, "null"))
                 {
-                    CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE));
+                    if (!fEnabled)
+                        CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE));
                     CHECK_ERROR(nic, COMSETTER(AttachmentType)(NetworkAttachmentType_Null));
                 }
                 else if (!RTStrICmp(ValueUnion.psz, "nat"))
                 {
-                    CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE));
+                    if (!fEnabled)
+                        CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE));
                     CHECK_ERROR(nic, COMSETTER(AttachmentType)(NetworkAttachmentType_NAT));
                 }
@@ -1650 +1664 @@
                         || !RTStrICmp(ValueUnion.psz, "hostif")) /* backward compatibility */
                 {
-                    CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE));
+                    if (!fEnabled)
+                        CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE));
                     CHECK_ERROR(nic, COMSETTER(AttachmentType)(NetworkAttachmentType_Bridged));
                 }
                 else if (!RTStrICmp(ValueUnion.psz, "intnet"))
                 {
-                    CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE));
+                    if (!fEnabled)
+                        CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE));
                     CHECK_ERROR(nic, COMSETTER(AttachmentType)(NetworkAttachmentType_Internal));
                 }
                 else if (!RTStrICmp(ValueUnion.psz, "hostonly"))
                 {
-
-                    CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE));
+                    if (!fEnabled)
+                        CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE));
                     CHECK_ERROR(nic, COMSETTER(AttachmentType)(NetworkAttachmentType_HostOnly));
                 }
                 else if (!RTStrICmp(ValueUnion.psz, "generic"))
                 {
-
-                    CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE));
+                    if (!fEnabled)
+                        CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE));
                     CHECK_ERROR(nic, COMSETTER(AttachmentType)(NetworkAttachmentType_Generic));
                 }
                 else if (!RTStrICmp(ValueUnion.psz, "natnetwork"))
                 {
-
-                    CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE));
+                    if (!fEnabled)
+                        CHECK_ERROR(nic, COMSETTER(Enabled)(TRUE));
                     CHECK_ERROR(nic, COMSETTER(AttachmentType)(NetworkAttachmentType_NATNetwork));
                 }