From nobody Sun May 5 10:22:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1569340720; cv=none; d=zoho.com; s=zohoarc; b=R4VGD9DJPJL/Cnw2F2DiBKLYdWwkX2Hx5vidvaZEPAznzPYNhbBp7gWf/UMnUSQ/kxxbR0hfjEzohyzjQ6OEtx4DeyaqX3K3jZXCA0t07PR79yZkYdn4VmBh4GOpTWreYP4Vt1vPOAtMx7PnE6c4MzZgfs2WLZxzlRo0nri9Iwg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569340720; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=jWD8WTNN6DvBrZsEnGWXTeaiVcriy1bKA17rnhJaMjI=; b=TWO3Que2duYYKA+CpbWNy2FttKGrOIFes8OIjkcYpajpYpqmR707WJNqXZJMYdJ/tTy8Qrh+fDiT9konsN5WeiWohdlLT/hopdH+5YxLtpz/fwD4MI6Fa/f7D2QxbGzDIyT2GxaL+2B5aHNzm3Kf7WvSjSyqpuTiL9Vf8+4TcfQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 15693407209201002.6790934697136; Tue, 24 Sep 2019 08:58:40 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B5C10A26675; Tue, 24 Sep 2019 15:58:38 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E73475D721; Tue, 24 Sep 2019 15:58:37 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 1BEEE1800B74; Tue, 24 Sep 2019 15:58:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x8OFwXhF031962 for ; Tue, 24 Sep 2019 11:58:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6BB2460A97; Tue, 24 Sep 2019 15:58:33 +0000 (UTC) Received: from ridgehead.redhat.com (ovpn-200-51.brq.redhat.com [10.40.200.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id A3CC960925; Tue, 24 Sep 2019 15:58:29 +0000 (UTC) From: Erik Skultety To: libvir-list@redhat.com Date: Tue, 24 Sep 2019 17:58:26 +0200 Message-Id: <5509299a6b8ad6b398a3ffd7196c3fadb97a3940.1569340614.git.eskultet@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: Erik Skultety Subject: [libvirt] [libvirt-tck PATCH] conf: Drop UML from the suite X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.68]); Tue, 24 Sep 2019 15:58:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Libvirt dropped UML in v5.0.0 so there's no reason for us not to follow alo= ng. Signed-off-by: Erik Skultety Reviewed-by: Daniel P. Berrang=C3=A9 --- 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 =3D ( kernel =3D http://dl.fedoraproject.org/pub/fedora/linux/releases/30/E= verything/x86_64/os/images/pxeboot/vmlinuz initrd =3D http://dl.fedoraproject.org/pub/fedora/linux/releases/30/E= verything/x86_64/os/images/pxeboot/initrd.img } - # User mode linux i686 needs custom kernel + root filesystem - { - arch =3D i686 - ostype =3D uml - kernel =3D { - source =3D http://user-mode-linux.sourceforge.net/linux-2.6.24-rc7.= bz2 - uncompress =3D bzip2 - } - disk =3D { - source =3D http://fs.devloop.org.uk/filesystems/Fedora13/Fedora13-x= 86-root_fs.bz2 - uncompress =3D bzip2 - } - } - # User mode linux x86_64 needs custom kernel + root filesystem - { - arch =3D x86_64 - ostype =3D uml - kernel =3D { - source =3D http://user-mode-linux.sourceforge.net/linux-2.6.24-x86_= 64.bz2 - uncompress =3D bzip2 - } - disk =3D { - source =3D http://fs.devloop.org.uk/filesystems/Fedora13/Fedora13-A= MD64-root_fs.bz2 - uncompress =3D bzip2 - } - } # LXC containers need a virtual container filesystem somewhere # { # arch =3D 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 =3D "xvda"; - } elsif ($ostype eq "uml") { - $dev =3D "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