[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/7] python/machine: add instance disambiguator to default nicknam
From: |
John Snow |
Subject: |
[PULL 3/7] python/machine: add instance disambiguator to default nickname |
Date: |
Mon, 22 Nov 2021 21:38:01 -0500 |
If you create two instances of QEMUMachine(), they'll both create the
same nickname by default -- which is not that helpful.
Luckily, they'll both create unique temporary directories ... but due to
user configuration, they may share logging and sockfile directories,
meaning two instances can collide. The Python logging will also be quite
confusing, with no differentiation between the two instances.
Add an instance disambiguator (The memory address of the instance) to
the default nickname to foolproof this in all cases.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-id: 20211118204620.1897674-4-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
---
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 ea9e07805d..ad529fd92a 100644
--- a/python/qemu/machine/machine.py
+++ b/python/qemu/machine/machine.py
@@ -133,7 +133,7 @@ def __init__(self,
self._wrapper = wrapper
self._qmp_timer = qmp_timer
- self._name = name or "qemu-%d" % os.getpid()
+ self._name = name or f"qemu-{os.getpid()}-{id(self):02x}"
self._temp_dir: Optional[str] = None
self._base_temp_dir = base_temp_dir
self._sock_dir = sock_dir
--
2.31.1
- [PULL 0/7] Python patches, John Snow, 2021/11/22
- [PULL 1/7] python/machine: add @sock_dir property, John Snow, 2021/11/22
- [PULL 2/7] python/machine: remove _remove_monitor_sockfile property, John Snow, 2021/11/22
- [PULL 3/7] python/machine: add instance disambiguator to default nickname,
John Snow <=
- [PULL 4/7] python/machine: move more variable initializations to _pre_launch, John Snow, 2021/11/22
- [PULL 6/7] scripts/device-crash-test: Use a QMP timeout, John Snow, 2021/11/22
- [PULL 5/7] python/machine: handle "fast" QEMU terminations, John Snow, 2021/11/22
- [PULL 7/7] python/aqmp: fix send_fd_scm for python 3.6.x, John Snow, 2021/11/22
- Re: [PULL 0/7] Python patches, Richard Henderson, 2021/11/23