From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39224) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCpaq-0006Jr-PB for qemu-devel@nongnu.org; Mon, 10 Feb 2014 07:04:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WCpal-0001Jt-Ps for qemu-devel@nongnu.org; Mon, 10 Feb 2014 07:04:08 -0500 Received: from paradis.irqsave.net ([62.212.105.220]:49546) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCpal-0001Jk-9x for qemu-devel@nongnu.org; Mon, 10 Feb 2014 07:04:03 -0500 Date: Mon, 10 Feb 2014 13:04:02 +0100 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140210120402.GB3088@irqsave.net> References: <1391769813-15437-1-git-send-email-famz@redhat.com> <1391769813-15437-3-git-send-email-famz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1391769813-15437-3-git-send-email-famz@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 2/5] qtest: Add scripts/qtest/qtest.py List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng Cc: Kevin Wolf , =?iso-8859-1?Q?Beno=EEt?= Canet , qemu-devel@nongnu.org, Stefan Hajnoczi , pbonzini@redhat.com Le Friday 07 Feb 2014 =E0 18:43:30 (+0800), Fam Zheng a =E9crit : > This removes the dummy scripts/qtest and adds scripts/qtest/qtest.py as > a python library for qtest protocol. >=20 > This is a skeleton with a basic "cmd" method to execute a command, > reading and parsing of qtest output will be added later on demand. >=20 > Signed-off-by: Fam Zheng > --- > scripts/qtest | 5 ---- > scripts/qtest/qtest.py | 78 ++++++++++++++++++++++++++++++++++++++++++= ++++++++ > 2 files changed, 78 insertions(+), 5 deletions(-) > delete mode 100755 scripts/qtest > create mode 100644 scripts/qtest/qtest.py >=20 > diff --git a/scripts/qtest b/scripts/qtest > deleted file mode 100755 > index 4ef6c1c..0000000 > --- a/scripts/qtest > +++ /dev/null > @@ -1,5 +0,0 @@ > -#!/bin/sh > - > -export QTEST_QEMU_BINARY=3D$1 > -shift > -"$@" > diff --git a/scripts/qtest/qtest.py b/scripts/qtest/qtest.py > new file mode 100644 > index 0000000..a5daf50 > --- /dev/null > +++ b/scripts/qtest/qtest.py > @@ -0,0 +1,78 @@ > +# QEMU qtest library > +# > +# Copyright (C) 2014 Red Hat Inc. > +# > +# Authors: > +# Fam Zheng > +# > +# This work is licensed under the terms of the GNU GPL, version 2. Se= e > +# the COPYING file in the top-level directory. > +# > +# Based on qmp.py. > +# > + > +import errno > +import socket > + > +class QEMUQtestProtocol: > + def __init__(self, address, server=3DFalse): > + """ > + Create a QEMUQtestProtocol object. > + > + @param address: QEMU address, can be either a unix socket path= (string) > + or a tuple in the form ( address, port ) for a= TCP > + connection > + @param server: server mode listens on the socket (bool) > + @raise socket.error on socket connection errors > + @note No connection is established, this is done by the connec= t() or > + accept() methods > + """ > + self.__address =3D address > + self.__sock =3D self.__get_sock() > + if server: > + self.__sock.bind(self.__address) > + self.__sock.listen(1) > + > + def __get_sock(self): > + if isinstance(self.__address, tuple): > + family =3D socket.AF_INET > + else: > + family =3D socket.AF_UNIX > + return socket.socket(family, socket.SOCK_STREAM) > + > + error =3D socket.error This statement outside of method looks suspicious. > + > + def connect(self): > + """ > + Connect to the qtest socket. > + > + @raise socket.error on socket connection errors > + """ > + self.__sock.connect(self.__address) > + self.__sockfile =3D self.__sock.makefile() > + > + def accept(self): > + """ > + Await connection from QEMU. > + > + @raise socket.error on socket connection errors > + """ > + self.__sock, _ =3D self.__sock.accept() > + self.__sockfile =3D self.__sock.makefile() > + > + def cmd(self, qtest_cmd): > + """ > + Send a qtest command on the wire. > + > + @param qtest_cmd: qtest command to be sent as a Python dict There is no conversion involved here. Should this comment be "Python dict to send as a qtest command" ? > + """ > + self.__sock.sendall(qtest_cmd + "\n") > + > + def close(self): > + self.__sock.close() > + self.__sockfile.close() self.__sock was opened before self.__sockfile so should the self.__sockfi= le be closed first ? > + > + timeout =3D socket.timeout This line too looks suspicious: in Python class variables tend to be spelled like " TIMEOUT =3D socket.timeout" to indicate that they do not belong to a= method. > + > + def settimeout(self, timeout): > + self.__sock.settimeout(timeout) > --=20 > 1.8.5.4 >=20