rpm/xen
SHA256
1
0
Fork 0
forked from pool/xen
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=3

Browse Source
This commit is contained in:
OBS User unknown
2007-02-11 10:48:10 +00:00
committed by Git OBS Bridge
parent 241ee9df04
commit d7002a96b9
166 changed files with 35454 additions and 7164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
xen-hvm-default-bridge.diff
View File

@@ -1,8 +1,8 @@
Index: xen-3.0.3-testing/tools/examples/xend-config.sxp
Index: xen-3.0.4-testing/tools/examples/xend-config.sxp
===================================================================
--- xen-3.0.3-testing.orig/tools/examples/xend-config.sxp
+++ xen-3.0.3-testing/tools/examples/xend-config.sxp
@@ -76,7 +76,8 @@
--- xen-3.0.4-testing.orig/tools/examples/xend-config.sxp
+++ xen-3.0.4-testing/tools/examples/xend-config.sxp
@@ -116,7 +116,8 @@
#
# (network-script 'network-bridge netdev=eth1')
#
@@ -12,10 +12,10 @@ Index: xen-3.0.3-testing/tools/examples/xend-config.sxp
#
# (network-script 'network-bridge bridge=<name>')
#
Index: xen-3.0.3-testing/tools/ioemu/vl.c
Index: xen-3.0.4-testing/tools/ioemu/vl.c
===================================================================
--- xen-3.0.3-testing.orig/tools/ioemu/vl.c
+++ xen-3.0.3-testing/tools/ioemu/vl.c
--- xen-3.0.4-testing.orig/tools/ioemu/vl.c
+++ xen-3.0.4-testing/tools/ioemu/vl.c
@@ -89,7 +89,6 @@
#include "exec-all.h"
@@ -24,7 +24,7 @@ Index: xen-3.0.3-testing/tools/ioemu/vl.c
//#define DEBUG_UNUSED_IOPORT
//#define DEBUG_IOPORT
@@ -3773,10 +3772,10 @@ int net_client_init(const char *str)
@@ -3779,10 +3778,10 @@ int net_client_init(const char *str)
if (get_param_value(setup_script, sizeof(setup_script), "script", p) == 0) {
pstrcpy(setup_script, sizeof(setup_script), DEFAULT_NETWORK_SCRIPT);
}
@@ -39,33 +39,33 @@ Index: xen-3.0.3-testing/tools/ioemu/vl.c
}
} else
#endif
Index: xen-3.0.3-testing/tools/python/xen/xend/image.py
Index: xen-3.0.4-testing/tools/python/xen/xend/image.py
===================================================================
--- xen-3.0.3-testing.orig/tools/python/xen/xend/image.py
+++ xen-3.0.3-testing/tools/python/xen/xend/image.py
@@ -339,13 +339,16 @@ class HVMImageHandler(ImageHandler):
mac = sxp.child_value(info, 'mac')
if mac == None:
mac = randomMAC()
- bridge = sxp.child_value(info, 'bridge', 'xenbr0')
+ bridge = sxp.child_value(info, 'bridge', None)
model = sxp.child_value(info, 'model', 'rtl8139')
ret.append("-net")
ret.append("nic,vlan=%d,macaddr=%s,model=%s" %
(nics, mac, model))
ret.append("-net")
- ret.append("tap,vlan=%d,bridge=%s" % (nics, bridge))
+ net = "tap,vlan=%d" % (nics,)
+ if bridge:
+ net += ",bridge=%s" % (bridge,)
+ ret.append(net)
--- xen-3.0.4-testing.orig/tools/python/xen/xend/image.py
+++ xen-3.0.4-testing/tools/python/xen/xend/image.py
@@ -419,13 +419,16 @@ class HVMImageHandler(ImageHandler):
mac = devinfo.get('mac')
if mac is None:
mac = randomMAC()
- bridge = devinfo.get('bridge', 'xenbr0')
+ bridge = devinfo.get('bridge', None)
model = devinfo.get('model', 'rtl8139')
ret.append("-net")
ret.append("nic,vlan=%d,macaddr=%s,model=%s" %
(nics, mac, model))
ret.append("-net")
- ret.append("tap,vlan=%d,bridge=%s" % (nics, bridge))
+ net = "tap,vlan=%d" % (nics,)
+ if bridge:
+ net += ",bridge=%s" % (bridge,)
+ ret.append(net)
return ret
def configVNC(self, config):
Index: xen-3.0.3-testing/tools/ioemu/target-i386-dm/qemu-ifup
Index: xen-3.0.4-testing/tools/ioemu/target-i386-dm/qemu-ifup
===================================================================
--- xen-3.0.3-testing.orig/tools/ioemu/target-i386-dm/qemu-ifup
+++ xen-3.0.3-testing/tools/ioemu/target-i386-dm/qemu-ifup
--- xen-3.0.4-testing.orig/tools/ioemu/target-i386-dm/qemu-ifup
+++ xen-3.0.4-testing/tools/ioemu/target-i386-dm/qemu-ifup
@@ -1,10 +1,11 @@
#!/bin/sh