[QEMU] move machine info to config parsing script

to not duplicate hmat info parsing - extra parsing was done in
start_qemu.sh. If "hmat" not found in libvirt args, assume hmat=off.

Author: lukaszstolarczuk

scripts/qemu/parse_config.py

@@ -56,9 +56,10 @@ def parse_topology_xml(tpg_file_name: str) -> TopologyCfg:
         if verbose_mode != False:
             print(f"\nFull libvirt_args: {libvirt_args}\n")
 
+        hmat_search = re.search(r"hmat=(\w+)", libvirt_args)
         tpg_cfg = {
             "name": re.search(r"guest=(\w+)", libvirt_args).group(1),
-            "hmat": "hmat=on" in libvirt_args,
+            "hmat": hmat_search.group(0) if hmat_search else "hmat=off",
             "cpu_model": re.search(r"cpu (\S+)", libvirt_args).group(1),
             "cpu_options": re.search("(?=-smp)(.*)threads=[0-9]+", libvirt_args).group(
                 0
@@ -89,7 +90,8 @@ def get_qemu_args(tpg_file_name: str) -> str:
     Get QEMU arguments from topology xml file
     """
     tpg = parse_topology_xml(tpg_file_name)
-    qemu_args = f"-name {tpg.name} {calculate_memory(tpg)} -cpu {tpg.cpu_model} {tpg.cpu_options} {tpg.mem_options}"
+    qemu_args = f"-machine q35,usb=off,{tpg.hmat} -name {tpg.name} " \
+        f"{calculate_memory(tpg)} -cpu {tpg.cpu_model} {tpg.cpu_options} {tpg.mem_options}"
     return qemu_args
 
 

scripts/qemu/start_qemu.sh

@@ -10,16 +10,9 @@ config_file=$1
 # Parse the config file to get topology info and fix escaped single quotes
 parsed_config=$(python3 scripts/qemu/parse_config.py ${config_file} | sed s/''\''/'/g)
 
-if grep -q '<interconnects>' "$config_file"; then
-    hmat="on"
-else
-    hmat="off"
-fi
-
 sudo qemu-system-x86_64 \
     -drive file=./ubuntu-23.04-server-cloudimg-amd64.img,format=qcow2,index=0,media=disk,id=hd \
     -cdrom ./ubuntu-cloud-init.iso \
-    -machine q35,usb=off,hmat=${hmat} \
     -enable-kvm \
     -net nic -net user,hostfwd=tcp::2222-:22 \
     ${parsed_config} \