From 5a751d3384dfc8d61abbd7d7f1e09ab353dd612e Mon Sep 17 00:00:00 2001
From: Wayne Chen <wchen@suse.com>
Date: Thu, 19 Dec 2024 12:53:30 +0800
Subject: [PATCH] Add guest profiles for SL Micro 6.2

Add guest profiles for SL Micro 6.2, including x86_64 and aarch64.
Because there is possibility of older SL Micro respin, keeping the
SL Micro 6.1 guest profiles and created new ones for SL Micro 6.2:
1.slm_6_2_64_kvm_hvm_aarch64_default_qcow_ignition+combustion.xml
2.slm_6_2_64_kvm_hvm_aarch64_default_raw_ignition+combustion.xml
3.slm_6_2_64_kvm_hvm_x86_64_default_encrypted_ignition+combustion.xml
4.slm_6_2_64_kvm_hvm_x86_64_default_qcow_ignition+combustion.xml
5.slm_6_2_64_kvm_hvm_x86_64_default_raw_ignition+combustion.xml
---
 ...rch64_default_qcow_ignition+combustion.xml | 97 +++++++++++++++++++
 ...arch64_default_raw_ignition+combustion.xml | 96 ++++++++++++++++++
 ..._default_encrypted_ignition+combustion.xml | 97 +++++++++++++++++++
 ...86_64_default_qcow_ignition+combustion.xml | 97 +++++++++++++++++++
 ...x86_64_default_raw_ignition+combustion.xml | 96 ++++++++++++++++++
 lib/virt_autotest/utils.pm                    |  6 +-
 6 files changed, 487 insertions(+), 2 deletions(-)
 create mode 100755 data/virt_autotest/guest_params_xml_files/slm_6_2_64_kvm_hvm_aarch64_default_qcow_ignition+combustion.xml
 create mode 100755 data/virt_autotest/guest_params_xml_files/slm_6_2_64_kvm_hvm_aarch64_default_raw_ignition+combustion.xml
 create mode 100755 data/virt_autotest/guest_params_xml_files/slm_6_2_64_kvm_hvm_x86_64_default_encrypted_ignition+combustion.xml
 create mode 100755 data/virt_autotest/guest_params_xml_files/slm_6_2_64_kvm_hvm_x86_64_default_qcow_ignition+combustion.xml
 create mode 100755 data/virt_autotest/guest_params_xml_files/slm_6_2_64_kvm_hvm_x86_64_default_raw_ignition+combustion.xml

