Revision 7cb42171

b/lib/constants.py
773 773
HV_PASSTHROUGH = "pci_pass"
774 774
HV_BLOCKDEV_PREFIX = "blockdev_prefix"
775 775
HV_REBOOT_BEHAVIOR = "reboot_behavior"
776
HV_CPU_TYPE = "cpu_type"
776 777

  
777 778
HVS_PARAMETER_TYPES = {
778 779
  HV_BOOT_ORDER: VTYPE_STRING,
......
828 829
  HV_PASSTHROUGH: VTYPE_STRING,
829 830
  HV_BLOCKDEV_PREFIX: VTYPE_STRING,
830 831
  HV_REBOOT_BEHAVIOR: VTYPE_STRING,
832
  HV_CPU_TYPE: VTYPE_STRING,
831 833
  }
832 834

  
833 835
HVS_PARAMETERS = frozenset(HVS_PARAMETER_TYPES.keys())
......
1812 1814
    HV_MEM_PATH: "",
1813 1815
    HV_REBOOT_BEHAVIOR: INSTANCE_REBOOT_ALLOWED,
1814 1816
    HV_CPU_MASK: CPU_PINNING_ALL,
1817
    HV_CPU_TYPE: "",
1815 1818
    },
1816 1819
  HT_FAKE: {
1817 1820
    },
b/lib/hypervisor/hv_kvm.py
493 493
    constants.HV_REBOOT_BEHAVIOR:
494 494
      hv_base.ParamInSet(True, constants.REBOOT_BEHAVIORS),
495 495
    constants.HV_CPU_MASK: hv_base.OPT_MULTI_CPU_MASK_CHECK,
496
    constants.HV_CPU_TYPE: hv_base.NO_CHECK
496 497
    }
497 498

  
498 499
  _MIGRATION_STATUS_RE = re.compile("Migration\s+status:\s+(\w+)",
......
1243 1244
    if hvp[constants.HV_KVM_USE_CHROOT]:
1244 1245
      kvm_cmd.extend(["-chroot", self._InstanceChrootDir(instance.name)])
1245 1246

  
1247
    # Add qemu-KVM -cpu param
1248
    if hvp[constants.HV_CPU_TYPE]:
1249
      kvm_cmd.extend(["-cpu", hvp[constants.HV_CPU_TYPE]])
1250

  
1246 1251
    # Save the current instance nics, but defer their expansion as parameters,
1247 1252
    # as we'll need to generate executable temp files for them.
1248 1253
    kvm_nics = instance.nics
b/lib/query.py
1773 1773
    constants.HV_PAE: "PAE",
1774 1774
    constants.HV_VNC_BIND_ADDRESS: "VNC_bind_address",
1775 1775
    constants.HV_PASSTHROUGH: "pci_pass",
1776
    constants.HV_CPU_TYPE: "cpu_type",
1776 1777
    }
1777 1778

  
1778 1779
  fields = [
b/man/gnt-instance.rst
385 385

  
386 386
    Enables or disables passing mouse events via SPICE vdagent.
387 387

  
388
cpu\_type
389
    Valid for the KVM hypervisor.
390

  
391
    This parameter determines the emulated cpu for the instance. If this
392
    parameter is empty (which is the default configuration), it will not
393
    be passed to KVM.
394

  
395
    Be aware of setting this parameter to ``"host"`` if you have nodes
396
    with different CPUs from each other. Live migration may stop working
397
    in this situation.
398

  
399
    For more information please refer to the KVM manual.
400

  
388 401
acpi
389 402
    Valid for the Xen HVM and KVM hypervisors.
390 403

  

Also available in: Unified diff