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 <[email protected]>
Signed-off-by: Lucas Meneghel Rodrigues <[email protected]>
---
 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

_______________________________________________
Autotest-kernel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/autotest-kernel

Reply via email to