From patchwork Thu Oct  7 19:52:05 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Luiz Capitulino <lcapitulino@redhat.com>
X-Patchwork-Id: 238791
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o97JqMeA021232
	for <patchwork-kvm@patchwork.kernel.org>; Thu, 7 Oct 2010 19:52:22 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755019Ab0JGTwT (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Thu, 7 Oct 2010 15:52:19 -0400
Received: from mx1.redhat.com ([209.132.183.28]:28633 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754976Ab0JGTwT (ORCPT <rfc822;kvm@vger.kernel.org>);
	Thu, 7 Oct 2010 15:52:19 -0400
Received: from int-mx02.intmail.prod.int.phx2.redhat.com
	(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o97JqIAs005193
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
	Thu, 7 Oct 2010 15:52:18 -0400
Received: from localhost (ovpn-113-106.phx2.redhat.com [10.3.113.106])
	by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id o97JqH56032160; Thu, 7 Oct 2010 15:52:17 -0400
From: Luiz Capitulino <lcapitulino@redhat.com>
To: autotest@test.kernel.org
Cc: kvm@vger.kernel.org, lmr@redhat.com, ehabkost@redhat.com,
	armbru@redhat.com
Subject: [PATCH 1/3] QMPMonitor: Introduce the get_greeting() method
Date: Thu,  7 Oct 2010 16:52:05 -0300
Message-Id: <1286481127-24640-2-git-send-email-lcapitulino@redhat.com>
In-Reply-To: <1286481127-24640-1-git-send-email-lcapitulino@redhat.com>
References: <1286481127-24640-1-git-send-email-lcapitulino@redhat.com>
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Thu, 07 Oct 2010 19:52:23 +0000 (UTC)


diff --git a/client/tests/kvm/kvm_monitor.py b/client/tests/kvm/kvm_monitor.py
index 8440835..c23835c 100644
--- a/client/tests/kvm/kvm_monitor.py
+++ b/client/tests/kvm/kvm_monitor.py
@@ -408,7 +408,7 @@ class QMPMonitor(Monitor):
             while time.time() < end_time:
                 for obj in self._read_objects():
                     if "QMP" in obj:
-                        self._greeting = obj["QMP"]
+                        self._greeting = obj
                         break
                 if self._greeting:
                     break
@@ -597,6 +597,13 @@ class QMPMonitor(Monitor):
         self._lock.release()
 
 
+    def get_greeting(self):
+        """
+        Return QMP greeting message.
+        """
+        return self._greeting
+
+
     # Command wrappers
     # Note: all of the following functions raise exceptions in a similar manner
     # to cmd() and _get_command_output().