ia64/xen-unstable

changeset 2695:5576a0159e82

bitkeeper revision 1.1159.125.1 (4177d25b5-3vkLfJZ_69DrX3zk4bww)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xeno.bk-26dom0
into freefall.cl.cam.ac.uk:/local/scratch/cl349/xeno.bk-24dom0
author cl349@freefall.cl.cam.ac.uk
date Thu Oct 21 15:14:35 2004 +0000 (2004-10-21)
parents bd272fb0c28f 82d4a403106d
children 59daee42dceb
files tools/python/xen/xend/XendDomainInfo.py
line diff
     1.1 --- a/tools/python/xen/xend/XendDomainInfo.py	Thu Oct 21 14:15:00 2004 +0000
     1.2 +++ b/tools/python/xen/xend/XendDomainInfo.py	Thu Oct 21 15:14:35 2004 +0000
     1.3 @@ -1020,31 +1020,6 @@ def vm_image_linux(vm, image):
     1.4      vm.create_domain("linux", kernel, ramdisk, cmdline)
     1.5      return vm
     1.6  
     1.7 -def vm_image_netbsd(vm, image):
     1.8 -    """Create a VM for a bsd image.
     1.9 -
    1.10 -    @param name:     vm name
    1.11 -    @param memory:    vm memory
    1.12 -    @param image:     image config
    1.13 -    @return: vm
    1.14 -    """
    1.15 -    #todo: Same as for linux. Is that right? If so can unify them.
    1.16 -    kernel = sxp.child_value(image, "kernel")
    1.17 -    cmdline = ""
    1.18 -    ip = sxp.child_value(image, "ip", "dhcp")
    1.19 -    if ip:
    1.20 -        cmdline += "ip=" + ip
    1.21 -    root = sxp.child_value(image, "root")
    1.22 -    if root:
    1.23 -        cmdline += "root=" + root
    1.24 -    args = sxp.child_value(image, "args")
    1.25 -    if args:
    1.26 -        cmdline += " " + args
    1.27 -    ramdisk = sxp.child_value(image, "ramdisk", '')
    1.28 -    vm.create_domain("netbsd", kernel, ramdisk, cmdline)
    1.29 -    return vm
    1.30 -
    1.31 -
    1.32  def vm_dev_vif(vm, val, index, change=0):
    1.33      """Create a virtual network interface (vif).
    1.34  
    1.35 @@ -1168,7 +1143,6 @@ def vm_field_maxmem(vm, config, val, ind
    1.36  
    1.37  # Register image handlers.
    1.38  add_image_handler('linux',  vm_image_linux)
    1.39 -add_image_handler('netbsd', vm_image_netbsd)
    1.40  
    1.41  # Register device handlers.
    1.42  add_device_handler('vif',  vm_dev_vif)