[PATCH] virt.kvm_monitor: Future proof migration handling on QMP monitor

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



With d46ad35c74, the exception handling for migrations
happening when using a single QMP monitor relies on
an exception class that's going to disappear in future
versions of QEMU, being replaced by the GenericError
class. So let's also handle this exception class.

CC: Luiz Capitulino <lcapitulino@xxxxxxxxxx>
Signed-off-by: Lucas Meneghel Rodrigues <lmr@xxxxxxxxxx>
---
 client/virt/kvm_monitor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/virt/kvm_monitor.py b/client/virt/kvm_monitor.py
index 9d8ed87..932725b 100644
--- a/client/virt/kvm_monitor.py
+++ b/client/virt/kvm_monitor.py
@@ -1155,7 +1155,7 @@ class QMPMonitor(Monitor):
         try:
             return self.cmd("migrate", args)
         except QMPCmdError, e:
-            if e.data['class'] == 'SockConnectInprogress':
+            if e.data['class'] in ['SockConnectInprogress', 'GenericError']:
                 logging.debug("Migrate socket connection still initializing...")
             else:
                 raise e
-- 
1.7.11.4

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [KVM ARM]     [KVM ia64]     [KVM ppc]     [Virtualization Tools]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite Questions]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux