Patchwork [03/32] qmp: fix __accept() in qmp.py

login
register
mail settings
Submitter Kevin Wolf
Date Oct. 24, 2012, 9:50 a.m.
Message ID <1351072256-6112-4-git-send-email-kwolf@redhat.com>
Download mbox | patch
Permalink /patch/193715/
State New
Headers show

Comments

Kevin Wolf - Oct. 24, 2012, 9:50 a.m.
From: Jeff Cody <jcody@redhat.com>

In QEMUMonitorProtocol, commit e9d17b6 removed the __sockfile creation
from __negotiate_capabilities(), which breaks _accept().  This causes
failures in qemu-io python based tests (i.e. tests 030 and 040).

This patch creates the sockfile in __accept() as well.

Signed-off-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 QMP/qmp.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

Patch

diff --git a/QMP/qmp.py b/QMP/qmp.py
index 33c7d36..32510a1 100644
--- a/QMP/qmp.py
+++ b/QMP/qmp.py
@@ -96,6 +96,7 @@  class QEMUMonitorProtocol:
         @raise QMPCapabilitiesError if fails to negotiate capabilities
         """
         self.__sock, _ = self.__sock.accept()
+        self.__sockfile = self.__sock.makefile()
         return self.__negotiate_capabilities()
 
     def cmd_obj(self, qmp_cmd):