From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Thu, 4 May 2017 12:54:30 +0000 (+0400)
Subject: qmp-shell: Cope with query-commands error
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=daa5a72ebab20345da474ee2f6148a8dacd2cb17;p=qemu.git

qmp-shell: Cope with query-commands error

qemu-ga doesn't implement it.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20170504125432.21653-3-marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[Commit message tweaked]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---

diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell
index b4d2dbd292..1182f823ef 100755
--- a/scripts/qmp/qmp-shell
+++ b/scripts/qmp/qmp-shell
@@ -131,7 +131,10 @@ class QMPShell(qmp.QEMUMonitorProtocol):
         return arg
 
     def _fill_completion(self):
-        for cmd in self.cmd('query-commands')['return']:
+        cmds = self.cmd('query-commands')
+        if cmds.has_key('error'):
+            return
+        for cmd in cmds['return']:
             self._completer.append(cmd['name'])
 
     def __completer_setup(self):