diff mbox

[3/4] qmp-shell: don't show version greeting if unavailable

Message ID 20170504125432.21653-4-marcandre.lureau@redhat.com
State New
Headers show

Commit Message

Marc-André Lureau May 4, 2017, 12:54 p.m. UTC 
qemu-ga doesn't have greeting.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 scripts/qmp/qmp-shell | 3 +++
 1 file changed, 3 insertions(+)

Comments

Eric Blake May 4, 2017, 1:50 p.m. UTC | #1 
On 05/04/2017 07:54 AM, Marc-André Lureau wrote:
> qemu-ga doesn't have greeting.
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  scripts/qmp/qmp-shell | 3 +++
>  1 file changed, 3 insertions(+)
> 

Reviewed-by: Eric Blake <eblake@redhat.com>

> diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell
> index 04b8fa3eae..db24c87cdd 100755
> --- a/scripts/qmp/qmp-shell
> +++ b/scripts/qmp/qmp-shell
> @@ -265,6 +265,9 @@ class QMPShell(qmp.QEMUMonitorProtocol):
>  
>      def show_banner(self, msg='Welcome to the QMP low-level shell!'):
>          print msg
> +        if not self._greeting:
> +            print 'Connected'
> +            return
>          version = self._greeting['QMP']['version']['qemu']
>          print 'Connected to QEMU %d.%d.%d\n' % (version['major'],version['minor'],version['micro'])
>  
>
diff mbox

Patch

diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell
index 04b8fa3eae..db24c87cdd 100755
--- a/scripts/qmp/qmp-shell
+++ b/scripts/qmp/qmp-shell
@@ -265,6 +265,9 @@  class QMPShell(qmp.QEMUMonitorProtocol):
 
     def show_banner(self, msg='Welcome to the QMP low-level shell!'):
         print msg
+        if not self._greeting:
+            print 'Connected'
+            return
         version = self._greeting['QMP']['version']['qemu']
         print 'Connected to QEMU %d.%d.%d\n' % (version['major'],version['minor'],version['micro'])