| From b91bb231645300a29ab82994a003ba22835ee994 Mon Sep 17 00:00:00 2001 |
| Message-Id: <b91bb231645300a29ab82994a003ba22835ee994@dist-git> |
| From: Jiri Denemark <jdenemar@redhat.com> |
| Date: Thu, 8 Oct 2020 18:01:26 +0200 |
| Subject: [PATCH] cpu_map: Remove monitor feature from EPYC-Rome |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| The feature is filtered by KVM and never automatically enabled. So even |
| though QEMU definition of EPYC-Rome contains this feature, the guest |
| won't see it. Also domain capabilities will show it as disabled for KVM |
| domains. Thus the feature should not really be included in our |
| definition of EPYC-Rome. |
| |
| Signed-off-by: Jiri Denemark <jdenemar@redhat.com> |
| Reviewed-by: Peter Krempa <pkrempa@redhat.com> |
| (cherry picked from commit 3bf6f9fe22dfbd3c1dcc614b31f2f4fe8b71a2f2) |
| |
| https://bugzilla.redhat.com/show_bug.cgi?id=1861506 |
| |
| Conflicts: |
| tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml |
| tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml |
| tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml |
| tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml |
| tests/domaincapsdata/qemu_5.1.0.x86_64.xml |
| tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml |
| tests/domaincapsdata/qemu_5.2.0.x86_64.xml |
| - not present downstream |
| |
| Signed-off-by: Jiri Denemark <jdenemar@redhat.com> |
| Message-Id: <74b9257f49925312b025a99dd934a9613ca295d4.1602172344.git.jdenemar@redhat.com> |
| Reviewed-by: Ján Tomko <jtomko@redhat.com> |
| |
| src/cpu_map/x86_EPYC-Rome.xml | 1 - |
| tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml | 1 + |
| tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml | 1 + |
| tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml | 1 - |
| 4 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/src/cpu_map/x86_EPYC-Rome.xml b/src/cpu_map/x86_EPYC-Rome.xml |
| index 99fc015fdd..e54d0a48d8 100644 |
| |
| |
| @@ -37,7 +37,6 @@ |
| <feature name='misalignsse'/> |
| <feature name='mmx'/> |
| <feature name='mmxext'/> |
| - <feature name='monitor'/> |
| <feature name='movbe'/> |
| <feature name='msr'/> |
| <feature name='mtrr'/> |
| diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml |
| index cb2caab6f5..6d95b508b2 100644 |
| |
| |
| @@ -2,6 +2,7 @@ |
| <model fallback='forbid'>EPYC-Rome</model> |
| <vendor>AMD</vendor> |
| <feature policy='require' name='ht'/> |
| + <feature policy='require' name='monitor'/> |
| <feature policy='require' name='osxsave'/> |
| <feature policy='require' name='cmt'/> |
| <feature policy='require' name='xsaves'/> |
| diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml |
| index b6784f9eba..65eaeabdd0 100644 |
| |
| |
| @@ -3,6 +3,7 @@ |
| <model>EPYC-Rome</model> |
| <vendor>AMD</vendor> |
| <feature name='ht'/> |
| + <feature name='monitor'/> |
| <feature name='osxsave'/> |
| <feature name='cmt'/> |
| <feature name='xsaves'/> |
| diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-json.xml |
| index 86466c0547..febfdfcf2b 100644 |
| |
| |
| @@ -17,5 +17,4 @@ |
| <feature policy='require' name='skip-l1dfl-vmentry'/> |
| <feature policy='require' name='mds-no'/> |
| <feature policy='require' name='pschange-mc-no'/> |
| - <feature policy='disable' name='monitor'/> |
| </cpu> |
| -- |
| 2.29.2 |
| |