Revision c1bfc2eb lib/config.py

b/lib/config.py
289 289
    else:
290 290
      self._temporary_macs.Reserve(ec_id, mac)
291 291

  
292
  @locking.ssynchronized(_config_lock, shared=1)
293
  def GetPCIInfo(self, instance_name, dev_type):
292
  @locking.ssynchronized(_config_lock)
293
  def GetPCIInfo(self, instance, dev_type):
294 294

  
295
    instance = self._UnlockedGetInstanceInfo(instance_name)
296 295
    if not instance.hotplug_info:
297
      return None, None 
296
      return None, None
298 297
    idx = getattr(instance.hotplug_info, dev_type)
299 298
    setattr(instance.hotplug_info, dev_type, idx+1)
300 299
    pci = instance.hotplug_info.pci_pool.pop()
......
302 301

  
303 302
    return idx, pci
304 303

  
305
  @locking.ssynchronized(_config_lock, shared=1)
306
  def UpdatePCIInfo(self, instance_name, pci_slot):
304
  @locking.ssynchronized(_config_lock)
305
  def UpdatePCIInfo(self, instance, pci_slot):
307 306

  
308
    instance = self._UnlockedGetInstanceInfo(instance_name)
309 307
    if instance.hotplug_info:
308
      logging.info("Releasing PCI slot %d for instance %s",
309
                    pci_slot, instance.name)
310 310
      instance.hotplug_info.pci_pool.append(pci_slot)
311 311
      self._WriteConfig()
312 312

  

Also available in: Unified diff