Merge ~paelzer/ubuntu/+source/libvirt:lp-1921880-1921754-amd-epyc-1922907-stepping-parsing-GROOVY into ubuntu/+source/libvirt:ubuntu/groovy-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4525

[Robie Basak (racb)]

review: Approve (sru)

[Christian Ehrhardt  (paelzer)]

Thanks for the Review Robie!

FYI tests also completed (again in a more complete fashion) and LGTM:

prep (x86_64) : Pass 25 F/S/N 0/0/0 - RC 0 (15 min 44428 lin)
migrate (x86_64) : Pass 720 F/S/N 36/0/0 - RC 36 (496 min 820003 lin)
cross (x86_64) : Pass 58 F/S/N 0/1/2 - RC 0 (82 min 100241 lin)
misc (x86_64) : Pass 219 F/S/N 0/0/0 - RC 0 (84 min 120581 lin)

prep (s390x) : Pass 25 F/S/N 0/0/0 - RC 0 (14 min 31196 lin)
migrate (s390x) : Pass 804 F/S/N 0/15/0 - RC 0 (311 min 517498 lin)
cross (s390x) : Pass 62 F/S/N 0/1/1 - RC 0 (94 min 93721 lin)
misc (s390x) : Pass 199 F/S/N 2/0/0 - RC 2 (78 min 94668 lin)

The 36 fails in x86 are an issue with postcopy-after-precopy that isn't due to this new version.
The 2 fails on s390x are a real issue in Hirsute guests, but not due to these updates.
The tests above included F/G/H releases.

[Christian Ehrhardt  (paelzer)]

Hirsute is completed, uploading this one

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/libvirt
 * [new tag] upload/6.6.0-1ubuntu3.5 -> upload/6.6.0-1ubuntu3.5

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading libvirt_6.6.0-1ubuntu3.5.dsc: done.
  Uploading libvirt_6.6.0-1ubuntu3.5.debian.tar.xz: done.
  Uploading libvirt_6.6.0-1ubuntu3.5_source.buildinfo: done.
  Uploading libvirt_6.6.0-1ubuntu3.5_source.changes: done.
Successfully uploaded packages.

[Christian Ehrhardt  (paelzer)]

This is in F/G-proposed, setting the MP to merged

