Revision c2672466

b/lib/hypervisor/hv_kvm.py
330 330
    # Save the current instance nics, but defer their expansion as parameters,
331 331
    # as we'll need to generate executable temp files for them.
332 332
    kvm_nics = instance.nics
333
    hvparams = instance.hvparams
333 334

  
334
    return (kvm_cmd, kvm_nics)
335
    return (kvm_cmd, kvm_nics, hvparams)
335 336

  
336 337
  def _WriteKVMRuntime(self, instance_name, data):
337 338
    """Write an instance's KVM runtime
......
357 358
    """Save an instance's KVM runtime
358 359

  
359 360
    """
360
    kvm_cmd, kvm_nics = kvm_runtime
361
    kvm_cmd, kvm_nics, hvparams = kvm_runtime
361 362
    serialized_nics = [nic.ToDict() for nic in kvm_nics]
362
    serialized_form = serializer.Dump((kvm_cmd, serialized_nics))
363
    serialized_form = serializer.Dump((kvm_cmd, serialized_nics, hvparams))
363 364
    self._WriteKVMRuntime(instance.name, serialized_form)
364 365

  
365 366
  def _LoadKVMRuntime(self, instance, serialized_runtime=None):
......
369 370
    if not serialized_runtime:
370 371
      serialized_runtime = self._ReadKVMRuntime(instance.name)
371 372
    loaded_runtime = serializer.Load(serialized_runtime)
372
    kvm_cmd, serialized_nics = loaded_runtime
373
    kvm_cmd, serialized_nics, hvparams = loaded_runtime
373 374
    kvm_nics = [objects.NIC.FromDict(snic) for snic in serialized_nics]
374
    return (kvm_cmd, kvm_nics)
375
    return (kvm_cmd, kvm_nics, hvparams)
375 376

  
376 377
  def _ExecuteKVMRuntime(self, instance, kvm_runtime, incoming=None):
377 378
    """Execute a KVM cmd, after completing it with some last minute data
......
387 388

  
388 389
    temp_files = []
389 390

  
390
    kvm_cmd, kvm_nics = kvm_runtime
391
    kvm_cmd, kvm_nics, hvparams = kvm_runtime
391 392

  
392 393
    if not kvm_nics:
393 394
      kvm_cmd.extend(['-net', 'none'])

Also available in: Unified diff