Use zvm and zkvm detection from Yast::Arch

src/lib/installation/cio_ignore.rb

@@ -24,16 +24,6 @@ def reset
 
   private
 
-    def kvm?
-      File.exist?("/proc/sysinfo") &&
-        File.readlines("/proc/sysinfo").grep(/Control Program: KVM\/Linux/).any?
-    end
-
-    def zvm?
-      File.exist?("/proc/sysinfo") &&
-        File.readlines("/proc/sysinfo").grep(/Control Program: z\/VM/).any?
-    end
-
     # Get current I/O device autoconf setting (rd.zdev kernel option)
     #
     # @return [Boolean]
@@ -53,11 +43,12 @@ def cio_setting
       if Yast::Mode.autoinst
         Yast::AutoinstConfig.cio_ignore
       else
+        Yast.import "Arch"
         # In case of given as a kernel parameter we should respect it,
         # if not it will depend on the installation environment (bsc#1210525)
         # cio_ignore does not make sense for KVM or z/VM (fate#317861)
         # but for other cases return true as requested FATE#315586
-        cio_ignore_given? || !(kvm? || zvm?)
+        cio_ignore_given? || !(Yast::Arch.is_zkvm || Yast::Arch.is_zvm)
       end
     end
 

test/cio_ignore_test.rb

@@ -13,10 +13,10 @@
   let(:auto) { false }
 
   before do
+    arch_mock = double("Yast::Arch", s390: false, is_zkvm: kvm, is_zvm: zvm)
+    stub_const("Yast::Arch", arch_mock)
     allow(Yast::Bootloader).to receive(:kernel_param).with(:common, "rd.zdev")
     allow(Yast::Bootloader).to receive(:kernel_param).with(:common, "cio_ignore").and_return(param)
-    allow_any_instance_of(described_class).to receive(:kvm?).and_return(kvm)
-    allow_any_instance_of(described_class).to receive(:zvm?).and_return(zvm)
     allow(Yast::Mode).to receive(:autoinst).and_return(auto)
   end