From patchwork Tue Oct 19 13:35:33 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: 265621
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 o9JDa79b004904
	for <patchwork-kvm@patchwork.kernel.org>;
	Tue, 19 Oct 2010 13:36:25 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1758678Ab0JSNfl (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Tue, 19 Oct 2010 09:35:41 -0400
Received: from mx1.redhat.com ([209.132.183.28]:33684 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1758670Ab0JSNfk (ORCPT <rfc822;kvm@vger.kernel.org>);
	Tue, 19 Oct 2010 09:35:40 -0400
Received: from int-mx10.intmail.prod.int.phx2.redhat.com
	(int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9JDZdGA014817
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK);
	Tue, 19 Oct 2010 09:35:39 -0400
Received: from localhost (ovpn-113-77.phx2.redhat.com [10.3.113.77])
	by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with
	ESMTP id o9JDZc0q028030; Tue, 19 Oct 2010 09:35:38 -0400
From: Luiz Capitulino <lcapitulino@redhat.com>
To: autotest@test.kernel.org
Cc: kvm@vger.kernel.org, lmr@redhat.com
Subject: [PATCH 1/2] QMPMonitor: Introduce the get_greeting() method
Date: Tue, 19 Oct 2010 11:35:33 -0200
Message-Id: <1287495334-18019-2-git-send-email-lcapitulino@redhat.com>
In-Reply-To: <1287495334-18019-1-git-send-email-lcapitulino@redhat.com>
References: <1287495334-18019-1-git-send-email-lcapitulino@redhat.com>
X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23
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]);
	Tue, 19 Oct 2010 13:36:25 +0000 (UTC)


diff --git a/client/tests/kvm/kvm_monitor.py b/client/tests/kvm/kvm_monitor.py
index 40be77d..6447cb3 100644
--- a/client/tests/kvm/kvm_monitor.py
+++ b/client/tests/kvm/kvm_monitor.py
@@ -392,7 +392,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
@@ -652,6 +652,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().