qemu: add support for Hyper-V Enlightened VMCS

QEMU 3.1 supports Hyper-V Enlightened VMCS feature which significantly
speeds up nested Hyper-V on KVM environments.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 27e77f7d6633a82171022dbab34c132812e8e2e5..d543ada2a12681d2597e5d2e8ac5eb8c28cb474a 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6883,6 +6883,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
             case VIR_DOMAIN_HYPERV_REENLIGHTENMENT:
             case VIR_DOMAIN_HYPERV_TLBFLUSH:
             case VIR_DOMAIN_HYPERV_IPI:
+            case VIR_DOMAIN_HYPERV_EVMCS:
                 if (def->hyperv_features[i] == VIR_TRISTATE_SWITCH_ON)
                     virBufferAsprintf(&buf, ",hv_%s",
                                       virDomainHypervTypeToString(i));
@@ -6900,7 +6901,6 @@ 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 a1f836991959d5fc7e8dcac85d2cfe3bb28e3578..d91fc8d9019f3fe917cc1fa3546d89f034240ea9 100644 (file)
--- a/src/qemu/qemu_parse_command.c
+++ b/src/qemu/qemu_parse_command.c
@@ -1540,6 +1540,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom,
             case VIR_DOMAIN_HYPERV_REENLIGHTENMENT:
             case VIR_DOMAIN_HYPERV_TLBFLUSH:
             case VIR_DOMAIN_HYPERV_IPI:
+            case VIR_DOMAIN_HYPERV_EVMCS:
                 if (value) {
                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                    _("HyperV feature '%s' should not "
@@ -1580,7 +1581,6 @@ 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 fbdd445cd6cb3c029f8ca654c42cc4c42ff77b2a..874451ce7273d84878d812241e84cfeb9256f7cf 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3965,12 +3965,12 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def,
         case VIR_DOMAIN_HYPERV_REENLIGHTENMENT:
         case VIR_DOMAIN_HYPERV_TLBFLUSH:
         case VIR_DOMAIN_HYPERV_IPI:
+        case VIR_DOMAIN_HYPERV_EVMCS:
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("host doesn't support hyperv '%s' feature"),
                            virDomainHypervTypeToString(i));
             return -1;
 
-        case VIR_DOMAIN_HYPERV_EVMCS:
         /* coverity[dead_error_begin] */
         case VIR_DOMAIN_HYPERV_VENDOR_ID:
         case VIR_DOMAIN_HYPERV_LAST:

diff --git a/tests/qemuxml2argvdata/hyperv-off.xml b/tests/qemuxml2argvdata/hyperv-off.xml
index e51cca45b55adb5f536681921829a79819dc55cf..59c1e17ccd369ffbf011c7849598ca8386110769 100644 (file)
--- a/tests/qemuxml2argvdata/hyperv-off.xml
+++ b/tests/qemuxml2argvdata/hyperv-off.xml
@@ -24,6 +24,7 @@
       <reenlightenment state='off'/>
       <tlbflush state='off'/>
       <ipi state='off'/>
+      <evmcs state='off'/>
     </hyperv>
   </features>
   <clock offset='utc'/>

diff --git a/tests/qemuxml2argvdata/hyperv.args b/tests/qemuxml2argvdata/hyperv.args
index 0800e4f79d028969e3e0095ae39ad8cae22b5a01..5d59788e1496f23fcecc583b86a68b199de952ca 100644 (file)
--- a/tests/qemuxml2argvdata/hyperv.args
+++ b/tests/qemuxml2argvdata/hyperv.args
@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -cpu 'qemu32,hv_relaxed,hv_vapic,hv_spinlocks=0x2fff,hv_vpindex,hv_runtime,\
 hv_synic,hv_stimer,hv_reset,hv_vendor_id=KVM Hv,hv_frequencies,\
-hv_reenlightenment,hv_tlbflush,hv_ipi' \
+hv_reenlightenment,hv_tlbflush,hv_ipi,hv_evmcs' \
 -m 214 \
 -smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \

diff --git a/tests/qemuxml2argvdata/hyperv.xml b/tests/qemuxml2argvdata/hyperv.xml
index 05c7d478f75580f471d695a57ad360a9dc1597af..c6feaed5287aa22b99d4b907e6474fa773c02a36 100644 (file)
--- a/tests/qemuxml2argvdata/hyperv.xml
+++ b/tests/qemuxml2argvdata/hyperv.xml
@@ -24,6 +24,7 @@
       <reenlightenment state='on'/>
       <tlbflush state='on'/>
       <ipi state='on'/>
+      <evmcs state='on'/>
     </hyperv>
   </features>
   <clock offset='utc'/>

diff --git a/tests/qemuxml2xmloutdata/hyperv-off.xml b/tests/qemuxml2xmloutdata/hyperv-off.xml
index 2282b763b5bd7394905902815fb1b8e731b159ba..1b7d82b14a907a53f8e3e1bfd114e8600b5bab95 100644 (file)
--- a/tests/qemuxml2xmloutdata/hyperv-off.xml
+++ b/tests/qemuxml2xmloutdata/hyperv-off.xml
@@ -24,6 +24,7 @@
       <reenlightenment state='off'/>
       <tlbflush state='off'/>
       <ipi state='off'/>
+      <evmcs state='off'/>
     </hyperv>
   </features>
   <clock offset='utc'/>

diff --git a/tests/qemuxml2xmloutdata/hyperv.xml b/tests/qemuxml2xmloutdata/hyperv.xml
index 97f387c172b917fbd88b404b9862abbf011f7b4b..5510d3dfadd79dba81ebee146eda0319f2f15934 100644 (file)
--- a/tests/qemuxml2xmloutdata/hyperv.xml
+++ b/tests/qemuxml2xmloutdata/hyperv.xml
@@ -24,6 +24,7 @@
       <reenlightenment state='on'/>
       <tlbflush state='on'/>
       <ipi state='on'/>
+      <evmcs state='on'/>
     </hyperv>
   </features>
   <clock offset='utc'/>