wip: pass cpu topology on creation

UPC · Jul 14, 2023 · 74e9584 · 74e9584
1 parent 817a5db
commit 74e9584
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 11 deletions.
diff --git a/lib/Ravada.pm b/lib/Ravada.pm
@@ -494,7 +494,9 @@ sub _update_isos {
         ,file_re => 'alpine-standard-3.16.*-x86_64.iso'
         ,sha256_url => '$url/alpine-standard-3.16.*.iso.sha256'
             ,min_disk_size => '2'
-            ,options => { machine => 'pc-q35', bios => 'UEFI' }
+            ,options => { machine => 'pc-q35', bios => 'UEFI'
+                ,hardware => { cpu => { cpu => { topology => { threads => 2, cores => 2}}}}
+            }
         }
         ,alpine381_32 => {
             name => 'Alpine 3.16 32 bits'
@@ -866,7 +868,9 @@ sub _update_isos {
           ,min_ram => 4
           ,arch => 'x86_64'
           ,extra_iso => 'https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.2\d+-\d+/virtio-win-0.1.2\d+.iso'
-            ,options => { machine => 'pc-q35', bios => 'UEFI' }
+            ,options => { machine => 'pc-q35', bios => 'UEFI'
+                ,hardware => { cpu => { cpu => { topology => { threads => 2, cores => 2}}}}
+            }
         }
        ,empty_32bits => {
           name => 'Empty Machine 32 bits'

diff --git a/lib/Ravada/VM.pm b/lib/Ravada/VM.pm
@@ -497,7 +497,7 @@ sub _around_create_domain {
     $domain->_data('is_compacted' => 1);
     $domain->_data('alias' => $alias) if $alias;
     $domain->_data('date_status_change', Ravada::Utils::now());
-    _change_hardware_install($domain,$hardware) if $hardware;
+    $self->_change_hardware_install($domain,$hardware) if $hardware;
 
     if ($id_base) {
         $domain->run_timeout($base->run_timeout)
@@ -541,7 +541,7 @@ sub _around_create_domain {
     return $domain;
 }
 
-sub _change_hardware_install($domain, $hardware) {
+sub _change_hardware_install($self, $domain, $hardware) {
 
     for my $item (sort keys %$hardware) {
         Ravada::Request->change_hardware(

diff --git a/lib/Ravada/VM/KVM.pm b/lib/Ravada/VM/KVM.pm
@@ -1078,6 +1078,8 @@ sub _domain_create_from_iso {
         if $spice_password;
     $domain->xml_description();
 
+    $self->_change_hardware_install($domain,$iso->{options}->{hardware});
+
     return $domain;
 }
 

diff --git a/public/js/admin.js b/public/js/admin.js
@@ -215,9 +215,14 @@ ravadaApp.directive("solShowMachine", swMach)
                 }
             }
         }
-        if ($scope.id_iso && $scope.id_iso.options
-                          && $scope.id_iso.options['bios']) {
-            $scope.bios = $scope.id_iso.options['bios'];
+        if ($scope.id_iso && $scope.id_iso.options) {
+            if( $scope.id_iso.options['bios']) {
+                $scope.bios = $scope.id_iso.options['bios'];
+            }
+            if( $scope.id_iso.options['hardware']) {
+                $scope.hardware = $scope.id_iso.options['hardware'];
+            }
+
         }
 
       };

diff --git a/script/rvd_front b/script/rvd_front
@@ -2837,6 +2837,7 @@ sub req_new_domain {
     my $vm = ( $c->param('backend') or 'KVM');
     $swap = int($swap * 1024*1024*1024);
     my $bios = $c->param('bios');
+    my $hardware = $c->param('hardware');
     my $machine = ($c->param('machine') or '');
     $machine =~ s/^string://;
     $machine = '' if $machine eq '?';

diff --git a/t/kvm/uefi.t b/t/kvm/uefi.t
@@ -20,24 +20,25 @@ sub test_threads($vm) {
     my $name = new_domain_name();
     my $id_iso = search_id_iso('Alpine');
 
+    my $n_threads = 4;
     my $req = Ravada::Request->create_domain(
         name => $name
         ,vm => $vm->type
         ,id_iso => $id_iso
         ,id_owner => user_admin->id
         ,memory => 512 * 1024
         ,disk => 1024 * 1024
-        ,options => { hardware => { cpu => { topology => { threads => 4 } }} }
+        ,options => { hardware => { cpu => { cpu => { topology => { threads => $n_threads }}}} }
     );
-    wait_request( debug => 1);
+    wait_request( debug => 0);
     my $domain = $vm->search_domain($name);
     ok($domain);
     my $config = $domain->xml_description();
 
     my $doc = XML::LibXML->load_xml(string => $config);
-    my ($topology) = $doc->findnodes("/domain/vcpu/topology");
+    my ($topology) = $doc->findnodes("/domain/cpu/topology");
     ok($topology) or die $domain->name;
-    die $topology->toString;
+    is($topology->getAttribute('threads'), $n_threads);
 
 }