Merge d7e160a into 652ad68

os-autoinst · Nov 13, 2017 · 3216617 · 3216617
2 parents 652ad68 + d7e160a
commit 3216617
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 25 deletions.
diff --git a/backend/svirt.pm b/backend/svirt.pm
@@ -37,7 +37,7 @@ sub do_start_vm {
     my ($self) = @_;
 
     my $vars = \%bmwqemu::vars;
-    $vars->{NUMDISKS} ||= 1;
+    $vars->{NUMDISKS} ||= defined($vars->{RAIDLEVEL}) ? 4 : 1;
 
     # truncate the serial file
     open(my $sf, '>', $self->{serialfile});

diff --git a/consoles/sshVirtsh.pm b/consoles/sshVirtsh.pm
@@ -384,33 +384,15 @@ sub add_disk {
     my $bus_type;
     my $dev_id = $args->{dev_id};
     if ($self->vmm_family eq 'xen') {
-        if ($self->vmm_type eq 'hvm') {
-            if ($args->{cdrom}) {
-                $dev_type = "hd$dev_id";
-                $bus_type = 'ide';
-            }
-            else {
-                $dev_type = "hd$dev_id";
-                $bus_type = 'xen';
-            }
-        }
-        elsif ($self->vmm_type eq 'linux') {
-            if ($args->{cdrom}) {
-                $dev_type = "xvd$dev_id";
-            }
-            else {
-                $dev_type = "xvd$dev_id";
-            }
-            $bus_type = 'xen';
+        if ($args->{cdrom}) {
+            $dev_type = "sd$dev_id";
+            $bus_type = 'scsi';
         }
+        $dev_type = "xvd$dev_id";
+        $bus_type = 'xen';
     }
     elsif ($self->vmm_family eq 'vmware') {
-        if ($args->{cdrom}) {
-            $dev_type = "hd$dev_id";
-        }
-        else {
-            $dev_type = "hd$dev_id";
-        }
+        $dev_type = "hd$dev_id";
         $bus_type = 'ide';
     }
     elsif ($self->vmm_family eq 'kvm') {