conf/default.cfg | 26 -------------------------- lib/Sys/Virt/TCK.pm | 2 -- 2 files changed, 28 deletions(-)
Libvirt dropped UML in v5.0.0 so there's no reason for us not to follow along.
Signed-off-by: Erik Skultety <eskultet@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
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
On Tue, Sep 24, 2019 at 05:58:26PM +0200, Erik Skultety wrote: > Libvirt dropped UML in v5.0.0 so there's no reason for us not to follow along. > > Signed-off-by: Erik Skultety <eskultet@redhat.com> > --- > conf/default.cfg | 26 -------------------------- > lib/Sys/Virt/TCK.pm | 2 -- > 2 files changed, 28 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
© 2016 - 2024 Red Hat, Inc.