rpms/libvirt
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Fix for bug #249594, Daniel

Browse Source
This commit is contained in:
Daniel Veillard 2007-07-26 15:35:55 +00:00
parent 06a21e388f
commit cbe377ed29
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libvirt-qemu.patch Normal file
View File

@ -0,0 +1,14 @@
diff -rup libvirt-0.3.1.orig/src/qemu_conf.c libvirt-0.3.1.new/src/qemu_conf.c
--- libvirt-0.3.1.orig/src/qemu_conf.c 2007-07-24 11:06:38.000000000 -0400
+++ libvirt-0.3.1.new/src/qemu_conf.c 2007-07-26 10:22:09.000000000 -0400
@@ -1088,6 +1088,10 @@ static struct qemud_vm_def *qemudParseXM
if ((obj == NULL) || (obj->type != XPATH_STRING) ||
(obj->stringval == NULL) || (obj->stringval[0] == 0)) {
const char *defaultMachine = qemudDefaultMachineForArch(def->os.arch);
+ if (!defaultMachine) {
+ qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "unsupported arch %s", def->os.arch);
+ goto error;
+ }
if (strlen(defaultMachine) >= (QEMUD_OS_MACHINE_MAX_LEN-1)) {
qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", "machine type too long");
goto error;

7
libvirt.spec
View File

@ -3,7 +3,7 @@
Summary: Library providing a simple API virtualization Summary: Library providing a simple API virtualization
Name: libvirt Name: libvirt
Version: 0.3.1 Version: 0.3.1
Release: 2%{?dist}%{?extra_release} Release: 3%{?dist}%{?extra_release}
License: LGPL License: LGPL
Group: Development/Libraries Group: Development/Libraries
Source: libvirt-%{version}.tar.gz Source: libvirt-%{version}.tar.gz
@ -24,6 +24,7 @@ BuildRequires: gettext
BuildRequires: gnutls-devel BuildRequires: gnutls-devel
Obsoletes: libvir Obsoletes: libvir
ExclusiveArch: i386 x86_64 ia64 ExclusiveArch: i386 x86_64 ia64
Patch0: libvirt-qemu.patch
%description %description
Libvirt is a C toolkit to interract with the virtualization capabilities Libvirt is a C toolkit to interract with the virtualization capabilities
@ -54,6 +55,7 @@ of recent versions of Linux (and other OSes).
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
%configure --with-init-script=redhat --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid --with-remote-file=%{_localstatedir}/run/libvirtd.pid %configure --with-init-script=redhat --with-qemud-pid-file=%{_localstatedir}/run/libvirt_qemud.pid --with-remote-file=%{_localstatedir}/run/libvirtd.pid
@ -165,6 +167,9 @@ fi
%doc docs/examples/python %doc docs/examples/python
%changelog %changelog
* Thu Jul 26 2007 Daniel Veillard <veillard@redhat.com> - 0.3.1-3.fc8
- adds fix for bug #249594
* Wed Jul 25 2007 Jesse Keating <jkeating@redhat.com> - 0.3.1-2 * Wed Jul 25 2007 Jesse Keating <jkeating@redhat.com> - 0.3.1-2
- Rebuild for RH #249435 - Rebuild for RH #249435