[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/46] python: Treat None-return of greeting cmd
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 08/46] python: Treat None-return of greeting cmd |
Date: |
Thu, 6 Feb 2020 22:18:58 +0100 |
From: Lukáš Doktor <address@hidden>
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 <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Wainer dos Santos Moschetta <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
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 4b9a362240..f40586eedd 100644
--- a/python/qemu/qmp.py
+++ b/python/qemu/qmp.py
@@ -80,7 +80,7 @@ class QEMUMonitorProtocol:
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.1
- [PULL 00/46] Python queue 2020-02-06, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 01/46] python/qemu: qmp: Replace socket.error with OSError, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 02/46] python/qemu: Delint the qmp module, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 04/46] python/qemu: qmp: Make QEMUMonitorProtocol a context manager, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 05/46] python/qemu: qmp: Remove unnused attributes, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 03/46] python/qemu: qmp: Make accept()'s timeout configurable, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 06/46] python/qemu: accel: Fix kvm_available() on ppc64le, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 07/46] qemu-deprecated: Remove text about Python 2, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 08/46] python: Treat None-return of greeting cmd,
Philippe Mathieu-Daudé <=
- [PULL 09/46] python/qemu/machine: Allow to use other serial consoles than default, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 10/46] Acceptance tests: Extract _console_interaction(), Philippe Mathieu-Daudé, 2020/02/06
- [PULL 11/46] Acceptance tests: Add interrupt_interactive_console_until_pattern(), Philippe Mathieu-Daudé, 2020/02/06
- [PULL 12/46] travis.yml: install rpm2cpio for acceptance tests, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 13/46] tests/boot_linux_console: add extract_from_rpm method, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 14/46] tests/boot_linux_console: use os.path for filesystem paths, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 15/46] tests/boot_linux_console: fix extract_from_deb() comment, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 16/46] tests/boot_linux_console: Tag Emcraft Smartfusion2 as running 'u-boot', Philippe Mathieu-Daudé, 2020/02/06
- [PULL 18/46] tests: rename virtio_seg_max_adjust to virtio_check_params, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 17/46] tests/acceptance: Add boot tests for some of the QEMU advent calendar images, Philippe Mathieu-Daudé, 2020/02/06