diff -Nru libvirt-7.0.0/debian/changelog libvirt-7.0.0/debian/changelog
--- libvirt-7.0.0/debian/changelog	2021-02-23 11:16:08.000000000 +0000
+++ libvirt-7.0.0/debian/changelog	2021-04-07 11:33:46.000000000 +0000
@@ -1,3 +1,13 @@
+libvirt (7.0.0-2ubuntu2) hirsute; 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 <christian.ehrhardt@canonical.com>  Wed, 07 Apr 2021 13:33:46 +0200
+
 libvirt (7.0.0-2ubuntu1) hirsute; urgency=medium
 
   * Merge with Debian 7.0.0-1 from Debian unstable
diff -Nru libvirt-7.0.0/debian/patches/series libvirt-7.0.0/debian/patches/series
--- libvirt-7.0.0/debian/patches/series	2021-02-23 11:15:50.000000000 +0000
+++ libvirt-7.0.0/debian/patches/series	2021-04-07 11:33:46.000000000 +0000
@@ -34,3 +34,9 @@
 ubuntu-aa/0033-UBUNTU-only-apparmor-for-kvm.powerpc-LP-1680384.patch
 ubuntu-aa/0034-apparmor-virt-aa-helper-access-for-snapped-nova.patch
 ubuntu-aa/lp-1815910-allow-vhost-hotplug.patch
