05bedd5488
named ext" xm-create-xflag.patch - Fix xen-utils to cope with xen-unstable c/s 21483 - xz-devel is available since 11.2, make it optional for SLES11SP1 - bnc#665610 - xm console > 1 to same VM messes up both consoles Upstream rejected due to portability concern, see http://lists.xensource.com/archives/html/xen-devel/2011-02/msg00942.html xenconsole-no-multiple-connections.patch - Enable support for kernel decompression for gzip, bzip2, and LZMA so that kernels compressed with any of these methods can be launched. - Update to Xen 4.1.0 c/s 22861 OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=102
51 lines
2.2 KiB
Diff
51 lines
2.2 KiB
Diff
Index: xen-4.1.0-testing/tools/python/xen/xm/create.py
|
|
===================================================================
|
|
--- xen-4.1.0-testing.orig/tools/python/xen/xm/create.py
|
|
+++ xen-4.1.0-testing/tools/python/xen/xm/create.py
|
|
@@ -36,7 +36,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, auxbin
|
|
from xen.util.pci import dev_dict_to_sxp, \
|
|
parse_pci_name_extended, PciDeviceParseError
|
|
@@ -1528,7 +1528,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)
|
|
@@ -1536,9 +1536,9 @@ def main(argv):
|
|
if opts.vals.dryrun and not opts.is_xml:
|
|
SXPPrettyPrint.prettyprint(config)
|
|
|
|
- if opts.vals.xmldryrun and serverType == SERVER_XEN_API:
|
|
- from xml.dom.ext import PrettyPrint as XMLPrettyPrint
|
|
- XMLPrettyPrint(doc)
|
|
+ if opts.vals.xmldryrun:
|
|
+ xml_as_string = doc.toprettyxml()
|
|
+ print("%s" % xml_as_string)
|
|
|
|
if opts.vals.dryrun or opts.vals.xmldryrun:
|
|
return
|
|
Index: xen-4.1.0-testing/tools/python/xen/xend/XendAPIConstants.py
|
|
===================================================================
|
|
--- xen-4.1.0-testing.orig/tools/python/xen/xend/XendAPIConstants.py
|
|
+++ xen-4.1.0-testing/tools/python/xen/xend/XendAPIConstants.py
|
|
@@ -45,8 +45,10 @@ XEN_API_ON_NORMAL_EXIT = [
|
|
XEN_API_ON_CRASH_BEHAVIOUR = [
|
|
'destroy',
|
|
'coredump_and_destroy',
|
|
+ 'coredump_destroy',
|
|
'restart',
|
|
'coredump_and_restart',
|
|
+ 'coredump_restart',
|
|
'preserve',
|
|
'rename_restart'
|
|
]
|