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>

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 4366b9d611c2ca4da193a136363752fa1dea6132..295f9ff93e44d41c6e0015278e384cbac88415f0 100644 (file)
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -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>

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 5cf4982027e2c0e046694b7abbfa2270b8978bfb..cad189513a2d209906a5dc2fc588469f7577a3bb 100644 (file)
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -5784,6 +5784,11 @@
             <ref name="featurestate"/>
           </element>
         </optional>
+        <optional>
+          <element name="evmcs">
+            <ref name="featurestate"/>
+          </element>
+        </optional>
       </interleave>
     </element>
   </define>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index d1e2e1969c8058be001834c415ded211945076dd..6c15781dc09212828390fc6e25ccfaa6f772be0e 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -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:

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 24ff12ba85f8cb2c8a6b8e03c5f2e7c5c7559803..c167f8c43ce1119cfb8c09899eff9b52c20319ab 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -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;

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 33252e927ecadd14734ab886f5dc10d79b83dad4..ebfa74fccd0c3df759f7a55a2793747b038dda4a 100644 (file)
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -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;

diff --git a/src/cpu/cpu_x86_data.h b/src/cpu/cpu_x86_data.h
index 8c51d88e1a910eea1ea46e16f075cf4f169fe130..f52bba821fe277b474a3abc6a5a3a01e40baada2 100644 (file)
--- a/src/cpu/cpu_x86_data.h
+++ b/src/cpu/cpu_x86_data.h
@@ -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 }

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 6fc8deff00a98fa00d79df01146f326a812aeaf7..27e77f7d6633a82171022dbab34c132812e8e2e5 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -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;

diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c
index a15f4d1121d607778c0250f15f90c10b4dd79ff6..a1f836991959d5fc7e8dcac85d2cfe3bb28e3578 100644 (file)
--- a/src/qemu/qemu_parse_command.c
+++ b/src/qemu/qemu_parse_command.c
@@ -1580,6 +1580,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom,
 
                 break;
 
+            case VIR_DOMAIN_HYPERV_EVMCS:
             case VIR_DOMAIN_HYPERV_LAST:
                 break;
             }

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 262fbc0210781446690e4ccf3ddefb28d7f2ce8d..fbdd445cd6cb3c029f8ca654c42cc4c42ff77b2a 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -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: