rpms/libvirt/F-7 libvirt-qemu.patch, NONE, 1.1 libvirt.spec, 1.58, 1.59

[Daniel Veillard (veillard)]

Author: veillard

Update of /cvs/pkgs/rpms/libvirt/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17487

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-qemu.patch 
Log Message:
Bug fix for 249594, daniel


libvirt-qemu.patch:

--- NEW FILE libvirt-qemu.patch ---
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;


Index: libvirt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt/F-7/libvirt.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- libvirt.spec	25 Jul 2007 12:03:38 -0000	1.58
+++ libvirt.spec	26 Jul 2007 15:40:00 -0000	1.59
@@ -3,7 +3,7 @@
 Summary: Library providing a simple API virtualization
 Name: libvirt
 Version: 0.3.1
-Release: 1%{?dist}%{?extra_release}
+Release: 2%{?dist}%{?extra_release}
 License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -24,6 +24,7 @@
 BuildRequires: gnutls-devel
 Obsoletes: libvir
 ExclusiveArch: i386 x86_64 ia64
+Patch0: libvirt-qemu.patch
 
 %description
 Libvirt is a C toolkit to interract with the virtualization capabilities
@@ -54,6 +55,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %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 @@
 %doc docs/examples/python
 
 %changelog
+* Thu Jul 26 2007 Daniel Veillard <veillard at redhat.com> - 0.3.1-2.fc7
+- adds fix for bug #249594
+
 * Tue Jul 24 2007 Daniel Veillard <veillard at redhat.com> - 0.3.1-1.fc7
 - Release of 0.3.1
 - localtime clock support