diff --git a/SOURCES/kvm-hw-arm-virt-Add-9.0-machine-type-and-remove-8.5-one.patch b/SOURCES/kvm-hw-arm-virt-Add-9.0-machine-type-and-remove-8.5-one.patch
new file mode 100644
index 0000000..390a91c
--- /dev/null
+++ b/SOURCES/kvm-hw-arm-virt-Add-9.0-machine-type-and-remove-8.5-one.patch
@@ -0,0 +1,48 @@
+From 6b0e129f0758ccd076d1ecbf85c8f1e863788981 Mon Sep 17 00:00:00 2001
+From: Eric Auger <eric.auger@redhat.com>
+Date: Mon, 20 Dec 2021 10:11:47 +0100
+Subject: [PATCH 5/6] hw/arm/virt: Add 9.0 machine type and remove 8.5 one
+
+RH-Author: Eric Auger <eric.auger@redhat.com>
+RH-MergeRequest: 57: hw/arm/virt: Add 9.0 machine type and remove 8.5 one
+RH-Commit: [5/6] f573a2fb44882a010e2c6bf5f561f29d54e6e9b5 (eauger1/centos-qemu-kvm)
+RH-Bugzilla: 2031044
+RH-Acked-by: Gavin Shan <gshan@redhat.com>
+RH-Acked-by: Andrew Jones <drjones@redhat.com>
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+
+branch: c9s
+Brew: 42213566
+Upstream: no
+
+Add 9.0 machine type and remove 8.5 one.
+
+Signed-off-by: Eric Auger <eric.auger@redhat.com>
+---
+ hw/arm/virt.c | 10 ++--------
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/hw/arm/virt.c b/hw/arm/virt.c
+index d433139479..d537706a86 100644
+--- a/hw/arm/virt.c
++++ b/hw/arm/virt.c
+@@ -3236,14 +3236,8 @@ static void rhel_machine_init(void)
+ }
+ type_init(rhel_machine_init);
+
+-static void rhel850_virt_options(MachineClass *mc)
++static void rhel900_virt_options(MachineClass *mc)
+ {
+- VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
+-
+ compat_props_add(mc->compat_props, arm_rhel_compat, arm_rhel_compat_len);
+- compat_props_add(mc->compat_props, hw_compat_rhel_8_5, hw_compat_rhel_8_5_len);
+- mc->smp_props.prefer_sockets = true;
+- vmc->no_cpu_topology = true;
+- vmc->no_tcg_its = true;
+ }
+-DEFINE_RHEL_MACHINE_AS_LATEST(8, 5, 0)
++DEFINE_RHEL_MACHINE_AS_LATEST(9, 0, 0)
+--
+2.27.0
+
diff --git a/SOURCES/kvm-hw-arm-virt-Check-no_tcg_its-and-minor-style-changes.patch b/SOURCES/kvm-hw-arm-virt-Check-no_tcg_its-and-minor-style-changes.patch
new file mode 100644
index 0000000..0e4acf4
--- /dev/null
+++ b/SOURCES/kvm-hw-arm-virt-Check-no_tcg_its-and-minor-style-changes.patch
@@ -0,0 +1,88 @@
+From 4098f7b5aea8871a655bab43d5114d067662e6c5 Mon Sep 17 00:00:00 2001
+From: Eric Auger <eric.auger@redhat.com>
+Date: Wed, 5 Jan 2022 16:17:10 +0100
+Subject: [PATCH 6/6] hw/arm/virt: Check no_tcg_its and minor style changes
+
+RH-Author: Eric Auger <eric.auger@redhat.com>
+RH-MergeRequest: 57: hw/arm/virt: Add 9.0 machine type and remove 8.5 one
+RH-Commit: [6/6] 4480d569463fd3f637404539d3bd06b59cafbc88 (eauger1/centos-qemu-kvm)
+RH-Bugzilla: 2031044
+RH-Acked-by: Gavin Shan <gshan@redhat.com>
+RH-Acked-by: Andrew Jones <drjones@redhat.com>
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+
+branch: c9s
+Brew: 42213566
+Upstream: no
+
+Truly allow TCG ITS instantiation according to the no_tcg_its
+class flag. Otherwise it is always set to false.
+
+We also take benefit of this patch to do some minor non
+functional style changes to be closer to the upstream code.
+
+Signed-off-by: Eric Auger <eric.auger@redhat.com>
+---
+ hw/arm/virt.c | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/hw/arm/virt.c b/hw/arm/virt.c
+index d537706a86..0e691cbe81 100644
+--- a/hw/arm/virt.c
++++ b/hw/arm/virt.c
+@@ -3163,6 +3163,7 @@ static void rhel_machine_class_init(ObjectClass *oc, void *data)
+ "in ACPI table header."
+ "The string may be up to 6 bytes in size");
+
++
+ object_class_property_add_str(oc, "x-oem-table-id",
+ virt_get_oem_table_id,
+ virt_set_oem_table_id);
+@@ -3170,6 +3171,7 @@ static void rhel_machine_class_init(ObjectClass *oc, void *data)
+ "Override the default value of field OEM Table ID "
+ "in ACPI table header."
+ "The string may be up to 8 bytes in size");
++
+ }
+
+ static void rhel_virt_instance_init(Object *obj)
+@@ -3194,26 +3196,32 @@ static void rhel_virt_instance_init(Object *obj)
+ } else {
+ /* Default allows ITS instantiation */
+ vms->its = true;
++
++ if (vmc->no_tcg_its) {
++ vms->tcg_its = false;
++ } else {
++ vms->tcg_its = true;
++ }
+ }
+
+ /* Default disallows iommu instantiation */
+ vms->iommu = VIRT_IOMMU_NONE;
+
++ /* The default root bus is attached to iommu by default */
++ vms->default_bus_bypass_iommu = false;
++
+ /* Default disallows RAS instantiation and is non-configurable for RHEL */
+ vms->ras = false;
+
+ /* MTE is disabled by default and non-configurable for RHEL */
+ vms->mte = false;
+
+- /* The default root bus is attached to iommu by default */
+- vms->default_bus_bypass_iommu = false;
+-
+ vms->irqmap = a15irqmap;
+
+ virt_flash_create(vms);
++
+ vms->oem_id = g_strndup(ACPI_BUILD_APPNAME6, 6);
+ vms->oem_table_id = g_strndup(ACPI_BUILD_APPNAME8, 8);
+-
+ }
+
+ static const TypeInfo rhel_machine_info = {
+--
+2.27.0
+
diff --git a/SOURCES/kvm-hw-arm-virt-Expose-the-RAS-option.patch b/SOURCES/kvm-hw-arm-virt-Expose-the-RAS-option.patch
new file mode 100644
index 0000000..e0365c9
--- /dev/null
+++ b/SOURCES/kvm-hw-arm-virt-Expose-the-RAS-option.patch
@@ -0,0 +1,60 @@
+From 914d9f9eea5d0a944aa93682b03d3189ad37ec9b Mon Sep 17 00:00:00 2001
+From: Eric Auger <eric.auger@redhat.com>
+Date: Mon, 20 Dec 2021 15:34:22 +0100
+Subject: [PATCH 4/6] hw/arm/virt: Expose the 'RAS' option
+
+RH-Author: Eric Auger <eric.auger@redhat.com>
+RH-MergeRequest: 57: hw/arm/virt: Add 9.0 machine type and remove 8.5 one
+RH-Commit: [4/6] c8704564d31b23a0f08a6ced946c9a81e2e72c11 (eauger1/centos-qemu-kvm)
+RH-Bugzilla: 2031044
+RH-Acked-by: Gavin Shan <gshan@redhat.com>
+RH-Acked-by: Andrew Jones <drjones@redhat.com>
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+
+branch: c9s
+Brew: 42213566
+Upstream: no
+
+In RHEL9.0 we want to expose the 'RAS' option.
+
+Signed-off-by: Eric Auger <eric.auger@redhat.com>
+---
+ hw/arm/virt.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/hw/arm/virt.c b/hw/arm/virt.c
+index c99ca93e75..d433139479 100644
+--- a/hw/arm/virt.c
++++ b/hw/arm/virt.c
+@@ -2348,7 +2348,6 @@ static void virt_set_acpi(Object *obj, Visitor *v, const char *name,
+ visit_type_OnOffAuto(v, name, &vms->acpi, errp);
+ }
+
+-#if 0 /* Disabled for Red Hat Enterprise Linux */
+ static bool virt_get_ras(Object *obj, Error **errp)
+ {
+ VirtMachineState *vms = VIRT_MACHINE(obj);
+@@ -2363,6 +2362,7 @@ static void virt_set_ras(Object *obj, bool value, Error **errp)
+ vms->ras = value;
+ }
+
++#if 0 /* Disabled for Red Hat Enterprise Linux */
+ static bool virt_get_mte(Object *obj, Error **errp)
+ {
+ VirtMachineState *vms = VIRT_MACHINE(obj);
+@@ -3143,6 +3143,12 @@ static void rhel_machine_class_init(ObjectClass *oc, void *data)
+ "Set on/off to enable/disable "
+ "bypass_iommu for default root bus");
+
++ object_class_property_add_bool(oc, "ras", virt_get_ras,
++ virt_set_ras);
++ object_class_property_set_description(oc, "ras",
++ "Set on/off to enable/disable reporting host memory errors "
++ "to a KVM guest using ACPI and guest external abort exceptions");
++
+ object_class_property_add_bool(oc, "its", virt_get_its,
+ virt_set_its);
+ object_class_property_set_description(oc, "its",
+--
+2.27.0
+
diff --git a/SOURCES/kvm-hw-arm-virt-Register-iommu-as-a-class-property.patch b/SOURCES/kvm-hw-arm-virt-Register-iommu-as-a-class-property.patch
new file mode 100644
index 0000000..6c21c9a
--- /dev/null
+++ b/SOURCES/kvm-hw-arm-virt-Register-iommu-as-a-class-property.patch
@@ -0,0 +1,81 @@
+From 545076d67ef27203e08538123d8bc3798caf9505 Mon Sep 17 00:00:00 2001
+From: Eric Auger <eric.auger@redhat.com>
+Date: Mon, 20 Dec 2021 15:50:44 +0100
+Subject: [PATCH 1/6] hw/arm/virt: Register "iommu" as a class property
+
+RH-Author: Eric Auger <eric.auger@redhat.com>
+RH-MergeRequest: 57: hw/arm/virt: Add 9.0 machine type and remove 8.5 one
+RH-Commit: [1/6] 2b6a22ebddd2da7505961ff4ffe90424f7489300 (eauger1/centos-qemu-kvm)
+RH-Bugzilla: 2031044
+RH-Acked-by: Gavin Shan <gshan@redhat.com>
+RH-Acked-by: Andrew Jones <drjones@redhat.com>
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+
+branch: c9s
+Brew: 42213566
+Upstream: no
+
+Register the "iommu" option as a class property. This mirrors what
+was done in upstream commit b91def7b ("arm/virt: Register
+most properties as class properties").
+
+While we are at it we also move the "x-oem-id" and "x-oem-table-id"
+registrations at the very end of the rhel_machine_class_init()
+function. This makes our life easier when comparing with upstream.
+
+Signed-off-by: Eric Auger <eric.auger@redhat.com>
+---
+ hw/arm/virt.c | 23 ++++++++++++-----------
+ 1 file changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/hw/arm/virt.c b/hw/arm/virt.c
+index 6ba9a2c2e1..7e227b1fa4 100644
+--- a/hw/arm/virt.c
++++ b/hw/arm/virt.c
+@@ -3131,6 +3131,18 @@ static void rhel_machine_class_init(ObjectClass *oc, void *data)
+ "Set GIC version. "
+ "Valid values are 2, 3, host and max");
+
++ object_class_property_add_str(oc, "iommu", virt_get_iommu, virt_set_iommu);
++ object_class_property_set_description(oc, "iommu",
++ "Set the IOMMU type. "
++ "Valid values are none and smmuv3");
++
++ object_class_property_add_bool(oc, "default_bus_bypass_iommu",
++ virt_get_default_bus_bypass_iommu,
++ virt_set_default_bus_bypass_iommu);
++ object_class_property_set_description(oc, "default_bus_bypass_iommu",
++ "Set on/off to enable/disable "
++ "bypass_iommu for default root bus");
++
+ object_class_property_add_str(oc, "x-oem-id",
+ virt_get_oem_id,
+ virt_set_oem_id);
+@@ -3146,13 +3158,6 @@ static void rhel_machine_class_init(ObjectClass *oc, void *data)
+ "Override the default value of field OEM Table ID "
+ "in ACPI table header."
+ "The string may be up to 8 bytes in size");
+- object_class_property_add_bool(oc, "default_bus_bypass_iommu",
+- virt_get_default_bus_bypass_iommu,
+- virt_set_default_bus_bypass_iommu);
+- object_class_property_set_description(oc, "default_bus_bypass_iommu",
+- "Set on/off to enable/disable "
+- "bypass_iommu for default root bus");
+-
+ }
+
+ static void rhel_virt_instance_init(Object *obj)
+@@ -3186,10 +3191,6 @@ static void rhel_virt_instance_init(Object *obj)
+
+ /* Default disallows iommu instantiation */
+ vms->iommu = VIRT_IOMMU_NONE;
+- object_property_add_str(obj, "iommu", virt_get_iommu, virt_set_iommu);
+- object_property_set_description(obj, "iommu",
+- "Set the IOMMU type. "
+- "Valid values are none and smmuv3");
+
+ /* Default disallows RAS instantiation and is non-configurable for RHEL */
+ vms->ras = false;
+--
+2.27.0
+
diff --git a/SOURCES/kvm-hw-arm-virt-Register-its-as-a-class-property.patch b/SOURCES/kvm-hw-arm-virt-Register-its-as-a-class-property.patch
new file mode 100644
index 0000000..95f58a4
--- /dev/null
+++ b/SOURCES/kvm-hw-arm-virt-Register-its-as-a-class-property.patch
@@ -0,0 +1,57 @@
+From 789933e2598f9a525c2a638feca974ca1730a859 Mon Sep 17 00:00:00 2001
+From: Eric Auger <eric.auger@redhat.com>
+Date: Mon, 20 Dec 2021 16:04:59 +0100
+Subject: [PATCH 2/6] hw/arm/virt: Register "its" as a class property
+
+RH-Author: Eric Auger <eric.auger@redhat.com>
+RH-MergeRequest: 57: hw/arm/virt: Add 9.0 machine type and remove 8.5 one
+RH-Commit: [2/6] dbd3e994553f00cd19842824f6bd763863a4e484 (eauger1/centos-qemu-kvm)
+RH-Bugzilla: 2031044
+RH-Acked-by: Gavin Shan <gshan@redhat.com>
+RH-Acked-by: Andrew Jones <drjones@redhat.com>
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+
+branch: c9s
+Brew: 42213566
+Upstream: no
+
+Register "its" as a class property. This mirrors what was done
+in commit 27edeeaafe43 ("virt: Register "its" as class property").
+
+Signed-off-by: Eric Auger <eric.auger@redhat.com>
+---
+ hw/arm/virt.c | 11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/hw/arm/virt.c b/hw/arm/virt.c
+index 7e227b1fa4..984151b7dd 100644
+--- a/hw/arm/virt.c
++++ b/hw/arm/virt.c
+@@ -3143,6 +3143,12 @@ static void rhel_machine_class_init(ObjectClass *oc, void *data)
+ "Set on/off to enable/disable "
+ "bypass_iommu for default root bus");
+
++ object_class_property_add_bool(oc, "its", virt_get_its,
++ virt_set_its);
++ object_class_property_set_description(oc, "its",
++ "Set on/off to enable/disable "
++ "ITS instantiation");
++
+ object_class_property_add_str(oc, "x-oem-id",
+ virt_get_oem_id,
+ virt_set_oem_id);
+@@ -3182,11 +3188,6 @@ static void rhel_virt_instance_init(Object *obj)
+ } else {
+ /* Default allows ITS instantiation */
+ vms->its = true;
+- object_property_add_bool(obj, "its", virt_get_its,
+- virt_set_its);
+- object_property_set_description(obj, "its",
+- "Set on/off to enable/disable "
+- "ITS instantiation");
+ }
+
+ /* Default disallows iommu instantiation */
+--
+2.27.0
+
diff --git a/SOURCES/kvm-hw-arm-virt-Rename-default_bus_bypass_iommu.patch b/SOURCES/kvm-hw-arm-virt-Rename-default_bus_bypass_iommu.patch
new file mode 100644
index 0000000..eab69d2
--- /dev/null
+++ b/SOURCES/kvm-hw-arm-virt-Rename-default_bus_bypass_iommu.patch
@@ -0,0 +1,46 @@
+From 94987c271c3bdc37216c5baa4c5766b9b7f053a1 Mon Sep 17 00:00:00 2001
+From: Eric Auger <eric.auger@redhat.com>
+Date: Mon, 20 Dec 2021 15:58:38 +0100
+Subject: [PATCH 3/6] hw/arm/virt: Rename default_bus_bypass_iommu
+
+RH-Author: Eric Auger <eric.auger@redhat.com>
+RH-MergeRequest: 57: hw/arm/virt: Add 9.0 machine type and remove 8.5 one
+RH-Commit: [3/6] 6b66844ae4629d8c879f7c6abbc5e5017a162e16 (eauger1/centos-qemu-kvm)
+RH-Bugzilla: 2031044
+RH-Acked-by: Gavin Shan <gshan@redhat.com>
+RH-Acked-by: Andrew Jones <drjones@redhat.com>
+RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
+
+branch: c9s
+Brew: 42213566
+Upstream: no
+
+Rename "default_bus_bypass_iommu" into "default-bus-bypass-iommu".
+This mirrors what was done in upstream commit:
+9dad363a223 ("hw/arm/virt: Rename default_bus_bypass_iommu")
+
+Signed-off-by: Eric Auger <eric.auger@redhat.com>
+---
+ hw/arm/virt.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hw/arm/virt.c b/hw/arm/virt.c
+index 984151b7dd..c99ca93e75 100644
+--- a/hw/arm/virt.c
++++ b/hw/arm/virt.c
+@@ -3136,10 +3136,10 @@ static void rhel_machine_class_init(ObjectClass *oc, void *data)
+ "Set the IOMMU type. "
+ "Valid values are none and smmuv3");
+
+- object_class_property_add_bool(oc, "default_bus_bypass_iommu",
++ object_class_property_add_bool(oc, "default-bus-bypass-iommu",
+ virt_get_default_bus_bypass_iommu,
+ virt_set_default_bus_bypass_iommu);
+- object_class_property_set_description(oc, "default_bus_bypass_iommu",
++ object_class_property_set_description(oc, "default-bus-bypass-iommu",
+ "Set on/off to enable/disable "
+ "bypass_iommu for default root bus");
+
+--
+2.27.0
+
diff --git a/SOURCES/kvm-redhat-Add-rhel8.6.0-and-rhel9.0.0-machine-types-for.patch b/SOURCES/kvm-redhat-Add-rhel8.6.0-and-rhel9.0.0-machine-types-for.patch
new file mode 100644
index 0000000..407aa1e
--- /dev/null
+++ b/SOURCES/kvm-redhat-Add-rhel8.6.0-and-rhel9.0.0-machine-types-for.patch
@@ -0,0 +1,82 @@
+From 0e85c10b73c36f386723c842a797d5e2155e758f Mon Sep 17 00:00:00 2001
+From: Thomas Huth <thuth@redhat.com>
+Date: Fri, 10 Dec 2021 10:07:40 +0100
+Subject: [PATCH 1/2] redhat: Add rhel8.6.0 and rhel9.0.0 machine types for
+ s390x
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+RH-Author: Thomas Huth <thuth@redhat.com>
+RH-MergeRequest: 55: redhat: Add rhel8.6.0 and rhel9.0.0 machine types for s390x
+RH-Commit: [1/1] ad8fd5c825ae52a8fbb3a28f700a514509c59978 (thuth/qemu-kvm-cs9)
+RH-Bugzilla: 2008060
+RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
+RH-Acked-by: David Hildenbrand <david@redhat.com>
+RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
+
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2008060
+
+The new machine types have better default values for the upcoming
+"generation 16" mainframe.
+
+Signed-off-by: Thomas Huth <thuth@redhat.com>
+---
+ hw/s390x/s390-virtio-ccw.c | 26 +++++++++++++++++++++++++-
+ 1 file changed, 25 insertions(+), 1 deletion(-)
+
+diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
+index c654045964..9da6e9b1d4 100644
+--- a/hw/s390x/s390-virtio-ccw.c
++++ b/hw/s390x/s390-virtio-ccw.c
+@@ -1103,10 +1103,33 @@ static void ccw_machine_2_4_class_options(MachineClass *mc)
+ DEFINE_CCW_MACHINE(2_4, "2.4", false);
+ #endif
+
++static void ccw_machine_rhel900_instance_options(MachineState *machine)
++{
++}
++
++static void ccw_machine_rhel900_class_options(MachineClass *mc)
++{
++}
++DEFINE_CCW_MACHINE(rhel900, "rhel9.0.0", true);
++
++static void ccw_machine_rhel860_instance_options(MachineState *machine)
++{
++ /* Note: The -rhel8.6.0 and -rhel9.0.0 machines are technically identical */
++ ccw_machine_rhel900_instance_options(machine);
++}
++
++static void ccw_machine_rhel860_class_options(MachineClass *mc)
++{
++ ccw_machine_rhel900_class_options(mc);
++}
++DEFINE_CCW_MACHINE(rhel860, "rhel8.6.0", false);
++
+ static void ccw_machine_rhel850_instance_options(MachineState *machine)
+ {
+ static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V6_0 };
+
++ ccw_machine_rhel860_instance_options(machine);
++
+ s390_set_qemu_cpu_model(0x2964, 13, 2, qemu_cpu_feat);
+
+ s390_cpudef_featoff_greater(16, 1, S390_FEAT_NNPA);
+@@ -1118,10 +1141,11 @@ static void ccw_machine_rhel850_instance_options(MachineState *machine)
+
+ static void ccw_machine_rhel850_class_options(MachineClass *mc)
+ {
++ ccw_machine_rhel860_class_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_rhel_8_5, hw_compat_rhel_8_5_len);
+ mc->smp_props.prefer_sockets = true;
+ }
+-DEFINE_CCW_MACHINE(rhel850, "rhel8.5.0", true);
++DEFINE_CCW_MACHINE(rhel850, "rhel8.5.0", false);
+
+ static void ccw_machine_rhel840_instance_options(MachineState *machine)
+ {
+--
+2.27.0
+
diff --git a/SOURCES/kvm-redhat-Enable-virtio-mem-as-tech-preview-on-x86-64.patch b/SOURCES/kvm-redhat-Enable-virtio-mem-as-tech-preview-on-x86-64.patch
new file mode 100644
index 0000000..d3b2ba0
--- /dev/null
+++ b/SOURCES/kvm-redhat-Enable-virtio-mem-as-tech-preview-on-x86-64.patch
@@ -0,0 +1,43 @@
+From 24b44713de4b2a47c42dfeea813c8911694367a0 Mon Sep 17 00:00:00 2001
+From: David Hildenbrand <david@redhat.com>
+Date: Fri, 17 Dec 2021 10:00:53 +0100
+Subject: [PATCH 2/2] redhat: Enable virtio-mem as tech-preview on x86-64
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+RH-Author: David Hildenbrand <david@redhat.com>
+RH-MergeRequest: 56: redhat: Enable virtio-mem as tech-preview on x86-64
+RH-Commit: [1/1] 255749cd877b91ce1978b67a088f7c0e181fd85e
+RH-Bugzilla: 2014484
+RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+RH-Acked-by: Thomas Huth <thuth@redhat.com>
+RH-Acked-by: Gavin Shan <gshan@redhat.com>
+
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2014484
+Upstream-status: RHEL-only
+
+Everything necesssary for tech-preview of virtio-mem in RHEL9 is
+included in QEMU v6.2. Let's enable it via the config option
+CONFIG_VIRTIO_MEM on x86-64.
+
+Signed-off-by: David Hildenbrand <david@redhat.com>
+---
+ configs/devices/x86_64-softmmu/x86_64-rh-devices.mak | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak b/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak
+index 1f7a9ab024..dc03fbb671 100644
+--- a/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak
++++ b/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak
+@@ -88,6 +88,7 @@ CONFIG_VGA_CIRRUS=y
+ CONFIG_VGA_PCI=y
+ CONFIG_VHOST_USER=y
+ CONFIG_VHOST_USER_BLK=y
++CONFIG_VIRTIO_MEM=y
+ CONFIG_VIRTIO_PCI=y
+ CONFIG_VIRTIO_VGA=y
+ CONFIG_VMMOUSE=y
+--
+2.27.0
+
diff --git a/SPECS/qemu-kvm.spec b/SPECS/qemu-kvm.spec
index 786b6db..d35d448 100644
--- a/SPECS/qemu-kvm.spec
+++ b/SPECS/qemu-kvm.spec
@@ -130,7 +130,7 @@ Obsoletes: %{name}-block-iscsi <= %{version} \
Summary: QEMU is a machine emulator and virtualizer
Name: qemu-kvm
Version: 6.2.0
-Release: 1%{?rcrel}%{?dist}%{?cc_suffix}
+Release: 3%{?rcrel}%{?dist}%{?cc_suffix}
# Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
# Epoch 15 used for RHEL 8
# Epoch 17 used for RHEL 9 (due to release versioning offset in RHEL 8.5)
@@ -177,6 +177,22 @@ Patch0022: 0022-x86-rhel-machine-types-Wire-compat-into-q35-and-i440.patch
Patch0023: 0023-redhat-virt-rhel8.5.0-Update-machine-type-compatibil.patch
Patch0024: 0024-redhat-Add-s390x-machine-type-compatibility-handling.patch
Patch0025: 0025-compat-Update-hw_compat_rhel_8_5-with-6.2.0-RC2-chan.patch
+# For bz#2008060 - Fix CPU Model for new IBM Z Hardware - qemu part
+Patch26: kvm-redhat-Add-rhel8.6.0-and-rhel9.0.0-machine-types-for.patch
+# For bz#2014484 - [RHEL9] Enable virtio-mem as tech-preview on x86-64 - QEMU
+Patch27: kvm-redhat-Enable-virtio-mem-as-tech-preview-on-x86-64.patch
+# For bz#2031044 - Add rhel-9.0.0 machine types for RHEL 9.0 [aarch64]
+Patch28: kvm-hw-arm-virt-Register-iommu-as-a-class-property.patch
+# For bz#2031044 - Add rhel-9.0.0 machine types for RHEL 9.0 [aarch64]
+Patch29: kvm-hw-arm-virt-Register-its-as-a-class-property.patch
+# For bz#2031044 - Add rhel-9.0.0 machine types for RHEL 9.0 [aarch64]
+Patch30: kvm-hw-arm-virt-Rename-default_bus_bypass_iommu.patch
+# For bz#2031044 - Add rhel-9.0.0 machine types for RHEL 9.0 [aarch64]
+Patch31: kvm-hw-arm-virt-Expose-the-RAS-option.patch
+# For bz#2031044 - Add rhel-9.0.0 machine types for RHEL 9.0 [aarch64]
+Patch32: kvm-hw-arm-virt-Add-9.0-machine-type-and-remove-8.5-one.patch
+# For bz#2031044 - Add rhel-9.0.0 machine types for RHEL 9.0 [aarch64]
+Patch33: kvm-hw-arm-virt-Check-no_tcg_its-and-minor-style-changes.patch
%if %{have_clang}
BuildRequires: clang
@@ -1155,6 +1171,24 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
%endif
%changelog
+* Mon Jan 10 2022 Miroslav Rezanina <mrezanin@redhat.com> - 6.2.0-3
+- kvm-hw-arm-virt-Register-iommu-as-a-class-property.patch [bz#2031044]
+- kvm-hw-arm-virt-Register-its-as-a-class-property.patch [bz#2031044]
+- kvm-hw-arm-virt-Rename-default_bus_bypass_iommu.patch [bz#2031044]
+- kvm-hw-arm-virt-Expose-the-RAS-option.patch [bz#2031044]
+- kvm-hw-arm-virt-Add-9.0-machine-type-and-remove-8.5-one.patch [bz#2031044]
+- kvm-hw-arm-virt-Check-no_tcg_its-and-minor-style-changes.patch [bz#2031044]
+- Resolves: bz#2031044
+ (Add rhel-9.0.0 machine types for RHEL 9.0 [aarch64])
+
+* Fri Jan 07 2022 Miroslav Rezanina <mrezanin@redhat.com> - 6.2.0-2
+- kvm-redhat-Add-rhel8.6.0-and-rhel9.0.0-machine-types-for.patch [bz#2008060]
+- kvm-redhat-Enable-virtio-mem-as-tech-preview-on-x86-64.patch [bz#2014484]
+- Resolves: bz#2008060
+ (Fix CPU Model for new IBM Z Hardware - qemu part)
+- Resolves: bz#2014484
+ ([RHEL9] Enable virtio-mem as tech-preview on x86-64 - QEMU)
+
* Thu Dec 16 2021 Miroslav Rezanina <mrezanin@redhat.com> - 6.2.0-1
- Rebase to QEMU 6.2.0 [bz#2027697]
- Resolves: bz#2027697