ia64/xen-unstable

changeset 14835:d3ed330f8292

Merge
author Tim Deegan <Tim.Deegan@xensource.com>
date Thu Apr 12 15:55:24 2007 +0100 (2007-04-12)
parents 74321599b8e8 e630c107988b
children e3b3800c769a
files
line diff
     1.1 --- a/README	Thu Apr 12 15:54:59 2007 +0100
     1.2 +++ b/README	Thu Apr 12 15:55:24 2007 +0100
     1.3 @@ -199,3 +199,7 @@ Xend (the Xen daemon) has the following 
     1.4      * For optional PAM support, PyPAM:
     1.5            URL:    http://www.pangalactic.org/PyPAM/
     1.6            Debian: python-pam
     1.7 +
     1.8 +    * For optional XenAPI support in XM, PyXML:
     1.9 +          URL:    http://pyxml.sourceforge.net
    1.10 +          YUM:    PyXML
     2.1 --- a/tools/python/xen/xm/xenapi_create.py	Thu Apr 12 15:54:59 2007 +0100
     2.2 +++ b/tools/python/xen/xm/xenapi_create.py	Thu Apr 12 15:55:24 2007 +0100
     2.3 @@ -48,7 +48,7 @@ def get_name_description(node):
     2.4  
     2.5  def get_text_in_child_node(node, child):
     2.6      tag_node = node.getElementsByTagName(child)[0]
     2.7 -    return tag_node.nodeValue
     2.8 +    return " ".join([child.nodeValue for child in tag_node.childNodes])
     2.9  
    2.10  def get_child_node_attribute(node, child, attribute):
    2.11      tag_node = node.getElementsByTagName(child)[0]
    2.12 @@ -264,7 +264,23 @@ class xenapi_create:
    2.13              "platform":
    2.14                  get_child_nodes_as_dict(vm, "platform", "key", "value"),
    2.15              "other_config":
    2.16 -                get_child_nodes_as_dict(vm, "other_config", "key", "value")
    2.17 +                get_child_nodes_as_dict(vm, "other_config", "key", "value"),
    2.18 +            "PV_bootloader":
    2.19 +                "",
    2.20 +            "PV_kernel":
    2.21 +                "",
    2.22 +            "PV_ramdisk":
    2.23 +                "",
    2.24 +            "PV_args":
    2.25 +                "",
    2.26 +            "PV_bootloader_args":
    2.27 +                "",
    2.28 +            "HVM_boot_policy":
    2.29 +                "",
    2.30 +            "HVM_boot_params":
    2.31 +                {},
    2.32 +            "PCI_bus":
    2.33 +               ""
    2.34              }
    2.35  
    2.36          if len(vm.getElementsByTagName("pv")) > 0:
    2.37 @@ -494,7 +510,7 @@ class sxp2xml:
    2.38          # Make version tag
    2.39  
    2.40          version = document.createElement("version")
    2.41 -        version.appendChild(document.createTextNode("1.0"))
    2.42 +        version.appendChild(document.createTextNode("0"))
    2.43          vm.appendChild(version)
    2.44          
    2.45          # Make pv or hvm tag