0c76f22ef1
- bnc#633573 - System fail to boot after running several warm reboot tests 22749-vtd-workarounds.patch - Upstream patches from Jan 22744-ept-pod-locking.patch 22777-vtd-ats-fixes.patch 22781-pod-hap-logdirty.patch 22782-x86-emul-smsw.patch 22789-i386-no-x2apic.patch 22790-svm-resume-migrate-pirqs.patch 22816-x86-pirq-drop-priv-check.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=94
47 lines
2.0 KiB
Diff
47 lines
2.0 KiB
Diff
Index: xen-4.0.2-testing/tools/python/xen/xm/create.py
|
|
===================================================================
|
|
--- xen-4.0.2-testing.orig/tools/python/xen/xm/create.py
|
|
+++ xen-4.0.2-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
|
|
@@ -1522,7 +1522,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)
|
|
@@ -1530,7 +1530,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)
|
|
|
|
Index: xen-4.0.2-testing/tools/python/xen/xend/XendAPIConstants.py
|
|
===================================================================
|
|
--- xen-4.0.2-testing.orig/tools/python/xen/xend/XendAPIConstants.py
|
|
+++ xen-4.0.2-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'
|
|
]
|