Merge remote-tracking branch 'origin/pr/619'

* origin/pr/619: fix: incorrect fmt type fix: hotplug typo
QubesOS · Sep 26, 2024 · b61d2a0 · b61d2a0
2 parents 1ec74f9 + 4c21c7a
commit b61d2a0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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):

diff --git 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):