From b3dd26fbdf935fe2f4996f37df8104e7a0cdb9033a36273a42955916127c0502 Mon Sep 17 00:00:00 2001
From: Charles Arnold <carnold@suse.com>
Date: Fri, 9 Oct 2009 17:10:14 +0000
Subject: [PATCH] - bnc#541945 - xm create -x command does not work in SLES 10
 SP2 or   SLES 11   xm-create-xflag.patch

- Minor enhancement to xen-updown.sh sysconfig hook

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=23
---
 mkbuildtree.patch     | 15 ++++++++++++++-
 xen-updown.sh         |  1 +
 xen.changes           | 12 ++++++++++++
 xm-create-xflag.patch | 31 +++++++++++++++++++++++++++++++
 4 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 xm-create-xflag.patch

diff --git a/mkbuildtree.patch b/mkbuildtree.patch
index d8e479c..f346359 100644
--- a/mkbuildtree.patch
+++ b/mkbuildtree.patch
@@ -2,7 +2,20 @@ Index: xen-3.4.1-testing/unmodified_drivers/linux-2.6/mkbuildtree
 ===================================================================
 --- xen-3.4.1-testing.orig/unmodified_drivers/linux-2.6/mkbuildtree
 +++ xen-3.4.1-testing/unmodified_drivers/linux-2.6/mkbuildtree
-@@ -47,7 +47,14 @@ ln -nsf ${XEN}/include/public include/xe
+@@ -33,7 +33,11 @@ for d in $(find ${XL}/drivers/xen/ -mind
+ done
+ 
+ ln -sf ${XL}/drivers/xen/core/gnttab.c platform-pci
+-ln -sf ${XL}/drivers/xen/core/features.c platform-pci
++if [ -f ${XL}/drivers/xen/core/features.c ]; then
++    ln -sf ${XL}/drivers/xen/core/features.c platform-pci
++else
++    ln -sf ${XL}/drivers/xen/features.c platform-pci
++fi
+ ln -sf ${XL}/drivers/xen/core/xen_proc.c xenbus
+ ln -sf ${XL}/drivers/xen/core/reboot.c platform-pci
+ 
+@@ -47,7 +51,14 @@ ln -nsf ${XEN}/include/public include/xe
  # be native and not xenolinux).
  case "$uname" in
  i[34567]86|x86_64)
diff --git a/xen-updown.sh b/xen-updown.sh
index 6d19359..7bdb197 100644
--- a/xen-updown.sh
+++ b/xen-updown.sh
@@ -151,6 +151,7 @@ case $SCRIPTNAME in
 ;;
 *if-down.d*)
 	exit_if_xend_not_running
+        test -d "/sys/class/net/$INTERFACE/brif/" || exit 0
 
 	# Remember vifs attached to $INTERFACE
 	vifs=()
diff --git a/xen.changes b/xen.changes
index 05f2e6f..c7a206e 100644
--- a/xen.changes
+++ b/xen.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Oct  9 09:24:29 MDT 2009 - carnold@novell.com
+
+- bnc#541945 - xm create -x command does not work in SLES 10 SP2 or
+  SLES 11
+  xm-create-xflag.patch 
+
+-------------------------------------------------------------------
+Thu Oct  8 22:44:04 MDT 2009 - jfehlig@novell.com
+
+- Minor enhancement to xen-updown.sh sysconfig hook
+
 -------------------------------------------------------------------
 Mon Sep 28 16:34:19 CST 2009 - wkong@novell.com
 - Add patch ioemu-bdrv-open-CACHE_WB.patch
diff --git a/xm-create-xflag.patch b/xm-create-xflag.patch
new file mode 100644
index 0000000..51971a7
--- /dev/null
+++ b/xm-create-xflag.patch
@@ -0,0 +1,31 @@
+Index: xen-3.4.1-testing/tools/python/xen/xm/create.py
+===================================================================
+--- xen-3.4.1-testing.orig/tools/python/xen/xm/create.py
++++ xen-3.4.1-testing/tools/python/xen/xm/create.py
+@@ -37,7 +37,7 @@ from xen.xend.server.DevConstants import
+ from xen.util import blkif
+ from xen.util import vscsi_util
+ import xen.util.xsm.xsm as security
+-from xen.xm.main import serverType, SERVER_XEN_API, get_single_vm
++from xen.xm.main import serverType, SERVER_XEN_API, SERVER_LEGACY_XMLRPC, get_single_vm
+ from xen.util import utils
+ 
+ from xen.xm.opts import *
+@@ -1351,7 +1351,7 @@ def main(argv):
+             except IOError, exn:
+                 raise OptionError("Cannot read file %s: %s" % (config, exn[1]))
+         
+-        if serverType == SERVER_XEN_API:
++        if serverType == SERVER_XEN_API or serverType == SERVER_LEGACY_XMLRPC:
+             from xen.xm.xenapi_create import sxp2xml
+             sxp2xml_inst = sxp2xml()
+             doc = sxp2xml_inst.convert_sxp_to_xml(config, transient=True)
+@@ -1359,7 +1359,7 @@ def main(argv):
+         if opts.vals.dryrun and not opts.is_xml:
+             SXPPrettyPrint.prettyprint(config)
+ 
+-        if opts.vals.xmldryrun and serverType == SERVER_XEN_API:
++        if opts.vals.xmldryrun:
+             from xml.dom.ext import PrettyPrint as XMLPrettyPrint
+             XMLPrettyPrint(doc)
+