Merge pull request #5023 from chloerh/hmat

Fixup:update dmesg check list to be compatible with new version
autotest · Jul 11, 2023 · f8be986 · f8be986
2 parents ae4d3c8 + da53b40
commit f8be986
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/libvirt/tests/cfg/memory/hmat.cfg b/libvirt/tests/cfg/memory/hmat.cfg
@@ -23,10 +23,10 @@
             qemu_checks2 = -numa hmat-lb,initiator=0,target=0,hierarchy=first-level,data-type=access-latency,latency=5`-numa hmat-lb,initiator=0,target=1,hierarchy=memory,data-type=access-latency,latency=10
             qemu_checks3 = -numa hmat-lb,initiator=0,target=0,hierarchy=memory,data-type=access-bandwidth,bandwidth=204800K`-numa hmat-lb,initiator=0,target=1,hierarchy=memory,data-type=access-bandwidth,bandwidth=102400K
             qemu_checks4 = -numa hmat-cache,node-id=0,size=8K,level=1,associativity=direct,policy=write-back,line=8`-numa hmat-cache,node-id=1,size=12K,level=1,associativity=direct,policy=write-back,line=8
-            dmsg_checks1 = HMAT: Memory Flags:0001 Processor Domain:0 Memory Domain:0`HMAT: Memory Flags:0001 Processor Domain:0 Memory Domain:1
-            dmsg_checks2 = HMAT: Locality: Flags:00 Type:Access Latency Initiator Domains:1 Target Domains:2 Base:1000`Initiator-Target[0-0]:5 nsec`Initiator-Target[0-1]:10 nsec
-            dmsg_checks3 = HMAT: Locality: Flags:00 Type:Access Bandwidth Initiator Domains:1 Target Domains:2 Base:`Initiator-Target[0-0]:200 MB/s`Initiator-Target[0-1]:100 MB/s
-            dmsg_checks4 = HMAT: Cache: Domain:0 Size:10240 Attrs`HMAT: Cache: Domain:0 Size:10240 Attrs
+            dmsg_checks1 = Memory Flags:0001 Processor Domain:0 Memory Domain:0`Memory Flags:0001 Processor Domain:0 Memory Domain:1
+            dmsg_checks2 = Locality: Flags:00 Type:Access Latency Initiator Domains:1 Target Domains:2 Base:1000`Initiator-Target[0-0]:5 nsec`Initiator-Target[0-1]:10 nsec
+            dmsg_checks3 = Locality: Flags:00 Type:Access Bandwidth Initiator Domains:1 Target Domains:2 Base:`Initiator-Target[0-0]:200 MB/s`Initiator-Target[0-1]:100 MB/s
+            dmsg_checks4 = Cache: Domain:0 Size:10240 Attrs`Cache: Domain:0 Size:10240 Attrs
         - cell_distances:
             chk = "cell_distances"
             sibling0 = [{'id': '0', 'value': '10'}, {'id': '1', 'value': '21'}]

diff --git a/libvirt/tests/src/memory/hmat.py b/libvirt/tests/src/memory/hmat.py
@@ -85,6 +85,7 @@ def check_list_in_content(check_list, content):
             for i in range(1, 5):
                 dmsg_list.extend(params.get('dmsg_checks%d' % i, '').split('`'))
             content = vm_session.cmd('dmesg').strip()
+            logging.debug('dmesg output: \n%s', content)
             check_list_in_content(dmsg_list, content)
 
         if chk_case == "cell_distances":