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

Timestamp:

Mar 31, 2010 1:29:26 PM (15 years ago)

Author:

vboxsync

Message:

vboxshell: cold hotplug shall handle errors better

File:

• trunk/src/VBox/Frontends/VBoxShell/vboxshell.py (modified) (3 diffs)

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

@@ -370 +370 @@
     else:
         passwd = ""
-    
+
     if len(args) > 2:
         maxDowntime  = int(args[2])
@@ -821 +821 @@
         if mach.CPUHotPlugEnabled:
             session = ctx['global'].openMachineSession(mach.id)
-            mach1 = session.machine
-            cpu = int(args[2])
-            print "Adding CPU %d..." %(cpu)
-            mach1.hotPlugCPU(cpu)
-            mach1.saveSettings()
+            try:
+                mach1 = session.machine
+                cpu = int(args[2])
+                print "Adding CPU %d..." %(cpu)
+                mach1.hotPlugCPU(cpu)
+                mach1.saveSettings()
+            except:
+                session.close()
+                raise
             session.close()
     else:
@@ -841 +845 @@
         if mach.CPUHotPlugEnabled:
             session = ctx['global'].openMachineSession(mach.id)
-            mach1 = session.machine
-            cpu = int(args[2])
-            print "Removing CPU %d..." %(cpu)
-            mach1.hotUnplugCPU(cpu)
-            mach1.saveSettings()
+            try:
+                mach1 = session.machine
+                cpu = int(args[2])
+                print "Removing CPU %d..." %(cpu)
+                mach1.hotUnplugCPU(cpu)
+                mach1.saveSettings()
+            except:
+                session.close()
+                raise
             session.close()
     else: