From nobody Wed May 14 20:21:09 2025 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1523047542598280.61475844093263; Fri, 6 Apr 2018 13:45:42 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 940E02820C; Fri, 6 Apr 2018 20:45:40 +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 200A567920; Fri, 6 Apr 2018 20:45:40 +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 0094E1800CA0; Fri, 6 Apr 2018 20:45:36 +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 w36KjZc2026067 for ; Fri, 6 Apr 2018 16:45:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2F9639E376; Fri, 6 Apr 2018 20:45:35 +0000 (UTC) Received: from mx1.redhat.com (ext-mx02.extmail.prod.ext.phx2.redhat.com [10.5.110.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2628B67921 for ; Fri, 6 Apr 2018 20:45:32 +0000 (UTC) Received: from smtp2.provo.novell.com (smtp2.provo.novell.com [137.65.250.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E1A7D1CCC2A for ; Fri, 6 Apr 2018 20:45:30 +0000 (UTC) Received: from linux-tbji.gns.novell.com (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) by smtp2.provo.novell.com with ESMTP (NOT encrypted); Fri, 06 Apr 2018 14:45:29 -0600 From: Jim Fehlig To: libvir-list@redhat.com Date: Fri, 6 Apr 2018 14:44:59 -0600 Message-Id: <20180406204500.616-8-jfehlig@suse.com> In-Reply-To: <20180406204500.616-1-jfehlig@suse.com> References: <20180406204500.616-1-jfehlig@suse.com> X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 207 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 06 Apr 2018 20:45:31 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 06 Apr 2018 20:45:31 +0000 (UTC) for IP:'137.65.250.81' DOMAIN:'smtp2.provo.novell.com' HELO:'smtp2.provo.novell.com' FROM:'jfehlig@suse.com' RCPT:'' X-RedHat-Spam-Score: -2.301 (RCVD_IN_DNSWL_MED, SPF_PASS) 137.65.250.81 smtp2.provo.novell.com 137.65.250.81 smtp2.provo.novell.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.26 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH V2 7/8] spec: remove legacy xen driver 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: , MIME-Version: 1.0 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 06 Apr 2018 20:45:41 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jim Fehlig --- libvirt.spec.in | 57 ++++-------------------------------------------------= ---- 1 file changed, 4 insertions(+), 53 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 97143c68a..5090dfa2a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -18,7 +18,6 @@ %{!?enable_autotools:%global enable_autotools 0} =20 # The hypervisor drivers that run in libvirtd -%define with_xen 0%{!?_without_xen:1} %define with_qemu 0%{!?_without_qemu:1} %define with_lxc 0%{!?_without_lxc:1} %define with_uml 0%{!?_without_uml:1} @@ -96,7 +95,6 @@ =20 # Xen is available only on i386 x86_64 ia64 %ifnarch %{ix86} x86_64 ia64 - %define with_xen 0 %define with_libxl 0 %endif =20 @@ -161,11 +159,6 @@ %define with_firewalld 1 %endif =20 -# RHEL-6 stopped including Xen on all archs. -%if 0%{?rhel} - %define with_xen 0 -%endif - # fuse is used to provide virtualized /proc for LXC %if %{with_lxc} && 0%{?rhel} !=3D 6 %define with_fuse 0%{!?_without_fuse:1} @@ -280,9 +273,6 @@ Requires: libvirt-daemon-driver-qemu =3D %{version}-%{r= elease} %if %{with_uml} Requires: libvirt-daemon-driver-uml =3D %{version}-%{release} %endif -%if %{with_xen} -Requires: libvirt-daemon-driver-xen =3D %{version}-%{release} -%endif %if %{with_vbox} Requires: libvirt-daemon-driver-vbox =3D %{version}-%{release} %endif @@ -316,7 +306,7 @@ BuildRequires: %{python} %if %{with_systemd} BuildRequires: systemd-units %endif -%if %{with_xen} || %{with_libxl} +%if %{with_libxl} BuildRequires: xen-devel %endif BuildRequires: libxml2-devel @@ -376,11 +366,6 @@ BuildRequires: util-linux BuildRequires: libacl-devel # From QEMU RPMs BuildRequires: /usr/bin/qemu-img -%else - %if %{with_xen} -# From Xen RPMs -BuildRequires: /usr/sbin/qcow-create - %endif %endif # For LVM drivers BuildRequires: lvm2 @@ -634,11 +619,6 @@ Requires: util-linux %if %{with_qemu} # From QEMU RPMs Requires: /usr/bin/qemu-img -%else - %if %{with_xen} -# From Xen RPMs -Requires: /usr/sbin/qcow-create - %endif %endif =20 %description daemon-driver-storage-core @@ -843,19 +823,6 @@ User Mode Linux %endif =20 =20 -%if %{with_xen} -%package daemon-driver-xen -Summary: Xen driver plugin for the libvirtd daemon -Group: Development/Libraries -Requires: libvirt-daemon =3D %{version}-%{release} - -%description daemon-driver-xen -The Xen driver plugin for the libvirtd daemon, providing -an implementation of the hypervisor driver APIs using -Xen -%endif - - %if %{with_vbox} %package daemon-driver-vbox Summary: VirtualBox driver plugin for the libvirtd daemon @@ -966,15 +933,12 @@ capabilities of UML %endif =20 =20 -%if %{with_xen} || %{with_libxl} +%if %{with_libxl} %package daemon-xen Summary: Server side daemon & driver required to run XEN guests Group: Development/Libraries =20 Requires: libvirt-daemon =3D %{version}-%{release} - %if %{with_xen} -Requires: libvirt-daemon-driver-xen =3D %{version}-%{release} - %endif %if %{with_libxl} Requires: libvirt-daemon-driver-libxl =3D %{version}-%{release} %endif @@ -1169,12 +1133,6 @@ echo "This RPM requires either Fedora >=3D %{min_fed= ora} or RHEL >=3D %{min_rhel}" exit 1 %endif =20 -%if %{with_xen} - %define arg_xen --with-xen -%else - %define arg_xen --without-xen -%endif - %if %{with_qemu} %define arg_qemu --with-qemu %else @@ -1342,8 +1300,7 @@ export SOURCE_DATE_EPOCH=3D$(stat --printf=3D'%Y' %{_= specdir}/%{name}.spec) %endif =20 rm -f po/stamp-po -%configure %{?arg_xen} \ - %{?arg_qemu} \ +%configure %{?arg_qemu} \ %{?arg_openvz} \ %{?arg_lxc} \ %{?arg_vbox} \ @@ -2002,12 +1959,6 @@ exit 0 %{_libdir}/%{name}/connection-driver/libvirt_driver_uml.so %endif =20 -%if %{with_xen} -%files daemon-driver-xen -%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/xen/ -%{_libdir}/%{name}/connection-driver/libvirt_driver_xen.so -%endif - %if %{with_libxl} %files daemon-driver-libxl %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf @@ -2042,7 +1993,7 @@ exit 0 %files daemon-uml %endif =20 -%if %{with_xen} || %{with_libxl} +%if %{with_libxl} %files daemon-xen %endif =20 --=20 2.16.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list