Merge ~paelzer/ubuntu/+source/libvirt:lp-1921880-1921754-amd-epyc-1922907-stepping-parsing-FOCAL into ubuntu/+source/libvirt:ubuntu/focal-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 completed uploading focal

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/libvirt
 * [new tag] upload/6.0.0-0ubuntu8.9 -> upload/6.0.0-0ubuntu8.9

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading libvirt_6.0.0-0ubuntu8.9.dsc: done.
  Uploading libvirt_6.0.0-0ubuntu8.9.debian.tar.xz: done.
  Uploading libvirt_6.0.0-0ubuntu8.9_source.buildinfo: done.
  Uploading libvirt_6.0.0-0ubuntu8.9_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 443bb33..fa7efba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libvirt (6.0.0-0ubuntu8.9) focal; 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)
+  * d/p/u/lp-1922907: add ability to parse cpu stepping and thereby correctly
+    differentiate skylake and cascadelake chips (LP: #1922907)
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 07 Apr 2021 13:33:46 +0200
+
 libvirt (6.0.0-0ubuntu8.8) focal; 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 dc5b7e9..33f754c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -109,3 +109,49 @@ ubuntu/lp-1887490-cpu_map-Remove-monitor-feature-from-EPYC-Rome.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
+ubuntu/lp-1922907-cpu_x86-Drop-noTSX-hint-for-incompatible-CPUs.patch
+ubuntu/lp-1922907-cpu_x86-Use-glib-allocation-for-virCPU-x86-Data.patch
+ubuntu/lp-1922907-cpu_x86-Use-glib-allocation-for-virCPUx86Vendor.patch
+ubuntu/lp-1922907-cpu_x86-Use-glib-allocation-for-virCPUx86Feature.patch
+ubuntu/lp-1922907-cpu_x86-Use-glib-allocation-for-virCPUx86Model.patch
+ubuntu/lp-1922907-cpu_x86-Use-glib-allocation-for-virCPUx86Map.patch
+ubuntu/lp-1922907-cpu_x86-Use-glib-allocation-in-virCPUx86GetModels.patch
+ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86DataToCPU.patch
+ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86VendorParse.patch
+ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86FeatureParse.patch
+ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86ModelFromCPU.patch
+ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86ModelParse.patch
+ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86LoadMap.patch
+ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86DataParse.patch
+ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86Compute.patch
+ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86Compare.patch
+ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86Decode.patch
+ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86EncodePolicy.patch
+ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86Encode.patch
+ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86CheckFeature.patch
+ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86GetHost.patch
+ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86Baseline.patch
+ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86UpdateHostModel.patch
+ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86Update.patch
+ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86UpdateLive.patch
+ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86Translate.patch
+ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86ExpandFeatures.patch
+ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86CopyMigratable.patch
+ubuntu/lp-1922907-cpu_x86-Move-and-rename-x86ModelCopySignatures.patch
+ubuntu/lp-1922907-cpu_x86-Move-and-rename-x86ModelHasSignature.patch
+ubuntu/lp-1922907-cpu_x86-Move-and-rename-x86FormatSignatures.patch
+ubuntu/lp-1922907-cpu_x86-Introduce-virCPUx86SignaturesFree.patch
+ubuntu/lp-1922907-cpu_x86-Introduce-virCPUx86SignatureFromCPUID.patch
+ubuntu/lp-1922907-cpu_x86-Replace-32b-signatures-in-virCPUx86Model-wit.patch
+ubuntu/lp-1922907-cpu_x86-Don-t-check-return-value-of-x86ModelCopy.patch
+ubuntu/lp-1922907-cpu_x86-Add-support-for-stepping-part-of-CPU-signatu.patch
+ubuntu/lp-1922907-cputest-Add-data-for-Intel-R-Xeon-R-Platinum-9242-CP.patch
+ubuntu/lp-1922907-cputest-Add-data-for-Intel-R-Xeon-R-Gold-6130-CPU.patch
+ubuntu/lp-1922907-cpu_map-Distinguish-Cascadelake-Server-from-Skylake-.patch
+ubuntu/lp-1922907-cleanup-test-data.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..e9e6e9f
--- /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: Focal 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
+
diff --git a/debian/patches/ubuntu/lp-1922907-cleanup-test-data.patch b/debian/patches/ubuntu/lp-1922907-cleanup-test-data.patch
new file mode 100644
index 0000000..52e378e
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cleanup-test-data.patch
@@ -0,0 +1,28 @@
+Description: clean up testcase data
+ When adding
+  lp-1887490-cpu_map-Add-pschange-mc-no-bit-in-IA32_ARCH_CAPABILI.patch
+ in the past some cpu types where not present yet. Now that they got added
+ by the series for LP: #1922907 the changes that were skipped back then need
+ to be applied as the code of 1887490 changes that behavior.
+Author: Christian Ehrhardt <[e-mail]>
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=12eb0c94
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1922907
+Last-Update: 2021-04-07
+--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-enabled.xml
+@@ -6,5 +6,5 @@
+   <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
+   <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
+   <cpuid eax_in='0x80000008' ecx_in='0x00' eax='0x00000000' ebx='0x01001000' ecx='0x00000000' edx='0x00000000'/>
+-  <msr index='0x10a' edx='0x00000000' eax='0x000000ab'/>
++  <msr index='0x10a' edx='0x00000000' eax='0x000000eb'/>
+ </cpudata>
+--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-json.xml
+@@ -17,5 +17,6 @@
+   <feature policy='require' name='ibrs-all'/>
+   <feature policy='require' name='skip-l1dfl-vmentry'/>
+   <feature policy='require' name='mds-no'/>
++  <feature policy='require' name='pschange-mc-no'/>
+   <feature policy='require' name='tsx-ctrl'/>
+ </cpu>
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_map-Distinguish-Cascadelake-Server-from-Skylake-.patch b/debian/patches/ubuntu/lp-1922907-cpu_map-Distinguish-Cascadelake-Server-from-Skylake-.patch
new file mode 100644
index 0000000..4ee3c48
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_map-Distinguish-Cascadelake-Server-from-Skylake-.patch
@@ -0,0 +1,151 @@
+From 5d6059f8ec16d64f240dc5e6413ca55a3b46b3f7 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Thu, 26 Mar 2020 21:55:14 +0100
+Subject: [PATCH] cpu_map: Distinguish Cascadelake-Server from Skylake-Server
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The signatures of these two CPU model differ only in stepping as both
+report family 6 and model 85. Skylake-Server uses stepping 4 or less and
+Cascadelake-Server uses stepping 5..7.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1761678
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=5d6059f8ec
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu_map/x86_Cascadelake-Server-noTSX.xml            | 2 +-
+ src/cpu_map/x86_Cascadelake-Server.xml                  | 2 +-
+ src/cpu_map/x86_Skylake-Server-IBRS.xml                 | 2 +-
+ src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml           | 2 +-
+ src/cpu_map/x86_Skylake-Server.xml                      | 2 +-
+ tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml | 5 +++--
+ tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml  | 5 +++--
+ 7 files changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/src/cpu_map/x86_Cascadelake-Server-noTSX.xml b/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
+index 459174a30d..bfd4629836 100644
+--- a/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
++++ b/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
+@@ -1,7 +1,7 @@
+ <cpus>
+   <model name='Cascadelake-Server-noTSX'>
+     <decode host='on' guest='off'/>
+-    <signature family='6' model='85'/> <!-- 050654 -->
++    <signature family='6' model='85' stepping='5-7'/> <!-- 050654 -->
+     <vendor name='Intel'/>
+     <feature name='3dnowprefetch'/>
+     <feature name='abm'/>
+diff --git a/src/cpu_map/x86_Cascadelake-Server.xml b/src/cpu_map/x86_Cascadelake-Server.xml
+index d7ec42f57e..335e9cb584 100644
+--- a/src/cpu_map/x86_Cascadelake-Server.xml
++++ b/src/cpu_map/x86_Cascadelake-Server.xml
+@@ -1,7 +1,7 @@
+ <cpus>
+   <model name='Cascadelake-Server'>
+     <decode host='on' guest='on'/>
+-    <signature family='6' model='85'/> <!-- 050654 -->
++    <signature family='6' model='85' stepping='5-7'/> <!-- 050654 -->
+     <vendor name='Intel'/>
+     <feature name='3dnowprefetch'/>
+     <feature name='abm'/>
+diff --git a/src/cpu_map/x86_Skylake-Server-IBRS.xml b/src/cpu_map/x86_Skylake-Server-IBRS.xml
+index bd6b6457ad..9fb3488809 100644
+--- a/src/cpu_map/x86_Skylake-Server-IBRS.xml
++++ b/src/cpu_map/x86_Skylake-Server-IBRS.xml
+@@ -1,7 +1,7 @@
+ <cpus>
+   <model name='Skylake-Server-IBRS'>
+     <decode host='on' guest='on'/>
+-    <signature family='6' model='85'/> <!-- 050654 -->
++    <signature family='6' model='85' stepping='0-4'/> <!-- 050654 -->
+     <vendor name='Intel'/>
+     <feature name='3dnowprefetch'/>
+     <feature name='abm'/>
+diff --git a/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml b/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
+index c2b7de40e8..c162c0acc3 100644
+--- a/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
++++ b/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
+@@ -1,7 +1,7 @@
+ <cpus>
+   <model name='Skylake-Server-noTSX-IBRS'>
+     <decode host='on' guest='off'/>
+-    <signature family='6' model='85'/> <!-- 050654 -->
++    <signature family='6' model='85' stepping='0-4'/> <!-- 050654 -->
+     <vendor name='Intel'/>
+     <feature name='3dnowprefetch'/>
+     <feature name='abm'/>
+diff --git a/src/cpu_map/x86_Skylake-Server.xml b/src/cpu_map/x86_Skylake-Server.xml
+index f96875a85f..e022d94c84 100644
+--- a/src/cpu_map/x86_Skylake-Server.xml
++++ b/src/cpu_map/x86_Skylake-Server.xml
+@@ -1,7 +1,7 @@
+ <cpus>
+   <model name='Skylake-Server'>
+     <decode host='on' guest='on'/>
+-    <signature family='6' model='85'/> <!-- 050654 -->
++    <signature family='6' model='85' stepping='0-4'/> <!-- 050654 -->
+     <vendor name='Intel'/>
+     <feature name='3dnowprefetch'/>
+     <feature name='abm'/>
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
+index cfb0eb982d..c21cb1e600 100644
+--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
+@@ -1,5 +1,5 @@
+ <cpu mode='custom' match='exact'>
+-  <model fallback='forbid'>Cascadelake-Server</model>
++  <model fallback='forbid'>Skylake-Server-IBRS</model>
+   <vendor>Intel</vendor>
+   <feature policy='require' name='ds'/>
+   <feature policy='require' name='acpi'/>
+@@ -20,14 +20,15 @@
+   <feature policy='require' name='osxsave'/>
+   <feature policy='require' name='tsc_adjust'/>
+   <feature policy='require' name='cmt'/>
++  <feature policy='require' name='clflushopt'/>
+   <feature policy='require' name='intel-pt'/>
+   <feature policy='require' name='pku'/>
+   <feature policy='require' name='ospke'/>
+   <feature policy='require' name='md-clear'/>
+   <feature policy='require' name='stibp'/>
++  <feature policy='require' name='ssbd'/>
+   <feature policy='require' name='xsaves'/>
+   <feature policy='require' name='mbm_total'/>
+   <feature policy='require' name='mbm_local'/>
+   <feature policy='require' name='invtsc'/>
+-  <feature policy='disable' name='avx512vnni'/>
+ </cpu>
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
+index 968d904557..b482043ccf 100644
+--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
+@@ -1,16 +1,17 @@
+ <cpu mode='custom' match='exact'>
+-  <model fallback='forbid'>Cascadelake-Server</model>
++  <model fallback='forbid'>Skylake-Server-IBRS</model>
+   <vendor>Intel</vendor>
+   <feature policy='require' name='ss'/>
+   <feature policy='require' name='vmx'/>
+   <feature policy='require' name='hypervisor'/>
+   <feature policy='require' name='tsc_adjust'/>
++  <feature policy='require' name='clflushopt'/>
+   <feature policy='require' name='umip'/>
+   <feature policy='require' name='pku'/>
+   <feature policy='require' name='md-clear'/>
+   <feature policy='require' name='stibp'/>
+   <feature policy='require' name='arch-capabilities'/>
++  <feature policy='require' name='ssbd'/>
+   <feature policy='require' name='xsaves'/>
+   <feature policy='require' name='skip-l1dfl-vmentry'/>
+-  <feature policy='disable' name='avx512vnni'/>
+ </cpu>
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Add-support-for-stepping-part-of-CPU-signatu.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Add-support-for-stepping-part-of-CPU-signatu.patch
new file mode 100644
index 0000000..dd02a2a
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Add-support-for-stepping-part-of-CPU-signatu.patch
@@ -0,0 +1,180 @@
+From c7a27949954d78dc95459758e329fb9c580361bb Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Thu, 26 Mar 2020 20:34:56 +0100
+Subject: [PATCH] cpu_x86: Add support for stepping part of CPU signature
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+CPU models defined in the cpu_map can use signature/@stepping attribute
+to match a limited set of stepping numbers. The value is a bitmap for
+bits 0..15 each corresponding to a single stepping value. For example,
+stepping='4-6,9' will match 4, 5, 6, and 9. Omitting the attribute is
+equivalent to stepping='0-15'.
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=c7a2794995
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 60 +++++++++++++++++++++++++++++++++++++++--------
+ 1 file changed, 50 insertions(+), 10 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 511c50bf06..9183259bce 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -125,6 +125,7 @@ typedef struct _virCPUx86Signature virCPUx86Signature;
+ struct _virCPUx86Signature {
+     unsigned int family;
+     unsigned int model;
++    virBitmapPtr stepping;
+ };
+ 
+ typedef struct _virCPUx86Signatures virCPUx86Signatures;
+@@ -732,7 +733,17 @@ x86MakeSignature(unsigned int family,
+ static uint32_t
+ virCPUx86SignatureToCPUID(virCPUx86Signature *sig)
+ {
+-    return x86MakeSignature(sig->family, sig->model, 0);
++    unsigned int stepping = 0;
++
++    if (sig->stepping) {
++        ssize_t firstBit;
++
++        firstBit = virBitmapNextSetBit(sig->stepping, -1);
++        if (firstBit >= 0)
++            stepping = firstBit;
++    }
++
++    return x86MakeSignature(sig->family, sig->model, stepping);
+ }
+ 
+ 
+@@ -767,8 +778,8 @@ x86DataToSignatureFull(const virCPUx86Data *data,
+ }
+ 
+ 
+-/* Mask out irrelevant bits (R and Step) from processor signature. */
+-#define SIGNATURE_MASK  0x0fff3ff0
++/* Mask out reserved bits from processor signature. */
++#define SIGNATURE_MASK  0x0fff3fff
+ 
+ static uint32_t
+ x86DataToSignature(const virCPUx86Data *data)
+@@ -1134,9 +1145,14 @@ virCPUx86SignaturesNew(size_t count)
+ static void
+ virCPUx86SignaturesFree(virCPUx86SignaturesPtr sigs)
+ {
++    size_t i;
++
+     if (!sigs)
+         return;
+ 
++    for (i = 0; i < sigs->count; i++)
++        virBitmapFree(sigs->items[i].stepping);
++
+     g_free(sigs->items);
+     g_free(sigs);
+ }
+@@ -1153,8 +1169,12 @@ virCPUx86SignaturesCopy(virCPUx86SignaturesPtr src)
+ 
+     dst = virCPUx86SignaturesNew(src->count);
+ 
+-    for (i = 0; i < src->count; i++)
+-        dst->items[i] = src->items[i];
++    for (i = 0; i < src->count; i++) {
++        dst->items[i].family = src->items[i].family;
++        dst->items[i].model = src->items[i].model;
++        if (src->items[i].stepping)
++            dst->items[i].stepping = virBitmapNewCopy(src->items[i].stepping);
++    }
+ 
+     return dst;
+ }
+@@ -1176,7 +1196,9 @@ virCPUx86SignaturesMatch(virCPUx86SignaturesPtr sigs,
+ 
+     for (i = 0; i < sigs->count; i++) {
+         if (sigs->items[i].family == family &&
+-            sigs->items[i].model == model)
++            sigs->items[i].model == model &&
++            (!sigs->items[i].stepping ||
++             virBitmapIsBitSet(sigs->items[i].stepping, stepping)))
+             return true;
+     }
+ 
+@@ -1194,9 +1216,15 @@ virCPUx86SignaturesFormat(virCPUx86SignaturesPtr sigs)
+         return virBufferContentAndReset(&buf);
+ 
+     for (i = 0; i < sigs->count; i++) {
+-        virBufferAsprintf(&buf, "(%u,%u,0), ",
++        g_autofree char *stepping = NULL;
++
++        if (sigs->items[i].stepping)
++            stepping = virBitmapFormat(sigs->items[i].stepping);
++
++        virBufferAsprintf(&buf, "(%u,%u,%s), ",
+                           sigs->items[i].family,
+-                          sigs->items[i].model);
++                          sigs->items[i].model,
++                          stepping ? stepping : "0-15");
+     }
+ 
+     virBufferTrim(&buf, ", ", -1);
+@@ -1473,6 +1501,7 @@ x86ModelParseSignatures(virCPUx86ModelPtr model,
+ 
+     for (i = 0; i < n; i++) {
+         virCPUx86Signature *sig = &model->signatures->items[i];
++        g_autofree char *stepping = NULL;
+         int rc;
+ 
+         ctxt->node = nodes[i];
+@@ -1492,6 +1521,11 @@ x86ModelParseSignatures(virCPUx86ModelPtr model,
+                            model->name);
+             return -1;
+         }
++
++        stepping = virXPathString("string(@stepping)", ctxt);
++        /* stepping corresponds to 4 bits in 32b signature, see above */
++        if (stepping && virBitmapParse(stepping, &sig->stepping, 16) < 0)
++            return -1;
+     }
+ 
+     ctxt->node = root;
+@@ -2090,6 +2124,9 @@ x86Decode(virCPUDefPtr cpu,
+     virDomainCapsCPUModelPtr hvModel = NULL;
+     g_autofree char *sigs = NULL;
+     uint32_t signature;
++    unsigned int sigFamily;
++    unsigned int sigModel;
++    unsigned int sigStepping;
+     ssize_t i;
+     int rc;
+ 
+@@ -2103,6 +2140,7 @@ x86Decode(virCPUDefPtr cpu,
+ 
+     vendor = x86DataToVendor(&data, map);
+     signature = x86DataToSignature(&data);
++    virCPUx86SignatureFromCPUID(signature, &sigFamily, &sigModel, &sigStepping);
+ 
+     x86DataFilterTSX(&data, vendor, map);
+ 
+@@ -2184,8 +2222,10 @@ x86Decode(virCPUDefPtr cpu,
+ 
+     sigs = virCPUx86SignaturesFormat(model->signatures);
+ 
+-    VIR_DEBUG("Using CPU model %s (signatures %s) for CPU with signature %06lx",
+-              model->name, NULLSTR(sigs), (unsigned long)signature);
++    VIR_DEBUG("Using CPU model %s with signatures [%s] for "
++              "CPU with signature (%u,%u,%u)",
++              model->name, NULLSTR(sigs),
++              sigFamily, sigModel, sigStepping);
+ 
+     cpu->model = g_steal_pointer(&cpuModel->model);
+     cpu->features = g_steal_pointer(&cpuModel->features);
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Don-t-check-return-value-of-x86ModelCopy.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Don-t-check-return-value-of-x86ModelCopy.patch
new file mode 100644
index 0000000..cd08f7a
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Don-t-check-return-value-of-x86ModelCopy.patch
@@ -0,0 +1,71 @@
+From 70f3041d39802e53a19901bee040ff33850cd5e0 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Thu, 26 Mar 2020 16:16:49 +0100
+Subject: [PATCH] cpu_x86: Don't check return value of x86ModelCopy
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Thanks to glib allocation functions which abort on OOM the function
+cannot ever return NULL.
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=70f3041d39
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 14 ++++----------
+ 1 file changed, 4 insertions(+), 10 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 5a19cd4120..511c50bf06 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1287,9 +1287,6 @@ x86ModelFromCPU(const virCPUDef *cpu,
+         model = g_new0(virCPUx86Model, 1);
+     }
+ 
+-    if (!model)
+-        return NULL;
+-
+     for (i = 0; i < cpu->nfeatures; i++) {
+         virCPUx86FeaturePtr feature;
+         virCPUFeaturePolicy fpol;
+@@ -1869,9 +1866,7 @@ x86Compute(virCPUDefPtr host,
+         return VIR_CPU_COMPARE_INCOMPATIBLE;
+     }
+ 
+-    if (!(diff = x86ModelCopy(host_model)))
+-        return VIR_CPU_COMPARE_ERROR;
+-
++    diff = x86ModelCopy(host_model);
+     x86DataSubtract(&diff->data, &cpu_optional->data);
+     x86DataSubtract(&diff->data, &cpu_require->data);
+     x86DataSubtract(&diff->data, &cpu_disable->data);
+@@ -1892,8 +1887,7 @@ x86Compute(virCPUDefPtr host,
+     }
+ 
+     if (guest) {
+-        if (!(guest_model = x86ModelCopy(host_model)))
+-            return VIR_CPU_COMPARE_ERROR;
++        guest_model = x86ModelCopy(host_model);
+ 
+         if (cpu->vendor && host_model->vendor &&
+             virCPUx86DataAddItem(&guest_model->data,
+@@ -3131,8 +3125,8 @@ virCPUx86ExpandFeatures(virCPUDefPtr cpu)
+         return -1;
+     }
+ 
+-    if (!(model = x86ModelCopy(model)) ||
+-        x86DataToCPUFeatures(expanded, host ? -1 : VIR_CPU_FEATURE_REQUIRE,
++    model = x86ModelCopy(model);
++    if (x86DataToCPUFeatures(expanded, host ? -1 : VIR_CPU_FEATURE_REQUIRE,
+                              &model->data, map) < 0)
+         return -1;
+ 
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Drop-noTSX-hint-for-incompatible-CPUs.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Drop-noTSX-hint-for-incompatible-CPUs.patch
new file mode 100644
index 0000000..fd2d06f
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Drop-noTSX-hint-for-incompatible-CPUs.patch
@@ -0,0 +1,99 @@
+From 8452779049ef785b1d2e373b4d42633d4a929a60 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Tue, 24 Mar 2020 23:35:44 +0100
+Subject: [PATCH] cpu_x86: Drop noTSX hint for incompatible CPUs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The hint was introduced a long time ago when broken TSX implementation
+was found in Haswell and Broadwell CPUs. Since then many more CPUs with
+TSX were introduced and and disabled due to TAA vulnerability.
+
+Thus the hint is not very useful and I think removing it is a better
+choice then updating it to cover all current noTSX models.
+
+This partially reverts:
+commit 7f127ded657b24e0e55cd5f3539ef5b2dc935908
+    cpu: Rework cpuCompare* APIs
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=8452779049
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 44 ++++++--------------------------------------
+ 1 file changed, 6 insertions(+), 38 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index ce15bb0454..08749f87b9 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1937,8 +1937,6 @@ virCPUx86Compare(virCPUDefPtr host,
+                  bool failIncompatible)
+ {
+     virCPUCompareResult ret = VIR_CPU_COMPARE_ERROR;
+-    virCPUx86MapPtr map;
+-    virCPUx86ModelPtr model = NULL;
+     char *message = NULL;
+ 
+     if (!host || !host->model) {
+@@ -1954,46 +1952,16 @@ virCPUx86Compare(virCPUDefPtr host,
+ 
+     ret = x86Compute(host, cpu, NULL, &message);
+ 
+-    if (ret == VIR_CPU_COMPARE_INCOMPATIBLE) {
+-        bool noTSX = false;
+-
+-        if (STREQ_NULLABLE(cpu->model, "Haswell") ||
+-            STREQ_NULLABLE(cpu->model, "Broadwell")) {
+-            if (!(map = virCPUx86GetMap()))
+-                goto cleanup;
+-
+-            if (!(model = x86ModelFromCPU(cpu, map, -1)))
+-                goto cleanup;
+-
+-            noTSX = !x86FeatureInData("hle", &model->data, map) ||
+-                    !x86FeatureInData("rtm", &model->data, map);
+-        }
+-
+-        if (failIncompatible) {
+-            ret = VIR_CPU_COMPARE_ERROR;
+-            if (message) {
+-                if (noTSX) {
+-                    virReportError(VIR_ERR_CPU_INCOMPATIBLE,
+-                                   _("%s; try using '%s-noTSX' CPU model"),
+-                                   message, cpu->model);
+-                } else {
+-                    virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s", message);
+-                }
+-            } else {
+-                if (noTSX) {
+-                    virReportError(VIR_ERR_CPU_INCOMPATIBLE,
+-                                   _("try using '%s-noTSX' CPU model"),
+-                                   cpu->model);
+-                } else {
+-                    virReportError(VIR_ERR_CPU_INCOMPATIBLE, NULL);
+-                }
+-            }
+-        }
++    if (ret == VIR_CPU_COMPARE_INCOMPATIBLE && failIncompatible) {
++        ret = VIR_CPU_COMPARE_ERROR;
++        if (message)
++            virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s", message);
++        else
++            virReportError(VIR_ERR_CPU_INCOMPATIBLE, NULL);
+     }
+ 
+  cleanup:
+     VIR_FREE(message);
+-    x86ModelFree(model);
+     return ret;
+ }
+ 
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Introduce-virCPUx86SignatureFromCPUID.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Introduce-virCPUx86SignatureFromCPUID.patch
new file mode 100644
index 0000000..5c2258b
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Introduce-virCPUx86SignatureFromCPUID.patch
@@ -0,0 +1,68 @@
+From 3b474c1f8f3c1f124fab303625733ea79047660c Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Thu, 26 Mar 2020 14:57:47 +0100
+Subject: [PATCH] cpu_x86: Introduce virCPUx86SignatureFromCPUID
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It can be used for separating family, model, and stepping numbers from a
+single 32b integer as reported by CPUID.
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=3b474c1f8f
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 19 ++++++++++++++-----
+ 1 file changed, 14 insertions(+), 5 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index dd936e28a4..6fe9ffe808 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -717,6 +717,18 @@ x86MakeSignature(unsigned int family,
+ }
+ 
+ 
++static void
++virCPUx86SignatureFromCPUID(uint32_t sig,
++                            unsigned int *family,
++                            unsigned int *model,
++                            unsigned int *stepping)
++{
++    *family = ((sig >> 20) & 0xff) + ((sig >> 8) & 0xf);
++    *model = ((sig >> 12) & 0xf0) + ((sig >> 4) & 0xf);
++    *stepping = sig & 0xf;
++}
++
++
+ static void
+ x86DataToSignatureFull(const virCPUx86Data *data,
+                        unsigned int *family,
+@@ -725,17 +737,14 @@ x86DataToSignatureFull(const virCPUx86Data *data,
+ {
+     virCPUx86DataItem leaf1 = CPUID(.eax_in = 0x1);
+     virCPUx86DataItemPtr item;
+-    virCPUx86CPUIDPtr cpuid;
+ 
+     *family = *model = *stepping = 0;
+ 
+     if (!(item = virCPUx86DataGet(data, &leaf1)))
+         return;
+ 
+-    cpuid = &item->data.cpuid;
+-    *family = ((cpuid->eax >> 20) & 0xff) + ((cpuid->eax >> 8) & 0xf);
+-    *model = ((cpuid->eax >> 12) & 0xf0) + ((cpuid->eax >> 4) & 0xf);
+-    *stepping = cpuid->eax & 0xf;
++    virCPUx86SignatureFromCPUID(item->data.cpuid.eax,
++                                family, model, stepping);
+ }
+ 
+ 
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Introduce-virCPUx86SignaturesFree.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Introduce-virCPUx86SignaturesFree.patch
new file mode 100644
index 0000000..4e7faa6
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Introduce-virCPUx86SignaturesFree.patch
@@ -0,0 +1,61 @@
+From 372b2cf1ca3f4361546732a3f5f9c0c0be2591e9 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Thu, 26 Mar 2020 15:23:28 +0100
+Subject: [PATCH] cpu_x86: Introduce virCPUx86SignaturesFree
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The function will be used for freeing virCPUx86Signatures structure
+introduced later in this series.
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=372b2cf1ca
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index b6ba26b0d0..dd936e28a4 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1090,6 +1090,13 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
+ }
+ 
+ 
++static void
++virCPUx86SignaturesFree(uint32_t *signatures)
++{
++    g_free(signatures);
++}
++
++
+ static int
+ virCPUx86SignaturesCopy(virCPUx86ModelPtr dst,
+                         virCPUx86ModelPtr src)
+@@ -1149,7 +1156,7 @@ x86ModelFree(virCPUx86ModelPtr model)
+         return;
+ 
+     g_free(model->name);
+-    g_free(model->signatures);
++    virCPUx86SignaturesFree(model->signatures);
+     virCPUx86DataClear(&model->data);
+     g_free(model);
+ }
+@@ -1414,7 +1421,7 @@ x86ModelParseSignatures(virCPUx86ModelPtr model,
+         return n;
+ 
+     /* Remove inherited signatures. */
+-    VIR_FREE(model->signatures);
++    virCPUx86SignaturesFree(model->signatures);
+ 
+     model->nsignatures = n;
+     if (VIR_ALLOC_N(model->signatures, n) < 0)
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Move-and-rename-x86FormatSignatures.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Move-and-rename-x86FormatSignatures.patch
new file mode 100644
index 0000000..19cd1b7
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Move-and-rename-x86FormatSignatures.patch
@@ -0,0 +1,85 @@
+From 7e0d351fa69c468906533b2ac9b24212df13a370 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Thu, 26 Mar 2020 15:14:41 +0100
+Subject: [PATCH] cpu_x86: Move and rename x86FormatSignatures
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Later in this series the function will work on a newly introduced
+virCPUx86Signatures structure. Let's move it to the place where all
+related functions will be added and rename the function as
+virCPUx86SignaturesFormat for easier review of the virCPUx86Signatures
+patch.
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Backport-Note: some noise due to missing 0a125c71
+Origin: backport, https://libvirt.org/git/?p=libvirt.git;a=commit;h=7e0d351fa6
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 36 ++++++++++++++++++------------------
+ 1 file changed, 18 insertions(+), 18 deletions(-)
+
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1125,6 +1125,23 @@ virCPUx86SignaturesMatch(virCPUx86ModelP
+ }
+ 
+ 
++static char *
++virCPUx86SignaturesFormat(virCPUx86ModelPtr model)
++{
++    virBuffer buf = VIR_BUFFER_INITIALIZER;
++    size_t i;
++
++    for (i = 0; i < model->nsignatures; i++) {
++        virBufferAsprintf(&buf, "%06lx,",
++                          (unsigned long)model->signatures[i]);
++    }
++
++    virBufferTrim(&buf, ",", -1);
++
++    return virBufferContentAndReset(&buf);
++}
++
++
+ static void
+ x86ModelFree(virCPUx86ModelPtr model)
+ {
+@@ -1890,23 +1907,6 @@ virCPUx86Compare(virCPUDefPtr host,
+ }
+ 
+ 
+-static char *
+-x86FormatSignatures(virCPUx86ModelPtr model)
+-{
+-    virBuffer buf = VIR_BUFFER_INITIALIZER;
+-    size_t i;
+-
+-    for (i = 0; i < model->nsignatures; i++) {
+-        virBufferAsprintf(&buf, "%06lx,",
+-                          (unsigned long)model->signatures[i]);
+-    }
+-
+-    virBufferTrim(&buf, ",", -1);
+-
+-    return virBufferContentAndReset(&buf);
+-}
+-
+-
+ /*
+  * Checks whether a candidate model is a better fit for the CPU data than the
+  * current model.
+@@ -2134,7 +2134,7 @@ x86Decode(virCPUDefPtr cpu,
+     if (vendor)
+         cpu->vendor = g_strdup(vendor->name);
+ 
+-    sigs = x86FormatSignatures(model);
++    sigs = virCPUx86SignaturesFormat(model);
+ 
+     VIR_DEBUG("Using CPU model %s (signatures %s) for CPU with signature %06lx",
+               model->name, NULLSTR(sigs), (unsigned long)signature);
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Move-and-rename-x86ModelCopySignatures.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Move-and-rename-x86ModelCopySignatures.patch
new file mode 100644
index 0000000..d03aaef
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Move-and-rename-x86ModelCopySignatures.patch
@@ -0,0 +1,97 @@
+From a8ec1d746ed41ac76df2e28cbc5683b3e37b9a60 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Thu, 26 Mar 2020 15:07:42 +0100
+Subject: [PATCH] cpu_x86: Move and rename x86ModelCopySignatures
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Later in this series the function will work on a newly introduced
+virCPUx86Signatures structure. Let's move it to the place were all
+related functions will be added and rename the function as
+virCPUx86SignaturesCopy for easier review of the virCPUx86Signatures
+patch.
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=a8ec1d746e
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 36 ++++++++++++++++++------------------
+ 1 file changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index f40609f7e4..50ee9408e6 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1090,23 +1090,9 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
+ }
+ 
+ 
+-static void
+-x86ModelFree(virCPUx86ModelPtr model)
+-{
+-    if (!model)
+-        return;
+-
+-    g_free(model->name);
+-    g_free(model->signatures);
+-    virCPUx86DataClear(&model->data);
+-    g_free(model);
+-}
+-G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUx86Model, x86ModelFree);
+-
+-
+ static int
+-x86ModelCopySignatures(virCPUx86ModelPtr dst,
+-                       virCPUx86ModelPtr src)
++virCPUx86SignaturesCopy(virCPUx86ModelPtr dst,
++                        virCPUx86ModelPtr src)
+ {
+     size_t i;
+ 
+@@ -1124,6 +1110,20 @@ x86ModelCopySignatures(virCPUx86ModelPtr dst,
+ }
+ 
+ 
++static void
++x86ModelFree(virCPUx86ModelPtr model)
++{
++    if (!model)
++        return;
++
++    g_free(model->name);
++    g_free(model->signatures);
++    virCPUx86DataClear(&model->data);
++    g_free(model);
++}
++G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUx86Model, x86ModelFree);
++
++
+ static virCPUx86ModelPtr
+ x86ModelCopy(virCPUx86ModelPtr model)
+ {
+@@ -1132,7 +1132,7 @@ x86ModelCopy(virCPUx86ModelPtr model)
+     copy = g_new0(virCPUx86Model, 1);
+     copy->name = g_strdup(model->name);
+ 
+-    if (x86ModelCopySignatures(copy, model) < 0) {
++    if (virCPUx86SignaturesCopy(copy, model) < 0) {
+         x86ModelFree(copy);
+         return NULL;
+     }
+@@ -1360,7 +1360,7 @@ x86ModelParseAncestor(virCPUx86ModelPtr model,
+     }
+ 
+     model->vendor = ancestor->vendor;
+-    if (x86ModelCopySignatures(model, ancestor) < 0)
++    if (virCPUx86SignaturesCopy(model, ancestor) < 0)
+         return -1;
+ 
+     x86DataCopy(&model->data, &ancestor->data);
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Move-and-rename-x86ModelHasSignature.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Move-and-rename-x86ModelHasSignature.patch
new file mode 100644
index 0000000..7ab794e
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Move-and-rename-x86ModelHasSignature.patch
@@ -0,0 +1,98 @@
+From 782be9f0af2e02e725fca45b7674e8b2f008dc6c Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Thu, 26 Mar 2020 15:12:26 +0100
+Subject: [PATCH] cpu_x86: Move and rename x86ModelHasSignature
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Later in this series the function will work on a newly introduced
+virCPUx86Signatures structure. Let's move it to the place were all
+related functions will be added and rename the function as
+virCPUx86SignaturesMatch for easier review of the virCPUx86Signatures
+patch.
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=782be9f0af
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 38 +++++++++++++++++++-------------------
+ 1 file changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 50ee9408e6..407a5d54de 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1110,6 +1110,21 @@ virCPUx86SignaturesCopy(virCPUx86ModelPtr dst,
+ }
+ 
+ 
++static bool
++virCPUx86SignaturesMatch(virCPUx86ModelPtr model,
++                         uint32_t signature)
++{
++    size_t i;
++
++    for (i = 0; i < model->nsignatures; i++) {
++        if (model->signatures[i] == signature)
++            return true;
++    }
++
++    return false;
++}
++
++
+ static void
+ x86ModelFree(virCPUx86ModelPtr model)
+ {
+@@ -1875,21 +1890,6 @@ virCPUx86Compare(virCPUDefPtr host,
+ }
+ 
+ 
+-static bool
+-x86ModelHasSignature(virCPUx86ModelPtr model,
+-                     uint32_t signature)
+-{
+-    size_t i;
+-
+-    for (i = 0; i < model->nsignatures; i++) {
+-        if (model->signatures[i] == signature)
+-            return true;
+-    }
+-
+-    return false;
+-}
+-
+-
+ static char *
+ x86FormatSignatures(virCPUx86ModelPtr model)
+ {
+@@ -1961,8 +1961,8 @@ x86DecodeUseCandidate(virCPUx86ModelPtr current,
+      * consider candidates with matching family/model.
+      */
+     if (signature &&
+-        x86ModelHasSignature(current, signature) &&
+-        !x86ModelHasSignature(candidate, signature)) {
++        virCPUx86SignaturesMatch(current, signature) &&
++        !virCPUx86SignaturesMatch(candidate, signature)) {
+         VIR_DEBUG("%s differs in signature from matching %s",
+                   cpuCandidate->model, cpuCurrent->model);
+         return 0;
+@@ -1978,8 +1978,8 @@ x86DecodeUseCandidate(virCPUx86ModelPtr current,
+      * result in longer list of features.
+      */
+     if (signature &&
+-        x86ModelHasSignature(candidate, signature) &&
+-        !x86ModelHasSignature(current, signature)) {
++        virCPUx86SignaturesMatch(candidate, signature) &&
++        !virCPUx86SignaturesMatch(current, signature)) {
+         VIR_DEBUG("%s provides matching signature", cpuCandidate->model);
+         return 1;
+     }
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Replace-32b-signatures-in-virCPUx86Model-wit.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Replace-32b-signatures-in-virCPUx86Model-wit.patch
new file mode 100644
index 0000000..6210254
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Replace-32b-signatures-in-virCPUx86Model-wit.patch
@@ -0,0 +1,317 @@
+From 22bded201ffc91661e44065203dcb987e51084ca Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Thu, 26 Mar 2020 16:16:00 +0100
+Subject: [PATCH] cpu_x86: Replace 32b signatures in virCPUx86Model with a
+ struct
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The CPU models in our cpu_map define their signatures using separate
+family and model numbers. Let's store the signatures in the same way in
+our runtime representation of the cpu_map.
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=22bded201f
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 149 +++++++++++++++++++++++++++++-----------------
+ 1 file changed, 95 insertions(+), 54 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 6fe9ffe808..5a19cd4120 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -121,6 +121,19 @@ static virCPUx86Feature x86_kvm_features[] =
+     KVM_FEATURE(VIR_CPU_x86_HV_STIMER_DIRECT),
+ };
+ 
++typedef struct _virCPUx86Signature virCPUx86Signature;
++struct _virCPUx86Signature {
++    unsigned int family;
++    unsigned int model;
++};
++
++typedef struct _virCPUx86Signatures virCPUx86Signatures;
++typedef virCPUx86Signatures *virCPUx86SignaturesPtr;
++struct _virCPUx86Signatures {
++    size_t count;
++    virCPUx86Signature *items;
++};
++
+ typedef struct _virCPUx86Model virCPUx86Model;
+ typedef virCPUx86Model *virCPUx86ModelPtr;
+ struct _virCPUx86Model {
+@@ -128,8 +141,7 @@ struct _virCPUx86Model {
+     bool decodeHost;
+     bool decodeGuest;
+     virCPUx86VendorPtr vendor;
+-    size_t nsignatures;
+-    uint32_t *signatures;
++    virCPUx86SignaturesPtr signatures;
+     virCPUx86Data data;
+ };
+ 
+@@ -717,6 +729,13 @@ x86MakeSignature(unsigned int family,
+ }
+ 
+ 
++static uint32_t
++virCPUx86SignatureToCPUID(virCPUx86Signature *sig)
++{
++    return x86MakeSignature(sig->family, sig->model, 0);
++}
++
++
+ static void
+ virCPUx86SignatureFromCPUID(uint32_t sig,
+                             unsigned int *family,
+@@ -1099,41 +1118,65 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
+ }
+ 
+ 
++static virCPUx86SignaturesPtr
++virCPUx86SignaturesNew(size_t count)
++{
++    virCPUx86SignaturesPtr sigs;
++
++    sigs = g_new0(virCPUx86Signatures, 1);
++    sigs->items = g_new0(virCPUx86Signature, count);
++    sigs->count = count;
++
++    return sigs;
++}
++
++
+ static void
+-virCPUx86SignaturesFree(uint32_t *signatures)
++virCPUx86SignaturesFree(virCPUx86SignaturesPtr sigs)
+ {
+-    g_free(signatures);
++    if (!sigs)
++        return;
++
++    g_free(sigs->items);
++    g_free(sigs);
+ }
+ 
+ 
+-static int
+-virCPUx86SignaturesCopy(virCPUx86ModelPtr dst,
+-                        virCPUx86ModelPtr src)
++static virCPUx86SignaturesPtr
++virCPUx86SignaturesCopy(virCPUx86SignaturesPtr src)
+ {
++    virCPUx86SignaturesPtr dst;
+     size_t i;
+ 
+-    if (src->nsignatures == 0)
+-        return 0;
++    if (!src || src->count == 0)
++        return NULL;
+ 
+-    if (VIR_ALLOC_N(dst->signatures, src->nsignatures) < 0)
+-        return -1;
++    dst = virCPUx86SignaturesNew(src->count);
+ 
+-    dst->nsignatures = src->nsignatures;
+-    for (i = 0; i < src->nsignatures; i++)
+-        dst->signatures[i] = src->signatures[i];
++    for (i = 0; i < src->count; i++)
++        dst->items[i] = src->items[i];
+ 
+-    return 0;
++    return dst;
+ }
+ 
+ 
+ static bool
+-virCPUx86SignaturesMatch(virCPUx86ModelPtr model,
++virCPUx86SignaturesMatch(virCPUx86SignaturesPtr sigs,
+                          uint32_t signature)
+ {
+     size_t i;
++    unsigned int family;
++    unsigned int model;
++    unsigned int stepping;
+ 
+-    for (i = 0; i < model->nsignatures; i++) {
+-        if (model->signatures[i] == signature)
++    if (!sigs)
++        return false;
++
++    virCPUx86SignatureFromCPUID(signature, &family, &model, &stepping);
++
++    for (i = 0; i < sigs->count; i++) {
++        if (sigs->items[i].family == family &&
++            sigs->items[i].model == model)
+             return true;
+     }
+ 
+@@ -1142,17 +1185,21 @@ virCPUx86SignaturesMatch(virCPUx86ModelPtr model,
+ 
+ 
+ static char *
+-virCPUx86SignaturesFormat(virCPUx86ModelPtr model)
++virCPUx86SignaturesFormat(virCPUx86SignaturesPtr sigs)
+ {
+     virBuffer buf = VIR_BUFFER_INITIALIZER;
+     size_t i;
+ 
+-    for (i = 0; i < model->nsignatures; i++) {
+-        virBufferAsprintf(&buf, "%06lx,",
+-                          (unsigned long)model->signatures[i]);
++    if (!sigs)
++        return virBufferContentAndReset(&buf);
++
++    for (i = 0; i < sigs->count; i++) {
++        virBufferAsprintf(&buf, "(%u,%u,0), ",
++                          sigs->items[i].family,
++                          sigs->items[i].model);
+     }
+ 
+-    virBufferTrim(&buf, ",", -1);
++    virBufferTrim(&buf, ", ", -1);
+ 
+     return virBufferContentAndReset(&buf);
+ }
+@@ -1179,16 +1226,11 @@ x86ModelCopy(virCPUx86ModelPtr model)
+ 
+     copy = g_new0(virCPUx86Model, 1);
+     copy->name = g_strdup(model->name);
+-
+-    if (virCPUx86SignaturesCopy(copy, model) < 0) {
+-        x86ModelFree(copy);
+-        return NULL;
+-    }
++    copy->signatures = virCPUx86SignaturesCopy(model->signatures);
+     x86DataCopy(&copy->data, &model->data);
+-
+     copy->vendor = model->vendor;
+ 
+-    return copy;
++    return g_steal_pointer(&copy);
+ }
+ 
+ 
+@@ -1408,9 +1450,7 @@ x86ModelParseAncestor(virCPUx86ModelPtr model,
+     }
+ 
+     model->vendor = ancestor->vendor;
+-    if (virCPUx86SignaturesCopy(model, ancestor) < 0)
+-        return -1;
+-
++    model->signatures = virCPUx86SignaturesCopy(ancestor->signatures);
+     x86DataCopy(&model->data, &ancestor->data);
+ 
+     return 0;
+@@ -1432,34 +1472,29 @@ x86ModelParseSignatures(virCPUx86ModelPtr model,
+     /* Remove inherited signatures. */
+     virCPUx86SignaturesFree(model->signatures);
+ 
+-    model->nsignatures = n;
+-    if (VIR_ALLOC_N(model->signatures, n) < 0)
+-       return -1;
++    model->signatures = virCPUx86SignaturesNew(n);
+ 
+     for (i = 0; i < n; i++) {
+-        unsigned int sigFamily = 0;
+-        unsigned int sigModel = 0;
++        virCPUx86Signature *sig = &model->signatures->items[i];
+         int rc;
+ 
+         ctxt->node = nodes[i];
+ 
+-        rc = virXPathUInt("string(@family)", ctxt, &sigFamily);
+-        if (rc < 0 || sigFamily == 0) {
++        rc = virXPathUInt("string(@family)", ctxt, &sig->family);
++        if (rc < 0 || sig->family == 0) {
+             virReportError(VIR_ERR_INTERNAL_ERROR,
+                            _("Invalid CPU signature family in model %s"),
+                            model->name);
+             return -1;
+         }
+ 
+-        rc = virXPathUInt("string(@model)", ctxt, &sigModel);
++        rc = virXPathUInt("string(@model)", ctxt, &sig->model);
+         if (rc < 0) {
+             virReportError(VIR_ERR_INTERNAL_ERROR,
+                            _("Invalid CPU signature model in model %s"),
+                            model->name);
+             return -1;
+         }
+-
+-        model->signatures[i] = x86MakeSignature(sigFamily, sigModel, 0);
+     }
+ 
+     ctxt->node = root;
+@@ -1865,9 +1900,12 @@ x86Compute(virCPUDefPtr host,
+                                  &host_model->vendor->data) < 0)
+             return VIR_CPU_COMPARE_ERROR;
+ 
+-        if (host_model->signatures &&
+-            x86DataAddSignature(&guest_model->data, *host_model->signatures) < 0)
+-            return VIR_CPU_COMPARE_ERROR;
++        if (host_model->signatures && host_model->signatures->count > 0) {
++            virCPUx86Signature *sig = &host_model->signatures->items[0];
++            if (x86DataAddSignature(&guest_model->data,
++                                    virCPUx86SignatureToCPUID(sig)) < 0)
++                return VIR_CPU_COMPARE_ERROR;
++        }
+ 
+         if (cpu->type == VIR_CPU_TYPE_GUEST
+             && cpu->match == VIR_CPU_MATCH_EXACT)
+@@ -1977,8 +2015,8 @@ x86DecodeUseCandidate(virCPUx86ModelPtr current,
+      * consider candidates with matching family/model.
+      */
+     if (signature &&
+-        virCPUx86SignaturesMatch(current, signature) &&
+-        !virCPUx86SignaturesMatch(candidate, signature)) {
++        virCPUx86SignaturesMatch(current->signatures, signature) &&
++        !virCPUx86SignaturesMatch(candidate->signatures, signature)) {
+         VIR_DEBUG("%s differs in signature from matching %s",
+                   cpuCandidate->model, cpuCurrent->model);
+         return 0;
+@@ -1994,8 +2032,8 @@ x86DecodeUseCandidate(virCPUx86ModelPtr current,
+      * result in longer list of features.
+      */
+     if (signature &&
+-        virCPUx86SignaturesMatch(candidate, signature) &&
+-        !virCPUx86SignaturesMatch(current, signature)) {
++        virCPUx86SignaturesMatch(candidate->signatures, signature) &&
++        !virCPUx86SignaturesMatch(current->signatures, signature)) {
+         VIR_DEBUG("%s provides matching signature", cpuCandidate->model);
+         return 1;
+     }
+@@ -2150,7 +2188,7 @@ x86Decode(virCPUDefPtr cpu,
+     if (vendor)
+         cpu->vendor = g_strdup(vendor->name);
+ 
+-    sigs = virCPUx86SignaturesFormat(model);
++    sigs = virCPUx86SignaturesFormat(model->signatures);
+ 
+     VIR_DEBUG("Using CPU model %s (signatures %s) for CPU with signature %06lx",
+               model->name, NULLSTR(sigs), (unsigned long)signature);
+@@ -3046,9 +3084,12 @@ virCPUx86Translate(virCPUDefPtr cpu,
+         virCPUx86DataAddItem(&model->data, &model->vendor->data) < 0)
+         return -1;
+ 
+-    if (model->signatures &&
+-        x86DataAddSignature(&model->data, model->signatures[0]) < 0)
+-        return -1;
++    if (model->signatures && model->signatures->count > 0) {
++        virCPUx86Signature *sig = &model->signatures->items[0];
++        if (x86DataAddSignature(&model->data,
++                                virCPUx86SignatureToCPUID(sig)) < 0)
++            return -1;
++    }
+ 
+     if (!(translated = virCPUDefCopyWithoutModel(cpu)))
+         return -1;
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86Baseline.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86Baseline.patch
new file mode 100644
index 0000000..cbd1ecc
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86Baseline.patch
@@ -0,0 +1,157 @@
+From 5efefe7d7eb129b72bcbbebfbba2d5750ffeeeff Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 10:34:09 +0100
+Subject: [PATCH] cpu_x86: Use g_auto* in virCPUx86Baseline
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=5efefe7d7e
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 46 +++++++++++++++++-----------------------------
+ 1 file changed, 17 insertions(+), 29 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 50fdc76326..3ab70e7c20 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -2697,21 +2697,20 @@ virCPUx86Baseline(virCPUDefPtr *cpus,
+                   bool migratable)
+ {
+     virCPUx86MapPtr map = NULL;
+-    virCPUx86ModelPtr base_model = NULL;
+-    virCPUDefPtr cpu = NULL;
++    g_autoptr(virCPUx86Model) base_model = NULL;
++    g_autoptr(virCPUDef) cpu = NULL;
+     size_t i;
+     virCPUx86VendorPtr vendor = NULL;
+-    virCPUx86ModelPtr model = NULL;
+     bool outputVendor = true;
+     const char *modelName;
+     bool matchingNames = true;
+-    virCPUDataPtr featData = NULL;
++    g_autoptr(virCPUData) featData = NULL;
+ 
+     if (!(map = virCPUx86GetMap()))
+-        goto error;
++        return NULL;
+ 
+     if (!(base_model = x86ModelFromCPU(cpus[0], map, -1)))
+-        goto error;
++        return NULL;
+ 
+     cpu = virCPUDefNew();
+ 
+@@ -2723,11 +2722,12 @@ virCPUx86Baseline(virCPUDefPtr *cpus,
+     } else if (!(vendor = x86VendorFind(map, cpus[0]->vendor))) {
+         virReportError(VIR_ERR_OPERATION_FAILED,
+                        _("Unknown CPU vendor %s"), cpus[0]->vendor);
+-        goto error;
++        return NULL;
+     }
+ 
+     modelName = cpus[0]->model;
+     for (i = 1; i < ncpus; i++) {
++        g_autoptr(virCPUx86Model) model = NULL;
+         const char *vn = NULL;
+ 
+         if (matchingNames && cpus[i]->model) {
+@@ -2740,14 +2740,14 @@ virCPUx86Baseline(virCPUDefPtr *cpus,
+         }
+ 
+         if (!(model = x86ModelFromCPU(cpus[i], map, -1)))
+-            goto error;
++            return NULL;
+ 
+         if (cpus[i]->vendor && model->vendor &&
+             STRNEQ(cpus[i]->vendor, model->vendor->name)) {
+             virReportError(VIR_ERR_OPERATION_FAILED,
+                            _("CPU vendor %s of model %s differs from vendor %s"),
+                            model->vendor->name, model->name, cpus[i]->vendor);
+-            goto error;
++            return NULL;
+         }
+ 
+         if (cpus[i]->vendor) {
+@@ -2763,30 +2763,28 @@ virCPUx86Baseline(virCPUDefPtr *cpus,
+                 if (!(vendor = x86VendorFind(map, vn))) {
+                     virReportError(VIR_ERR_OPERATION_FAILED,
+                                    _("Unknown CPU vendor %s"), vn);
+-                    goto error;
++                    return NULL;
+                 }
+             } else if (STRNEQ(vendor->name, vn)) {
+                 virReportError(VIR_ERR_OPERATION_FAILED,
+                                "%s", _("CPU vendors do not match"));
+-                goto error;
++                return NULL;
+             }
+         }
+ 
+         x86DataIntersect(&base_model->data, &model->data);
+-        x86ModelFree(model);
+-        model = NULL;
+     }
+ 
+     if (features) {
+         virCPUx86FeaturePtr feat;
+ 
+         if (!(featData = virCPUDataNew(archs[0])))
+-            goto cleanup;
++            return NULL;
+ 
+         for (i = 0; features[i]; i++) {
+             if ((feat = x86FeatureFind(map, features[i])) &&
+                 x86DataAdd(&featData->data.x86, &feat->data) < 0)
+-                goto cleanup;
++                return NULL;
+         }
+ 
+         x86DataIntersect(&base_model->data, &featData->data.x86);
+@@ -2795,15 +2793,15 @@ virCPUx86Baseline(virCPUDefPtr *cpus,
+     if (x86DataIsEmpty(&base_model->data)) {
+         virReportError(VIR_ERR_OPERATION_FAILED,
+                        "%s", _("CPUs are incompatible"));
+-        goto error;
++        return NULL;
+     }
+ 
+     if (vendor &&
+         virCPUx86DataAddItem(&base_model->data, &vendor->data) < 0)
+-        goto error;
++        return NULL;
+ 
+     if (x86Decode(cpu, &base_model->data, models, modelName, migratable) < 0)
+-        goto error;
++        return NULL;
+ 
+     if (STREQ_NULLABLE(cpu->model, modelName))
+         cpu->fallback = VIR_CPU_FALLBACK_FORBID;
+@@ -2811,17 +2809,7 @@ virCPUx86Baseline(virCPUDefPtr *cpus,
+     if (!outputVendor)
+         VIR_FREE(cpu->vendor);
+ 
+- cleanup:
+-    x86ModelFree(base_model);
+-    virCPUx86DataFree(featData);
+-
+-    return cpu;
+-
+- error:
+-    x86ModelFree(model);
+-    virCPUDefFree(cpu);
+-    cpu = NULL;
+-    goto cleanup;
++    return g_steal_pointer(&cpu);
+ }
+ 
+ 
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86CheckFeature.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86CheckFeature.patch
new file mode 100644
index 0000000..d4b9a38
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86CheckFeature.patch
@@ -0,0 +1,51 @@
+From 3b5f1ca58e8f12bc7b768206cb9c7c2ef237e3ff Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 11:31:29 +0100
+Subject: [PATCH] cpu_x86: Use g_auto* in virCPUx86CheckFeature
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=3b5f1ca58e
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 11 +++--------
+ 1 file changed, 3 insertions(+), 8 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index afdde24754..3bb212a909 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -2278,21 +2278,16 @@ static int
+ virCPUx86CheckFeature(const virCPUDef *cpu,
+                       const char *name)
+ {
+-    int ret = -1;
+     virCPUx86MapPtr map;
+-    virCPUx86ModelPtr model = NULL;
++    g_autoptr(virCPUx86Model) model = NULL;
+ 
+     if (!(map = virCPUx86GetMap()))
+         return -1;
+ 
+     if (!(model = x86ModelFromCPU(cpu, map, -1)))
+-        goto cleanup;
+-
+-    ret = x86FeatureInData(name, &model->data, map);
++        return -1;
+ 
+- cleanup:
+-    x86ModelFree(model);
+-    return ret;
++    return x86FeatureInData(name, &model->data, map);
+ }
+ 
+ 
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86Compare.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86Compare.patch
new file mode 100644
index 0000000..317e315
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86Compare.patch
@@ -0,0 +1,66 @@
+From bc62d7a49141d745b19d066c07599f228020a0b3 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 11:30:24 +0100
+Subject: [PATCH] cpu_x86: Use g_auto* in virCPUx86Compare
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=bc62d7a491
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 7a59680516..feefd6cfee 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1847,32 +1847,30 @@ virCPUx86Compare(virCPUDefPtr host,
+                  virCPUDefPtr cpu,
+                  bool failIncompatible)
+ {
+-    virCPUCompareResult ret = VIR_CPU_COMPARE_ERROR;
+-    char *message = NULL;
++    virCPUCompareResult ret;
++    g_autofree char *message = NULL;
+ 
+     if (!host || !host->model) {
+         if (failIncompatible) {
+             virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s",
+                            _("unknown host CPU"));
+-        } else {
+-            VIR_WARN("unknown host CPU");
+-            ret = VIR_CPU_COMPARE_INCOMPATIBLE;
++            return VIR_CPU_COMPARE_ERROR;
+         }
+-        goto cleanup;
++
++        VIR_WARN("unknown host CPU");
++        return VIR_CPU_COMPARE_INCOMPATIBLE;
+     }
+ 
+     ret = x86Compute(host, cpu, NULL, &message);
+ 
+     if (ret == VIR_CPU_COMPARE_INCOMPATIBLE && failIncompatible) {
+-        ret = VIR_CPU_COMPARE_ERROR;
+         if (message)
+             virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s", message);
+         else
+             virReportError(VIR_ERR_CPU_INCOMPATIBLE, NULL);
++        return VIR_CPU_COMPARE_ERROR;
+     }
+ 
+- cleanup:
+-    VIR_FREE(message);
+     return ret;
+ }
+ 
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86CopyMigratable.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86CopyMigratable.patch
new file mode 100644
index 0000000..be23841
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86CopyMigratable.patch
@@ -0,0 +1,51 @@
+From a32a3e934f5e7769dc9d12a221f344319200b435 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 18:50:15 +0100
+Subject: [PATCH] cpu_x86: Use g_auto* in virCPUx86CopyMigratable
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=a32a3e934f
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index c3b8adaea0..f40609f7e4 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -3109,7 +3109,7 @@ x86FeatureFilterMigratable(const char *name,
+ static virCPUDefPtr
+ virCPUx86CopyMigratable(virCPUDefPtr cpu)
+ {
+-    virCPUDefPtr copy;
++    g_autoptr(virCPUDef) copy = NULL;
+     virCPUx86MapPtr map;
+ 
+     if (!(map = virCPUx86GetMap()))
+@@ -3120,13 +3120,9 @@ virCPUx86CopyMigratable(virCPUDefPtr cpu)
+ 
+     if (virCPUDefCopyModelFilter(copy, cpu, false,
+                                  x86FeatureFilterMigratable, map) < 0)
+-        goto error;
+-
+-    return copy;
++        return NULL;
+ 
+- error:
+-    virCPUDefFree(copy);
+-    return NULL;
++    return g_steal_pointer(&copy);
+ }
+ 
+ 
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86DataParse.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86DataParse.patch
new file mode 100644
index 0000000..80d0f01
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86DataParse.patch
@@ -0,0 +1,84 @@
+From c1532711dda6db27c7f6fa7d86ab5ec5d2ab2224 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 10:32:47 +0100
+Subject: [PATCH] cpu_x86: Use g_auto* in virCPUx86DataParse
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=c1532711dd
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 23 ++++++++---------------
+ 1 file changed, 8 insertions(+), 15 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index c41c7da594..34b0087857 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1636,8 +1636,8 @@ virCPUx86DataFormat(const virCPUData *data)
+ static virCPUDataPtr
+ virCPUx86DataParse(xmlXPathContextPtr ctxt)
+ {
+-    xmlNodePtr *nodes = NULL;
+-    virCPUDataPtr cpuData = NULL;
++    g_autofree xmlNodePtr *nodes = NULL;
++    g_autoptr(virCPUData) cpuData = NULL;
+     virCPUx86DataItem item;
+     size_t i;
+     int n;
+@@ -1646,11 +1646,11 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt)
+     if (n <= 0) {
+         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                        _("no x86 CPU data found"));
+-        goto error;
++        return NULL;
+     }
+ 
+     if (!(cpuData = virCPUDataNew(VIR_ARCH_X86_64)))
+-        goto error;
++        return NULL;
+ 
+     for (i = 0; i < n; i++) {
+         ctxt->node = nodes[i];
+@@ -1658,28 +1658,21 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt)
+             if (x86ParseCPUID(ctxt, &item) < 0) {
+                 virReportError(VIR_ERR_INTERNAL_ERROR,
+                                _("failed to parse cpuid[%zu]"), i);
+-                goto error;
++                return NULL;
+             }
+         } else {
+             if (x86ParseMSR(ctxt, &item) < 0) {
+                 virReportError(VIR_ERR_INTERNAL_ERROR,
+                                _("failed to parse msr[%zu]"), i);
+-                goto error;
++                return NULL;
+             }
+         }
+ 
+         if (virCPUx86DataAdd(cpuData, &item) < 0)
+-            goto error;
++            return NULL;
+     }
+ 
+- cleanup:
+-    VIR_FREE(nodes);
+-    return cpuData;
+-
+- error:
+-    virCPUx86DataFree(cpuData);
+-    cpuData = NULL;
+-    goto cleanup;
++    return g_steal_pointer(&cpuData);
+ }
+ 
+ 
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86ExpandFeatures.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86ExpandFeatures.patch
new file mode 100644
index 0000000..5b5c399
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86ExpandFeatures.patch
@@ -0,0 +1,83 @@
+From ff6897c84504a3e663759d710968ad1f72bc9208 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 11:32:57 +0100
+Subject: [PATCH] cpu_x86: Use g_auto* in virCPUx86ExpandFeatures
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=ff6897c845
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 22 ++++++++--------------
+ 1 file changed, 8 insertions(+), 14 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index cf573b6711..c3b8adaea0 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -3055,30 +3055,29 @@ static int
+ virCPUx86ExpandFeatures(virCPUDefPtr cpu)
+ {
+     virCPUx86MapPtr map;
+-    virCPUDefPtr expanded = NULL;
+-    virCPUx86ModelPtr model = NULL;
++    g_autoptr(virCPUDef) expanded = NULL;
++    g_autoptr(virCPUx86Model) model = NULL;
+     bool host = cpu->type == VIR_CPU_TYPE_HOST;
+     size_t i;
+-    int ret = -1;
+ 
+     if (!(map = virCPUx86GetMap()))
+-        goto cleanup;
++        return -1;
+ 
+     if (!(expanded = virCPUDefCopy(cpu)))
+-        goto cleanup;
++        return -1;
+ 
+     virCPUDefFreeFeatures(expanded);
+ 
+     if (!(model = x86ModelFind(map, cpu->model))) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("unknown CPU model %s"), cpu->model);
+-        goto cleanup;
++        return -1;
+     }
+ 
+     if (!(model = x86ModelCopy(model)) ||
+         x86DataToCPUFeatures(expanded, host ? -1 : VIR_CPU_FEATURE_REQUIRE,
+                              &model->data, map) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     for (i = 0; i < cpu->nfeatures; i++) {
+         virCPUFeatureDefPtr f = cpu->features + i;
+@@ -3089,17 +3088,12 @@ virCPUx86ExpandFeatures(virCPUDefPtr cpu)
+             continue;
+ 
+         if (virCPUDefUpdateFeature(expanded, f->name, f->policy) < 0)
+-            goto cleanup;
++            return -1;
+     }
+ 
+     virCPUDefFreeModel(cpu);
+ 
+-    ret = virCPUDefCopyModel(cpu, expanded, false);
+-
+- cleanup:
+-    virCPUDefFree(expanded);
+-    x86ModelFree(model);
+-    return ret;
++    return virCPUDefCopyModel(cpu, expanded, false);
+ }
+ 
+ 
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86GetHost.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86GetHost.patch
new file mode 100644
index 0000000..42dae8f
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86GetHost.patch
@@ -0,0 +1,68 @@
+From 4a7f6f43a2a6144780d7ab74b8a6f6b008a7aa9d Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 10:33:48 +0100
+Subject: [PATCH] cpu_x86: Use g_auto* in virCPUx86GetHost
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=4a7f6f43a2
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 14 ++++++--------
+ 1 file changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 3bb212a909..50fdc76326 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -2637,18 +2637,18 @@ static int
+ virCPUx86GetHost(virCPUDefPtr cpu,
+                  virDomainCapsCPUModelsPtr models)
+ {
+-    virCPUDataPtr cpuData = NULL;
+-    int ret = -1;
++    g_autoptr(virCPUData) cpuData = NULL;
++    int ret;
+ 
+     if (virCPUx86DriverInitialize() < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (!(cpuData = virCPUDataNew(archs[0])))
+-        goto cleanup;
++        return -1;
+ 
+     if (cpuidSet(CPUX86_BASIC, cpuData) < 0 ||
+         cpuidSet(CPUX86_EXTENDED, cpuData) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     /* Read the IA32_ARCH_CAPABILITIES MSR (0x10a) if supported.
+      * This is best effort since there might be no way to read the MSR
+@@ -2668,7 +2668,7 @@ virCPUx86GetHost(virCPUDefPtr cpu,
+             };
+ 
+             if (virCPUx86DataAdd(cpuData, &item) < 0)
+-                goto cleanup;
++                return -1;
+         }
+     }
+ 
+@@ -2684,8 +2684,6 @@ virCPUx86GetHost(virCPUDefPtr cpu,
+         VIR_DEBUG("Host CPU does not support invariant TSC");
+     }
+ 
+- cleanup:
+-    virCPUx86DataFree(cpuData);
+     return ret;
+ }
+ #endif
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86LoadMap.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86LoadMap.patch
new file mode 100644
index 0000000..7c7a1f3
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86LoadMap.patch
@@ -0,0 +1,48 @@
+From 3c650a8f7a89046b925fb5ddc78c4b6669ed76ef Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 14:52:01 +0100
+Subject: [PATCH] cpu_x86: Use g_auto* in virCPUx86LoadMap
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=3c650a8f7a
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 983730f0c2..c41c7da594 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1559,18 +1559,14 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUx86Map, x86MapFree);
+ static virCPUx86MapPtr
+ virCPUx86LoadMap(void)
+ {
+-    virCPUx86MapPtr map;
++    g_autoptr(virCPUx86Map) map = NULL;
+ 
+     map = g_new0(virCPUx86Map, 1);
+ 
+     if (cpuMapLoad("x86", x86VendorParse, x86FeatureParse, x86ModelParse, map) < 0)
+-        goto error;
+-
+-    return map;
++        return NULL;
+ 
+- error:
+-    x86MapFree(map);
+-    return NULL;
++    return g_steal_pointer(&map);
+ }
+ 
+ 
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86Translate.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86Translate.patch
new file mode 100644
index 0000000..0b37b7d
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86Translate.patch
@@ -0,0 +1,82 @@
+From dff59020187c34e3f814c2aa24f3832d1d5b34f9 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 11:32:44 +0100
+Subject: [PATCH] cpu_x86: Use g_auto* in virCPUx86Translate
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=dff5902018
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 26 ++++++++++----------------
+ 1 file changed, 10 insertions(+), 16 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 70aadfaa99..cf573b6711 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -3015,45 +3015,39 @@ static int
+ virCPUx86Translate(virCPUDefPtr cpu,
+                    virDomainCapsCPUModelsPtr models)
+ {
+-    virCPUDefPtr translated = NULL;
++    g_autoptr(virCPUDef) translated = NULL;
+     virCPUx86MapPtr map;
+-    virCPUx86ModelPtr model = NULL;
++    g_autoptr(virCPUx86Model) model = NULL;
+     size_t i;
+-    int ret = -1;
+ 
+     if (!(map = virCPUx86GetMap()))
+-        goto cleanup;
++        return -1;
+ 
+     if (!(model = x86ModelFromCPU(cpu, map, -1)))
+-        goto cleanup;
++        return -1;
+ 
+     if (model->vendor &&
+         virCPUx86DataAddItem(&model->data, &model->vendor->data) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (model->signatures &&
+         x86DataAddSignature(&model->data, model->signatures[0]) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (!(translated = virCPUDefCopyWithoutModel(cpu)))
+-        goto cleanup;
++        return -1;
+ 
+     if (x86Decode(translated, &model->data, models, NULL, false) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     for (i = 0; i < cpu->nfeatures; i++) {
+         virCPUFeatureDefPtr f = cpu->features + i;
+         if (virCPUDefUpdateFeature(translated, f->name, f->policy) < 0)
+-            goto cleanup;
++            return -1;
+     }
+ 
+     virCPUDefStealModel(cpu, translated, true);
+-    ret = 0;
+-
+- cleanup:
+-    virCPUDefFree(translated);
+-    x86ModelFree(model);
+-    return ret;
++    return 0;
+ }
+ 
+ 
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86Update.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86Update.patch
new file mode 100644
index 0000000..7a11331
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86Update.patch
@@ -0,0 +1,70 @@
+From e0244a786db265647ab6c1c37ca3852876e4b0a3 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 11:32:09 +0100
+Subject: [PATCH] cpu_x86: Use g_auto* in virCPUx86Update
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=e0244a786d
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 15 +++++----------
+ 1 file changed, 5 insertions(+), 10 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 0300bd08da..0408bb5638 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -2853,9 +2853,8 @@ static int
+ virCPUx86Update(virCPUDefPtr guest,
+                 const virCPUDef *host)
+ {
+-    virCPUx86ModelPtr model = NULL;
++    g_autoptr(virCPUx86Model) model = NULL;
+     virCPUx86MapPtr map;
+-    int ret = -1;
+     size_t i;
+ 
+     if (!host) {
+@@ -2868,14 +2867,14 @@ virCPUx86Update(virCPUDefPtr guest,
+         return -1;
+ 
+     if (!(model = x86ModelFromCPU(host, map, -1)))
+-        goto cleanup;
++        return -1;
+ 
+     for (i = 0; i < guest->nfeatures; i++) {
+         if (guest->features[i].policy == VIR_CPU_FEATURE_OPTIONAL) {
+             int supported = x86FeatureInData(guest->features[i].name,
+                                              &model->data, map);
+             if (supported < 0)
+-                goto cleanup;
++                return -1;
+             else if (supported)
+                 guest->features[i].policy = VIR_CPU_FEATURE_REQUIRE;
+             else
+@@ -2885,13 +2884,9 @@ virCPUx86Update(virCPUDefPtr guest,
+ 
+     if (guest->mode == VIR_CPU_MODE_HOST_MODEL ||
+         guest->match == VIR_CPU_MATCH_MINIMUM)
+-        ret = x86UpdateHostModel(guest, host);
+-    else
+-        ret = 0;
++        return x86UpdateHostModel(guest, host);
+ 
+- cleanup:
+-    x86ModelFree(model);
+-    return ret;
++    return 0;
+ }
+ 
+ 
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86UpdateLive.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86UpdateLive.patch
new file mode 100644
index 0000000..d7f913a
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-virCPUx86UpdateLive.patch
@@ -0,0 +1,101 @@
+From 2748e91c548cbc48a5ea499e06e62de528c10d20 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 10:30:10 +0100
+Subject: [PATCH] cpu_x86: Use g_auto* in virCPUx86UpdateLive
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Backport-Note: missing ac36a8246 caused some noise in virCPUx86UpdateLive
+Origin: backport, https://libvirt.org/git/?p=libvirt.git;a=commit;h=2748e91c54
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 42 +++++++++++++++---------------------------
+ 1 file changed, 15 insertions(+), 27 deletions(-)
+
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -2896,21 +2896,20 @@ virCPUx86UpdateLive(virCPUDefPtr cpu,
+                     virCPUDataPtr dataDisabled)
+ {
+     virCPUx86MapPtr map;
+-    virCPUx86ModelPtr model = NULL;
+-    virCPUx86Data enabled = VIR_CPU_X86_DATA_INIT;
+-    virCPUx86Data disabled = VIR_CPU_X86_DATA_INIT;
+-    virBuffer bufAdded = VIR_BUFFER_INITIALIZER;
+-    virBuffer bufRemoved = VIR_BUFFER_INITIALIZER;
+-    char *added = NULL;
+-    char *removed = NULL;
++    g_autoptr(virCPUx86Model) model = NULL;
++    g_auto(virCPUx86Data) enabled = VIR_CPU_X86_DATA_INIT;
++    g_auto(virCPUx86Data) disabled = VIR_CPU_X86_DATA_INIT;
++    g_auto(virBuffer) bufAdded = VIR_BUFFER_INITIALIZER;
++    g_auto(virBuffer) bufRemoved = VIR_BUFFER_INITIALIZER;
++    g_autofree char *added = NULL;
++    g_autofree char *removed = NULL;
+     size_t i;
+-    int ret = -1;
+ 
+     if (!(map = virCPUx86GetMap()))
+         return -1;
+ 
+     if (!(model = x86ModelFromCPU(cpu, map, -1)))
+-        goto cleanup;
++        return -1;
+ 
+     if (dataEnabled)
+         x86DataCopy(&enabled, &dataEnabled->data.x86);
+@@ -2928,7 +2927,7 @@ virCPUx86UpdateLive(virCPUDefPtr cpu,
+                 virBufferAsprintf(&bufAdded, "%s,", feature->name);
+             else if (virCPUDefUpdateFeature(cpu, feature->name,
+                                             VIR_CPU_FEATURE_REQUIRE) < 0)
+-                goto cleanup;
++                return -1;
+         }
+ 
+         if (x86DataIsSubset(&disabled, &feature->data) ||
+@@ -2939,7 +2938,7 @@ virCPUx86UpdateLive(virCPUDefPtr cpu,
+                 virBufferAsprintf(&bufRemoved, "%s,", feature->name);
+             else if (virCPUDefUpdateFeature(cpu, feature->name,
+                                             VIR_CPU_FEATURE_DISABLE) < 0)
+-                goto cleanup;
++                return -1;
+         }
+     }
+ 
+@@ -2965,27 +2964,17 @@ virCPUx86UpdateLive(virCPUDefPtr cpu,
+                            _("guest CPU doesn't match specification: "
+                              "missing features: %s"),
+                            removed);
+-        goto cleanup;
++        return -1;
+     }
+ 
+     if (cpu->check == VIR_CPU_CHECK_FULL &&
+         !x86DataIsEmpty(&disabled)) {
+         virReportError(VIR_ERR_OPERATION_FAILED, "%s",
+                        _("guest CPU doesn't match specification"));
+-        goto cleanup;
++        return -1;
+     }
+ 
+-    ret = 0;
+-
+- cleanup:
+-    x86ModelFree(model);
+-    virCPUx86DataClear(&enabled);
+-    virCPUx86DataClear(&disabled);
+-    VIR_FREE(added);
+-    VIR_FREE(removed);
+-    virBufferFreeAndReset(&bufAdded);
+-    virBufferFreeAndReset(&bufRemoved);
+-    return ret;
++    return 0;
+ }
+ 
+ 
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86Compute.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86Compute.patch
new file mode 100644
index 0000000..b500637
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86Compute.patch
@@ -0,0 +1,178 @@
+From edf3c9045f1742d6c132066e4ba2da25c9ad7b26 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 10:33:03 +0100
+Subject: [PATCH] cpu_x86: Use g_auto* in x86Compute
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=edf3c9045f
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 65 +++++++++++++++++------------------------------
+ 1 file changed, 24 insertions(+), 41 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 34b0087857..7a59680516 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1680,7 +1680,6 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt)
+  * redundant code:
+  * MSG: error message
+  * CPU_DEF: a virCPUx86Data pointer with flags that are conflicting
+- * RET: return code to set
+  *
+  * This macro generates the error string outputs it into logs.
+  */
+@@ -1689,13 +1688,12 @@ virCPUx86DataParse(xmlXPathContextPtr ctxt)
+             char *flagsStr = NULL; \
+             if (!(flagsStr = x86FeatureNames(map, ", ", (CPU_DEF)))) { \
+                 virReportOOMError(); \
+-                goto error; \
++                return VIR_CPU_COMPARE_ERROR; \
+             } \
+             if (message) \
+                 *message = g_strdup_printf("%s: %s", _(MSG), flagsStr); \
+             VIR_DEBUG("%s: %s", MSG, flagsStr); \
+             VIR_FREE(flagsStr); \
+-            ret = VIR_CPU_COMPARE_INCOMPATIBLE; \
+         } while (0)
+ 
+ 
+@@ -1706,15 +1704,15 @@ x86Compute(virCPUDefPtr host,
+            char **message)
+ {
+     virCPUx86MapPtr map = NULL;
+-    virCPUx86ModelPtr host_model = NULL;
+-    virCPUx86ModelPtr cpu_force = NULL;
+-    virCPUx86ModelPtr cpu_require = NULL;
+-    virCPUx86ModelPtr cpu_optional = NULL;
+-    virCPUx86ModelPtr cpu_disable = NULL;
+-    virCPUx86ModelPtr cpu_forbid = NULL;
+-    virCPUx86ModelPtr diff = NULL;
+-    virCPUx86ModelPtr guest_model = NULL;
+-    virCPUDataPtr guestData = NULL;
++    g_autoptr(virCPUx86Model) host_model = NULL;
++    g_autoptr(virCPUx86Model) cpu_force = NULL;
++    g_autoptr(virCPUx86Model) cpu_require = NULL;
++    g_autoptr(virCPUx86Model) cpu_optional = NULL;
++    g_autoptr(virCPUx86Model) cpu_disable = NULL;
++    g_autoptr(virCPUx86Model) cpu_forbid = NULL;
++    g_autoptr(virCPUx86Model) diff = NULL;
++    g_autoptr(virCPUx86Model) guest_model = NULL;
++    g_autoptr(virCPUData) guestData = NULL;
+     virCPUCompareResult ret;
+     virCPUx86CompareResult result;
+     virArch arch;
+@@ -1764,13 +1762,13 @@ x86Compute(virCPUDefPtr host,
+         !(cpu_optional = x86ModelFromCPU(cpu, map, VIR_CPU_FEATURE_OPTIONAL)) ||
+         !(cpu_disable = x86ModelFromCPU(cpu, map, VIR_CPU_FEATURE_DISABLE)) ||
+         !(cpu_forbid = x86ModelFromCPU(cpu, map, VIR_CPU_FEATURE_FORBID)))
+-        goto error;
++        return VIR_CPU_COMPARE_ERROR;
+ 
+     x86DataIntersect(&cpu_forbid->data, &host_model->data);
+     if (!x86DataIsEmpty(&cpu_forbid->data)) {
+         virX86CpuIncompatible(N_("Host CPU provides forbidden features"),
+                               &cpu_forbid->data);
+-        goto cleanup;
++        return VIR_CPU_COMPARE_INCOMPATIBLE;
+     }
+ 
+     /* first remove features that were inherited from the CPU model and were
+@@ -1785,20 +1783,20 @@ x86Compute(virCPUDefPtr host,
+         virX86CpuIncompatible(N_("Host CPU does not provide required "
+                                  "features"),
+                               &cpu_require->data);
+-        goto cleanup;
++        return VIR_CPU_COMPARE_INCOMPATIBLE;
+     }
+ 
+-    ret = VIR_CPU_COMPARE_IDENTICAL;
+-
+     if (!(diff = x86ModelCopy(host_model)))
+-        goto error;
++        return VIR_CPU_COMPARE_ERROR;
+ 
+     x86DataSubtract(&diff->data, &cpu_optional->data);
+     x86DataSubtract(&diff->data, &cpu_require->data);
+     x86DataSubtract(&diff->data, &cpu_disable->data);
+     x86DataSubtract(&diff->data, &cpu_force->data);
+ 
+-    if (!x86DataIsEmpty(&diff->data))
++    if (x86DataIsEmpty(&diff->data))
++        ret = VIR_CPU_COMPARE_IDENTICAL;
++    else
+         ret = VIR_CPU_COMPARE_SUPERSET;
+ 
+     if (ret == VIR_CPU_COMPARE_SUPERSET
+@@ -1807,54 +1805,39 @@ x86Compute(virCPUDefPtr host,
+         virX86CpuIncompatible(N_("Host CPU does not strictly match guest CPU: "
+                                  "Extra features"),
+                               &diff->data);
+-        goto cleanup;
++        return VIR_CPU_COMPARE_INCOMPATIBLE;
+     }
+ 
+     if (guest) {
+         if (!(guest_model = x86ModelCopy(host_model)))
+-            goto error;
++            return VIR_CPU_COMPARE_ERROR;
+ 
+         if (cpu->vendor && host_model->vendor &&
+             virCPUx86DataAddItem(&guest_model->data,
+                                  &host_model->vendor->data) < 0)
+-            goto error;
++            return VIR_CPU_COMPARE_ERROR;
+ 
+         if (host_model->signatures &&
+             x86DataAddSignature(&guest_model->data, *host_model->signatures) < 0)
+-            goto error;
++            return VIR_CPU_COMPARE_ERROR;
+ 
+         if (cpu->type == VIR_CPU_TYPE_GUEST
+             && cpu->match == VIR_CPU_MATCH_EXACT)
+             x86DataSubtract(&guest_model->data, &diff->data);
+ 
+         if (x86DataAdd(&guest_model->data, &cpu_force->data))
+-            goto error;
++            return VIR_CPU_COMPARE_ERROR;
+ 
+         x86DataSubtract(&guest_model->data, &cpu_disable->data);
+ 
+         if (!(guestData = virCPUDataNew(arch)))
+-            goto error;
++            return VIR_CPU_COMPARE_ERROR;
+         x86DataCopy(&guestData->data.x86, &guest_model->data);
+ 
+-        *guest = guestData;
++        *guest = g_steal_pointer(&guestData);
+     }
+ 
+- cleanup:
+-    x86ModelFree(host_model);
+-    x86ModelFree(diff);
+-    x86ModelFree(cpu_force);
+-    x86ModelFree(cpu_require);
+-    x86ModelFree(cpu_optional);
+-    x86ModelFree(cpu_disable);
+-    x86ModelFree(cpu_forbid);
+-    x86ModelFree(guest_model);
+-
+     return ret;
+-
+- error:
+-    virCPUx86DataFree(guestData);
+-    ret = VIR_CPU_COMPARE_ERROR;
+-    goto cleanup;
+ }
+ #undef virX86CpuIncompatible
+ 
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86DataToCPU.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86DataToCPU.patch
new file mode 100644
index 0000000..ac91559
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86DataToCPU.patch
@@ -0,0 +1,68 @@
+From 4f2fdad36db2da1aa139470846b3f60f65da8424 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 10:29:39 +0100
+Subject: [PATCH] cpu_x86: Use g_auto* in x86DataToCPU
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=4f2fdad36d
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 20 ++++++--------------
+ 1 file changed, 6 insertions(+), 14 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 3c08edcd73..be4f40f470 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -771,9 +771,9 @@ x86DataToCPU(const virCPUx86Data *data,
+              virCPUx86MapPtr map,
+              virDomainCapsCPUModelPtr hvModel)
+ {
+-    virCPUDefPtr cpu;
+-    virCPUx86Data copy = VIR_CPU_X86_DATA_INIT;
+-    virCPUx86Data modelData = VIR_CPU_X86_DATA_INIT;
++    g_autoptr(virCPUDef) cpu = NULL;
++    g_auto(virCPUx86Data) copy = VIR_CPU_X86_DATA_INIT;
++    g_auto(virCPUx86Data) modelData = VIR_CPU_X86_DATA_INIT;
+     virCPUx86VendorPtr vendor;
+ 
+     cpu = virCPUDefNew();
+@@ -801,7 +801,7 @@ x86DataToCPU(const virCPUx86Data *data,
+             if ((feature = x86FeatureFind(map, *blocker)) &&
+                 !x86DataIsSubset(&copy, &feature->data))
+                 if (x86DataAdd(&modelData, &feature->data) < 0)
+-                    goto error;
++                    return NULL;
+         }
+     }
+ 
+@@ -810,17 +810,9 @@ x86DataToCPU(const virCPUx86Data *data,
+ 
+     if (x86DataToCPUFeatures(cpu, VIR_CPU_FEATURE_REQUIRE, &copy, map) ||
+         x86DataToCPUFeatures(cpu, VIR_CPU_FEATURE_DISABLE, &modelData, map))
+-        goto error;
+-
+- cleanup:
+-    virCPUx86DataClear(&modelData);
+-    virCPUx86DataClear(&copy);
+-    return cpu;
++        return NULL;
+ 
+- error:
+-    virCPUDefFree(cpu);
+-    cpu = NULL;
+-    goto cleanup;
++    return g_steal_pointer(&cpu);
+ }
+ 
+ 
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86Decode.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86Decode.patch
new file mode 100644
index 0000000..7502be0
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86Decode.patch
@@ -0,0 +1,96 @@
+From 9bb9cbf6761ecf985fe9cf8a18030a8aff9b448b Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 10:29:54 +0100
+Subject: [PATCH] cpu_x86: Use g_auto* in x86Decode
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=9bb9cbf676
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 24 +++++++-----------------
+ 1 file changed, 7 insertions(+), 17 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index feefd6cfee..471ca3e93d 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -2032,15 +2032,12 @@ x86Decode(virCPUDefPtr cpu,
+           const char *preferred,
+           bool migratable)
+ {
+-    int ret = -1;
+     virCPUx86MapPtr map;
+     virCPUx86ModelPtr candidate;
+     virCPUDefPtr cpuCandidate;
+     virCPUx86ModelPtr model = NULL;
+-    virCPUDefPtr cpuModel = NULL;
+-    virCPUx86Data data = VIR_CPU_X86_DATA_INIT;
+-    virCPUx86Data copy = VIR_CPU_X86_DATA_INIT;
+-    virCPUx86Data features = VIR_CPU_X86_DATA_INIT;
++    g_autoptr(virCPUDef) cpuModel = NULL;
++    g_auto(virCPUx86Data) data = VIR_CPU_X86_DATA_INIT;
+     virCPUx86VendorPtr vendor;
+     virDomainCapsCPUModelPtr hvModel = NULL;
+     g_autofree char *sigs = NULL;
+@@ -2054,7 +2051,7 @@ x86Decode(virCPUDefPtr cpu,
+     x86DataCopy(&data, cpuData);
+ 
+     if (!(map = virCPUx86GetMap()))
+-        goto cleanup;
++        return -1;
+ 
+     vendor = x86DataToVendor(&data, map);
+     signature = x86DataToSignature(&data);
+@@ -2073,7 +2070,7 @@ x86Decode(virCPUDefPtr cpu,
+                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                                    _("CPU model %s is not supported by hypervisor"),
+                                    preferred);
+-                    goto cleanup;
++                    return -1;
+                 } else {
+                     VIR_WARN("Preferred CPU model %s not allowed by"
+                              " hypervisor; closest supported model will be"
+@@ -2096,7 +2093,7 @@ x86Decode(virCPUDefPtr cpu,
+         }
+ 
+         if (!(cpuCandidate = x86DataToCPU(&data, candidate, map, hvModel)))
+-            goto cleanup;
++            return -1;
+         cpuCandidate->type = cpu->type;
+ 
+         if ((rc = x86DecodeUseCandidate(model, cpuModel,
+@@ -2115,7 +2112,7 @@ x86Decode(virCPUDefPtr cpu,
+     if (!cpuModel) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+                        "%s", _("Cannot find suitable CPU model for given data"));
+-        goto cleanup;
++        return -1;
+     }
+ 
+     /* Remove non-migratable features if requested
+@@ -2149,14 +2146,7 @@ x86Decode(virCPUDefPtr cpu,
+     cpu->nfeatures_max = cpuModel->nfeatures_max;
+     cpuModel->nfeatures_max = 0;
+ 
+-    ret = 0;
+-
+- cleanup:
+-    virCPUDefFree(cpuModel);
+-    virCPUx86DataClear(&data);
+-    virCPUx86DataClear(&copy);
+-    virCPUx86DataClear(&features);
+-    return ret;
++    return 0;
+ }
+ 
+ static int
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86Encode.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86Encode.patch
new file mode 100644
index 0000000..255fbf9
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86Encode.patch
@@ -0,0 +1,138 @@
+From e6e54fcebe99f1c07fe905c419cbe5d12f6844b1 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 10:33:27 +0100
+Subject: [PATCH] cpu_x86: Use g_auto* in x86Encode
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=e6e54fcebe
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 51 +++++++++++++++++++----------------------------
+ 1 file changed, 21 insertions(+), 30 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 67387df23e..afdde24754 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -2188,12 +2188,12 @@ x86Encode(virArch arch,
+           virCPUDataPtr *vendor)
+ {
+     virCPUx86MapPtr map = NULL;
+-    virCPUDataPtr data_forced = NULL;
+-    virCPUDataPtr data_required = NULL;
+-    virCPUDataPtr data_optional = NULL;
+-    virCPUDataPtr data_disabled = NULL;
+-    virCPUDataPtr data_forbidden = NULL;
+-    virCPUDataPtr data_vendor = NULL;
++    g_autoptr(virCPUData) data_forced = NULL;
++    g_autoptr(virCPUData) data_required = NULL;
++    g_autoptr(virCPUData) data_optional = NULL;
++    g_autoptr(virCPUData) data_disabled = NULL;
++    g_autoptr(virCPUData) data_forbidden = NULL;
++    g_autoptr(virCPUData) data_vendor = NULL;
+ 
+     if (forced)
+         *forced = NULL;
+@@ -2209,37 +2209,37 @@ x86Encode(virArch arch,
+         *vendor = NULL;
+ 
+     if (!(map = virCPUx86GetMap()))
+-        goto error;
++        return -1;
+ 
+     if (forced &&
+         (!(data_forced = virCPUDataNew(arch)) ||
+          x86EncodePolicy(&data_forced->data.x86, cpu, map,
+                          VIR_CPU_FEATURE_FORCE) < 0))
+-        goto error;
++        return -1;
+ 
+     if (required &&
+         (!(data_required = virCPUDataNew(arch)) ||
+          x86EncodePolicy(&data_required->data.x86, cpu, map,
+                          VIR_CPU_FEATURE_REQUIRE) < 0))
+-        goto error;
++        return -1;
+ 
+     if (optional &&
+         (!(data_optional = virCPUDataNew(arch)) ||
+          x86EncodePolicy(&data_optional->data.x86, cpu, map,
+                          VIR_CPU_FEATURE_OPTIONAL) < 0))
+-        goto error;
++        return -1;
+ 
+     if (disabled &&
+         (!(data_disabled = virCPUDataNew(arch)) ||
+          x86EncodePolicy(&data_disabled->data.x86, cpu, map,
+                          VIR_CPU_FEATURE_DISABLE) < 0))
+-        goto error;
++        return -1;
+ 
+     if (forbidden &&
+         (!(data_forbidden = virCPUDataNew(arch)) ||
+          x86EncodePolicy(&data_forbidden->data.x86, cpu, map,
+                          VIR_CPU_FEATURE_FORBID) < 0))
+-        goto error;
++        return -1;
+ 
+     if (vendor) {
+         virCPUx86VendorPtr v = NULL;
+@@ -2247,39 +2247,30 @@ x86Encode(virArch arch,
+         if (cpu->vendor && !(v = x86VendorFind(map, cpu->vendor))) {
+             virReportError(VIR_ERR_OPERATION_FAILED,
+                            _("CPU vendor %s not found"), cpu->vendor);
+-            goto error;
++            return -1;
+         }
+ 
+         if (!(data_vendor = virCPUDataNew(arch)))
+-            goto error;
++            return -1;
+ 
+         if (v && virCPUx86DataAdd(data_vendor, &v->data) < 0)
+-            goto error;
++            return -1;
+     }
+ 
+     if (forced)
+-        *forced = data_forced;
++        *forced = g_steal_pointer(&data_forced);
+     if (required)
+-        *required = data_required;
++        *required = g_steal_pointer(&data_required);
+     if (optional)
+-        *optional = data_optional;
++        *optional = g_steal_pointer(&data_optional);
+     if (disabled)
+-        *disabled = data_disabled;
++        *disabled = g_steal_pointer(&data_disabled);
+     if (forbidden)
+-        *forbidden = data_forbidden;
++        *forbidden = g_steal_pointer(&data_forbidden);
+     if (vendor)
+-        *vendor = data_vendor;
++        *vendor = g_steal_pointer(&data_vendor);
+ 
+     return 0;
+-
+- error:
+-    virCPUx86DataFree(data_forced);
+-    virCPUx86DataFree(data_required);
+-    virCPUx86DataFree(data_optional);
+-    virCPUx86DataFree(data_disabled);
+-    virCPUx86DataFree(data_forbidden);
+-    virCPUx86DataFree(data_vendor);
+-    return -1;
+ }
+ 
+ 
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86EncodePolicy.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86EncodePolicy.patch
new file mode 100644
index 0000000..d231fc5
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86EncodePolicy.patch
@@ -0,0 +1,43 @@
+From 5b45d2cf1ff0d2d972f103a678c01bc0eb7c1e18 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 11:30:43 +0100
+Subject: [PATCH] cpu_x86: Use g_auto* in x86EncodePolicy
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=5b45d2cf1f
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 471ca3e93d..67387df23e 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -2164,7 +2164,7 @@ x86EncodePolicy(virCPUx86Data *data,
+                 virCPUx86MapPtr map,
+                 virCPUFeaturePolicy policy)
+ {
+-    virCPUx86ModelPtr model;
++    g_autoptr(virCPUx86Model) model = NULL;
+ 
+     if (!(model = x86ModelFromCPU(cpu, map, policy)))
+         return -1;
+@@ -2172,7 +2172,6 @@ x86EncodePolicy(virCPUx86Data *data,
+     *data = model->data;
+     model->data.len = 0;
+     model->data.items = NULL;
+-    x86ModelFree(model);
+ 
+     return 0;
+ }
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86FeatureParse.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86FeatureParse.patch
new file mode 100644
index 0000000..f070000
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86FeatureParse.patch
@@ -0,0 +1,112 @@
+From 3125688f78f6289e51bfdaa196addb230b0de4e1 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 10:45:40 +0100
+Subject: [PATCH] cpu_x86: Use g_auto* in x86FeatureParse
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=3125688f78
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 31 ++++++++++++-------------------
+ 1 file changed, 12 insertions(+), 19 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 94a5551000..248c774777 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1023,13 +1023,12 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
+                 void *data)
+ {
+     virCPUx86MapPtr map = data;
+-    xmlNodePtr *nodes = NULL;
+-    virCPUx86FeaturePtr feature;
++    g_autofree xmlNodePtr *nodes = NULL;
++    g_autoptr(virCPUx86Feature) feature = NULL;
+     virCPUx86DataItem item;
+     size_t i;
+     int n;
+-    char *str = NULL;
+-    int ret = -1;
++    g_autofree char *str = NULL;
+ 
+     feature = g_new0(virCPUx86Feature, 1);
+     feature->migratable = true;
+@@ -1038,7 +1037,7 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
+     if (x86FeatureFind(map, feature->name)) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("CPU feature %s already defined"), feature->name);
+-        goto cleanup;
++        return -1;
+     }
+ 
+     str = virXPathString("string(@migratable)", ctxt);
+@@ -1047,13 +1046,13 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
+ 
+     n = virXPathNodeSet("./cpuid|./msr", ctxt, &nodes);
+     if (n < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (n == 0) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("Missing cpuid or msr element in feature %s"),
+                        feature->name);
+-        goto cleanup;
++        return -1;
+     }
+ 
+     for (i = 0; i < n; i++) {
+@@ -1063,37 +1062,31 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
+                 virReportError(VIR_ERR_INTERNAL_ERROR,
+                                _("Invalid cpuid[%zu] in %s feature"),
+                                i, feature->name);
+-                goto cleanup;
++                return -1;
+             }
+         } else {
+             if (x86ParseMSR(ctxt, &item) < 0) {
+                 virReportError(VIR_ERR_INTERNAL_ERROR,
+                                _("Invalid msr[%zu] in %s feature"),
+                                i, feature->name);
+-                goto cleanup;
++                return -1;
+             }
+         }
+ 
+         if (virCPUx86DataAddItem(&feature->data, &item))
+-            goto cleanup;
++            return -1;
+     }
+ 
+     if (!feature->migratable &&
+         VIR_APPEND_ELEMENT_COPY(map->migrate_blockers,
+                                 map->nblockers,
+                                 feature) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (VIR_APPEND_ELEMENT(map->features, map->nfeatures, feature) < 0)
+-        goto cleanup;
+-
+-    ret = 0;
++        return -1;
+ 
+- cleanup:
+-    x86FeatureFree(feature);
+-    VIR_FREE(nodes);
+-    VIR_FREE(str);
+-    return ret;
++    return 0;
+ }
+ 
+ 
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86ModelFromCPU.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86ModelFromCPU.patch
new file mode 100644
index 0000000..5feab1f
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86ModelFromCPU.patch
@@ -0,0 +1,71 @@
+From 93f173adbecee92f9973745a2aca65a27c4aa8a6 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 11:29:14 +0100
+Subject: [PATCH] cpu_x86: Use g_auto* in x86ModelFromCPU
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=93f173adbe
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 14 +++++---------
+ 1 file changed, 5 insertions(+), 9 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 248c774777..1f76fe1e5c 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1173,7 +1173,7 @@ x86ModelFromCPU(const virCPUDef *cpu,
+                 virCPUx86MapPtr map,
+                 int policy)
+ {
+-    virCPUx86ModelPtr model = NULL;
++    g_autoptr(virCPUx86Model) model = NULL;
+     size_t i;
+ 
+     /* host CPU only contains required features; requesting other features
+@@ -1216,7 +1216,7 @@ x86ModelFromCPU(const virCPUDef *cpu,
+         if (!(feature = x86FeatureFind(map, cpu->features[i].name))) {
+             virReportError(VIR_ERR_INTERNAL_ERROR,
+                            _("Unknown CPU feature %s"), cpu->features[i].name);
+-            goto error;
++            return NULL;
+         }
+ 
+         if (policy == -1) {
+@@ -1224,7 +1224,7 @@ x86ModelFromCPU(const virCPUDef *cpu,
+             case VIR_CPU_FEATURE_FORCE:
+             case VIR_CPU_FEATURE_REQUIRE:
+                 if (x86DataAdd(&model->data, &feature->data) < 0)
+-                    goto error;
++                    return NULL;
+                 break;
+ 
+             case VIR_CPU_FEATURE_DISABLE:
+@@ -1238,15 +1238,11 @@ x86ModelFromCPU(const virCPUDef *cpu,
+                 break;
+             }
+         } else if (x86DataAdd(&model->data, &feature->data) < 0) {
+-            goto error;
++            return NULL;
+         }
+     }
+ 
+-    return model;
+-
+- error:
+-    x86ModelFree(model);
+-    return NULL;
++    return g_steal_pointer(&model);
+ }
+ 
+ 
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86ModelParse.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86ModelParse.patch
new file mode 100644
index 0000000..5af2631
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86ModelParse.patch
@@ -0,0 +1,77 @@
+From b239a60967cc2979f01e4521d6582b7d6acedd72 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 11:29:36 +0100
+Subject: [PATCH] cpu_x86: Use g_auto* in x86ModelParse
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=b239a60967
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 23 +++++++++--------------
+ 1 file changed, 9 insertions(+), 14 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 1f76fe1e5c..983730f0c2 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1493,41 +1493,36 @@ x86ModelParse(xmlXPathContextPtr ctxt,
+               void *data)
+ {
+     virCPUx86MapPtr map = data;
+-    virCPUx86ModelPtr model = NULL;
+-    int ret = -1;
++    g_autoptr(virCPUx86Model) model = NULL;
+ 
+     if (x86ModelFind(map, name)) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("Multiple definitions of CPU model '%s'"), name);
+-        goto cleanup;
++        return -1;
+     }
+ 
+     model = g_new0(virCPUx86Model, 1);
+     model->name = g_strdup(name);
+ 
+     if (x86ModelParseDecode(model, ctxt) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (x86ModelParseAncestor(model, ctxt, map) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (x86ModelParseSignatures(model, ctxt) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (x86ModelParseVendor(model, ctxt, map) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (x86ModelParseFeatures(model, ctxt, map) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (VIR_APPEND_ELEMENT(map->models, map->nmodels, model) < 0)
+-        goto cleanup;
+-
+-    ret = 0;
++        return -1;
+ 
+- cleanup:
+-    x86ModelFree(model);
+-    return ret;
++    return 0;
+ }
+ 
+ 
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86UpdateHostModel.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86UpdateHostModel.patch
new file mode 100644
index 0000000..7e070b6
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86UpdateHostModel.patch
@@ -0,0 +1,68 @@
+From 2f9d15b495efdd9e63c07cd6fda611701e71ee46 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 16:06:18 +0100
+Subject: [PATCH] cpu_x86: Use g_auto* in x86UpdateHostModel
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=2f9d15b495
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 14 +++++---------
+ 1 file changed, 5 insertions(+), 9 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 3ab70e7c20..0300bd08da 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -2817,17 +2817,16 @@ static int
+ x86UpdateHostModel(virCPUDefPtr guest,
+                    const virCPUDef *host)
+ {
+-    virCPUDefPtr updated = NULL;
++    g_autoptr(virCPUDef) updated = NULL;
+     size_t i;
+-    int ret = -1;
+ 
+     if (!(updated = virCPUDefCopyWithoutModel(host)))
+-        goto cleanup;
++        return -1;
+ 
+     updated->type = VIR_CPU_TYPE_GUEST;
+     updated->mode = VIR_CPU_MODE_CUSTOM;
+     if (virCPUDefCopyModel(updated, host, true) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (guest->vendor_id) {
+         VIR_FREE(updated->vendor_id);
+@@ -2838,18 +2837,15 @@ x86UpdateHostModel(virCPUDefPtr guest,
+         if (virCPUDefUpdateFeature(updated,
+                                    guest->features[i].name,
+                                    guest->features[i].policy) < 0)
+-            goto cleanup;
++            return -1;
+     }
+ 
+     virCPUDefStealModel(guest, updated,
+                         guest->mode == VIR_CPU_MODE_CUSTOM);
+     guest->mode = VIR_CPU_MODE_CUSTOM;
+     guest->match = VIR_CPU_MATCH_EXACT;
+-    ret = 0;
+ 
+- cleanup:
+-    virCPUDefFree(updated);
+-    return ret;
++    return 0;
+ }
+ 
+ 
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86VendorParse.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86VendorParse.patch
new file mode 100644
index 0000000..8be2394
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-g_auto-in-x86VendorParse.patch
@@ -0,0 +1,73 @@
+From 6a0a7db9041cb1d8d92919bb4adf0d19bdd5dd68 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 10:38:04 +0100
+Subject: [PATCH] cpu_x86: Use g_auto* in x86VendorParse
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=6a0a7db904
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 20 +++++++-------------
+ 1 file changed, 7 insertions(+), 13 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index be4f40f470..94a5551000 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -849,9 +849,8 @@ x86VendorParse(xmlXPathContextPtr ctxt,
+                void *data)
+ {
+     virCPUx86MapPtr map = data;
+-    virCPUx86VendorPtr vendor = NULL;
+-    char *string = NULL;
+-    int ret = -1;
++    g_autoptr(virCPUx86Vendor) vendor = NULL;
++    g_autofree char *string = NULL;
+ 
+     vendor = g_new0(virCPUx86Vendor, 1);
+     vendor->name = g_strdup(name);
+@@ -859,7 +858,7 @@ x86VendorParse(xmlXPathContextPtr ctxt,
+     if (x86VendorFind(map, vendor->name)) {
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("CPU vendor %s already defined"), vendor->name);
+-        goto cleanup;
++        return -1;
+     }
+ 
+     string = virXPathString("string(@string)", ctxt);
+@@ -867,21 +866,16 @@ x86VendorParse(xmlXPathContextPtr ctxt,
+         virReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("Missing vendor string for CPU vendor %s"),
+                        vendor->name);
+-        goto cleanup;
++        return -1;
+     }
+ 
+     if (virCPUx86VendorToData(string, &vendor->data) < 0)
+-        goto cleanup;
++        return -1;
+ 
+     if (VIR_APPEND_ELEMENT(map->vendors, map->nvendors, vendor) < 0)
+-        goto cleanup;
+-
+-    ret = 0;
++        return -1;
+ 
+- cleanup:
+-    x86VendorFree(vendor);
+-    VIR_FREE(string);
+-    return ret;
++    return 0;
+ }
+ 
+ 
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-glib-allocation-for-virCPU-x86-Data.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-glib-allocation-for-virCPU-x86-Data.patch
new file mode 100644
index 0000000..b64b182
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-glib-allocation-for-virCPU-x86-Data.patch
@@ -0,0 +1,142 @@
+From 800868583012e20fb60eb4be9fb1ccc018677006 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 10:28:26 +0100
+Subject: [PATCH] cpu_x86: Use glib allocation for virCPU{,x86}Data
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Backport-Note: some noise missing ac36a8246
+Origin: backport, https://libvirt.org/git/?p=libvirt.git;a=commit;h=8008685830
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 45 ++++++++++++++++++++++-----------------------
+ 1 file changed, 22 insertions(+), 23 deletions(-)
+
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -468,8 +468,9 @@ virCPUx86DataClear(virCPUx86Data *data)
+     if (!data)
+         return;
+ 
+-    VIR_FREE(data->items);
++    g_free(data->items);
+ }
++G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(virCPUx86Data, virCPUx86DataClear);
+ 
+ 
+ static void
+@@ -481,21 +482,19 @@ virCPUx86DataFree(virCPUDataPtr data)
+     virCPUx86DataClear(&data->data.x86);
+     VIR_FREE(data);
+ }
++G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUData, virCPUx86DataFree);
+ 
+ 
+-static int
++static void
+ x86DataCopy(virCPUx86Data *dst, const virCPUx86Data *src)
+ {
+     size_t i;
+ 
+-    if (VIR_ALLOC_N(dst->items, src->len) < 0)
+-        return -1;
+-
++    dst->items = g_new0(virCPUx86DataItem, src->len);
+     dst->len = src->len;
++
+     for (i = 0; i < src->len; i++)
+         dst->items[i] = src->items[i];
+-
+-    return 0;
+ }
+ 
+ 
+@@ -781,9 +780,8 @@ x86DataToCPU(const virCPUx86Data *data,
+ 
+     cpu->model = g_strdup(model->name);
+ 
+-    if (x86DataCopy(&copy, data) < 0 ||
+-        x86DataCopy(&modelData, &model->data) < 0)
+-        goto error;
++    x86DataCopy(&copy, data);
++    x86DataCopy(&modelData, &model->data);
+ 
+     if ((vendor = x86DataToVendor(&copy, map)))
+         cpu->vendor = g_strdup(vendor->name);
+@@ -1183,11 +1181,11 @@ x86ModelCopy(virCPUx86ModelPtr model)
+ 
+     copy->name = g_strdup(model->name);
+ 
+-    if (x86ModelCopySignatures(copy, model) < 0 ||
+-        x86DataCopy(&copy->data, &model->data) < 0) {
++    if (x86ModelCopySignatures(copy, model) < 0) {
+         x86ModelFree(copy);
+         return NULL;
+     }
++    x86DataCopy(&copy->data, &model->data);
+ 
+     copy->vendor = model->vendor;
+ 
+@@ -1415,10 +1413,11 @@ x86ModelParseAncestor(virCPUx86ModelPtr
+     }
+ 
+     model->vendor = ancestor->vendor;
+-    if (x86ModelCopySignatures(model, ancestor) < 0 ||
+-        x86DataCopy(&model->data, &ancestor->data) < 0)
++    if (x86ModelCopySignatures(model, ancestor) < 0)
+         return -1;
+ 
++    x86DataCopy(&model->data, &ancestor->data);
++
+     return 0;
+ }
+ 
+@@ -1904,9 +1903,9 @@ x86Compute(virCPUDefPtr host,
+ 
+         x86DataSubtract(&guest_model->data, &cpu_disable->data);
+ 
+-        if (!(guestData = virCPUDataNew(arch)) ||
+-            x86DataCopy(&guestData->data.x86, &guest_model->data) < 0)
++        if (!(guestData = virCPUDataNew(arch)))
+             goto error;
++        x86DataCopy(&guestData->data.x86, &guest_model->data);
+ 
+         *guest = guestData;
+     }
+@@ -2139,9 +2138,11 @@ x86Decode(virCPUDefPtr cpu,
+     ssize_t i;
+     int rc;
+ 
+-    if (!cpuData || x86DataCopy(&data, cpuData) < 0)
++    if (!cpuData)
+         return -1;
+ 
++    x86DataCopy(&data, cpuData);
++
+     if (!(map = virCPUx86GetMap()))
+         goto cleanup;
+ 
+@@ -3049,13 +3050,11 @@ virCPUx86UpdateLive(virCPUDefPtr cpu,
+     if (!(model = x86ModelFromCPU(cpu, map, -1)))
+         goto cleanup;
+ 
+-    if (dataEnabled &&
+-        x86DataCopy(&enabled, &dataEnabled->data.x86) < 0)
+-        goto cleanup;
++    if (dataEnabled)
++        x86DataCopy(&enabled, &dataEnabled->data.x86);
+ 
+-    if (dataDisabled &&
+-        x86DataCopy(&disabled, &dataDisabled->data.x86) < 0)
+-        goto cleanup;
++    if (dataDisabled)
++        x86DataCopy(&disabled, &dataDisabled->data.x86);
+ 
+     for (i = 0; i < map->nfeatures; i++) {
+         virCPUx86FeaturePtr feature = map->features[i];
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-glib-allocation-for-virCPUx86Feature.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-glib-allocation-for-virCPUx86Feature.patch
new file mode 100644
index 0000000..80e04fc
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-glib-allocation-for-virCPUx86Feature.patch
@@ -0,0 +1,71 @@
+From 51b6e9c1000151cc515804134a00ccb0d7b3e44a Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 10:40:29 +0100
+Subject: [PATCH] cpu_x86: Use glib allocation for virCPUx86Feature
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=51b6e9c100
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 22 ++++------------------
+ 1 file changed, 4 insertions(+), 18 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 5ffae3cebe..cf0f8a7120 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -893,28 +893,17 @@ x86VendorParse(xmlXPathContextPtr ctxt,
+ }
+ 
+ 
+-static virCPUx86FeaturePtr
+-x86FeatureNew(void)
+-{
+-    virCPUx86FeaturePtr feature;
+-
+-    if (VIR_ALLOC(feature) < 0)
+-        return NULL;
+-
+-    return feature;
+-}
+-
+-
+ static void
+ x86FeatureFree(virCPUx86FeaturePtr feature)
+ {
+     if (!feature)
+         return;
+ 
+-    VIR_FREE(feature->name);
++    g_free(feature->name);
+     virCPUx86DataClear(&feature->data);
+-    VIR_FREE(feature);
++    g_free(feature);
+ }
++G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUx86Feature, x86FeatureFree);
+ 
+ 
+ static int
+@@ -1056,11 +1045,8 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
+     char *str = NULL;
+     int ret = -1;
+ 
+-    if (!(feature = x86FeatureNew()))
+-        goto cleanup;
+-
++    feature = g_new0(virCPUx86Feature, 1);
+     feature->migratable = true;
+-
+     feature->name = g_strdup(name);
+ 
+     if (x86FeatureFind(map, feature->name)) {
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-glib-allocation-for-virCPUx86Map.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-glib-allocation-for-virCPUx86Map.patch
new file mode 100644
index 0000000..4ed89af
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-glib-allocation-for-virCPUx86Map.patch
@@ -0,0 +1,66 @@
+From 247e115e2753bde7957cc07a20d5a48a8a6632b0 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 14:49:57 +0100
+Subject: [PATCH] cpu_x86: Use glib allocation for virCPUx86Map
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=247e115e27
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 7bad9dbb76..51c2a0ea36 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1566,23 +1566,24 @@ x86MapFree(virCPUx86MapPtr map)
+ 
+     for (i = 0; i < map->nfeatures; i++)
+         x86FeatureFree(map->features[i]);
+-    VIR_FREE(map->features);
++    g_free(map->features);
+ 
+     for (i = 0; i < map->nmodels; i++)
+         x86ModelFree(map->models[i]);
+-    VIR_FREE(map->models);
++    g_free(map->models);
+ 
+     for (i = 0; i < map->nvendors; i++)
+         x86VendorFree(map->vendors[i]);
+-    VIR_FREE(map->vendors);
++    g_free(map->vendors);
+ 
+     /* migrate_blockers only points to the features from map->features list,
+      * which were already freed above
+      */
+-    VIR_FREE(map->migrate_blockers);
++    g_free(map->migrate_blockers);
+ 
+-    VIR_FREE(map);
++    g_free(map);
+ }
++G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUx86Map, x86MapFree);
+ 
+ 
+ static virCPUx86MapPtr
+@@ -1590,8 +1591,7 @@ virCPUx86LoadMap(void)
+ {
+     virCPUx86MapPtr map;
+ 
+-    if (VIR_ALLOC(map) < 0)
+-        return NULL;
++    map = g_new0(virCPUx86Map, 1);
+ 
+     if (cpuMapLoad("x86", x86VendorParse, x86FeatureParse, x86ModelParse, map) < 0)
+         goto error;
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-glib-allocation-for-virCPUx86Model.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-glib-allocation-for-virCPUx86Model.patch
new file mode 100644
index 0000000..e2430aa
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-glib-allocation-for-virCPUx86Model.patch
@@ -0,0 +1,100 @@
+From ccc0c2e4de58d62308e224076a7aa979ae97b520 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 11:28:13 +0100
+Subject: [PATCH] cpu_x86: Use glib allocation for virCPUx86Model
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=ccc0c2e4de
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 31 ++++++++-----------------------
+ 1 file changed, 8 insertions(+), 23 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index cf0f8a7120..7bad9dbb76 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -1111,29 +1111,18 @@ x86FeatureParse(xmlXPathContextPtr ctxt,
+ }
+ 
+ 
+-static virCPUx86ModelPtr
+-x86ModelNew(void)
+-{
+-    virCPUx86ModelPtr model;
+-
+-    if (VIR_ALLOC(model) < 0)
+-        return NULL;
+-
+-    return model;
+-}
+-
+-
+ static void
+ x86ModelFree(virCPUx86ModelPtr model)
+ {
+     if (!model)
+         return;
+ 
+-    VIR_FREE(model->name);
+-    VIR_FREE(model->signatures);
++    g_free(model->name);
++    g_free(model->signatures);
+     virCPUx86DataClear(&model->data);
+-    VIR_FREE(model);
++    g_free(model);
+ }
++G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUx86Model, x86ModelFree);
+ 
+ 
+ static int
+@@ -1161,9 +1150,7 @@ x86ModelCopy(virCPUx86ModelPtr model)
+ {
+     virCPUx86ModelPtr copy;
+ 
+-    if (VIR_ALLOC(copy) < 0)
+-        return NULL;
+-
++    copy = g_new0(virCPUx86Model, 1);
+     copy->name = g_strdup(model->name);
+ 
+     if (x86ModelCopySignatures(copy, model) < 0) {
+@@ -1216,7 +1203,7 @@ x86ModelFromCPU(const virCPUDef *cpu,
+     if (cpu->type == VIR_CPU_TYPE_HOST &&
+         policy != VIR_CPU_FEATURE_REQUIRE &&
+         policy != -1)
+-        return x86ModelNew();
++        return g_new0(virCPUx86Model, 1);
+ 
+     if (cpu->model &&
+         (policy == VIR_CPU_FEATURE_REQUIRE || policy == -1)) {
+@@ -1228,7 +1215,7 @@ x86ModelFromCPU(const virCPUDef *cpu,
+ 
+         model = x86ModelCopy(model);
+     } else {
+-        model = x86ModelNew();
++        model = g_new0(virCPUx86Model, 1);
+     }
+ 
+     if (!model)
+@@ -1540,9 +1527,7 @@ x86ModelParse(xmlXPathContextPtr ctxt,
+         goto cleanup;
+     }
+ 
+-    if (!(model = x86ModelNew()))
+-        goto cleanup;
+-
++    model = g_new0(virCPUx86Model, 1);
+     model->name = g_strdup(name);
+ 
+     if (x86ModelParseDecode(model, ctxt) < 0)
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-glib-allocation-for-virCPUx86Vendor.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-glib-allocation-for-virCPUx86Vendor.patch
new file mode 100644
index 0000000..41f1dfb
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-glib-allocation-for-virCPUx86Vendor.patch
@@ -0,0 +1,50 @@
+From 8a41417b23dda97eb09bcd2921c1ab0d5fbce1b6 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 10:37:29 +0100
+Subject: [PATCH] cpu_x86: Use glib allocation for virCPUx86Vendor
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=8a41417b23
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 9e22c83c4d..5ffae3cebe 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -830,9 +830,10 @@ x86VendorFree(virCPUx86VendorPtr vendor)
+     if (!vendor)
+         return;
+ 
+-    VIR_FREE(vendor->name);
+-    VIR_FREE(vendor);
++    g_free(vendor->name);
++    g_free(vendor);
+ }
++G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUx86Vendor, x86VendorFree);
+ 
+ 
+ static virCPUx86VendorPtr
+@@ -860,9 +861,7 @@ x86VendorParse(xmlXPathContextPtr ctxt,
+     char *string = NULL;
+     int ret = -1;
+ 
+-    if (VIR_ALLOC(vendor) < 0)
+-        goto cleanup;
+-
++    vendor = g_new0(virCPUx86Vendor, 1);
+     vendor->name = g_strdup(name);
+ 
+     if (x86VendorFind(map, vendor->name)) {
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-glib-allocation-in-virCPUx86GetModels.patch b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-glib-allocation-in-virCPUx86GetModels.patch
new file mode 100644
index 0000000..77c2fee
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cpu_x86-Use-glib-allocation-in-virCPUx86GetModels.patch
@@ -0,0 +1,49 @@
+From e43e2ff7f5b629f979e56387c4be46f2be251b75 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Wed, 25 Mar 2020 18:41:48 +0100
+Subject: [PATCH] cpu_x86: Use glib allocation in virCPUx86GetModels
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=e43e2ff7f5
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ src/cpu/cpu_x86.c | 10 +---------
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
+index 51c2a0ea36..3c08edcd73 100644
+--- a/src/cpu/cpu_x86.c
++++ b/src/cpu/cpu_x86.c
+@@ -3121,21 +3121,13 @@ virCPUx86GetModels(char ***models)
+         return -1;
+ 
+     if (models) {
+-        if (VIR_ALLOC_N(*models, map->nmodels + 1) < 0)
+-            goto error;
++        *models = g_new0(char *, map->nmodels + 1);
+ 
+         for (i = 0; i < map->nmodels; i++)
+             (*models)[i] = g_strdup(map->models[i]->name);
+     }
+ 
+     return map->nmodels;
+-
+- error:
+-    if (models) {
+-        virStringListFree(*models);
+-        *models = NULL;
+-    }
+-    return -1;
+ }
+ 
+ 
+-- 
+2.31.1
+
diff --git a/debian/patches/ubuntu/lp-1922907-cputest-Add-data-for-Intel-R-Xeon-R-Gold-6130-CPU.patch b/debian/patches/ubuntu/lp-1922907-cputest-Add-data-for-Intel-R-Xeon-R-Gold-6130-CPU.patch
new file mode 100644
index 0000000..ad911af
--- /dev/null
+++ b/debian/patches/ubuntu/lp-1922907-cputest-Add-data-for-Intel-R-Xeon-R-Gold-6130-CPU.patch
@@ -0,0 +1,1460 @@
+From 3714779b15e594a14de4e6fe49c2e3eafe39b161 Mon Sep 17 00:00:00 2001
+From: Jiri Denemark <[e-mail]>
+Date: Thu, 17 Oct 2019 10:01:29 +0200
+Subject: [PATCH] cputest: Add data for Intel(R) Xeon(R) Gold 6130 CPU
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Skylake-Server with family 6, model 85, stepping 4, which is currently
+mis-detected as Cascadelake-Server CPU model.
+
+Signed-off-by: Jiri Denemark <[e-mail]>
+Reviewed-by: Ján Tomko <[e-mail]>
+
+Origin: upstream, https://libvirt.org/git/?p=libvirt.git;a=commit;h=3714779b15
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1922907
+Last-Update: 2021-04-07
+
+---
+ tests/cputest.c                               |    1 +
+ .../x86_64-cpuid-Xeon-Gold-6130-disabled.xml  |    7 +
+ .../x86_64-cpuid-Xeon-Gold-6130-enabled.xml   |    9 +
+ .../x86_64-cpuid-Xeon-Gold-6130-guest.xml     |   33 +
+ .../x86_64-cpuid-Xeon-Gold-6130-host.xml      |   35 +
+ .../x86_64-cpuid-Xeon-Gold-6130-json.xml      |   16 +
+ .../x86_64-cpuid-Xeon-Gold-6130.json          | 1201 +++++++++++++++++
+ .../x86_64-cpuid-Xeon-Gold-6130.sig           |    4 +
+ .../x86_64-cpuid-Xeon-Gold-6130.xml           |   54 +
+ 9 files changed, 1360 insertions(+)
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-enabled.xml
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.json
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.sig
+ create mode 100644 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.xml
+
+diff --git a/tests/cputest.c b/tests/cputest.c
+index f9f1ca74ff..869d016ffc 100644
+--- a/tests/cputest.c
++++ b/tests/cputest.c
+@@ -1265,6 +1265,7 @@ mymain(void)
+     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7-8890-v3", JSON_MODELS);
+     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-E7540", JSON_MODELS);
+     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Gold-5115", JSON_MODELS);
++    DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Gold-6130", JSON_MODELS);
+     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Gold-6148", JSON_HOST);
+     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Platinum-8268", JSON_HOST);
+     DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-Platinum-9242", JSON_MODELS);
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml
+new file mode 100644
+index 0000000000..e7c59cef1e
+--- /dev/null
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml
+@@ -0,0 +1,7 @@
++<!-- Features disabled by QEMU -->
++<cpudata arch='x86'>
++  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x0804c1dc' edx='0xb0600000'/>
++  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x02001000' ecx='0x00000010' edx='0x00000000'/>
++  <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-Xeon-Gold-6130-enabled.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-enabled.xml
+new file mode 100644
+index 0000000000..8610577479
+--- /dev/null
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-enabled.xml
+@@ -0,0 +1,9 @@
++<!-- Features enabled by QEMU -->
++<cpudata arch='x86'>
++  <cpuid eax_in='0x00000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0xf7fa3223' edx='0x0f8bfbff'/>
++  <cpuid eax_in='0x00000006' ecx_in='0x00' eax='0x00000004' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0xd19f4fbb' ecx='0x0000000c' edx='0xac000400'/>
++  <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
++  <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
++  <msr index='0x10a' edx='0x00000000' eax='0x00000008'/>
++</cpudata>
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
+new file mode 100644
+index 0000000000..cfb0eb982d
+--- /dev/null
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
+@@ -0,0 +1,33 @@
++<cpu mode='custom' match='exact'>
++  <model fallback='forbid'>Cascadelake-Server</model>
++  <vendor>Intel</vendor>
++  <feature policy='require' name='ds'/>
++  <feature policy='require' name='acpi'/>
++  <feature policy='require' name='ss'/>
++  <feature policy='require' name='ht'/>
++  <feature policy='require' name='tm'/>
++  <feature policy='require' name='pbe'/>
++  <feature policy='require' name='dtes64'/>
++  <feature policy='require' name='monitor'/>
++  <feature policy='require' name='ds_cpl'/>
++  <feature policy='require' name='vmx'/>
++  <feature policy='require' name='smx'/>
++  <feature policy='require' name='est'/>
++  <feature policy='require' name='tm2'/>
++  <feature policy='require' name='xtpr'/>
++  <feature policy='require' name='pdcm'/>
++  <feature policy='require' name='dca'/>
++  <feature policy='require' name='osxsave'/>
++  <feature policy='require' name='tsc_adjust'/>
++  <feature policy='require' name='cmt'/>
++  <feature policy='require' name='intel-pt'/>
++  <feature policy='require' name='pku'/>
++  <feature policy='require' name='ospke'/>
++  <feature policy='require' name='md-clear'/>
++  <feature policy='require' name='stibp'/>
++  <feature policy='require' name='xsaves'/>
++  <feature policy='require' name='mbm_total'/>
++  <feature policy='require' name='mbm_local'/>
++  <feature policy='require' name='invtsc'/>
++  <feature policy='disable' name='avx512vnni'/>
++</cpu>
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
+new file mode 100644
+index 0000000000..207e9e0ee4
+--- /dev/null
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
+@@ -0,0 +1,35 @@
++<cpu>
++  <arch>x86_64</arch>
++  <model>Skylake-Server-IBRS</model>
++  <vendor>Intel</vendor>
++  <feature name='ds'/>
++  <feature name='acpi'/>
++  <feature name='ss'/>
++  <feature name='ht'/>
++  <feature name='tm'/>
++  <feature name='pbe'/>
++  <feature name='dtes64'/>
++  <feature name='monitor'/>
++  <feature name='ds_cpl'/>
++  <feature name='vmx'/>
++  <feature name='smx'/>
++  <feature name='est'/>
++  <feature name='tm2'/>
++  <feature name='xtpr'/>
++  <feature name='pdcm'/>
++  <feature name='dca'/>
++  <feature name='osxsave'/>
++  <feature name='tsc_adjust'/>
++  <feature name='cmt'/>
++  <feature name='clflushopt'/>
++  <feature name='intel-pt'/>
++  <feature name='pku'/>
++  <feature name='ospke'/>
++  <feature name='md-clear'/>
++  <feature name='stibp'/>
++  <feature name='ssbd'/>
++  <feature name='xsaves'/>
++  <feature name='mbm_total'/>
++  <feature name='mbm_local'/>
++  <feature name='invtsc'/>
++</cpu>
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
+new file mode 100644
+index 0000000000..968d904557
+--- /dev/null
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
+@@ -0,0 +1,16 @@
++<cpu mode='custom' match='exact'>
++  <model fallback='forbid'>Cascadelake-Server</model>
++  <vendor>Intel</vendor>
++  <feature policy='require' name='ss'/>
++  <feature policy='require' name='vmx'/>
++  <feature policy='require' name='hypervisor'/>
++  <feature policy='require' name='tsc_adjust'/>
++  <feature policy='require' name='umip'/>
++  <feature policy='require' name='pku'/>
++  <feature policy='require' name='md-clear'/>
++  <feature policy='require' name='stibp'/>
++  <feature policy='require' name='arch-capabilities'/>
++  <feature policy='require' name='xsaves'/>
++  <feature policy='require' name='skip-l1dfl-vmentry'/>
++  <feature policy='disable' name='avx512vnni'/>
++</cpu>
+diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.json b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.json
+new file mode 100644
+index 0000000000..1a22387617
+--- /dev/null
++++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130.json
+@@ -0,0 +1,1201 @@
++{
++  "return": {
++    "model": {
++      "name": "base",
++      "props": {
++        "phys-bits": 0,
++        "core-id": -1,
++        "xlevel": 2147483656,
++        "cmov": true,
++        "ia64": false,
++        "ssb-no": false,
++        "aes": true,
++        "mmx": true,
++        "rdpid": false,
++        "arat": true,
++        "gfni": false,
++        "ibrs-all": false,
++        "pause-filter": false,
++        "xsavec": true,
++        "intel-pt": false,
++        "hv-frequencies": false,
++        "tsc-frequency": 0,
++        "xd": true,
++        "x-intel-pt-auto-level": false,
++        "hv-vendor-id": "",
++        "kvm-asyncpf": true,
++        "kvm_asyncpf": true,
++        "perfctr_core": false,
++        "perfctr-core": false,
++        "mpx": true,
++        "pbe": false,
++        "decodeassists": false,
++        "avx512cd": true,
++        "sse4_1": true,
++        "sse4.1": true,
++        "sse4-1": true,
++        "family": 6,
++        "legacy-cache": true,
++        "host-phys-bits-limit": 48,
++        "vmware-cpuid-freq": true,
++        "wbnoinvd": false,
++        "avx512f": true,
++        "hv-stimer-direct": false,
++        "msr": true,
++        "mce": true,
++        "mca": true,
++        "hv-runtime": false,
++        "xcrypt": false,
++        "thread-id": -1,
++        "min-level": 13,
++        "xgetbv1": true,
++        "cid": false,
++        "hv-relaxed": false,
++        "hv-crash": false,
++        "ds": false,
++        "fxsr": true,
++        "xsaveopt": true,
++        "xtpr": false,
++        "hv-evmcs": false,
++        "avx512vl": true,
++        "avx512-vpopcntdq": false,
++        "phe": false,
++        "extapic": false,
++        "3dnowprefetch": true,
++        "avx512vbmi2": false,
++        "cr8legacy": false,
++        "stibp": true,
++        "cpuid-0xb": true,
++        "xcrypt-en": false,
++        "kvm_pv_eoi": true,
++        "apic-id": 4294967295,
++        "rsba": false,
++        "pn": false,
++        "dca": false,
++        "vendor": "GenuineIntel",
++        "hv-ipi": false,
++        "pku": true,
++        "smx": false,
++        "cmp_legacy": false,
++        "cmp-legacy": false,
++        "node-id": -1,
++        "avx512-4fmaps": false,
++        "vmcb_clean": false,
++        "vmcb-clean": false,
++        "3dnowext": false,
++        "amd-no-ssb": false,
++        "hle": true,
++        "npt": false,
++        "rdctl-no": false,
++        "memory": "/machine/unattached/system[0]",
++        "clwb": true,
++        "lbrv": false,
++        "adx": true,
++        "ss": true,
++        "pni": true,
++        "svm_lock": false,
++        "svm-lock": false,
++        "pfthreshold": false,
++        "smep": true,
++        "smap": true,
++        "x2apic": true,
++        "avx512vbmi": false,
++        "avx512vnni": false,
++        "hv-stimer": false,
++        "x-hv-synic-kvm-only": true,
++        "i64": true,
++        "flushbyasid": false,
++        "f16c": true,
++        "ace2-en": false,
++        "pat": true,
++        "pae": true,
++        "sse": true,
++        "die-id": -1,
++        "phe-en": false,
++        "kvm_nopiodelay": true,
++        "kvm-nopiodelay": true,
++        "tm": false,
++        "kvmclock-stable-bit": true,
++        "hypervisor": true,
++        "socket-id": -1,
++        "mds-no": false,
++        "pcommit": false,
++        "syscall": true,
++        "level": 13,
++        "avx512dq": true,
++        "x-migrate-smi-count": false,
++        "svm": false,
++        "full-cpuid-auto-level": true,
++        "hv-reset": false,
++        "invtsc": false,
++        "sse3": true,
++        "sse2": true,
++        "ssbd": true,
++        "est": false,
++        "avx512ifma": false,
++        "tm2": false,
++        "kvm-pv-ipi": true,
++        "kvm-pv-eoi": true,
++        "cx8": true,
++        "cldemote": false,
++        "hv-reenlightenment": false,
++        "kvm_mmu": false,
++        "kvm-mmu": false,
++        "sse4_2": true,
++        "sse4.2": true,
++        "sse4-2": true,
++        "pge": true,
++        "fill-mtrr-mask": true,
++        "avx512bitalg": false,
++        "nodeid_msr": false,
++        "pdcm": false,
++        "movbe": true,
++        "model": 85,
++        "nrip_save": false,
++        "nrip-save": false,
++        "kvm_pv_unhalt": true,
++        "ssse3": true,
++        "sse4a": false,
++        "invpcid": true,
++        "pdpe1gb": true,
++        "tsc-deadline": true,
++        "skip-l1dfl-vmentry": true,
++        "fma": true,
++        "cx16": true,
++        "de": true,
++        "enforce": false,
++        "stepping": 4,
++        "xsave": true,
++        "clflush": true,
++        "skinit": false,
++        "tsc": true,
++        "tce": false,
++        "fpu": true,
++        "ibs": false,
++        "ds_cpl": false,
++        "ds-cpl": false,
++        "host-phys-bits": true,
++        "fma4": false,
++        "la57": false,
++        "osvw": false,
++        "check": true,
++        "hv-spinlocks": 4294967295,
++        "pmu": false,
++        "pmm": false,
++        "apic": true,
++        "spec-ctrl": true,
++        "min-xlevel2": 0,
++        "tsc-adjust": true,
++        "tsc_adjust": true,
++        "kvm-steal-time": true,
++        "kvm_steal_time": true,
++        "kvmclock": true,
++        "l3-cache": true,
++        "lwp": false,
++        "hv-passthrough": false,
++        "amd-ssbd": false,
++        "ibpb": false,
++        "xop": false,
++        "avx": true,
++        "core-capability": false,
++        "movdiri": false,
++        "ace2": false,
++        "avx512bw": true,
++        "acpi": false,
++        "hv-vapic": false,
++        "fsgsbase": true,
++        "ht": false,
++        "nx": true,
++        "pclmulqdq": true,
++        "mmxext": false,
++        "vaes": false,
++        "popcnt": true,
++        "xsaves": true,
++        "movdir64b": false,
++        "tcg-cpuid": true,
++        "lm": true,
++        "umip": true,
++        "pse": true,
++        "avx2": true,
++        "sep": true,
++        "pclmuldq": true,
++        "virt-ssbd": false,
++        "x-hv-max-vps": -1,
++        "nodeid-msr": false,
++        "md-clear": true,
++        "split-lock-detect": false,
++        "kvm": true,
++        "misalignsse": false,
++        "min-xlevel": 2147483656,
++        "kvm-pv-unhalt": true,
++        "bmi2": true,
++        "bmi1": true,
++        "realized": false,
++        "tsc_scale": false,
++        "tsc-scale": false,
++        "topoext": false,
++        "hv-vpindex": false,
++        "xlevel2": 0,
++        "clflushopt": true,
++        "kvm-no-smi-migration": false,
++        "monitor": false,
++        "avx512er": false,
++        "pmm-en": false,
++        "pcid": true,
++        "arch-capabilities": true,
++        "3dnow": false,
++        "erms": true,
++        "x-force-features": false,
++        "lahf-lm": true,
++        "lahf_lm": true,
++        "vpclmulqdq": false,
++        "fxsr-opt": false,
++        "hv-synic": false,
++        "xstore": false,
++        "fxsr_opt": false,
++        "kvm-hint-dedicated": false,
++        "rtm": true,
++        "lmce": true,
++        "hv-time": false,
++        "perfctr-nb": false,
++        "perfctr_nb": false,
++        "ffxsr": false,
++        "hv-tlbflush": false,
++        "rdrand": true,
++        "rdseed": true,
++        "avx512-4vnniw": false,
++        "vmx": true,
++        "vme": true,
++        "dtes64": false,
++        "mtrr": true,
++        "rdtscp": true,
++        "pse36": true,
++        "kvm-pv-tlb-flush": true,
++        "tbm": false,
++        "wdt": false,
++        "pause_filter": false,
++        "sha-ni": false,
++        "model-id": "Intel(R) Xeon(R) Gold 6130 CPU @ 2.10GHz",
++        "abm": true,
++        "avx512pf": false,
++        "xstore-en": false
++      }
++    }
++  },
++  "id": "model-expansion"
++}
++
++{
++  "return": [
++    {
++      "name": "max",
++      "typename": "max-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": false
++    },
++    {
++      "name": "host",
++      "typename": "host-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": false
++    },
++    {
++      "name": "base",
++      "typename": "base-x86_64-cpu",
++      "unavailable-features": [],
++      "static": true,
++      "migration-safe": true
++    },
++    {
++      "name": "qemu64-v1",
++      "typename": "qemu64-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "qemu64",
++      "typename": "qemu64-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "qemu32-v1",
++      "typename": "qemu32-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "qemu32",
++      "typename": "qemu32-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "phenom-v1",
++      "typename": "phenom-v1-x86_64-cpu",
++      "unavailable-features": [
++        "mmxext",
++        "fxsr-opt",
++        "3dnowext",
++        "3dnow",
++        "sse4a",
++        "npt"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "phenom",
++      "typename": "phenom-x86_64-cpu",
++      "unavailable-features": [
++        "mmxext",
++        "fxsr-opt",
++        "3dnowext",
++        "3dnow",
++        "sse4a",
++        "npt"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "pentium3-v1",
++      "typename": "pentium3-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "pentium3",
++      "typename": "pentium3-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "pentium2-v1",
++      "typename": "pentium2-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "pentium2",
++      "typename": "pentium2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "pentium-v1",
++      "typename": "pentium-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "pentium",
++      "typename": "pentium-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "n270-v1",
++      "typename": "n270-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "n270",
++      "typename": "n270-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "kvm64-v1",
++      "typename": "kvm64-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "kvm64",
++      "typename": "kvm64-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "kvm32-v1",
++      "typename": "kvm32-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "kvm32",
++      "typename": "kvm32-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "cpu64-rhel6-v1",
++      "typename": "cpu64-rhel6-v1-x86_64-cpu",
++      "unavailable-features": [
++        "sse4a"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "cpu64-rhel6",
++      "typename": "cpu64-rhel6-x86_64-cpu",
++      "unavailable-features": [
++        "sse4a"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "coreduo-v1",
++      "typename": "coreduo-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "coreduo",
++      "typename": "coreduo-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "core2duo-v1",
++      "typename": "core2duo-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "core2duo",
++      "typename": "core2duo-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "athlon-v1",
++      "typename": "athlon-v1-x86_64-cpu",
++      "unavailable-features": [
++        "mmxext",
++        "3dnowext",
++        "3dnow"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "athlon",
++      "typename": "athlon-x86_64-cpu",
++      "unavailable-features": [
++        "mmxext",
++        "3dnowext",
++        "3dnow"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Westmere-v2",
++      "typename": "Westmere-v2-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Westmere-v1",
++      "typename": "Westmere-v1-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Westmere-IBRS",
++      "typename": "Westmere-IBRS-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Westmere",
++      "typename": "Westmere-x86_64-cpu",
++      "unavailable-features": [],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Snowridge-v1",
++      "typename": "Snowridge-v1-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "gfni",
++        "cldemote",
++        "movdiri",
++        "movdir64b",
++        "core-capability",
++        "split-lock-detect"
++      ],
++      "static": false,
++      "migration-safe": true
++    },
++    {
++      "name": "Snowridge",
++      "typename": "Snowridge-x86_64-cpu",
++      "unavailable-features": [
++        "sha-ni",
++        "gfni",
++        "cldemote",