diff --git a/0001-Use-qemu-system-i386-as-binary-instead-of-qemu.patch b/0001-Use-qemu-system-i386-as-binary-instead-of-qemu.patch new file mode 100644 index 0000000..585c39e --- /dev/null +++ b/0001-Use-qemu-system-i386-as-binary-instead-of-qemu.patch @@ -0,0 +1,27 @@ +From 37865f1dead1fac2ee34af48f96d19d686296e04 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Thu, 13 Sep 2012 14:37:22 +0100 +Subject: [PATCH] Use 'qemu-system-i386' as binary instead of 'qemu'. + +--- + src/qemu/qemu_capabilities.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c +index af3b0b2..179b3d2 100644 +--- a/src/qemu/qemu_capabilities.c ++++ b/src/qemu/qemu_capabilities.c +@@ -244,8 +244,8 @@ static const struct qemu_feature_flags const arch_info_x86_64_flags [] = { + + /* The archicture tables for supported QEMU archs */ + static const struct qemu_arch_info const arch_info_hvm[] = { +- { "i686", 32, NULL, "qemu", +- "qemu-system-x86_64", arch_info_i686_flags, 4 }, ++ { "i686", 32, NULL, "qemu-system-i386", ++ NULL, arch_info_i686_flags, 4 }, + { "x86_64", 64, NULL, "qemu-system-x86_64", + NULL, arch_info_x86_64_flags, 2 }, + { "arm", 32, NULL, "qemu-system-arm", NULL, NULL, 0 }, +-- +1.7.11.4 + diff --git a/libvirt.spec b/libvirt.spec index 9792c85..b5dffda 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -316,7 +316,7 @@ Summary: Library providing a simple virtualization API Name: libvirt Version: 0.10.2 -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -327,6 +327,10 @@ URL: http://libvirt.org/ %endif Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz +# Fix qemu -> qemu-system-i386 (RHBZ#857026). +# NB: This patch is Fedora-specific and not upstream. +Patch1: 0001-Use-qemu-system-i386-as-binary-instead-of-qemu.patch + %if %{with_libvirtd} Requires: libvirt-daemon = %{version}-%{release} %if %{with_network} @@ -1036,6 +1040,7 @@ of recent versions of Linux (and other OSes). %prep %setup -q +%patch1 -p1 %build %if ! %{with_xen} @@ -1879,6 +1884,10 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %endif %changelog +* Mon Sep 24 2012 Daniel Veillard - 0.10.2-2 +- Re-add 0001-Use-qemu-system-i386-as-binary-instead-of-qemu.patch + NB: This patch is Fedora-specific and not upstream. + * Mon Sep 24 2012 Daniel Veillard - 0.10.2-1 - Upstream release 0.10.2 - network: define new API virNetworkUpdate