From 08c5e42d39950b112b9dc63a018d4d184ed8b9ef Mon Sep 17 00:00:00 2001
From: Francesc Guasch <frankie@etsetb.upc.edu>
Date: Thu, 21 Mar 2024 11:53:39 +0100
Subject: [PATCH] wip: properly remove video by attr

issue #2036
---
 lib/Ravada/Domain/KVM.pm | 8 ++++----
 t/request/30_hardware.t  | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/Ravada/Domain/KVM.pm b/lib/Ravada/Domain/KVM.pm
index 77d4f874e..547f86588 100644
--- a/lib/Ravada/Domain/KVM.pm
+++ b/lib/Ravada/Domain/KVM.pm
@@ -2485,12 +2485,12 @@ sub _remove_all_video($devices, $attribute=undef, $value=undef) {
     confess "Error: attribute '$attribute' value search must be defined"
     if defined $attribute && !defined $value;
 
-    warn "Removing all video ".($attribute or 'any').'='.($value = '*');
     for my $video ($devices->findnodes("video")) {
-        next if defined $attribute && $video->getAttribute($attribute)
-        && $video->getAttribute($attribute) ne $value;
+        my ($model) = $video->findnodes('model');
+        next if defined $attribute
+        && (!$model->getAttribute($attribute)
+            || $model->getAttribute($attribute) ne $value);
 
-        warn "remove ".$video->toString();
         $devices->removeChild($video);
     }
 }
diff --git a/t/request/30_hardware.t b/t/request/30_hardware.t
index 1e7ee13af..96ace21a8 100644
--- a/t/request/30_hardware.t
+++ b/t/request/30_hardware.t
@@ -257,7 +257,6 @@ sub test_add_hardware_request($vm, $domain, $hardware, $data={}) {
     }
     _remove_usbs($domain,$hardware);
 	my $req;
-    diag("Adding $hardware ".($numero+1)."\n".Dumper($data));
 	eval {
 		$req = Ravada::Request->add_hardware(uid => $USER->id
                 , id_domain => $domain->id
@@ -270,7 +269,7 @@ sub test_add_hardware_request($vm, $domain, $hardware, $data={}) {
     $USER->unread_messages();
 	ok($req, 'Request');
     sleep 1 if !$TEST_TIMESTAMP;
-    wait_request(debug => 1);
+    wait_request(debug => 0);
     is($req->status(),'done');
     is($req->error(),'') or exit;
     my $n = 1;