Merge pull request os-autoinst#19128 from okurz/feature/s390x_qemu

Add support for s390x qemu
m-dati · Jul 18, 2024 · 4568043 · 4568043
2 parents 0fd6784 + 8d51f4d
commit 4568043
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/lib/main_common.pm b/lib/main_common.pm
@@ -858,15 +858,15 @@ sub unregister_needle_tags {
 }
 
 sub load_bootloader_s390x {
-    return 0 unless is_s390x;
-
     if (is_backend_s390x) {
         loadtest "installation/bootloader_s390";
+        return 1;
     }
-    else {
+    if (is_s390x && is_svirt) {
         loadtest "installation/bootloader_zkvm";
+        return 1;
     }
-    return 1;
+    return 0;
 }
 
 sub boot_hdd_image {

diff --git a/tests/installation/bootloader_start.pm b/tests/installation/bootloader_start.pm
@@ -43,17 +43,15 @@ sub run {
         $self->boot_from_pxe::run();
         return;
     }
-    if (is_s390x()) {
-        if (check_var("BACKEND", "s390x")) {
-            record_info('bootloader_s390x');
-            $self->bootloader_s390::run();
-            return;
-        }
-        else {
-            record_info('bootloader_zkvm');
-            $self->bootloader_zkvm::run();
-            return;
-        }
+    if (is_s390x() && check_var("BACKEND", "s390x")) {
+        record_info('bootloader_s390x');
+        $self->bootloader_s390::run();
+        return;
+    }
+    if (is_s390x() && check_var("BACKEND", "svirt")) {
+        record_info('bootloader_zkvm');
+        $self->bootloader_zkvm::run();
+        return;
     }
     if (is_svirt && is_x86_64()) {
         set_bridged_networking();