[pve-devel] r5284 - pve-qemu-kvm/trunk/debian/patches

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-10-25 11:16:27 +0000 (Mon, 25 Oct 2010)
New Revision: 5284

Added:
   pve-qemu-kvm/trunk/debian/patches/use-local-linux-kvm-h.diff
Modified:
   pve-qemu-kvm/trunk/debian/patches/adjust-path.diff
   pve-qemu-kvm/trunk/debian/patches/series
Log:


Modified: pve-qemu-kvm/trunk/debian/patches/adjust-path.diff
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/adjust-path.diff	2010-10-25 10:35:02 UTC (rev 5283)
+++ pve-qemu-kvm/trunk/debian/patches/adjust-path.diff	2010-10-25 11:16:27 UTC (rev 5284)
@@ -1,7 +1,7 @@
-Index: qemu-kvm/net.h
+Index: qemu-new/net.h
 ===================================================================
---- qemu-kvm.orig/net.h	2010-10-21 13:40:20.000000000 +0200
-+++ qemu-kvm/net.h	2010-10-21 13:50:57.000000000 +0200
+--- qemu-new.orig/net.h	2010-10-25 12:46:09.000000000 +0200
++++ qemu-new/net.h	2010-10-25 12:46:11.000000000 +0200
 @@ -167,8 +167,8 @@
  int do_netdev_add(Monitor *mon, const QDict *qdict, QObject **ret_data);
  int do_netdev_del(Monitor *mon, const QDict *qdict, QObject **ret_data);
@@ -13,3 +13,29 @@
  #ifdef __sun__
  #define SMBD_COMMAND "/usr/sfw/sbin/smbd"
  #else
+Index: qemu-new/configure
+===================================================================
+--- qemu-new.orig/configure	2010-10-25 12:46:09.000000000 +0200
++++ qemu-new/configure	2010-10-25 12:46:11.000000000 +0200
+@@ -300,7 +300,7 @@
+ docdir="\${prefix}/share/doc/qemu"
+ bindir="\${prefix}/bin"
+ sysconfdir="\${prefix}/etc"
+-confsuffix="/qemu"
++confsuffix="/kvm"
+ slirp="yes"
+ fmod_lib=""
+ fmod_inc=""
+Index: qemu-new/net/tap.h
+===================================================================
+--- qemu-new.orig/net/tap.h	2010-10-25 12:46:29.000000000 +0200
++++ qemu-new/net/tap.h	2010-10-25 12:46:53.000000000 +0200
+@@ -29,8 +29,6 @@
+ #include "qemu-common.h"
+ #include "qemu-option.h"
+ 
+-#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
+-#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
+ 
+ int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan);
+ 

Modified: pve-qemu-kvm/trunk/debian/patches/series
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/series	2010-10-25 10:35:02 UTC (rev 5283)
+++ pve-qemu-kvm/trunk/debian/patches/series	2010-10-25 11:16:27 UTC (rev 5284)
@@ -5,3 +5,4 @@
 live-migration-fixes.diff
 enable-ksm.diff
 set-max-nics.patch
+use-local-linux-kvm-h.diff

Added: pve-qemu-kvm/trunk/debian/patches/use-local-linux-kvm-h.diff
===================================================================
--- pve-qemu-kvm/trunk/debian/patches/use-local-linux-kvm-h.diff	                        (rev 0)
+++ pve-qemu-kvm/trunk/debian/patches/use-local-linux-kvm-h.diff	2010-10-25 11:16:27 UTC (rev 5284)
@@ -0,0 +1,16 @@
+
+Alway use our own version.
+
+Index: qemu-new/kvm/libkvm/libkvm.h
+===================================================================
+--- qemu-new.orig/kvm/libkvm/libkvm.h	2010-10-25 12:53:18.000000000 +0200
++++ qemu-new/kvm/libkvm/libkvm.h	2010-10-25 12:54:02.000000000 +0200
+@@ -15,7 +15,7 @@
+ #define __user /* temporary, until installed via make headers_install */
+ #endif
+ 
+-#include <linux/kvm.h>
++#include "linux/kvm.h"
+ 
+ #include <signal.h>
+