Revision 6555373d lib/hypervisor/hv_xen.py

b/lib/hypervisor/hv_xen.py
47 47

  
48 48
  ANCILLARY_FILES = [
49 49
    "/etc/xen/xend-config.sxp",
50
    "/etc/xen/xl.conf",
50 51
    "/etc/xen/scripts/vif-bridge",
51 52
    ]
52 53

  
......
200 201
    self._WriteConfigFile(instance, block_devices)
201 202
    cmd = [constants.XEN_CMD, "create"]
202 203
    if startup_paused:
203
      cmd.extend(["--paused"])
204
    cmd.extend([instance.name])
204
      cmd.extend(["-p"])
205
    cmd.extend([self._ConfigFileName(instance.name)])
205 206
    result = utils.RunCmd(cmd)
206 207

  
207 208
    if result.failed:
......
445 446
      raise errors.HypervisorError("Remote host %s not listening on port"
446 447
                                   " %s, cannot migrate" % (target, port))
447 448

  
449
    # FIXME: migrate must be upgraded for transitioning to "xl" (xen 4.1).
450
    #  -l doesn't exist anymore
451
    #  -p doesn't exist anymore
452
    #  -C config_file must be passed
453
    #  ssh must recognize the key of the target host for the migration
448 454
    args = [constants.XEN_CMD, "migrate", "-p", "%d" % port]
449 455
    if live:
450 456
      args.append("-l")

Also available in: Unified diff