80e28a00ec
- unmodified_drivers: handle IRQF_SAMPLE_RANDOM, it was removed in 3.6-rc1 - bnc#778105 - first XEN-PV VM fails to spawn xend: Increase wait time for disk to appear in host bootloader Modified existing xen-domUloader.diff - Disable the snapshot patches. Snapshot only supported the qcow2 image format which was poorly implemented qemu 0.10.2. Snapshot support may be restored in the future when the newer upstream qemu is used by Xen. - bnc#776995 - attaching scsi control luns with pvscsi - xend/pvscsi: fix passing of SCSI control LUNs xen-bug776995-pvscsi-no-devname.patch - xend/pvscsi: fix usage of persistant device names for SCSI devices xen-bug776995-pvscsi-persistent-names.patch - xend/pvscsi: update sysfs parser for Linux 3.0 xen-bug776995-pvscsi-sysfs-parser.patch - Update to Xen 4.2.0 RC3+ c/s 25779 - Update to Xen 4.2.0 RC2+ c/s 25765 OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=199
47 lines
2.0 KiB
Diff
47 lines
2.0 KiB
Diff
Index: xen-4.2.0-testing/tools/python/xen/xm/create.py
|
|
===================================================================
|
|
--- xen-4.2.0-testing.orig/tools/python/xen/xm/create.py
|
|
+++ xen-4.2.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
|
|
@@ -1533,7 +1533,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)
|
|
@@ -1541,7 +1541,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:
|
|
print doc.toprettyxml()
|
|
|
|
if opts.vals.dryrun or opts.vals.xmldryrun:
|
|
Index: xen-4.2.0-testing/tools/python/xen/xend/XendAPIConstants.py
|
|
===================================================================
|
|
--- xen-4.2.0-testing.orig/tools/python/xen/xend/XendAPIConstants.py
|
|
+++ xen-4.2.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'
|
|
]
|