diff --git a/rpm/common.inc b/rpm/common.inc index 7cfb44518a..6a4caa77b5 100644 --- a/rpm/common.inc +++ b/rpm/common.inc @@ -12,12 +12,19 @@ %define legacy_qemu_kvm 0 %define force_fit_virtio_pxe_rom 1 +%define with_xen 0%{!?_without_xen:1} + %if "%{?distribution}" == "" %define distro private-build %else %define distro %{distribution} %endif +# Items to exclude in ALP-based products +%if 0%{?suse_version} == 1600 +%define with_xen 0 +%endif + %bcond_with system_membarrier %bcond_with malloc_trim diff --git a/rpm/qemu.spec b/rpm/qemu.spec index 908e4d3631..b5cfd9c9d1 100644 --- a/rpm/qemu.spec +++ b/rpm/qemu.spec @@ -115,7 +115,9 @@ BuildRequires: cross-ppc64-gcc%gcc_version %endif %ifarch x86_64 BuildRequires: gcc-32bit +%if %{with_xen} BuildRequires: xen-devel >= 4.2 +%endif BuildRequires: pkgconfig(libpmem) %endif %ifnarch %arm s390x @@ -639,9 +641,11 @@ EXTRA_CFLAGS="$(echo %{optflags} | sed -E 's/-[A-Z]?_FORTIFY_SOURCE[=]?[0-9]*//g %ifarch x86_64 --enable-avx2 \ --enable-libpmem \ +%if %{with_xen} --enable-xen \ --enable-xen-pci-passthrough \ %endif +%endif %ifnarch %arm s390x --enable-numa \ %endif @@ -1014,7 +1018,10 @@ necessary for having SPICE working for your VMs. Summary: Minimum set of packages for having a functional QEMU Group: System/Emulators/PC Requires: qemu +Requires: qemu-block-curl +Requires: qemu-block-nfs Requires: qemu-img +Requires: virtiofsd %if %{legacy_qemu_kvm} Requires: qemu-kvm %endif