32d2c6bf29
- The patches from upstream cause testsuit failures (bsc#1197150 bsc#1197528) * Patches added: Revert-python-iotests-replace-qmp-with-a.patch Revert-python-machine-add-instance-disam.patch Revert-python-machine-add-sock_dir-prope.patch Revert-python-machine-handle-fast-QEMU-t.patch Revert-python-machine-move-more-variable.patch Revert-python-machine-remove-_remove_mon.patch OBS-URL: https://build.opensuse.org/request/show/965607 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=703
29 lines
1.0 KiB
Diff
29 lines
1.0 KiB
Diff
From: Li Zhang <lizhang@suse.de>
|
|
Date: Tue, 29 Mar 2022 12:00:29 +0200
|
|
Subject: Revert "python/machine: add instance disambiguator to default
|
|
nickname"
|
|
|
|
References: bsc#1197528 bsc#1197150
|
|
|
|
To improve testsuit, these patches still need more testing.
|
|
This reverts commit 72b17fe715056c96ea73f187ab46721788b3a782.
|
|
|
|
Signed-off-by: Li Zhang <lizhang@suse.de>
|
|
---
|
|
python/qemu/machine/machine.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py
|
|
index ad529fd92a6022150fd0156d005d..ea9e07805df10a57115dace06885 100644
|
|
--- a/python/qemu/machine/machine.py
|
|
+++ b/python/qemu/machine/machine.py
|
|
@@ -133,7 +133,7 @@ class QEMUMachine:
|
|
self._wrapper = wrapper
|
|
self._qmp_timer = qmp_timer
|
|
|
|
- self._name = name or f"qemu-{os.getpid()}-{id(self):02x}"
|
|
+ self._name = name or "qemu-%d" % os.getpid()
|
|
self._temp_dir: Optional[str] = None
|
|
self._base_temp_dir = base_temp_dir
|
|
self._sock_dir = sock_dir
|