From a1fdea2a021cc774f1319e4d956dfc1a4acd74ee Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Wed, 25 Sep 2024 21:33:22 +0200 Subject: [PATCH 1/2] fix: hotplug typo --- qubes/qmemman/domainstate.py | 2 +- qubes/tests/qmemman.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qubes/qmemman/domainstate.py b/qubes/qmemman/domainstate.py index 73219824f..99739106e 100644 --- a/qubes/qmemman/domainstate.py +++ b/qubes/qmemman/domainstate.py @@ -28,7 +28,7 @@ def __init__(self, id): self.mem_used = None # used memory, computed based on meminfo self.id = id # domain id self.last_target = 0 # the last memset target - self.use_hoplug = False # use memory hotplug for mem-set + self.use_hotplug = False # use memory hotplug for mem-set self.no_progress = False # no react to memset self.slow_memset_react = False # slow react to memset (after few # tries still above target) diff --git a/qubes/tests/qmemman.py b/qubes/tests/qmemman.py index f37daabb4..153c696b0 100644 --- a/qubes/tests/qmemman.py +++ b/qubes/tests/qmemman.py @@ -40,7 +40,7 @@ def construct_dominfo(id, d.memory_actual = memory_actual d.memory_current = memory_current d.last_target = last_target - d.use_hoplug = use_hotplug + d.use_hotplug = use_hotplug return d class TC_00_Qmemman_algo(qubes.tests.QubesTestCase): From 4c21c7a6f05284febc99da4bc88b973359b6a529 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Wed, 25 Sep 2024 21:34:54 +0200 Subject: [PATCH 2/2] fix: incorrect fmt type --- qubes/tools/qmemmand.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qubes/tools/qmemmand.py b/qubes/tools/qmemmand.py index 1f3a520e7..df61f172f 100644 --- a/qubes/tools/qmemmand.py +++ b/qubes/tools/qmemmand.py @@ -163,7 +163,7 @@ def meminfo_changed(self, domain_id): system_state.refresh_meminfo(domain_id, untrusted_meminfo_key) except: # pylint: disable=bare-except - self.log.exception('Updating meminfo for %d failed', domain_id) + self.log.exception('Updating meminfo for %s failed', domain_id) self.log.debug('global_lock released') def watch_loop(self):