diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 884c58b9c3456f1adb04c982763412e78622f790..f80d85d9798a56348b0c2b0c93b5809b875cc9f4 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1974,6 +1974,7 @@ <synic state='on'/> <reset state='on'/> <vendor_id state='on' value='KVM Hv'/> + <frequencies state='on'/> </hyperv> <kvm> <hidden state='on'/> @@ -2096,6 +2097,12 @@ on, off; value - string, up to 12 characters 1.3.3 (QEMU 2.5) + + frequencies + Expose frequency MSRs + on, off + 4.7.0 (QEMU 2.12) +
pvspinlock
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 749556c01306f31f984a5cd5892f2daf7f859cfa..351fdca3f3a45b09f15faa505b5b5f02d7d11076 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -5733,6 +5733,11 @@ + + + + + diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 77cc73744f24c26de0f9027e9054051691cea3de..388e65d9d6ad85a035389dc60afb3900995a1add 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -169,7 +169,8 @@ VIR_ENUM_IMPL(virDomainHyperv, VIR_DOMAIN_HYPERV_LAST, "synic", "stimer", "reset", - "vendor_id") + "vendor_id", + "frequencies") VIR_ENUM_IMPL(virDomainKVM, VIR_DOMAIN_KVM_LAST, "hidden") @@ -20278,6 +20279,7 @@ virDomainDefParseXML(xmlDocPtr xml, case VIR_DOMAIN_HYPERV_SYNIC: case VIR_DOMAIN_HYPERV_STIMER: case VIR_DOMAIN_HYPERV_RESET: + case VIR_DOMAIN_HYPERV_FREQUENCIES: break; case VIR_DOMAIN_HYPERV_SPINLOCKS: @@ -22462,6 +22464,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDefPtr src, case VIR_DOMAIN_HYPERV_SYNIC: case VIR_DOMAIN_HYPERV_STIMER: case VIR_DOMAIN_HYPERV_RESET: + case VIR_DOMAIN_HYPERV_FREQUENCIES: if (src->hyperv_features[i] != dst->hyperv_features[i]) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("State of HyperV enlightenment " @@ -28177,6 +28180,7 @@ virDomainDefFormatInternal(virDomainDefPtr def, case VIR_DOMAIN_HYPERV_SYNIC: case VIR_DOMAIN_HYPERV_STIMER: case VIR_DOMAIN_HYPERV_RESET: + case VIR_DOMAIN_HYPERV_FREQUENCIES: break; case VIR_DOMAIN_HYPERV_SPINLOCKS: diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index ade60f59d357f2f714f425e4379dc2ff6ce9149f..7d3e2811660d8296c0c3c5db12a465a0d8b91833 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1791,6 +1791,7 @@ typedef enum { VIR_DOMAIN_HYPERV_STIMER, VIR_DOMAIN_HYPERV_RESET, VIR_DOMAIN_HYPERV_VENDOR_ID, + VIR_DOMAIN_HYPERV_FREQUENCIES, VIR_DOMAIN_HYPERV_LAST } virDomainHyperv; diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 809da9411733eb45b0b7471b24489be404b67d0c..a2fbfb577ddb055324828281b8e657c4c7dbd6cb 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -109,6 +109,8 @@ KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_VPINDEX, 0x40000003, 0x00000040); KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_RESET, 0x40000003, 0x00000080); +KVM_FEATURE_DEF(VIR_CPU_x86_KVM_HV_FREQUENCIES, + 0x40000003, 0x00000800); static virCPUx86Feature x86_kvm_features[] = { @@ -129,6 +131,7 @@ static virCPUx86Feature x86_kvm_features[] = KVM_FEATURE(VIR_CPU_x86_KVM_HV_VAPIC), KVM_FEATURE(VIR_CPU_x86_KVM_HV_VPINDEX), KVM_FEATURE(VIR_CPU_x86_KVM_HV_RESET), + KVM_FEATURE(VIR_CPU_x86_KVM_HV_FREQUENCIES), }; typedef struct _virCPUx86Model virCPUx86Model; diff --git a/src/cpu/cpu_x86_data.h b/src/cpu/cpu_x86_data.h index b89110f16c8dd0ec3d3419a378a158a143321157..c01eb41be574f1fa555d341a0fa580784d00bbc1 100644 --- a/src/cpu/cpu_x86_data.h +++ b/src/cpu/cpu_x86_data.h @@ -63,6 +63,7 @@ struct _virCPUx86CPUID { # define VIR_CPU_x86_KVM_HV_VAPIC "__kvm_hv_vapic" # define VIR_CPU_x86_KVM_HV_VPINDEX "__kvm_hv_vpindex" # define VIR_CPU_x86_KVM_HV_RESET "__kvm_hv_reset" +# define VIR_CPU_x86_KVM_HV_FREQUENCIES "__kvm_hv_frequencies" # define VIR_CPU_X86_DATA_INIT { 0 } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 96fc360f4a8bbf3646efc9720d5776f307148d4d..f130803c147cefe110027f817e54c7f53e5dbe59 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6866,6 +6866,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, case VIR_DOMAIN_HYPERV_SYNIC: case VIR_DOMAIN_HYPERV_STIMER: case VIR_DOMAIN_HYPERV_RESET: + case VIR_DOMAIN_HYPERV_FREQUENCIES: if (def->hyperv_features[i] == VIR_TRISTATE_SWITCH_ON) virBufferAsprintf(&buf, ",hv_%s", virDomainHypervTypeToString(i)); diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index 351425fedd1569e50e8bb998b11749875947585a..ffea9a26bdde12969baa55c787c9495984283590 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -1536,6 +1536,7 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, case VIR_DOMAIN_HYPERV_SYNIC: case VIR_DOMAIN_HYPERV_STIMER: case VIR_DOMAIN_HYPERV_RESET: + case VIR_DOMAIN_HYPERV_FREQUENCIES: if (value) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("HyperV feature '%s' should not " diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 02fdc55156d9565406ca4e8918264cb157691549..21f13f722f51cc08375580cac0b9a42da33cd10b 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3912,6 +3912,7 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def, case VIR_DOMAIN_HYPERV_SYNIC: case VIR_DOMAIN_HYPERV_STIMER: case VIR_DOMAIN_HYPERV_RESET: + case VIR_DOMAIN_HYPERV_FREQUENCIES: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("host doesn't support hyperv '%s' feature"), virDomainHypervTypeToString(i)); diff --git a/tests/qemuxml2argvdata/hyperv-off.xml b/tests/qemuxml2argvdata/hyperv-off.xml index ba9c978848e198180ae14c90dd51f5fe5011cf61..d3a8455ac338ec01c9cbf77dbab432760ec01d6f 100644 --- a/tests/qemuxml2argvdata/hyperv-off.xml +++ b/tests/qemuxml2argvdata/hyperv-off.xml @@ -20,6 +20,7 @@ + diff --git a/tests/qemuxml2argvdata/hyperv.args b/tests/qemuxml2argvdata/hyperv.args index befafb23cf24d1b1da995a139a2318db5566fabd..63fb5fb0021d2f7a1ec1d3d22809d780d0706f6c 100644 --- a/tests/qemuxml2argvdata/hyperv.args +++ b/tests/qemuxml2argvdata/hyperv.args @@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \ -S \ -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_synic,hv_stimer,hv_reset,hv_vendor_id=KVM Hv,hv_frequencies' \ -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 09f6d2102495d47cbff567f918bbc9b859589d07..27372d16364af459fd058076fcda4e9d1a679c7f 100644 --- a/tests/qemuxml2argvdata/hyperv.xml +++ b/tests/qemuxml2argvdata/hyperv.xml @@ -20,6 +20,7 @@ + diff --git a/tests/qemuxml2xmloutdata/hyperv-off.xml b/tests/qemuxml2xmloutdata/hyperv-off.xml index 07eaf7219dfce44af922fa6db415c20991179c7f..3ba0b827c3f0dbed42b31338ec3a0e3f7c94489e 100644 --- a/tests/qemuxml2xmloutdata/hyperv-off.xml +++ b/tests/qemuxml2xmloutdata/hyperv-off.xml @@ -20,6 +20,7 @@ + diff --git a/tests/qemuxml2xmloutdata/hyperv.xml b/tests/qemuxml2xmloutdata/hyperv.xml index f9ae9504de5e46afb08bda4989fcee0ed71d3d1d..1e47a946d6d0f967858ea4cc3f24b91b20ba80e4 100644 --- a/tests/qemuxml2xmloutdata/hyperv.xml +++ b/tests/qemuxml2xmloutdata/hyperv.xml @@ -20,6 +20,7 @@ +