+ubuntu/lp-1921754-cpumap-Add-support-for-ibrs-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-sync_qemu_i386.py-Add-mapping-for-svme-addr-.patch
+ubuntu/lp-1921880-cpu_map-Fix-spelling-of-svme-addr-chk-feature.patch
diff -Nru libvirt-7.0.0/debian/patches/ubuntu/lp-1921754-cpumap-Add-support-for-ibrs-CPU-feature.patch libvirt-7.0.0/debian/patches/ubuntu/lp-1921754-cpumap-Add-support-for-ibrs-CPU-feature.patch
--- libvirt-7.0.0/debian/patches/ubuntu/lp-1921754-cpumap-Add-support-for-ibrs-CPU-feature.patch	1970-01-01 00:00:00.000000000 +0000
+++ libvirt-7.0.0/debian/patches/ubuntu/lp-1921754-cpumap-Add-support-for-ibrs-CPU-feature.patch	2021-04-07 11:33:46.000000000 +0000
@@ -0,0 +1,59 @@
+From 5c17a7ba41670f3182186c06e621995b5d03fc95 Mon Sep 17 00:00:00 2001
+From: Tim Wiederhake <twiederh@redhat.com>
+Date: Mon, 22 Feb 2021 13:20:09 +0100
+Subject: [PATCH] cpumap: Add support for ibrs CPU feature
+
+Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+
+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 -Nru libvirt-7.0.0/debian/patches/ubuntu/lp-1921880-cpu_map-Add-EPYC-Milan-x86-CPU-model.patch libvirt-7.0.0/debian/patches/ubuntu/lp-1921880-cpu_map-Add-EPYC-Milan-x86-CPU-model.patch
--- libvirt-7.0.0/debian/patches/ubuntu/lp-1921880-cpu_map-Add-EPYC-Milan-x86-CPU-model.patch	1970-01-01 00:00:00.000000000 +0000
+++ libvirt-7.0.0/debian/patches/ubuntu/lp-1921880-cpu_map-Add-EPYC-Milan-x86-CPU-model.patch	2021-04-07 11:33:46.000000000 +0000
@@ -0,0 +1,136 @@
+From f321a4822e9fa6542e48a78611989ecd9acaa83a Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <jdenemar@redhat.com>
+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 <jdenemar@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=f321a482
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1921880
+Last-Update: 2021-04-16
+
+---
+ 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
+
+diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
+index 2e0685df68..ffe1fa91e5 100644
+--- a/src/cpu_map/index.xml
++++ b/src/cpu_map/index.xml
+@@ -68,6 +68,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/src/cpu_map/x86_EPYC-Milan.xml b/src/cpu_map/x86_EPYC-Milan.xml
+new file mode 100644
+index 0000000000..53f0cd6aac
+--- /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>
+-- 
+2.31.1
+
diff -Nru libvirt-7.0.0/debian/patches/ubuntu/lp-1921880-cpumap-Add-support-for-svme-addr-check-CPU-feature.patch libvirt-7.0.0/debian/patches/ubuntu/lp-1921880-cpumap-Add-support-for-svme-addr-check-CPU-feature.patch
--- libvirt-7.0.0/debian/patches/ubuntu/lp-1921880-cpumap-Add-support-for-svme-addr-check-CPU-feature.patch	1970-01-01 00:00:00.000000000 +0000
+++ libvirt-7.0.0/debian/patches/ubuntu/lp-1921880-cpumap-Add-support-for-svme-addr-check-CPU-feature.patch	2021-04-07 11:33:46.000000000 +0000
@@ -0,0 +1,33 @@
+From 5ac6ab2fde63881d3c5cc7372a0d0e59618feb55 Mon Sep 17 00:00:00 2001
+From: Tim Wiederhake <twiederh@redhat.com>
+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 <twiederh@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+
+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
+
diff -Nru libvirt-7.0.0/debian/patches/ubuntu/lp-1921880-cpu_map-Fix-spelling-of-svme-addr-chk-feature.patch libvirt-7.0.0/debian/patches/ubuntu/lp-1921880-cpu_map-Fix-spelling-of-svme-addr-chk-feature.patch
--- libvirt-7.0.0/debian/patches/ubuntu/lp-1921880-cpu_map-Fix-spelling-of-svme-addr-chk-feature.patch	1970-01-01 00:00:00.000000000 +0000
+++ libvirt-7.0.0/debian/patches/ubuntu/lp-1921880-cpu_map-Fix-spelling-of-svme-addr-chk-feature.patch	2021-04-07 11:33:46.000000000 +0000
@@ -0,0 +1,63 @@
+From b5abf9a192248b1005f63a7102d2627375d70fe5 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <jdenemar@redhat.com>
+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 <jdenemar@redhat.com>
+Reviewed-by: Tim Wiederhake <twiederh@redhat.com>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=b5abf9a1
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1921880
+Last-Update: 2021-04-16
+
+---
+ 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/sync_qemu_i386.py b/src/cpu_map/sync_qemu_i386.py
+index 3febecdfd1..1a98fa70d7 100755
+--- a/src/cpu_map/sync_qemu_i386.py
++++ b/src/cpu_map/sync_qemu_i386.py
+@@ -142,7 +142,7 @@ def translate_feature(name):
+         "CPUID_SS": "ss",
+         "CPUID_SVM_NPT": "npt",
+         "CPUID_SVM_NRIPSAVE": "nrip-save",
+-        "CPUID_SVM_SVME_ADDR_CHK": "svme-addr-check",
++        "CPUID_SVM_SVME_ADDR_CHK": "svme-addr-chk",
+         "CPUID_TSC": "tsc",
+         "CPUID_VME": "vme",
+         "CPUID_XSAVE_XGETBV1": "xgetbv1",
+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 -Nru libvirt-7.0.0/debian/patches/ubuntu/lp-1921880-cpu_map-Install-x86_EPYC-Milan.xml.patch libvirt-7.0.0/debian/patches/ubuntu/lp-1921880-cpu_map-Install-x86_EPYC-Milan.xml.patch
--- libvirt-7.0.0/debian/patches/ubuntu/lp-1921880-cpu_map-Install-x86_EPYC-Milan.xml.patch	1970-01-01 00:00:00.000000000 +0000
+++ libvirt-7.0.0/debian/patches/ubuntu/lp-1921880-cpu_map-Install-x86_EPYC-Milan.xml.patch	2021-04-07 11:33:46.000000000 +0000
@@ -0,0 +1,31 @@
+From d3de79dbfc20dc4dfc19154b16079861c542b71e Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <jdenemar@redhat.com>
+Date: Tue, 2 Mar 2021 10:32:42 +0100
+Subject: [PATCH] cpu_map: Install x86_EPYC-Milan.xml
+
+Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
+Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=d3de79db
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1921880
+Last-Update: 2021-04-16
+
+---
+ src/cpu_map/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
+index 48f69f623c..013fc62a02 100644
+--- a/src/cpu_map/meson.build
++++ b/src/cpu_map/meson.build
+@@ -34,6 +34,7 @@ cpumap_data = [
+   'x86_Dhyana.xml',
+   'x86_EPYC-IBPB.xml',
+   'x86_EPYC.xml',
++  'x86_EPYC-Milan.xml',
+   'x86_EPYC-Rome.xml',
+   'x86_features.xml',
+   'x86_Haswell-IBRS.xml',
+-- 
+2.31.1
+
diff -Nru libvirt-7.0.0/debian/patches/ubuntu/lp-1921880-cpu_map-sync_qemu_i386.py-Add-mapping-for-svme-addr-.patch libvirt-7.0.0/debian/patches/ubuntu/lp-1921880-cpu_map-sync_qemu_i386.py-Add-mapping-for-svme-addr-.patch
--- libvirt-7.0.0/debian/patches/ubuntu/lp-1921880-cpu_map-sync_qemu_i386.py-Add-mapping-for-svme-addr-.patch	1970-01-01 00:00:00.000000000 +0000
+++ libvirt-7.0.0/debian/patches/ubuntu/lp-1921880-cpu_map-sync_qemu_i386.py-Add-mapping-for-svme-addr-.patch	2021-04-07 11:33:46.000000000 +0000
@@ -0,0 +1,33 @@
+From a208176ca1d9eedf8aa6bf12fde6a7a9579ab549 Mon Sep 17 00:00:00 2001
+From: Tim Wiederhake <twiederh@redhat.com>
+Date: Mon, 22 Feb 2021 13:20:08 +0100
+Subject: [PATCH] cpu_map/sync_qemu_i386.py: Add mapping for svme-addr-check
+
+This was added to qemu in commit 5447089c2b3b084b51670af36fc86ee3979e04be.
+
+Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
+Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=a208176c
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1921880
+Last-Update: 2021-04-16
+
+---
+ src/cpu_map/sync_qemu_i386.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/cpu_map/sync_qemu_i386.py b/src/cpu_map/sync_qemu_i386.py
+index 02e6724f65..3febecdfd1 100755
+--- a/src/cpu_map/sync_qemu_i386.py
++++ b/src/cpu_map/sync_qemu_i386.py
+@@ -142,6 +142,7 @@ def translate_feature(name):
+         "CPUID_SS": "ss",
+         "CPUID_SVM_NPT": "npt",
+         "CPUID_SVM_NRIPSAVE": "nrip-save",
++        "CPUID_SVM_SVME_ADDR_CHK": "svme-addr-check",
+         "CPUID_TSC": "tsc",
+         "CPUID_VME": "vme",
+         "CPUID_XSAVE_XGETBV1": "xgetbv1",
+-- 
+2.31.1
+