From patchwork Fri Nov 27 00:59:09 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 39610 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D82BCB6EF6 for ; Fri, 27 Nov 2009 12:33:20 +1100 (EST) Received: from localhost ([127.0.0.1]:48498 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDpi0-0003mZ-E9 for incoming@patchwork.ozlabs.org; Thu, 26 Nov 2009 20:33:16 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NDpBz-00025T-Db for qemu-devel@nongnu.org; Thu, 26 Nov 2009 20:00:11 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NDpBu-00022h-IK for qemu-devel@nongnu.org; Thu, 26 Nov 2009 20:00:11 -0500 Received: from [199.232.76.173] (port=48310 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDpBu-00022T-AU for qemu-devel@nongnu.org; Thu, 26 Nov 2009 20:00:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:10400) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NDpBt-0004Vi-Bx for qemu-devel@nongnu.org; Thu, 26 Nov 2009 20:00:05 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAR104tl019533 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 26 Nov 2009 20:00:04 -0500 Received: from localhost (vpn-10-232.rdu.redhat.com [10.11.10.232]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nAR1029Y004983; Thu, 26 Nov 2009 20:00:03 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Thu, 26 Nov 2009 22:59:09 -0200 Message-Id: <1259283550-3597-20-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1259283550-3597-1-git-send-email-lcapitulino@redhat.com> References: <1259283550-3597-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com, avi@redhat.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 19/20] QMP: Introduce qmp-shell X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This is a very simple shell written in Python for demonstration purposes. Unfortunately it's a bit awkward right now, as the user has to specify the arguments names and the printed data can be a raw dictionary or list, like the following example: (QEMU) pci_add pci_addr=auto type=nic {u'slot': 5, u'bus': 0, u'domain': 0, u'function': 0} (QEMU) It's worth to note that the shell is broken into two files. One is the shell itself, the other is the QMP class which handles the communication with QEMU. Signed-off-by: Luiz Capitulino --- QMP/qmp-shell | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ QMP/qmp.py | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 144 insertions(+), 0 deletions(-) create mode 100755 QMP/qmp-shell create mode 100644 QMP/qmp.py diff --git a/QMP/qmp-shell b/QMP/qmp-shell new file mode 100755 index 0000000..f89b9af --- /dev/null +++ b/QMP/qmp-shell @@ -0,0 +1,72 @@ +#!/usr/bin/python +# +# Simple QEMU shell on top of QMP +# +# Copyright (C) 2009 Red Hat Inc. +# +# Authors: +# Luiz Capitulino +# +# This work is licensed under the terms of the GNU GPL, version 2. See +# the COPYING file in the top-level directory. +# +# Usage: +# +# Start QEMU with: +# +# $ qemu [...] -monitor control,unix:./qmp,server +# +# Run the shell: +# +# $ qmp-shell ./qmp +# +# Commands have the following format: +# +# < command-name > [ arg-name1=arg1 ] ... [ arg-nameN=argN ] +# +# For example: +# +# (QEMU) info item=network + +import qmp +import readline +from sys import argv,exit + +def shell_help(): + print 'bye exit from the shell' + +def main(): + if len(argv) != 2: + print 'qemu-shell ' + exit(1) + + qemu = qmp.QEMUMonitorProtocol(argv[1]) + qemu.connect() + + print 'Connected!' + + while True: + try: + cmd = raw_input('(QEMU) ') + except EOFError: + print + break + if cmd == '': + continue + elif cmd == 'bye': + break + elif cmd == 'help': + shell_help() + else: + try: + resp = qemu.send(cmd) + if resp == None: + print 'Disconnected' + break + print resp + except IndexError: + print '-> command format: ', + print '[arg-name1=arg1] ... [arg-nameN=argN]' + +if __name__ == '__main__': + main() diff --git a/QMP/qmp.py b/QMP/qmp.py new file mode 100644 index 0000000..d9da603 --- /dev/null +++ b/QMP/qmp.py @@ -0,0 +1,72 @@ +# QEMU Monitor Protocol Python class +# +# Copyright (C) 2009 Red Hat Inc. +# +# Authors: +# Luiz Capitulino +# +# This work is licensed under the terms of the GNU GPL, version 2. See +# the COPYING file in the top-level directory. + +import socket, json + +class QMPError(Exception): + pass + +class QMPConnectError(QMPError): + pass + +class QEMUMonitorProtocol: + def connect(self): + self.sock.connect(self.filename) + data = self.__json_read() + if data == None: + raise QMPConnectError + if not data.has_key('QMP'): + raise QMPConnectError + return data['QMP']['capabilities'] + + def close(self): + self.sock.close() + + def send_raw(self, line): + self.sock.send(str(line)) + return self.__json_read() + + def send(self, cmdline): + cmd = self.__build_cmd(cmdline) + self.__json_send(cmd) + resp = self.__json_read() + if resp == None: + return + elif resp.has_key('error'): + return resp['error'] + else: + return resp['return'] + + def __build_cmd(self, cmdline): + cmdargs = cmdline.split() + qmpcmd = { 'execute': cmdargs[0], 'arguments': {} } + for arg in cmdargs[1:]: + opt = arg.split('=') + try: + value = int(opt[1]) + except ValueError: + value = opt[1] + qmpcmd['arguments'][opt[0]] = value + return qmpcmd + + def __json_send(self, cmd): + # XXX: We have to send any additional char, otherwise + # the Server won't read our input + self.sock.send(json.dumps(cmd) + ' ') + + def __json_read(self): + try: + return json.loads(self.sock.recv(1024)) + except ValueError: + return + + def __init__(self, filename): + self.filename = filename + self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)