From: John Snow Date: Thu, 18 Nov 2021 20:46:16 +0000 (-0500) Subject: python/machine: add instance disambiguator to default nickname X-Git-Tag: v6.2.0-rc2~4^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=72b17fe715056c96ea73f187ab46721788b3a782;p=thirdparty%2Fqemu.git python/machine: add instance disambiguator to default nickname 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 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Willian Rampazzo Message-id: 20211118204620.1897674-4-jsnow@redhat.com Signed-off-by: John Snow --- diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py index ea9e07805df..ad529fd92a6 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 "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