提交 c3d0d7cc 编写于 作者: V Vitaly Kuznetsov 提交者: Andrea Bolognani

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: NAndrea Bolognani <abologna@redhat.com>
Signed-off-by: NVitaly Kuznetsov <vkuznets@redhat.com>
上级 1c596f49
...@@ -2008,6 +2008,7 @@ ...@@ -2008,6 +2008,7 @@
&lt;reenlightenment state='on'/&gt; &lt;reenlightenment state='on'/&gt;
&lt;tlbflush state='on'/&gt; &lt;tlbflush state='on'/&gt;
&lt;ipi state='on'/&gt; &lt;ipi state='on'/&gt;
&lt;evmcs state='on'/&gt;
&lt;/hyperv&gt; &lt;/hyperv&gt;
&lt;kvm&gt; &lt;kvm&gt;
&lt;hidden state='on'/&gt; &lt;hidden state='on'/&gt;
...@@ -2154,6 +2155,12 @@ ...@@ -2154,6 +2155,12 @@
<td>on, off</td> <td>on, off</td>
<td><span class="since">4.10.0 (QEMU 3.1)</span></td> <td><span class="since">4.10.0 (QEMU 3.1)</span></td>
</tr> </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> </table>
</dd> </dd>
<dt><code>pvspinlock</code></dt> <dt><code>pvspinlock</code></dt>
......
...@@ -5784,6 +5784,11 @@ ...@@ -5784,6 +5784,11 @@
<ref name="featurestate"/> <ref name="featurestate"/>
</element> </element>
</optional> </optional>
<optional>
<element name="evmcs">
<ref name="featurestate"/>
</element>
</optional>
</interleave> </interleave>
</element> </element>
</define> </define>
......
...@@ -174,6 +174,7 @@ VIR_ENUM_IMPL(virDomainHyperv, VIR_DOMAIN_HYPERV_LAST, ...@@ -174,6 +174,7 @@ VIR_ENUM_IMPL(virDomainHyperv, VIR_DOMAIN_HYPERV_LAST,
"reenlightenment", "reenlightenment",
"tlbflush", "tlbflush",
"ipi", "ipi",
"evmcs",
); );
VIR_ENUM_IMPL(virDomainKVM, VIR_DOMAIN_KVM_LAST, VIR_ENUM_IMPL(virDomainKVM, VIR_DOMAIN_KVM_LAST,
...@@ -20200,6 +20201,7 @@ virDomainDefParseXML(xmlDocPtr xml, ...@@ -20200,6 +20201,7 @@ virDomainDefParseXML(xmlDocPtr xml,
case VIR_DOMAIN_HYPERV_REENLIGHTENMENT: case VIR_DOMAIN_HYPERV_REENLIGHTENMENT:
case VIR_DOMAIN_HYPERV_TLBFLUSH: case VIR_DOMAIN_HYPERV_TLBFLUSH:
case VIR_DOMAIN_HYPERV_IPI: case VIR_DOMAIN_HYPERV_IPI:
case VIR_DOMAIN_HYPERV_EVMCS:
break; break;
case VIR_DOMAIN_HYPERV_SPINLOCKS: case VIR_DOMAIN_HYPERV_SPINLOCKS:
...@@ -22395,6 +22397,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDefPtr src, ...@@ -22395,6 +22397,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDefPtr src,
case VIR_DOMAIN_HYPERV_REENLIGHTENMENT: case VIR_DOMAIN_HYPERV_REENLIGHTENMENT:
case VIR_DOMAIN_HYPERV_TLBFLUSH: case VIR_DOMAIN_HYPERV_TLBFLUSH:
case VIR_DOMAIN_HYPERV_IPI: case VIR_DOMAIN_HYPERV_IPI:
case VIR_DOMAIN_HYPERV_EVMCS:
if (src->hyperv_features[i] != dst->hyperv_features[i]) { if (src->hyperv_features[i] != dst->hyperv_features[i]) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("State of HyperV enlightenment " _("State of HyperV enlightenment "
...@@ -28196,6 +28199,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, ...@@ -28196,6 +28199,7 @@ virDomainDefFormatInternal(virDomainDefPtr def,
case VIR_DOMAIN_HYPERV_REENLIGHTENMENT: case VIR_DOMAIN_HYPERV_REENLIGHTENMENT:
case VIR_DOMAIN_HYPERV_TLBFLUSH: case VIR_DOMAIN_HYPERV_TLBFLUSH:
case VIR_DOMAIN_HYPERV_IPI: case VIR_DOMAIN_HYPERV_IPI:
case VIR_DOMAIN_HYPERV_EVMCS:
break; break;
case VIR_DOMAIN_HYPERV_SPINLOCKS: case VIR_DOMAIN_HYPERV_SPINLOCKS:
......
...@@ -1796,6 +1796,7 @@ typedef enum { ...@@ -1796,6 +1796,7 @@ typedef enum {
VIR_DOMAIN_HYPERV_REENLIGHTENMENT, VIR_DOMAIN_HYPERV_REENLIGHTENMENT,
VIR_DOMAIN_HYPERV_TLBFLUSH, VIR_DOMAIN_HYPERV_TLBFLUSH,
VIR_DOMAIN_HYPERV_IPI, VIR_DOMAIN_HYPERV_IPI,
VIR_DOMAIN_HYPERV_EVMCS,
VIR_DOMAIN_HYPERV_LAST VIR_DOMAIN_HYPERV_LAST
} virDomainHyperv; } virDomainHyperv;
......
...@@ -116,6 +116,8 @@ KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_TLBFLUSH, ...@@ -116,6 +116,8 @@ KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_TLBFLUSH,
0x40000004, 0x00000004); 0x40000004, 0x00000004);
KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_IPI, KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_IPI,
0x40000004, 0x00000400); 0x40000004, 0x00000400);
KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_EVMCS,
0x40000004, 0x00004000);
static virCPUx86Feature x86_kvm_features[] = static virCPUx86Feature x86_kvm_features[] =
{ {
...@@ -140,6 +142,7 @@ 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_REENLIGHTENMENT),
KVM_FEATURE(VIR_CPU_x86_KVM_HV_TLBFLUSH), KVM_FEATURE(VIR_CPU_x86_KVM_HV_TLBFLUSH),
KVM_FEATURE(VIR_CPU_x86_KVM_HV_IPI), KVM_FEATURE(VIR_CPU_x86_KVM_HV_IPI),
KVM_FEATURE(VIR_CPU_x86_KVM_HV_EVMCS),
}; };
typedef struct _virCPUx86Model virCPUx86Model; typedef struct _virCPUx86Model virCPUx86Model;
......
...@@ -66,6 +66,7 @@ struct _virCPUx86CPUID { ...@@ -66,6 +66,7 @@ struct _virCPUx86CPUID {
# define VIR_CPU_x86_KVM_HV_REENLIGHTENMENT "__kvm_hv_reenlightenment" # 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_TLBFLUSH "__kvm_hv_tlbflush"
# define VIR_CPU_x86_KVM_HV_IPI "__kvm_hv_ipi" # 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 } # define VIR_CPU_X86_DATA_INIT { 0 }
......
...@@ -6900,6 +6900,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, ...@@ -6900,6 +6900,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
def->hyperv_vendor_id); def->hyperv_vendor_id);
break; break;
case VIR_DOMAIN_HYPERV_EVMCS:
/* coverity[dead_error_begin] */ /* coverity[dead_error_begin] */
case VIR_DOMAIN_HYPERV_LAST: case VIR_DOMAIN_HYPERV_LAST:
break; break;
......
...@@ -1580,6 +1580,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, ...@@ -1580,6 +1580,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom,
break; break;
case VIR_DOMAIN_HYPERV_EVMCS:
case VIR_DOMAIN_HYPERV_LAST: case VIR_DOMAIN_HYPERV_LAST:
break; break;
} }
......
...@@ -3970,6 +3970,7 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def, ...@@ -3970,6 +3970,7 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def,
virDomainHypervTypeToString(i)); virDomainHypervTypeToString(i));
return -1; return -1;
case VIR_DOMAIN_HYPERV_EVMCS:
/* coverity[dead_error_begin] */ /* coverity[dead_error_begin] */
case VIR_DOMAIN_HYPERV_VENDOR_ID: case VIR_DOMAIN_HYPERV_VENDOR_ID:
case VIR_DOMAIN_HYPERV_LAST: case VIR_DOMAIN_HYPERV_LAST:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册