update to qemu 2.2.0-rc2

[pve-qemu-kvm.git] / debian / patches / adjust-path.diff

diff --git a/debian/patches/adjust-path.diff b/debian/patches/adjust-path.diff
index 3545a09830492f31622487455e81e4d256e96c62..ea72b60d1436a4c2f89f93946bbe3777322363fa 100644 (file)
--- a/debian/patches/adjust-path.diff
+++ b/debian/patches/adjust-path.diff
@@ -1,41 +1,16 @@
-Index: new/net.h
+Index: new/include/net/net.h
 ===================================================================
---- new.orig/net.h     2011-08-11 10:04:51.000000000 +0200
-+++ new/net.h  2011-08-11 10:09:49.000000000 +0200
-@@ -172,8 +172,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);
+--- new.orig/include/net/net.h 2014-11-20 06:45:06.000000000 +0100
++++ new/include/net/net.h      2014-11-20 06:47:47.000000000 +0100
+@@ -195,8 +195,9 @@
+ int net_hub_id_for_client(NetClientState *nc, int *id);
+ NetClientState *net_hub_port_find(int hub_id);
  
 -#define DEFAULT_NETWORK_SCRIPT "/etc/qemu-ifup"
 -#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/qemu-ifdown"
 +#define DEFAULT_NETWORK_SCRIPT "/etc/kvm/kvm-ifup"
 +#define DEFAULT_NETWORK_DOWN_SCRIPT "/etc/kvm/kvm-ifdown"
- #ifdef __sun__
- #define SMBD_COMMAND "/usr/sfw/sbin/smbd"
- #else
-Index: new/configure
-===================================================================
---- new.orig/configure 2011-08-11 10:04:51.000000000 +0200
-+++ new/configure      2011-08-11 10:09:49.000000000 +0200
-@@ -157,7 +157,7 @@
- bindir="\${prefix}/bin"
- libdir="\${prefix}/lib"
- sysconfdir="\${prefix}/etc"
--confsuffix="/qemu"
-+confsuffix="/kvm"
- slirp="yes"
- fmod_lib=""
- fmod_inc=""
-Index: new/net/tap.h
-===================================================================
---- new.orig/net/tap.h 2011-08-11 10:04:51.000000000 +0200
-+++ new/net/tap.h      2011-08-11 10:09:49.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);
++
+ #define DEFAULT_BRIDGE_HELPER CONFIG_QEMU_HELPERDIR "/qemu-bridge-helper"
+ #define DEFAULT_BRIDGE_INTERFACE "br0"