* [PATCH] python: Treat None-return of greeting cmd
@ 2020-01-20 7:12 Lukáš Doktor
2020-01-20 8:22 ` Philippe Mathieu-Daudé
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Lukáš Doktor @ 2020-01-20 7:12 UTC (permalink / raw)
To: qemu-devel; +Cc: ldoktor, ehabkost, crosa
In case qemu process dies the "monitor.cmd" returns None which gets
passed to the "__negotiate_capabilities" and leads to unhandled
exception. Let's only check the resp in case it has a value.
Signed-off-by: Lukáš Doktor <ldoktor@redhat.com>
---
python/qemu/qmp.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/python/qemu/qmp.py b/python/qemu/qmp.py
index 5c8cf6a056..a3e5de718a 100644
--- a/python/qemu/qmp.py
+++ b/python/qemu/qmp.py
@@ -73,7 +73,7 @@ class QEMUMonitorProtocol(object):
raise QMPConnectError
# Greeting seems ok, negotiate capabilities
resp = self.cmd('qmp_capabilities')
- if "return" in resp:
+ if resp and "return" in resp:
return greeting
raise QMPCapabilitiesError
--
2.21.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] python: Treat None-return of greeting cmd
2020-01-20 7:12 [PATCH] python: Treat None-return of greeting cmd Lukáš Doktor
@ 2020-01-20 8:22 ` Philippe Mathieu-Daudé
2020-01-29 20:24 ` Wainer dos Santos Moschetta
2020-01-30 22:16 ` Philippe Mathieu-Daudé
2 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-01-20 8:22 UTC (permalink / raw)
To: Lukáš Doktor, qemu-devel; +Cc: ehabkost, crosa
On 1/20/20 8:12 AM, Lukáš Doktor wrote:
> In case qemu process dies the "monitor.cmd" returns None which gets
> passed to the "__negotiate_capabilities" and leads to unhandled
> exception. Let's only check the resp in case it has a value.
>
> Signed-off-by: Lukáš Doktor <ldoktor@redhat.com>
> ---
> python/qemu/qmp.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/python/qemu/qmp.py b/python/qemu/qmp.py
> index 5c8cf6a056..a3e5de718a 100644
> --- a/python/qemu/qmp.py
> +++ b/python/qemu/qmp.py
> @@ -73,7 +73,7 @@ class QEMUMonitorProtocol(object):
> raise QMPConnectError
> # Greeting seems ok, negotiate capabilities
> resp = self.cmd('qmp_capabilities')
> - if "return" in resp:
> + if resp and "return" in resp:
> return greeting
> raise QMPCapabilitiesError
>
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] python: Treat None-return of greeting cmd
2020-01-20 7:12 [PATCH] python: Treat None-return of greeting cmd Lukáš Doktor
2020-01-20 8:22 ` Philippe Mathieu-Daudé
@ 2020-01-29 20:24 ` Wainer dos Santos Moschetta
2020-01-30 22:16 ` Philippe Mathieu-Daudé
2 siblings, 0 replies; 4+ messages in thread
From: Wainer dos Santos Moschetta @ 2020-01-29 20:24 UTC (permalink / raw)
To: Lukáš Doktor, qemu-devel
Cc: Philippe Mathieu-Daudé, ehabkost, crosa
On 1/20/20 5:12 AM, Lukáš Doktor wrote:
> In case qemu process dies the "monitor.cmd" returns None which gets
> passed to the "__negotiate_capabilities" and leads to unhandled
> exception. Let's only check the resp in case it has a value.
>
> Signed-off-by: Lukáš Doktor <ldoktor@redhat.com>
> ---
> python/qemu/qmp.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
>
> diff --git a/python/qemu/qmp.py b/python/qemu/qmp.py
> index 5c8cf6a056..a3e5de718a 100644
> --- a/python/qemu/qmp.py
> +++ b/python/qemu/qmp.py
> @@ -73,7 +73,7 @@ class QEMUMonitorProtocol(object):
> raise QMPConnectError
> # Greeting seems ok, negotiate capabilities
> resp = self.cmd('qmp_capabilities')
> - if "return" in resp:
> + if resp and "return" in resp:
> return greeting
> raise QMPCapabilitiesError
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] python: Treat None-return of greeting cmd
2020-01-20 7:12 [PATCH] python: Treat None-return of greeting cmd Lukáš Doktor
2020-01-20 8:22 ` Philippe Mathieu-Daudé
2020-01-29 20:24 ` Wainer dos Santos Moschetta
@ 2020-01-30 22:16 ` Philippe Mathieu-Daudé
2 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-01-30 22:16 UTC (permalink / raw)
To: Lukáš Doktor, qemu-devel; +Cc: ehabkost, crosa
On 1/20/20 8:12 AM, Lukáš Doktor wrote:
> In case qemu process dies the "monitor.cmd" returns None which gets
> passed to the "__negotiate_capabilities" and leads to unhandled
> exception. Let's only check the resp in case it has a value.
>
> Signed-off-by: Lukáš Doktor <ldoktor@redhat.com>
> ---
> python/qemu/qmp.py | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/python/qemu/qmp.py b/python/qemu/qmp.py
> index 5c8cf6a056..a3e5de718a 100644
> --- a/python/qemu/qmp.py
> +++ b/python/qemu/qmp.py
> @@ -73,7 +73,7 @@ class QEMUMonitorProtocol(object):
> raise QMPConnectError
> # Greeting seems ok, negotiate capabilities
> resp = self.cmd('qmp_capabilities')
> - if "return" in resp:
> + if resp and "return" in resp:
> return greeting
> raise QMPCapabilitiesError
>
>
Thanks, applied to my python-next tree:
https://gitlab.com/philmd/qemu/commits/python-next
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-01-30 22:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-20 7:12 [PATCH] python: Treat None-return of greeting cmd Lukáš Doktor
2020-01-20 8:22 ` Philippe Mathieu-Daudé
2020-01-29 20:24 ` Wainer dos Santos Moschetta
2020-01-30 22:16 ` Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).