mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-02-02 01:45:17 +00:00
conf: add support for Hyper-V Enlightened VMCS
Support Hyper-V Enlightened VMCS in domain config. QEMU support will be implemented in the next patch, adding interim VIR_DOMAIN_HYPERV_EVMCS cases to src/qemu/* for now. Reviewed-by: Andrea Bolognani <abologna@redhat.com> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
This commit is contained in:
parent
1c596f4964
commit
c3d0d7cc8a
@ -2008,6 +2008,7 @@
|
||||
<reenlightenment state='on'/>
|
||||
<tlbflush state='on'/>
|
||||
<ipi state='on'/>
|
||||
<evmcs state='on'/>
|
||||
</hyperv>
|
||||
<kvm>
|
||||
<hidden state='on'/>
|
||||
@ -2154,6 +2155,12 @@
|
||||
<td>on, off</td>
|
||||
<td><span class="since">4.10.0 (QEMU 3.1)</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>evmcs</td>
|
||||
<td>Enable Enlightened VMCS</td>
|
||||
<td>on, off</td>
|
||||
<td><span class="since">4.10.0 (QEMU 3.1)</span></td>
|
||||
</tr>
|
||||
</table>
|
||||
</dd>
|
||||
<dt><code>pvspinlock</code></dt>
|
||||
|
@ -5784,6 +5784,11 @@
|
||||
<ref name="featurestate"/>
|
||||
</element>
|
||||
</optional>
|
||||
<optional>
|
||||
<element name="evmcs">
|
||||
<ref name="featurestate"/>
|
||||
</element>
|
||||
</optional>
|
||||
</interleave>
|
||||
</element>
|
||||
</define>
|
||||
|
@ -174,6 +174,7 @@ VIR_ENUM_IMPL(virDomainHyperv, VIR_DOMAIN_HYPERV_LAST,
|
||||
"reenlightenment",
|
||||
"tlbflush",
|
||||
"ipi",
|
||||
"evmcs",
|
||||
);
|
||||
|
||||
VIR_ENUM_IMPL(virDomainKVM, VIR_DOMAIN_KVM_LAST,
|
||||
@ -20200,6 +20201,7 @@ virDomainDefParseXML(xmlDocPtr xml,
|
||||
case VIR_DOMAIN_HYPERV_REENLIGHTENMENT:
|
||||
case VIR_DOMAIN_HYPERV_TLBFLUSH:
|
||||
case VIR_DOMAIN_HYPERV_IPI:
|
||||
case VIR_DOMAIN_HYPERV_EVMCS:
|
||||
break;
|
||||
|
||||
case VIR_DOMAIN_HYPERV_SPINLOCKS:
|
||||
@ -22395,6 +22397,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDefPtr src,
|
||||
case VIR_DOMAIN_HYPERV_REENLIGHTENMENT:
|
||||
case VIR_DOMAIN_HYPERV_TLBFLUSH:
|
||||
case VIR_DOMAIN_HYPERV_IPI:
|
||||
case VIR_DOMAIN_HYPERV_EVMCS:
|
||||
if (src->hyperv_features[i] != dst->hyperv_features[i]) {
|
||||
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
||||
_("State of HyperV enlightenment "
|
||||
@ -28196,6 +28199,7 @@ virDomainDefFormatInternal(virDomainDefPtr def,
|
||||
case VIR_DOMAIN_HYPERV_REENLIGHTENMENT:
|
||||
case VIR_DOMAIN_HYPERV_TLBFLUSH:
|
||||
case VIR_DOMAIN_HYPERV_IPI:
|
||||
case VIR_DOMAIN_HYPERV_EVMCS:
|
||||
break;
|
||||
|
||||
case VIR_DOMAIN_HYPERV_SPINLOCKS:
|
||||
|
@ -1796,6 +1796,7 @@ typedef enum {
|
||||
VIR_DOMAIN_HYPERV_REENLIGHTENMENT,
|
||||
VIR_DOMAIN_HYPERV_TLBFLUSH,
|
||||
VIR_DOMAIN_HYPERV_IPI,
|
||||
VIR_DOMAIN_HYPERV_EVMCS,
|
||||
|
||||
VIR_DOMAIN_HYPERV_LAST
|
||||
} virDomainHyperv;
|
||||
|
@ -116,6 +116,8 @@ KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_TLBFLUSH,
|
||||
0x40000004, 0x00000004);
|
||||
KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_IPI,
|
||||
0x40000004, 0x00000400);
|
||||
KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_EVMCS,
|
||||
0x40000004, 0x00004000);
|
||||
|
||||
static virCPUx86Feature x86_kvm_features[] =
|
||||
{
|
||||
@ -140,6 +142,7 @@ static virCPUx86Feature x86_kvm_features[] =
|
||||
KVM_FEATURE(VIR_CPU_x86_KVM_HV_REENLIGHTENMENT),
|
||||
KVM_FEATURE(VIR_CPU_x86_KVM_HV_TLBFLUSH),
|
||||
KVM_FEATURE(VIR_CPU_x86_KVM_HV_IPI),
|
||||
KVM_FEATURE(VIR_CPU_x86_KVM_HV_EVMCS),
|
||||
};
|
||||
|
||||
typedef struct _virCPUx86Model virCPUx86Model;
|
||||
|
@ -66,6 +66,7 @@ struct _virCPUx86CPUID {
|
||||
# define VIR_CPU_x86_KVM_HV_REENLIGHTENMENT "__kvm_hv_reenlightenment"
|
||||
# define VIR_CPU_x86_KVM_HV_TLBFLUSH "__kvm_hv_tlbflush"
|
||||
# define VIR_CPU_x86_KVM_HV_IPI "__kvm_hv_ipi"
|
||||
# define VIR_CPU_x86_KVM_HV_EVMCS "__kvm_hv_evmcs"
|
||||
|
||||
|
||||
# define VIR_CPU_X86_DATA_INIT { 0 }
|
||||
|
@ -6900,6 +6900,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
|
||||
def->hyperv_vendor_id);
|
||||
break;
|
||||
|
||||
case VIR_DOMAIN_HYPERV_EVMCS:
|
||||
/* coverity[dead_error_begin] */
|
||||
case VIR_DOMAIN_HYPERV_LAST:
|
||||
break;
|
||||
|
@ -1580,6 +1580,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom,
|
||||
|
||||
break;
|
||||
|
||||
case VIR_DOMAIN_HYPERV_EVMCS:
|
||||
case VIR_DOMAIN_HYPERV_LAST:
|
||||
break;
|
||||
}
|
||||
|
@ -3970,6 +3970,7 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def,
|
||||
virDomainHypervTypeToString(i));
|
||||
return -1;
|
||||
|
||||
case VIR_DOMAIN_HYPERV_EVMCS:
|
||||
/* coverity[dead_error_begin] */
|
||||
case VIR_DOMAIN_HYPERV_VENDOR_ID:
|
||||
case VIR_DOMAIN_HYPERV_LAST:
|
||||
|
Loading…
x
Reference in New Issue
Block a user