Merge pull request #4251 from MiriamDeng/fix_ip_set

Author: PaulYuuu

qemu/tests/cfg/in_place_upgrade.cfg

@@ -31,13 +31,13 @@
     stop_yum_update = "rm -rf /var/run/yum.pid"
     check_repo_list = "yum repolist enabled"
     check_rhel_ver = "cut -f1-2 -d. /etc/redhat-release | sed 's/[^0-9]//g'"
-    RHEL.8:
-        rmmod_module = "rmmod ip_set;rmmod nft_compat"
+    rmmod_module = "rmmod ip_set"
+    x86_64:
+        RHEL.8:
+            rmmod_module += ";rmmod nft_compat"
     s390,s390x:
         # no need to check in host, and we don't support RHEL.7.9 as the
         # host on s390x
-        RHEL.8:
-            rmmod_module = "rmmod ip_set"
         device_cio_free_check_cmd = "systemctl status device_cio_free"
     # com_install = "yes" installing leapp from compose
     # com_install = "no" installing leapp from upstream