4b4fa7f68d
21317-xend-blkif-util-tap2.patch suse-disable-tap2-default.patch - Match upstreams cpu pools switch from domctl to sysctl - Upstream replacements for two of our custom patches (to ease applying further backports) - Fixed dump-exec-state.patch (could previously hang the system, as could - with lower probability - the un-patched implementation) - bnc#593536 - xen hypervisor takes very long to initialize Dom0 on 128 CPUs and 256Gb 21272-x86-dom0-alloc-performance.patch 21266-vmx-disabled-check.patch 21271-x86-cache-flush-global.patch - bnc#558815 - using multiple npiv luns with same wwpn/wwnn broken - bnc#601104 - Xen /etc/xen/scripts/block-npiv script fails when accessing multiple disks using NPIV block-npiv - bnc#595124 - VT-d can not be enabled on 32PAE Xen on Nehalem-EX platform 21234-x86-bad-srat-clear-pxm2node.patch bnc#585371 - kdump fails to load with xen: locate_hole failed 21235-crashkernel-advanced.patch - bnc#588918 - Attaching a U-disk to domain's failed by "xm usb-attach" init.xend OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=44
32 lines
1.5 KiB
Diff
32 lines
1.5 KiB
Diff
Index: xen-4.0.0-testing/tools/python/xen/xm/create.py
|
|
===================================================================
|
|
--- xen-4.0.0-testing.orig/tools/python/xen/xm/create.py
|
|
+++ xen-4.0.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
|
|
@@ -1514,7 +1514,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)
|
|
@@ -1522,7 +1522,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)
|
|
|