SHA256
1
0
forked from pool/xen
OBS User unknown
2008-08-17 22:24:29 +00:00
committed by Git OBS Bridge
parent f5d6338f4d
commit 8cefe055e5
67 changed files with 1102 additions and 2615 deletions

View File

@@ -2,7 +2,7 @@ Index: xen-3.3.0-testing/tools/python/xen/xend/image.py
===================================================================
--- xen-3.3.0-testing.orig/tools/python/xen/xend/image.py
+++ xen-3.3.0-testing/tools/python/xen/xend/image.py
@@ -481,6 +481,10 @@ class ImageHandler:
@@ -476,6 +476,10 @@ class ImageHandler:
# but this can easily lead to very rapid restart loops against
# which we currently have no protection
@@ -283,10 +283,10 @@ Index: xen-3.3.0-testing/tools/python/xen/xend/XendConfig.py
===================================================================
--- xen-3.3.0-testing.orig/tools/python/xen/xend/XendConfig.py
+++ xen-3.3.0-testing/tools/python/xen/xend/XendConfig.py
@@ -207,6 +207,7 @@ XENAPI_CFG_TYPES = {
'pci': str,
@@ -208,6 +208,7 @@ XENAPI_CFG_TYPES = {
'cpuid' : dict,
'cpuid_check' : dict,
'machine_address_size': int,
+ 'snapshotname': str,
}
@@ -448,7 +448,7 @@ Index: xen-3.3.0-testing/tools/python/xen/xm/main.py
===================================================================
--- xen-3.3.0-testing.orig/tools/python/xen/xm/main.py
+++ xen-3.3.0-testing/tools/python/xen/xm/main.py
@@ -113,6 +113,14 @@ SUBCOMMAND_HELP = {
@@ -122,6 +122,14 @@ SUBCOMMAND_HELP = {
'Restore a domain from a saved state.'),
'save' : ('[-c] <Domain> <CheckpointFile>',
'Save a domain state to restore later.'),
@@ -463,7 +463,7 @@ Index: xen-3.3.0-testing/tools/python/xen/xm/main.py
'shutdown' : ('<Domain> [-waRH]', 'Shutdown a domain.'),
'top' : ('', 'Monitor a host and the domains in real time.'),
'unpause' : ('<Domain>', 'Unpause a paused domain.'),
@@ -262,6 +270,9 @@ SUBCOMMAND_OPTIONS = {
@@ -278,6 +286,9 @@ SUBCOMMAND_OPTIONS = {
'save': (
('-c', '--checkpoint', 'Leave domain running after creating snapshot'),
),
@@ -473,7 +473,7 @@ Index: xen-3.3.0-testing/tools/python/xen/xm/main.py
'restore': (
('-p', '--paused', 'Do not unpause domain after restoring it'),
),
@@ -287,6 +298,10 @@ common_commands = [
@@ -304,6 +315,10 @@ common_commands = [
"restore",
"resume",
"save",
@@ -484,7 +484,7 @@ Index: xen-3.3.0-testing/tools/python/xen/xm/main.py
"shell",
"shutdown",
"start",
@@ -317,6 +332,10 @@ domain_commands = [
@@ -335,6 +350,10 @@ domain_commands = [
"restore",
"resume",
"save",
@@ -495,7 +495,7 @@ Index: xen-3.3.0-testing/tools/python/xen/xm/main.py
"shutdown",
"start",
"suspend",
@@ -707,6 +726,62 @@ def xm_event_monitor(args):
@@ -726,6 +745,62 @@ def xm_event_monitor(args):
#
#########################################################################
@@ -558,7 +558,7 @@ Index: xen-3.3.0-testing/tools/python/xen/xm/main.py
def xm_save(args):
arg_check(args, "save", 2, 3)
@@ -2600,6 +2675,10 @@ commands = {
@@ -2757,6 +2832,10 @@ commands = {
"restore": xm_restore,
"resume": xm_resume,
"save": xm_save,