Revision ab0c6a39 lib/hypervisor/hv_kvm.py

b/lib/hypervisor/hv_kvm.py
1831 1831
    tapfds = []
1832 1832
    taps = []
1833 1833
    devlist = self._GetKVMOutput(kvm_path, self._KVMOPT_DEVICELIST)
1834

  
1835
    bdev_opts = self._GenerateKVMBlockDevicesOptions(instance,
1836
                                                     up_hvp,
1837
                                                     kvm_disks,
1838
                                                     kvmhelp,
1839
                                                     devlist)
1840
    kvm_cmd.extend(bdev_opts)
1841

  
1834 1842
    if not kvm_nics:
1835 1843
      kvm_cmd.extend(["-net", "none"])
1836 1844
    else:
......
1918 1926
        continue
1919 1927
      self._ConfigureNIC(instance, nic_seq, nic, taps[nic_seq])
1920 1928

  
1921
    bdev_opts = self._GenerateKVMBlockDevicesOptions(instance,
1922
                                                     up_hvp,
1923
                                                     kvm_disks,
1924
                                                     kvmhelp,
1925
                                                     devlist)
1926
    kvm_cmd.extend(bdev_opts)
1927 1929
    # CPU affinity requires kvm to start paused, so we set this flag if the
1928 1930
    # instance is not already paused and if we are not going to accept a
1929 1931
    # migrating instance. In the latter case, pausing is not needed.

Also available in: Unified diff