rpms/libvirt/devel libvirt-0.2.0-disable-kqemu.patch, NONE, 1.1 libvirt-0.2.0-vnc-port.patch, NONE, 1.1 libvirt.spec, 1.46, 1.47

[fedora-cvs-commits at redhat.com]

Author: berrange

Update of /cvs/dist/rpms/libvirt/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26468

Modified Files:
	libvirt.spec 
Added Files:
	libvirt-0.2.0-disable-kqemu.patch libvirt-0.2.0-vnc-port.patch 
Log Message:
Fix incompatabilities with qemu 0.9.0

libvirt-0.2.0-disable-kqemu.patch:
 conf.c  |   10 ----------
 conf.c~ |only
 2 files changed, 10 deletions(-)

--- NEW FILE libvirt-0.2.0-disable-kqemu.patch ---
diff -rup libvirt-0.2.0-orig/qemud/conf.c libvirt-0.2.0-new/qemud/conf.c
--- libvirt-0.2.0-orig/qemud/conf.c	2007-02-16 16:54:39.000000000 -0500
+++ libvirt-0.2.0-new/qemud/conf.c	2007-02-16 16:55:14.000000000 -0500
@@ -542,8 +542,6 @@ static struct qemud_vm_def *qemudParseXM
 
     if (!strcmp((char *)prop, "qemu"))
         def->virtType = QEMUD_VIRT_QEMU;
-    else if (!strcmp((char *)prop, "kqemu"))
-        def->virtType = QEMUD_VIRT_KQEMU;
     else if (!strcmp((char *)prop, "kvm"))
         def->virtType = QEMUD_VIRT_KVM;
     else {
@@ -938,7 +936,6 @@ int qemudBuildCommandLine(struct qemud_s
 
     len = 1 + /* qemu */
         2 + /* machine type */
-        (vm->def->virtType == QEMUD_VIRT_QEMU ? 1 : 0) + /* Disable kqemu */
         2 * vm->def->ndisks + /* disks*/
         (vm->def->nnets > 0 ? (4 * vm->def->nnets) : 2) + /* networks */
         2 + /* memory*/
@@ -963,10 +960,6 @@ int qemudBuildCommandLine(struct qemud_s
         goto no_memory;
     if (!((*argv)[++n] = strdup(vm->def->os.machine)))
         goto no_memory;
-    if (vm->def->virtType == QEMUD_VIRT_QEMU) {
-        if (!((*argv)[++n] = strdup("-no-kqemu")))
-        goto no_memory;
-    }
     if (!((*argv)[++n] = strdup("-m")))
         goto no_memory;
     if (!((*argv)[++n] = strdup(memory)))
@@ -1713,9 +1706,6 @@ char *qemudGenerateXML(struct qemud_serv
     case QEMUD_VIRT_QEMU:
         type = "qemu";
         break;
-    case QEMUD_VIRT_KQEMU:
-        type = "kqemu";
-        break;
     case QEMUD_VIRT_KVM:
         type = "kvm";
         break;
Only in libvirt-0.2.0-new/qemud: conf.c~

libvirt-0.2.0-vnc-port.patch:
 conf.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE libvirt-0.2.0-vnc-port.patch ---
diff -rup libvirt-0.2.0-orig/qemud/conf.c libvirt-0.2.0-new/qemud/conf.c
--- libvirt-0.2.0-orig/qemud/conf.c	2007-02-16 16:54:39.000000000 -0500
+++ libvirt-0.2.0-new/qemud/conf.c	2007-02-16 16:59:03.000000000 -0500
@@ -1089,7 +1082,7 @@ int qemudBuildCommandLine(struct qemud_s
 
     if (vm->def->graphicsType == QEMUD_GRAPHICS_VNC) {
         char port[10];
-        snprintf(port, 10, "%d", vm->def->vncActivePort - 5900);
+        snprintf(port, 10, ":%d", vm->def->vncActivePort - 5900);
         if (!((*argv)[++n] = strdup("-vnc")))
             goto no_memory;
         if (!((*argv)[++n] = strdup(port)))


Index: libvirt.spec
===================================================================
RCS file: /cvs/dist/rpms/libvirt/devel/libvirt.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- libvirt.spec	15 Feb 2007 17:07:47 -0000	1.46
+++ libvirt.spec	16 Feb 2007 22:08:59 -0000	1.47
@@ -3,7 +3,7 @@
 Summary: Library providing an API to use the Xen virtualization
 Name: libvirt
 Version: 0.2.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 Group: Development/Libraries
 Source: libvirt-%{version}.tar.gz
@@ -25,6 +25,14 @@
 ExclusiveArch: i386 x86_64 ia64
 Patch0: libvirt-0.2.0-Werror.patch
 Patch2: libvirt-0.2.0-qemu-fixes.patch
+# The 0.9.0 build of QEMU in Fedora has compiled out
+# the normal KQEMU support, so we drop that from libvirt
+# too, otherwise we fail on the unknown -no-kqemu command
+# line arg to qemu
+Patch3: libvirt-0.2.0-disable-kqemu.patch
+
+# QEMU 0.9.0 wants a : in front of the port number now :-(
+Patch4: libvirt-0.2.0-vnc-port.patch
 
 %description
 This C library provides an API to use the Xen virtualization framework,
@@ -56,6 +64,8 @@
 %setup -q
 %patch0 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 %configure
@@ -123,6 +133,10 @@
 %doc docs/examples/python
 
 %changelog
+* Fri Feb 16 2007 Daniel P. Berrange <berrange at redhat.com> - 0.2.0-3.fc7
+- Disable kqemu support since its not in Fedora qemu binary
+- Fix for -vnc arg syntax change in 0.9.0  QEMU
+
 * Thu Feb 15 2007 Daniel P. Berrange <berrange at redhat.com> - 0.2.0-2.fc7
 - Fixed path to qemu daemon for autostart
 - Fixed generation of <features> block in XML