[libvirt] [libvirt-tck PATCH] conf: Drop UML from the suite

Erik Skultety eskultet at redhat.com
Tue Sep 24 15:58:26 UTC 2019


Libvirt dropped UML in v5.0.0 so there's no reason for us not to follow along.

Signed-off-by: Erik Skultety <eskultet at redhat.com>
---
 conf/default.cfg    | 26 --------------------------
 lib/Sys/Virt/TCK.pm |  2 --
 2 files changed, 28 deletions(-)

diff --git a/conf/default.cfg b/conf/default.cfg
index d9fd0cb..39d9b04 100644
--- a/conf/default.cfg
+++ b/conf/default.cfg
@@ -95,32 +95,6 @@ kernels = (
      kernel = http://dl.fedoraproject.org/pub/fedora/linux/releases/30/Everything/x86_64/os/images/pxeboot/vmlinuz
      initrd = http://dl.fedoraproject.org/pub/fedora/linux/releases/30/Everything/x86_64/os/images/pxeboot/initrd.img
    }
-   # User mode linux i686 needs custom kernel + root filesystem
-   {
-     arch = i686
-     ostype = uml
-     kernel = {
-       source = http://user-mode-linux.sourceforge.net/linux-2.6.24-rc7.bz2
-       uncompress = bzip2
-     }
-     disk = {
-       source = http://fs.devloop.org.uk/filesystems/Fedora13/Fedora13-x86-root_fs.bz2
-       uncompress = bzip2
-     }
-   }
-   # User mode linux x86_64 needs custom kernel + root filesystem
-   {
-     arch = x86_64
-     ostype = uml
-     kernel = {
-       source = http://user-mode-linux.sourceforge.net/linux-2.6.24-x86_64.bz2
-       uncompress = bzip2
-     }
-     disk = {
-       source = http://fs.devloop.org.uk/filesystems/Fedora13/Fedora13-AMD64-root_fs.bz2
-       uncompress = bzip2
-     }
-   }
    # LXC containers need a virtual container filesystem somewhere
 #   {
 #     arch = x86_64
diff --git a/lib/Sys/Virt/TCK.pm b/lib/Sys/Virt/TCK.pm
index 3ea06cc..a641d01 100644
--- a/lib/Sys/Virt/TCK.pm
+++ b/lib/Sys/Virt/TCK.pm
@@ -681,8 +681,6 @@ sub get_disk_dev {
     my $dev;
     if ($ostype eq "xen") {
         $dev = "xvda";
-    } elsif ($ostype eq "uml") {
-        $dev = "ubda";
     } elsif ($ostype eq "hvm") {
         if ($domain eq "kvm" ||
             $domain eq "qemu" ||
--
2.20.1




More information about the libvir-list mailing list