[Xen-devel] [OSSTEST PATCH 03/11] di_special_kernel: Replace open-coding in ts-host-install

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

The effect is simply to reuse the loop in di_special_kernel.  The
extra tests etc. to compute $k and $c in di_special_kernel are of no
import here, and are harmless.  We have already called
di_special_kernel so if it was going to fail due to this extra
computation, it would do so earlier.

No overall functional change.

Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 ts-host-install | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/ts-host-install b/ts-host-install
index 01d04d4..520983f 100755
--- a/ts-host-install
+++ b/ts-host-install
@@ -214,14 +214,11 @@ END
 
     my %xopts;
 
-    foreach my $kp (keys %{ $ho->{Flags} }) {
-       # Backwards compatibility
-       $kp = "need-kernel-deb-wheezy-backports" if $kp eq 
"need-kernel-deb-armmp";
-       $kp =~ s/need-kernel-deb-$ho->{Suite}-// or next;
-
+    di_special_kernel($ho, $d_i, sub {
+        my ($kp,$k,$c) = @_;
        $xopts{dtbs} = "/$d_i/$kp-dtbs"
            if -e "$ho->{Tftp}{Path}/$d_i/$kp-dtbs";
-    }
+    });
 
     $xopts{dtbs} = "/$d_i/dtbs"
        if !$xopts{dtbs} && -e "$ho->{Tftp}{Path}/$d_i/dtbs";
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel