Revision cad3422e

b/lib/hypervisor/hv_kvm.py
1022 1022
    """Removes an instance's rutime sockets/files/dirs.
1023 1023

  
1024 1024
    """
1025
    # This takes info from NICDir and RuntimeFile
1026
    cls._UnconfigureInstanceNICs(instance_name)
1025 1027
    utils.RemoveFile(pidfile)
1026 1028
    utils.RemoveFile(cls._InstanceMonitor(instance_name))
1027 1029
    utils.RemoveFile(cls._InstanceSerial(instance_name))
......
2289 2291
    elif dev_type == constants.HOTPLUG_TARGET_NIC:
2290 2292
      cmds = ["device_del %s" % kvm_devid]
2291 2293
      cmds += ["netdev_del %s" % kvm_devid]
2292
      utils.RemoveFile(self._InstanceNICFile(instance.name, seq))
2294
      self._UnconfigureNic(instance.name, kvm_device, False)
2295
      self._RemoveInstanceNICFiles(instance.name, seq, device)
2293 2296
    self._CallHotplugCommands(instance.name, cmds)
2294 2297
    self._VerifyHotplugCommand(instance.name, kvm_device, dev_type, False)
2295 2298
    index = _DEVICE_RUNTIME_INDEX[dev_type]
......
2515 2518

  
2516 2519
      self._WriteKVMRuntime(instance.name, info)
2517 2520
    else:
2521
      self._UnconfigureInstanceNICs(instance.name, info)
2518 2522
      self.StopInstance(instance, force=True)
2519 2523

  
2520 2524
  def MigrateInstance(self, cluster_name, instance, target, live):

Also available in: Unified diff