diff --git a/debian/changelog b/debian/changelog
index 95eef86..a93ad0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libvirt (6.6.0-1ubuntu3.5) groovy; urgency=medium
+
+  * d/p/u/lp-1921754*: add EPYC-Rome-v2 as v1 missed IBRS and thereby fails
+    on some HW/Guest combinations e.g. Windows 10 on Threadripper
+    (LP: #1921754)
+  * d/p/u/lp-1921880*: add EPYC-Milan features and named cpu type support
+    (LP: #1921880)
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 07 Apr 2021 13:33:46 +0200
+
 libvirt (6.6.0-1ubuntu3.4) groovy; urgency=medium
 
   * d/p/lp1915811-*: Fix NUMA topology population for machines with high number
diff --git a/debian/patches/series b/debian/patches/series
index 9841757..02c394a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -50,3 +50,9 @@ ubuntu/lp-1901242-util-Fix-logic-in-virFileSetCOW.patch
 ubuntu/lp-1913266-qemu-Add-virtio-related-options-to-vsock.patch
 ubuntu/lp1915811-01-virnuma-Don-t-work-around-numa_node_to_cpus.patch
 ubuntu/lp1915811-02-virnuma-Use-numa_nodes_ptr-when-checking-av.patch
+ubuntu/lp-1921754-cpumap-Add-support-for-ibrs-CPU-feature.patch
+ubuntu/lp-1921880-cpu_map-Add-support-for-fsrm-CPU-feature.patch
+ubuntu/lp-1921880-cpumap-Add-support-for-svme-addr-check-CPU-feature.patch
+ubuntu/lp-1921880-cpu_map-Add-EPYC-Milan-x86-CPU-model.patch
+ubuntu/lp-1921880-cpu_map-Install-x86_EPYC-Milan.xml.patch
+ubuntu/lp-1921880-cpu_map-Fix-spelling-of-svme-addr-chk-feature.patch
diff --git a/debian/patches/ubuntu/lp-1921754-cpumap-Add-support-for-ibrs-CPU-feature.patch b/debian/patches/ubuntu/lp-1921754-cpumap-Add-support-for-ibrs-CPU-feature.patch
new file mode 100644
index 0000000..5cd251d
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1921754-cpumap-Add-support-for-ibrs-CPU-feature.patch
@@ -0,0 +1,59 @@
+From 5c17a7ba41670f3182186c06e621995b5d03fc95 Mon Sep 17 00:00:00 2001
+From: Tim Wiederhake <[e-mail]>
+Date: Mon, 22 Feb 2021 13:20:09 +0100
+Subject: [PATCH] cpumap: Add support for ibrs CPU feature
+
+Signed-off-by: Tim Wiederhake <[e-mail]>
+Reviewed-by: Jiri Denemark <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=5c17a7ba
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1921754
+Last-Update: 2021-04-07
+
+---
+ src/cpu_map/x86_features.xml                               | 3 +++
+ tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml | 1 +
+ tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml  | 1 +
+ 3 files changed, 5 insertions(+)
+
+diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
+index 5cfa07502a..b03a6b065d 100644
+--- a/src/cpu_map/x86_features.xml
++++ b/src/cpu_map/x86_features.xml
+@@ -507,6 +507,9 @@
+   <feature name='ibpb'>
+     <cpuid eax_in='0x80000008' ebx='0x00001000'/>
+   </feature>
++  <feature name='ibrs'>
++    <cpuid eax_in='0x80000008' ebx='0x00004000'/>
++  </feature>
+   <feature name='amd-stibp'>
+     <cpuid eax_in='0x80000008' ebx='0x00008000'/>
+   </feature>
+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 6d95b508b2..40e7912398 100644
+--- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml
++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-guest.xml
+@@ -17,6 +17,7 @@
+   <feature policy='require' name='topoext'/>
+   <feature policy='require' name='perfctr_nb'/>
+   <feature policy='require' name='invtsc'/>
++  <feature policy='require' name='ibrs'/>
+   <feature policy='require' name='amd-ssbd'/>
+   <feature policy='require' name='lbrv'/>
+   <feature policy='require' name='svm-lock'/>
+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 65eaeabdd0..9f8108cdaa 100644
+--- a/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml
++++ b/tests/cputestdata/x86_64-cpuid-EPYC-7502-32-Core-host.xml
+@@ -18,6 +18,7 @@
+   <feature name='topoext'/>
+   <feature name='perfctr_nb'/>
+   <feature name='invtsc'/>
++  <feature name='ibrs'/>
+   <feature name='amd-ssbd'/>
+   <feature name='lbrv'/>
+   <feature name='svm-lock'/>
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1921880-cpu_map-Add-EPYC-Milan-x86-CPU-model.patch b/debian/patches/ubuntu/lp-1921880-cpu_map-Add-EPYC-Milan-x86-CPU-model.patch
new file mode 100644
index 0000000..50710d5
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1921880-cpu_map-Add-EPYC-Milan-x86-CPU-model.patch
@@ -0,0 +1,129 @@
+From f321a4822e9fa6542e48a78611989ecd9acaa83a Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Mon, 1 Mar 2021 19:20:51 +0100
+Subject: [PATCH] cpu_map: Add EPYC-Milan x86 CPU model
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Introduced in QEMU 6.0.0 by 623972ceae091b31331ae4a1dc94fe5cbb891937
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Backport-Note: only whitespace damage
+Origin: backport, https://libvirt.org/git/?p=libvirt.git;a=commit;h=f321a482
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1921880
+Last-Update: 2021-04-07
+
+---
+ src/cpu_map/index.xml          |  1 +
+ src/cpu_map/x86_EPYC-Milan.xml | 92 ++++++++++++++++++++++++++++++++++
+ 2 files changed, 93 insertions(+)
+ create mode 100644 src/cpu_map/x86_EPYC-Milan.xml
+
+--- /dev/null
++++ b/src/cpu_map/x86_EPYC-Milan.xml
+@@ -0,0 +1,92 @@
++<cpus>
++  <model name='EPYC-Milan'>
++    <decode host='on' guest='on'/>
++    <signature family='25' model='1'/>
++    <vendor name='AMD'/>
++    <feature name='3dnowprefetch'/>
++    <feature name='abm'/>
++    <feature name='adx'/>
++    <feature name='aes'/>
++    <feature name='amd-ssbd'/>
++    <feature name='amd-stibp'/>
++    <feature name='apic'/>
++    <feature name='arat'/>
++    <feature name='avx'/>
++    <feature name='avx2'/>
++    <feature name='bmi1'/>
++    <feature name='bmi2'/>
++    <feature name='clflush'/>
++    <feature name='clflushopt'/>
++    <feature name='clwb'/>
++    <feature name='clzero'/>
++    <feature name='cmov'/>
++    <feature name='cr8legacy'/>
++    <feature name='cx16'/>
++    <feature name='cx8'/>
++    <feature name='de'/>
++    <feature name='erms'/>
++    <feature name='f16c'/>
++    <feature name='fma'/>
++    <feature name='fpu'/>
++    <feature name='fsgsbase'/>
++    <feature name='fsrm'/>
++    <feature name='fxsr'/>
++    <feature name='fxsr_opt'/>
++    <feature name='ibpb'/>
++    <feature name='ibrs'/>
++    <feature name='invpcid'/>
++    <feature name='lahf_lm'/>
++    <feature name='lm'/>
++    <feature name='mca'/>
++    <feature name='mce'/>
++    <feature name='misalignsse'/>
++    <feature name='mmx'/>
++    <feature name='mmxext'/>
++    <feature name='movbe'/>
++    <feature name='msr'/>
++    <feature name='mtrr'/>
++    <feature name='npt'/>
++    <feature name='nrip-save'/>
++    <feature name='nx'/>
++    <feature name='osvw'/>
++    <feature name='pae'/>
++    <feature name='pat'/>
++    <feature name='pcid'/>
++    <feature name='pclmuldq'/>
++    <feature name='pdpe1gb'/>
++    <feature name='perfctr_core'/>
++    <feature name='pge'/>
++    <feature name='pku'/>
++    <feature name='pni'/>
++    <feature name='popcnt'/>
++    <feature name='pse'/>
++    <feature name='pse36'/>
++    <feature name='rdpid'/>
++    <feature name='rdrand'/>
++    <feature name='rdseed'/>
++    <feature name='rdtscp'/>
++    <feature name='sep'/>
++    <feature name='sha-ni'/>
++    <feature name='smap'/>
++    <feature name='smep'/>
++    <feature name='sse'/>
++    <feature name='sse2'/>
++    <feature name='sse4.1'/>
++    <feature name='sse4.2'/>
++    <feature name='sse4a'/>
++    <feature name='ssse3'/>
++    <feature name='svm'/>
++    <feature name='svme-addr-check'/>
++    <feature name='syscall'/>
++    <feature name='tsc'/>
++    <feature name='umip'/>
++    <feature name='vme'/>
++    <feature name='wbnoinvd'/>
++    <feature name='xgetbv1'/>
++    <feature name='xsave'/>
++    <feature name='xsavec'/>
++    <feature name='xsaveerptr'/>
++    <feature name='xsaveopt'/>
++    <feature name='xsaves'/>
++  </model>
++</cpus>
+--- a/src/cpu_map/index.xml
++++ b/src/cpu_map/index.xml
+@@ -66,6 +66,7 @@
+     <include filename="x86_EPYC.xml"/>
+     <include filename="x86_EPYC-IBPB.xml"/>
+     <include filename="x86_EPYC-Rome.xml"/>
++    <include filename='x86_EPYC-Milan.xml'/>
+ 
+     <!-- Hygon CPU models -->
+     <include filename="x86_Dhyana.xml"/>
diff --git a/debian/patches/ubuntu/lp-1921880-cpu_map-Add-support-for-fsrm-CPU-feature.patch b/debian/patches/ubuntu/lp-1921880-cpu_map-Add-support-for-fsrm-CPU-feature.patch
new file mode 100644
index 0000000..72a6c0f
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1921880-cpu_map-Add-support-for-fsrm-CPU-feature.patch
@@ -0,0 +1,73 @@
+From 8c5c660b99101544d8cfcb8edbe48688c04bee25 Mon Sep 17 00:00:00 2001
+From: Tim Wiederhake <[e-mail]>
+Date: Wed, 6 Jan 2021 11:05:06 +0100
+Subject: [PATCH] cpu_map: Add support for fsrm CPU feature
+
+Signed-off-by: Tim Wiederhake <[e-mail]>
+Reviewed-by: Jiri Denemark <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=8c5c660b
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1921880
+Last-Update: 2021-04-07
+
+---
+ src/cpu_map/x86_features.xml                                | 3 +++
+ tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml | 2 +-
+ tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml    | 1 +
+ tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml     | 1 +
+ 4 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
+index a55f52b16c..b0bf22d916 100644
+--- a/src/cpu_map/x86_features.xml
++++ b/src/cpu_map/x86_features.xml
+@@ -339,6 +339,9 @@
+   <feature name='avx512-4fmaps'>
+     <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000008'/>
+   </feature>
++  <feature name='fsrm'>
++    <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000010'/>
++  </feature>
+   <feature name='md-clear'> <!-- md_clear -->
+     <cpuid eax_in='0x07' ecx_in='0x00' edx='0x00000400'/>
+   </feature>
+diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml
+index ce65579bcc..33bd1013f0 100644
+--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml
++++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml
+@@ -1,7 +1,7 @@
+ <!-- Features disabled by QEMU -->
+ <cpudata arch='x86'>
+   <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1fc' edx='0xb0600000'/>
+-  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00400010' edx='0x00000000'/>
++  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00400010' edx='0x00000010'/>
+   <cpuid eax_in='0x0000000f' ecx_in='0x01' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000006'/>
+   <cpuid eax_in='0x80000007' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000000' edx='0x00000100'/>
+ </cpudata>
+diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
+index 9b75ace710..3a71b28cfb 100644
+--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
++++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
+@@ -24,6 +24,7 @@
+   <feature policy='require' name='sha-ni'/>
+   <feature policy='require' name='ospke'/>
+   <feature policy='require' name='rdpid'/>
++  <feature policy='require' name='fsrm'/>
+   <feature policy='require' name='stibp'/>
+   <feature policy='require' name='arch-capabilities'/>
+   <feature policy='require' name='xsaves'/>
+diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
+index efbf9d363b..1582de0422 100644
+--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
++++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
+@@ -25,6 +25,7 @@
+   <feature name='sha-ni'/>
+   <feature name='ospke'/>
+   <feature name='rdpid'/>
++  <feature name='fsrm'/>
+   <feature name='stibp'/>
+   <feature name='arch-capabilities'/>
+   <feature name='xsaves'/>
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1921880-cpu_map-Fix-spelling-of-svme-addr-chk-feature.patch b/debian/patches/ubuntu/lp-1921880-cpu_map-Fix-spelling-of-svme-addr-chk-feature.patch
new file mode 100644
index 0000000..8d23051
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1921880-cpu_map-Fix-spelling-of-svme-addr-chk-feature.patch
@@ -0,0 +1,51 @@
+From b5abf9a192248b1005f63a7102d2627375d70fe5 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Thu, 4 Mar 2021 08:43:09 +0100
+Subject: [PATCH] cpu_map: Fix spelling of svme-addr-chk feature
+
+Commit a208176ca1d9eedf8aa6bf12fde6a7a9579ab549 introduced this feature
+with an incorrect "svme-addr-check" spelling.
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Tim Wiederhake <[e-mail]>
+
+Backport-Note: sync_qemu_cpu_i386 didn't exist before v6.10
+Origin: backport, https://libvirt.org/git/?p=libvirt.git;a=commit;h=b5abf9a1
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1921880
+Last-Update: 2021-04-07
+
+---
+ src/cpu_map/sync_qemu_i386.py  | 2 +-
+ src/cpu_map/x86_EPYC-Milan.xml | 2 +-
+ src/cpu_map/x86_features.xml   | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/cpu_map/x86_EPYC-Milan.xml b/src/cpu_map/x86_EPYC-Milan.xml
+index 53f0cd6aac..3055e175fa 100644
+--- a/src/cpu_map/x86_EPYC-Milan.xml
++++ b/src/cpu_map/x86_EPYC-Milan.xml
+@@ -76,7 +76,7 @@
+     <feature name='sse4a'/>
+     <feature name='ssse3'/>
+     <feature name='svm'/>
+-    <feature name='svme-addr-check'/>
++    <feature name='svme-addr-chk'/>
+     <feature name='syscall'/>
+     <feature name='tsc'/>
+     <feature name='umip'/>
+diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
+index c43520d08f..e98b84f3ef 100644
+--- a/src/cpu_map/x86_features.xml
++++ b/src/cpu_map/x86_features.xml
+@@ -554,7 +554,7 @@
+   <feature name='pfthreshold'>
+     <cpuid eax_in='0x8000000a' edx='0x00001000'/>
+   </feature>
+-  <feature name='svme-addr-check'>
++  <feature name='svme-addr-chk'>
+     <cpuid eax_in='0x8000000a' edx='0x10000000'/>
+   </feature>
+ 
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1921880-cpu_map-Install-x86_EPYC-Milan.xml.patch b/debian/patches/ubuntu/lp-1921880-cpu_map-Install-x86_EPYC-Milan.xml.patch
new file mode 100644
index 0000000..263e151
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1921880-cpu_map-Install-x86_EPYC-Milan.xml.patch
@@ -0,0 +1,39 @@
+From d3de79dbfc20dc4dfc19154b16079861c542b71e Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Tue, 2 Mar 2021 10:32:42 +0100
+Subject: [PATCH] cpu_map: Install x86_EPYC-Milan.xml
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Pavel Hrdina <[e-mail]>
+
+Backport-Note: Groovy is pre-meson so the patch needed to be adapted to
+    fit the Make based build, the same that we've done in patch
+    ubuntu/lp-1887490-cpu_map-Defined-and-enable-EPYC-Rome-model.patch
+Origin: backport, https://libvirt.org/git/?p=libvirt.git;a=commit;h=d3de79db
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1921880
+Last-Update: 2021-04-07
+
+---
+ src/cpu_map/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -5561,6 +5561,7 @@ cpumap_DATA = \
+ 	cpu_map/x86_Dhyana.xml \
+ 	cpu_map/x86_EPYC.xml \
+ 	cpu_map/x86_EPYC-IBPB.xml \
++	cpu_map/x86_EPYC-Milan.xml \
+ 	cpu_map/x86_EPYC-Rome.xml \
+ 	cpu_map/x86_Haswell.xml \
+ 	cpu_map/x86_Haswell-IBRS.xml \
+--- a/src/cpu_map/Makefile.inc.am
++++ b/src/cpu_map/Makefile.inc.am
+@@ -29,6 +29,7 @@ cpumap_DATA = \
+ 	cpu_map/x86_Dhyana.xml \
+ 	cpu_map/x86_EPYC.xml \
+ 	cpu_map/x86_EPYC-IBPB.xml \
++	cpu_map/x86_EPYC-Milan.xml \
+ 	cpu_map/x86_EPYC-Rome.xml \
+ 	cpu_map/x86_Haswell.xml \
+ 	cpu_map/x86_Haswell-IBRS.xml \
diff --git a/debian/patches/ubuntu/lp-1921880-cpumap-Add-support-for-svme-addr-check-CPU-feature.patch b/debian/patches/ubuntu/lp-1921880-cpumap-Add-support-for-svme-addr-check-CPU-feature.patch
new file mode 100644
index 0000000..5e5420e
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1921880-cpumap-Add-support-for-svme-addr-check-CPU-feature.patch
@@ -0,0 +1,33 @@
+From 5ac6ab2fde63881d3c5cc7372a0d0e59618feb55 Mon Sep 17 00:00:00 2001
+From: Tim Wiederhake <[e-mail]>
+Date: Mon, 22 Feb 2021 13:20:10 +0100
+Subject: [PATCH] cpumap: Add support for svme-addr-check CPU feature
+
+Signed-off-by: Tim Wiederhake <[e-mail]>
+Reviewed-by: Jiri Denemark <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=5ac6ab2f
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1921880
+Last-Update: 2021-04-07
+
+---
+ src/cpu_map/x86_features.xml | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
+index b03a6b065d..c43520d08f 100644
+--- a/src/cpu_map/x86_features.xml
++++ b/src/cpu_map/x86_features.xml
+@@ -554,6 +554,9 @@
+   <feature name='pfthreshold'>
+     <cpuid eax_in='0x8000000a' edx='0x00001000'/>
+   </feature>
++  <feature name='svme-addr-check'>
++    <cpuid eax_in='0x8000000a' edx='0x10000000'/>
++  </feature>
+ 
+   <!-- IA32_ARCH_CAPABILITIES features -->
+   <feature name='rdctl-no'>
+-- 
+2.31.1
+