This commit is contained in:
committed by
Git OBS Bridge
parent
616dfa112f
commit
b4c780fd71
@@ -1,7 +1,7 @@
|
||||
Index: xen-3.4.0-testing/tools/ioemu-remote/net.h
|
||||
Index: xen-3.4.1-testing/tools/ioemu-remote/net.h
|
||||
===================================================================
|
||||
--- xen-3.4.0-testing.orig/tools/ioemu-remote/net.h
|
||||
+++ xen-3.4.0-testing/tools/ioemu-remote/net.h
|
||||
--- xen-3.4.1-testing.orig/tools/ioemu-remote/net.h
|
||||
+++ xen-3.4.1-testing/tools/ioemu-remote/net.h
|
||||
@@ -107,8 +107,8 @@ void net_host_device_add(const char *dev
|
||||
void net_host_device_remove(int vlan_id, const char *device);
|
||||
|
||||
@@ -13,10 +13,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/net.h
|
||||
#endif
|
||||
#ifdef __sun__
|
||||
#define SMBD_COMMAND "/usr/sfw/sbin/smbd"
|
||||
Index: xen-3.4.0-testing/tools/ioemu-remote/net.c
|
||||
Index: xen-3.4.1-testing/tools/ioemu-remote/net.c
|
||||
===================================================================
|
||||
--- xen-3.4.0-testing.orig/tools/ioemu-remote/net.c
|
||||
+++ xen-3.4.0-testing/tools/ioemu-remote/net.c
|
||||
--- xen-3.4.1-testing.orig/tools/ioemu-remote/net.c
|
||||
+++ xen-3.4.1-testing/tools/ioemu-remote/net.c
|
||||
@@ -1759,9 +1759,10 @@ int net_client_init(const char *device,
|
||||
}
|
||||
if (get_param_value(script_arg, sizeof(script_arg), "scriptarg", p) == 0 &&
|
||||
@@ -30,10 +30,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/net.c
|
||||
}
|
||||
} else
|
||||
#endif
|
||||
Index: xen-3.4.0-testing/tools/python/xen/xend/image.py
|
||||
Index: xen-3.4.1-testing/tools/python/xen/xend/image.py
|
||||
===================================================================
|
||||
--- xen-3.4.0-testing.orig/tools/python/xen/xend/image.py
|
||||
+++ xen-3.4.0-testing/tools/python/xen/xend/image.py
|
||||
--- xen-3.4.1-testing.orig/tools/python/xen/xend/image.py
|
||||
+++ xen-3.4.1-testing/tools/python/xen/xend/image.py
|
||||
@@ -832,14 +832,16 @@ class HVMImageHandler(ImageHandler):
|
||||
mac = devinfo.get('mac')
|
||||
if mac is None:
|
||||
@@ -54,10 +54,10 @@ Index: xen-3.4.0-testing/tools/python/xen/xend/image.py
|
||||
|
||||
if nics == 0:
|
||||
ret.append("-net")
|
||||
Index: xen-3.4.0-testing/tools/ioemu-remote/i386-dm/qemu-ifup
|
||||
Index: xen-3.4.1-testing/tools/ioemu-remote/i386-dm/qemu-ifup
|
||||
===================================================================
|
||||
--- xen-3.4.0-testing.orig/tools/ioemu-remote/i386-dm/qemu-ifup
|
||||
+++ xen-3.4.0-testing/tools/ioemu-remote/i386-dm/qemu-ifup
|
||||
--- xen-3.4.1-testing.orig/tools/ioemu-remote/i386-dm/qemu-ifup
|
||||
+++ xen-3.4.1-testing/tools/ioemu-remote/i386-dm/qemu-ifup
|
||||
@@ -1,36 +1,22 @@
|
||||
#!/bin/sh
|
||||
|
||||
|
Reference in New Issue
Block a user