diff --git a/data/virt_autotest/guest_params_xml_files/slm_6_2_64_kvm_hvm_aarch64_default_qcow_ignition+combustion.xml b/data/virt_autotest/guest_params_xml_files/slm_6_2_64_kvm_hvm_aarch64_default_qcow_ignition+combustion.xml
new file mode 100755
index 000000000000..833415674de8
--- /dev/null
+++ b/data/virt_autotest/guest_params_xml_files/slm_6_2_64_kvm_hvm_aarch64_default_qcow_ignition+combustion.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0"?>
+<guest>
+    <guest_os_name>slm</guest_os_name>
+    <guest_version>6.2</guest_version>
+    <guest_version_major>6</guest_version_major>
+    <guest_version_minor>2</guest_version_minor>
+    <guest_os_word_length>64</guest_os_word_length>
+    <guest_build/>
+    <host_hypervisor_uri/>
+    <host_virt_type>kvm</host_virt_type>
+    <guest_virt_type>hvm</guest_virt_type>
+    <guest_machine_type>virt</guest_machine_type>
+    <guest_arch>aarch64</guest_arch>
+    <guest_name/>
+    <guest_domain_name/>
+    <guest_memory>2048,maxmemory=4096</guest_memory>
+    <guest_vcpus>2,maxvcpus=4</guest_vcpus>
+    <guest_cpumodel>host-passthrough</guest_cpumodel>
+    <guest_metadata/>
+    <guest_boot_settings>hd</guest_boot_settings>
+    <guest_xpath/>
+    <guest_installation_automation_method>ignition+combustion</guest_installation_automation_method>
+    <guest_installation_automation_platform>qemu</guest_installation_automation_platform>
+    <guest_installation_automation_file>ignition_config_non_encrypted_image.ign#combustion_script</guest_installation_automation_file>
+    <guest_installation_method>import</guest_installation_method>
+    <guest_installation_method_others/>
+    <guest_installation_extra_args/>
+    <guest_installation_wait/>
+    <guest_installation_method_others/>
+    <guest_installation_media>http://openqa.suse.de/assets/hdd/SL-Micro.aarch64-6.2-Default-qcow-Build12345.qcow2</guest_installation_media>
+    <guest_installation_fine_grained/>
+    <guest_os_variant>slem6.1</guest_os_variant>
+    <guest_storage_path/>
+    <guest_storage_type>disk</guest_storage_type>
+    <guest_storage_format>qcow2</guest_storage_format>
+    <guest_storage_label>gpt</guest_storage_label>
+    <guest_storage_size>40</guest_storage_size>
+    <guest_storage_backing_path/>
+    <guest_storage_backing_format/>
+    <guest_storage_others>driver.name=qemu,target.dev=vda,target.bus=virtio,bus=virtio,cache=none</guest_storage_others>
+    <guest_network_type>bridge</guest_network_type>
+    <guest_network_mode>bridge</guest_network_mode>
+    <guest_network_device/>
+    <guest_network_others/>
+    <guest_netaddr/>
+    <guest_ipaddr/>
+    <guest_ipaddr_static>false</guest_ipaddr_static>
+    <guest_macaddr/>
+    <guest_graphics>vnc</guest_graphics>
+    <guest_controller/>
+    <guest_input/>
+    <guest_serial>pty</guest_serial>
+    <guest_parallel/>
+    <guest_channel/>
+    <guest_console/>
+    <guest_hostdev/>
+    <guest_filesystem/>
+    <guest_sound/>
+    <guest_watchdog/>
+    <guest_video/>
+    <guest_smartcard/>
+    <guest_redirdev/>
+    <guest_memballoon/>
+    <guest_tpm/>
+    <guest_rng/>
+    <guest_panic/>
+    <guest_memdev/>
+    <guest_vsock/>
+    <guest_iommu/>
+    <guest_iothreads/>
+    <guest_seclabel/>
+    <guest_keywrap/>
+    <guest_cputune/>
+    <guest_memtune/>
+    <guest_blkiotune/>
+    <guest_memorybacking/>
+    <guest_features/>
+    <guest_clock/>
+    <guest_power_management/>
+    <guest_events/>
+    <guest_resource/>
+    <guest_sysinfo/>
+    <guest_qemu_command/>
+    <guest_launchsecurity/>
+    <guest_autostart/>
+    <guest_transient/>
+    <guest_destroy_on_exit/>
+    <guest_autoconsole>text</guest_autoconsole>
+    <guest_noautoconsole>false</guest_noautoconsole>
+    <guest_noreboot/>
+    <guest_default_target>graphical</guest_default_target>
+    <guest_do_registration/>
+    <guest_registration_server/>
+    <guest_registration_username/>
+    <guest_registration_password/>
+    <guest_registration_extensions/>
+</guest>
diff --git a/data/virt_autotest/guest_params_xml_files/slm_6_2_64_kvm_hvm_aarch64_default_raw_ignition+combustion.xml b/data/virt_autotest/guest_params_xml_files/slm_6_2_64_kvm_hvm_aarch64_default_raw_ignition+combustion.xml
new file mode 100755
index 000000000000..61d52fb09672
--- /dev/null
+++ b/data/virt_autotest/guest_params_xml_files/slm_6_2_64_kvm_hvm_aarch64_default_raw_ignition+combustion.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+<guest>
+  <guest_os_name>slm</guest_os_name>
+  <guest_version>6.2</guest_version>
+  <guest_version_major>6</guest_version_major>
+  <guest_version_minor>2</guest_version_minor>
+  <guest_os_word_length>64</guest_os_word_length>
+  <guest_build/>
+  <host_hypervisor_uri/>
+  <host_virt_type>kvm</host_virt_type>
+  <guest_virt_type>hvm</guest_virt_type>
+  <guest_machine_type>virt</guest_machine_type>
+  <guest_arch>aarch64</guest_arch>
+  <guest_name/>
+  <guest_domain_name/>
+  <guest_memory>2048,maxmemory=4096</guest_memory>
+  <guest_vcpus>2,maxvcpus=4</guest_vcpus>
+  <guest_cpumodel>host-passthrough</guest_cpumodel>
+  <guest_metadata/>
+  <guest_boot_settings>hd</guest_boot_settings>
+  <guest_xpath/>
+  <guest_installation_automation_method>ignition+combustion</guest_installation_automation_method>
+  <guest_installation_automation_platform>metal</guest_installation_automation_platform>
+  <guest_installation_automation_file>ignition_config_non_encrypted_image.ign#combustion_script</guest_installation_automation_file>
+  <guest_installation_method>import</guest_installation_method>
+  <guest_installation_method_others/>
+  <guest_installation_extra_args/>
+  <guest_installation_wait/>
+  <guest_installation_media>http://openqa.suse.de/assets/hdd/SL-Micro.aarch64-6.2-Default-Build12345.raw.xz</guest_installation_media>
+  <guest_installation_fine_grained/>
+  <guest_os_variant>slem6.1</guest_os_variant>
+  <guest_storage_path/>
+  <guest_storage_type>disk</guest_storage_type>
+  <guest_storage_format>qcow2</guest_storage_format>
+  <guest_storage_label>gpt</guest_storage_label>
+  <guest_storage_size>40</guest_storage_size>
+  <guest_storage_backing_path/>
+  <guest_storage_backing_format/>
+  <guest_storage_others>driver.name=qemu,target.dev=vda,target.bus=virtio,bus=virtio,cache=none</guest_storage_others>
+  <guest_network_type>bridge</guest_network_type>
+  <guest_network_mode>bridge</guest_network_mode>
+  <guest_network_device/>
+  <guest_network_others/>
+  <guest_netaddr/>
+  <guest_ipaddr/>
+  <guest_ipaddr_static>false</guest_ipaddr_static>
+  <guest_macaddr/>
+  <guest_graphics>vnc</guest_graphics>
+  <guest_controller/>
+  <guest_input/>
+  <guest_serial>pty</guest_serial>
+  <guest_parallel/>
+  <guest_channel/>
+  <guest_console/>
+  <guest_hostdev/>
+  <guest_filesystem/>
+  <guest_sound/>
+  <guest_watchdog/>
+  <guest_video/>
+  <guest_smartcard/>
+  <guest_redirdev/>
+  <guest_memballoon/>
+  <guest_tpm/>
+  <guest_rng/>
+  <guest_panic/>
+  <guest_memdev/>
+  <guest_vsock/>
+  <guest_iommu/>
+  <guest_iothreads/>
+  <guest_seclabel/>
+  <guest_keywrap/>
+  <guest_cputune/>
+  <guest_memtune/>
+  <guest_blkiotune/>
+  <guest_memorybacking/>
+  <guest_features/>
+  <guest_clock/>
+  <guest_power_management/>
+  <guest_events/>
+  <guest_resource/>
+  <guest_sysinfo/>
+  <guest_qemu_command/>
+  <guest_launchsecurity/>
+  <guest_autostart/>
+  <guest_transient/>
+  <guest_destroy_on_exit/>
+  <guest_autoconsole>text</guest_autoconsole>
+  <guest_noautoconsole>false</guest_noautoconsole>
+  <guest_noreboot/>
+  <guest_default_target>graphical</guest_default_target>
+  <guest_do_registration/>
+  <guest_registration_server/>
+  <guest_registration_username/>
+  <guest_registration_password/>
+  <guest_registration_extensions/>
+</guest>
diff --git a/data/virt_autotest/guest_params_xml_files/slm_6_2_64_kvm_hvm_x86_64_default_encrypted_ignition+combustion.xml b/data/virt_autotest/guest_params_xml_files/slm_6_2_64_kvm_hvm_x86_64_default_encrypted_ignition+combustion.xml
new file mode 100755
index 000000000000..b7deb089790e
--- /dev/null
+++ b/data/virt_autotest/guest_params_xml_files/slm_6_2_64_kvm_hvm_x86_64_default_encrypted_ignition+combustion.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0"?>
+<guest>
+    <guest_os_name>slm</guest_os_name>
+    <guest_version>6.2</guest_version>
+    <guest_version_major>6</guest_version_major>
+    <guest_version_minor>2</guest_version_minor>
+    <guest_os_word_length>64</guest_os_word_length>
+    <guest_build/>
+    <host_hypervisor_uri/>
+    <host_virt_type>kvm</host_virt_type>
+    <guest_virt_type>hvm</guest_virt_type>
+    <guest_machine_type>q35</guest_machine_type>
+    <guest_arch>x86_64</guest_arch>
+    <guest_name/>
+    <guest_domain_name/>
+    <guest_memory>2048,maxmemory=4096</guest_memory>
+    <guest_vcpus>2,maxvcpus=4</guest_vcpus>
+    <guest_cpumodel>mode=host-passthrough,check=none,migratable=on</guest_cpumodel>
+    <guest_metadata/>
+    <guest_boot_settings>uefi,arch=x86_64,firmware.feature0.name=secure-boot,firmware.feature0.enabled=yes,firmware.feature0.name=enrolled-keys,firmware.feature0.enabled=yes</guest_boot_settings>
+    <guest_xpath/>
+    <guest_installation_automation_method>ignition+combustion</guest_installation_automation_method>
+    <guest_installation_automation_platform>metal</guest_installation_automation_platform>
+    <guest_installation_automation_file>ignition_config_encrypted_image.ign#combustion_script</guest_installation_automation_file>
+    <guest_installation_method>import</guest_installation_method>
+    <guest_installation_method_others/>
+    <guest_installation_extra_args/>
+    <guest_installation_wait/>
+    <guest_installation_method_others/>
+    <guest_installation_media>http://openqa.suse.de/assets/hdd/SL-Micro.x86_64-6.2-Default-encrypted-Build12345.raw.xz</guest_installation_media>
+    <guest_installation_fine_grained/>
+    <guest_os_variant>slem6.1</guest_os_variant>
+    <guest_storage_path/>
+    <guest_storage_type>disk</guest_storage_type>
+    <guest_storage_format>qcow2</guest_storage_format>
+    <guest_storage_label>gpt</guest_storage_label>
+    <guest_storage_size>40</guest_storage_size>
+    <guest_storage_backing_path/>
+    <guest_storage_backing_format/>
+    <guest_storage_others>driver.name=qemu,target.dev=vda,target.bus=virtio,bus=virtio,cache=none</guest_storage_others>
+    <guest_network_type>bridge</guest_network_type>
+    <guest_network_mode>bridge</guest_network_mode>
+    <guest_network_device/>
+    <guest_network_others/>
+    <guest_netaddr/>
+    <guest_ipaddr/>
+    <guest_ipaddr_static>false</guest_ipaddr_static>
+    <guest_macaddr/>
+    <guest_graphics>spice</guest_graphics>
+    <guest_controller/>
+    <guest_input/>
+    <guest_serial>pty,target.type=isa-serial</guest_serial>
+    <guest_parallel/>
+    <guest_channel>type=unix#spicevmc</guest_channel>
+    <guest_console>pty,target.type=serial</guest_console>
+    <guest_hostdev/>
+    <guest_filesystem/>
+    <guest_sound/>
+    <guest_watchdog/>
+    <guest_video/>
+    <guest_smartcard/>
+    <guest_redirdev/>
+    <guest_memballoon>virtio</guest_memballoon>
+    <guest_tpm>model=tpm-tis,backend.type=emulator,backend.version=2.0</guest_tpm>
+    <guest_rng>virtio,backend.model=random</guest_rng>
+    <guest_panic/>
+    <guest_memdev/>
+    <guest_vsock/>
+    <guest_iommu/>
+    <guest_iothreads/>
+    <guest_seclabel/>
+    <guest_keywrap/>
+    <guest_cputune/>
+    <guest_memtune/>
+    <guest_blkiotune/>
+    <guest_memorybacking/>
+    <guest_features>vmport.state=off,smm=on</guest_features>
+    <guest_clock/>
+    <guest_power_management/>
+    <guest_events/>
+    <guest_resource/>
+    <guest_sysinfo/>
+    <guest_qemu_command/>
+    <guest_launchsecurity/>
+    <guest_autostart/>
+    <guest_transient/>
+    <guest_destroy_on_exit/>
+    <guest_autoconsole>text</guest_autoconsole>
+    <guest_noautoconsole>false</guest_noautoconsole>
+    <guest_noreboot/>
+    <guest_default_target>graphical</guest_default_target>
+    <guest_do_registration>false</guest_do_registration>
+    <guest_registration_server/>
+    <guest_registration_username/>
+    <guest_registration_password/>
+    <guest_registration_extensions/>
+</guest>
diff --git a/data/virt_autotest/guest_params_xml_files/slm_6_2_64_kvm_hvm_x86_64_default_qcow_ignition+combustion.xml b/data/virt_autotest/guest_params_xml_files/slm_6_2_64_kvm_hvm_x86_64_default_qcow_ignition+combustion.xml
new file mode 100755
index 000000000000..42160176bdbc
--- /dev/null
+++ b/data/virt_autotest/guest_params_xml_files/slm_6_2_64_kvm_hvm_x86_64_default_qcow_ignition+combustion.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0"?>
+<guest>
+    <guest_os_name>slm</guest_os_name>
+    <guest_version>6.2</guest_version>
+    <guest_version_major>6</guest_version_major>
+    <guest_version_minor>2</guest_version_minor>
+    <guest_os_word_length>64</guest_os_word_length>
+    <guest_build/>
+    <host_hypervisor_uri/>
+    <host_virt_type>kvm</host_virt_type>
+    <guest_virt_type>hvm</guest_virt_type>
+    <guest_machine_type>q35</guest_machine_type>
+    <guest_arch>x86_64</guest_arch>
+    <guest_name/>
+    <guest_domain_name/>
+    <guest_memory>2048,maxmemory=4096</guest_memory>
+    <guest_vcpus>2,maxvcpus=4</guest_vcpus>
+    <guest_cpumodel>host-model</guest_cpumodel>
+    <guest_metadata/>
+    <guest_boot_settings>hd</guest_boot_settings>
+    <guest_xpath/>
+    <guest_installation_automation_method>ignition+combustion</guest_installation_automation_method>
+    <guest_installation_automation_platform>qemu</guest_installation_automation_platform>
+    <guest_installation_automation_file>ignition_config_non_encrypted_image.ign#combustion_script</guest_installation_automation_file>
+    <guest_installation_method>import</guest_installation_method>
+    <guest_installation_method_others/>
+    <guest_installation_extra_args/>
+    <guest_installation_wait/>
+    <guest_installation_method_others/>
+    <guest_installation_media>http://openqa.suse.de/assets/hdd/SL-Micro.x86_64-6.2-Default-qcow-Build12345.qcow2</guest_installation_media>
+    <guest_installation_fine_grained/>
+    <guest_os_variant>slem6.1</guest_os_variant>
+    <guest_storage_path/>
+    <guest_storage_type>disk</guest_storage_type>
+    <guest_storage_format>qcow2</guest_storage_format>
+    <guest_storage_label>gpt</guest_storage_label>
+    <guest_storage_size>40</guest_storage_size>
+    <guest_storage_backing_path/>
+    <guest_storage_backing_format/>
+    <guest_storage_others>driver.name=qemu,target.dev=vda,target.bus=virtio,bus=virtio,cache=none</guest_storage_others>
+    <guest_network_type>bridge</guest_network_type>
+    <guest_network_mode>bridge</guest_network_mode>
+    <guest_network_device/>
+    <guest_network_others/>
+    <guest_netaddr/>
+    <guest_ipaddr/>
+    <guest_ipaddr_static>false</guest_ipaddr_static>
+    <guest_macaddr/>
+    <guest_graphics>vnc</guest_graphics>
+    <guest_controller/>
+    <guest_input/>
+    <guest_serial>pty</guest_serial>
+    <guest_parallel/>
+    <guest_channel/>
+    <guest_console/>
+    <guest_hostdev/>
+    <guest_filesystem/>
+    <guest_sound/>
+    <guest_watchdog/>
+    <guest_video/>
+    <guest_smartcard/>
+    <guest_redirdev/>
+    <guest_memballoon/>
+    <guest_tpm/>
+    <guest_rng/>
+    <guest_panic/>
+    <guest_memdev/>
+    <guest_vsock/>
+    <guest_iommu/>
+    <guest_iothreads/>
+    <guest_seclabel/>
+    <guest_keywrap/>
+    <guest_cputune/>
+    <guest_memtune/>
+    <guest_blkiotune/>
+    <guest_memorybacking/>
+    <guest_features/>
+    <guest_clock/>
+    <guest_power_management/>
+    <guest_events/>
+    <guest_resource/>
+    <guest_sysinfo/>
+    <guest_qemu_command/>
+    <guest_launchsecurity/>
+    <guest_autostart/>
+    <guest_transient/>
+    <guest_destroy_on_exit/>
+    <guest_autoconsole>text</guest_autoconsole>
+    <guest_noautoconsole>false</guest_noautoconsole>
+    <guest_noreboot/>
+    <guest_default_target>graphical</guest_default_target>
+    <guest_do_registration>false</guest_do_registration>
+    <guest_registration_server/>
+    <guest_registration_username/>
+    <guest_registration_password/>
+    <guest_registration_extensions/>
+</guest>
diff --git a/data/virt_autotest/guest_params_xml_files/slm_6_2_64_kvm_hvm_x86_64_default_raw_ignition+combustion.xml b/data/virt_autotest/guest_params_xml_files/slm_6_2_64_kvm_hvm_x86_64_default_raw_ignition+combustion.xml
new file mode 100755
index 000000000000..2134e088ece1
--- /dev/null
+++ b/data/virt_autotest/guest_params_xml_files/slm_6_2_64_kvm_hvm_x86_64_default_raw_ignition+combustion.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+<guest>
+  <guest_os_name>slm</guest_os_name>
+  <guest_version>6.2</guest_version>
+  <guest_version_major>6</guest_version_major>
+  <guest_version_minor>2</guest_version_minor>
+  <guest_os_word_length>64</guest_os_word_length>
+  <guest_build/>
+  <host_hypervisor_uri/>
+  <host_virt_type>kvm</host_virt_type>
+  <guest_virt_type>hvm</guest_virt_type>
+  <guest_machine_type>q35</guest_machine_type>
+  <guest_arch>x86_64</guest_arch>
+  <guest_name/>
+  <guest_domain_name/>
+  <guest_memory>2048,maxmemory=4096</guest_memory>
+  <guest_vcpus>2,maxvcpus=4</guest_vcpus>
+  <guest_cpumodel>host-model</guest_cpumodel>
+  <guest_metadata/>
+  <guest_boot_settings>hd</guest_boot_settings>
+  <guest_xpath/>
+  <guest_installation_automation_method>ignition+combustion</guest_installation_automation_method>
+  <guest_installation_automation_platform>metal</guest_installation_automation_platform>
+  <guest_installation_automation_file>ignition_config_non_encrypted_image.ign#combustion_script</guest_installation_automation_file>
+  <guest_installation_method>import</guest_installation_method>
+  <guest_installation_method_others/>
+  <guest_installation_extra_args/>
+  <guest_installation_wait/>
+  <guest_installation_media>http://openqa.suse.de/assets/hdd/SL-Micro.x86_64-6.2-Default-Build12345.raw.xz</guest_installation_media>
+  <guest_installation_fine_grained/>
+  <guest_os_variant>slem6.1</guest_os_variant>
+  <guest_storage_path/>
+  <guest_storage_type>disk</guest_storage_type>
+  <guest_storage_format>qcow2</guest_storage_format>
+  <guest_storage_label>gpt</guest_storage_label>
+  <guest_storage_size>40</guest_storage_size>
+  <guest_storage_backing_path/>
+  <guest_storage_backing_format/>
+  <guest_storage_others>driver.name=qemu,target.dev=vda,target.bus=virtio,bus=virtio,cache=none</guest_storage_others>
+  <guest_network_type>bridge</guest_network_type>
+  <guest_network_mode>bridge</guest_network_mode>
+  <guest_network_device/>
+  <guest_network_others/>
+  <guest_netaddr/>
+  <guest_ipaddr/>
+  <guest_ipaddr_static>false</guest_ipaddr_static>
+  <guest_macaddr/>
+  <guest_graphics>vnc</guest_graphics>
+  <guest_controller/>
+  <guest_input/>
+  <guest_serial>pty</guest_serial>
+  <guest_parallel/>
+  <guest_channel/>
+  <guest_console/>
+  <guest_hostdev/>
+  <guest_filesystem/>
+  <guest_sound/>
+  <guest_watchdog/>
+  <guest_video/>
+  <guest_smartcard/>
+  <guest_redirdev/>
+  <guest_memballoon/>
+  <guest_tpm/>
+  <guest_rng/>
+  <guest_panic/>
+  <guest_memdev/>
+  <guest_vsock/>
+  <guest_iommu/>
+  <guest_iothreads/>
+  <guest_seclabel/>
+  <guest_keywrap/>
+  <guest_cputune/>
+  <guest_memtune/>
+  <guest_blkiotune/>
+  <guest_memorybacking/>
+  <guest_features/>
+  <guest_clock/>
+  <guest_power_management/>
+  <guest_events/>
+  <guest_resource/>
+  <guest_sysinfo/>
+  <guest_qemu_command/>
+  <guest_launchsecurity/>
+  <guest_autostart/>
+  <guest_transient/>
+  <guest_destroy_on_exit/>
+  <guest_autoconsole>text</guest_autoconsole>
+  <guest_noautoconsole>false</guest_noautoconsole>
+  <guest_noreboot/>
+  <guest_default_target>graphical</guest_default_target>
+  <guest_do_registration>false</guest_do_registration>
+  <guest_registration_server/>
+  <guest_registration_username/>
+  <guest_registration_password/>
+  <guest_registration_extensions/>
+</guest>
diff --git a/lib/virt_autotest/utils.pm b/lib/virt_autotest/utils.pm
index 5cae848be42a..9c393c8b20ac 100644
--- a/lib/virt_autotest/utils.pm
+++ b/lib/virt_autotest/utils.pm
@@ -115,7 +115,8 @@ sub check_modular_libvirt_daemons {
     my @daemons = @_;
 
     if (!@daemons) {
-        @daemons = qw(network nodedev nwfilter secret storage lock);
+        @daemons = qw(network nodedev secret storage lock);
+        #@daemons = qw(network nodedev nwfilter secret storage lock);
         # For details, please refer to poo#137096
         (is_xen_host) ? push @daemons, 'xen' : push @daemons, ('qemu', 'log');
     }
@@ -140,7 +141,8 @@ sub restart_modular_libvirt_daemons {
     my @daemons = @_;
 
     if (!@daemons) {
-        @daemons = qw(network nodedev nwfilter secret storage lock);
+        @daemons = qw(network nodedev secret storage lock);
+        #@daemons = qw(network nodedev nwfilter secret storage lock);
         # For details, please refer to poo#137096
         (is_xen_host) ? push @daemons, 'xen' : push @daemons, ('qemu', 'log');
     }