From a9e301a59cf5ce9de16c000ca17efec469865ddd Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Thu, 1 Jan 1970 00:00:00 +0000 Subject: [PATCH] import libvirt crash patch from rawhide --- libvirt/libvirt-0.4.5-no-emulator-segfault.patch | 13 +++++++++++++ libvirt/mingw-libvirt.spec | 10 +++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 libvirt/libvirt-0.4.5-no-emulator-segfault.patch diff --git a/libvirt/libvirt-0.4.5-no-emulator-segfault.patch b/libvirt/libvirt-0.4.5-no-emulator-segfault.patch new file mode 100644 index 0000000..03eea80 --- /dev/null +++ b/libvirt/libvirt-0.4.5-no-emulator-segfault.patch @@ -0,0 +1,13 @@ +diff --git a/src/qemu_conf.c b/src/qemu_conf.c +index d742c32..23ef050 100644 +--- a/src/qemu_conf.c ++++ b/src/qemu_conf.c +@@ -790,7 +790,7 @@ int qemudBuildCommandLine(virConnectPtr conn, + if (!emulator) + return -1; + +- ADD_ARG_LIT(vm->def->emulator); ++ ADD_ARG_LIT(emulator); + ADD_ARG_LIT("-S"); + ADD_ARG_LIT("-M"); + ADD_ARG_LIT(vm->def->os.machine); diff --git a/libvirt/mingw-libvirt.spec b/libvirt/mingw-libvirt.spec index 7394c93..388546f 100644 --- a/libvirt/mingw-libvirt.spec +++ b/libvirt/mingw-libvirt.spec @@ -6,13 +6,14 @@ Name: mingw-libvirt Version: 0.4.5 -Release: 3%{?dist}%{?extra_release} +Release: 4%{?dist}%{?extra_release} Summary: MinGW Windows libvirt virtualization library License: LGPLv2+ Group: Development/Libraries -URL: http://www.libvirt.org/ +URL: http://libvirt.org/ Source0: ftp://libvirt.org/libvirt/libvirt-%{version}.tar.gz +Patch1: libvirt-%{version}-no-emulator-segfault.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mingw-filesystem >= 23 @@ -34,7 +35,7 @@ MinGW Windows libvirt virtualization library. %prep %setup -q -n libvirt-%{version} - +%patch1 -p1 %build # XXX enable SASL in future @@ -86,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Sep 22 2008 Daniel P. Berrange - 0.4.5-4%{?extra_release} +- Import crash fix from rawhide + * Thu Sep 11 2008 Daniel P. Berrange - 0.4.5-3%{?extra_release} - Add dep on gettext & pkgconfig -- 1.8.3.1