Update AV-8.2.1 with the latest weekly rebase from qemu-5.0.0

2020-07-08 09:37:45 -04:00 · 2020-07-08 09:37:45 -04:00 · 3a50cdf32a
commit 3a50cdf32a
parent 68a8aa6b4d
28 changed files with 910 additions and 304 deletions
--- a/0001-redhat-Adding-slirp-to-the-exploded-tree.patch
+++ b/0001-redhat-Adding-slirp-to-the-exploded-tree.patch
@ -1,4 +1,4 @@
-From 606314e48b9307fd4c79b08017a143d9f749d395 Mon Sep 17 00:00:00 2001
+From 6527eafb590d72354bb02662f95d7603cd3a3fd3 Mon Sep 17 00:00:00 2001
 From: Miroslav Rezanina <mrezanin@redhat.com>
 Date: Thu, 23 Apr 2020 05:26:54 +0200
 Subject: redhat: Adding slirp to the exploded tree
--- a/0005-Initial-redhat-build.patch
+++ b/0005-Initial-redhat-build.patch
@ -1,4 +1,4 @@
-From b510775819649eeb2499b9d4b9baf93538d4bde7 Mon Sep 17 00:00:00 2001
+From b9d95992b85d3667c13df3a321933c44c7157d0b Mon Sep 17 00:00:00 2001
 From: Miroslav Rezanina <mrezanin@redhat.com>
 Date: Fri, 12 Oct 2018 07:31:11 +0200
 Subject: Initial redhat build
@ -11,7 +11,7 @@ several issues are fixed in QEMU tree:
 - Man page renamed from qemu to qemu-kvm
  - man page is installed using make install so we have to fix it in qemu tree
-This rebase includes changes up to qemu-kvm-4.2.0-19.el8
+This rebase includes changes up to qemu-kvm-4.2.0-28.el8
 Rebase notes (3.1.0):
 - added new configure options
@ -85,6 +85,15 @@ Rebase notes (5.0.0 rc2):
 Rebase notes (5.0.0 rc3):
 - Reorder configure options
 Rebase notes (weekly-200617):
 - Fixing qemu-kvm-tests rpm content
  - Fixed python shenigans
  - Include all qemu-iotests files
 - qemu-pr-helper moved to /usr/libexec/ (upstream)
 Rebase notes (weekly-200701):
 - Moved qemu-ga-ref.* and qemu-qmp-ref.* docs files to interop diretory (upstream)
 Merged patches (3.1.0):
 - 01f0c9f RHEL8: Add disable configure options to qemu spec file
 - Spec file cleanups
@ -111,31 +120,36 @@ Merged patches (weekly-200205):
 - 5edf6bd Add support for rh-brew-module
 - f77d52d redhat: ship virtiofsd vhost-user device backend
-Conflicts:
+Merged patches (weekly-200610):
-	gdbstub.c
+- 63f12d4 redhat: Always use module build target for rh-brew (modified)
 - 9b1e140 redhat: updating the modular target
 Merged patches (weekly-200617):
 - 44b8bd0 spec: Fix python shenigans for tests
 ---
 .gitignore                          |    1 +
 Makefile                            |    3 +-
 configure                           |    1 +
- redhat/Makefile                     |   88 ++
+ redhat/Makefile                     |   86 +
- redhat/Makefile.common              |   51 +
+ redhat/Makefile.common              |   53 +
 redhat/README.tests                 |   39 +
- redhat/qemu-kvm.spec.template       | 2812 +++++++++++++++++++++++++++++++++++
+ redhat/qemu-kvm.spec.template       | 2956 +++++++++++++++++++++++++++++++++++
 redhat/qemu-pr-helper.service       |    2 +-
 redhat/scripts/extract_build_cmd.py |    2 +-
 redhat/scripts/process-patches.sh   |    7 +-
 tests/check-block.sh                |    2 +
 ui/vnc.c                            |    2 +-
- 11 files changed, 3000 insertions(+), 8 deletions(-)
+ 12 files changed, 3145 insertions(+), 9 deletions(-)
 create mode 100644 redhat/Makefile
 create mode 100644 redhat/Makefile.common
 create mode 100644 redhat/README.tests
 create mode 100644 redhat/qemu-kvm.spec.template
 diff --git a/Makefile b/Makefile
-index 8a9113e..a89cc44 100644
+index b1b8a5a..88b7565 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -548,6 +548,7 @@ CAP_CFLAGS += -DCAPSTONE_HAS_ARM
+@@ -549,6 +549,7 @@ CAP_CFLAGS += -DCAPSTONE_HAS_ARM
 CAP_CFLAGS += -DCAPSTONE_HAS_ARM64
 CAP_CFLAGS += -DCAPSTONE_HAS_POWERPC
 CAP_CFLAGS += -DCAPSTONE_HAS_X86
@ -143,8 +157,8 @@ index 8a9113e..a89cc44 100644
 .PHONY: capstone/all
 capstone/all: .git-submodule-status
-@@ -884,7 +885,7 @@ install-doc: $(DOCS) install-sphinxdocs
+@@ -878,7 +879,7 @@ install-doc: $(DOCS) install-sphinxdocs
- 	$(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)"
+ 	$(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)/interop"
 ifdef CONFIG_POSIX
 	$(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1"
 -	$(INSTALL_DATA) $(MANUAL_BUILDDIR)/system/qemu.1 "$(DESTDIR)$(mandir)/man1"
@ -153,10 +167,10 @@ index 8a9113e..a89cc44 100644
 	$(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7"
 	$(INSTALL_DATA) $(MANUAL_BUILDDIR)/system/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7"
 diff --git a/configure b/configure
-index 23b5e93..1b40d7e 100755
+index 4a22dcd..53979dc 100755
 --- a/configure
 +++ b/configure
-@@ -2538,6 +2538,7 @@ if test "$seccomp" != "no" ; then
+@@ -2596,6 +2596,7 @@ if test "$seccomp" != "no" ; then
         seccomp="no"
     fi
 fi
@ -165,10 +179,10 @@ index 23b5e93..1b40d7e 100755
 # xen probe
 diff --git a/tests/check-block.sh b/tests/check-block.sh
-index ad320c2..1f26083 100755
+index 8e29c86..e9bcb5a 100755
 --- a/tests/check-block.sh
 +++ b/tests/check-block.sh
-@@ -43,6 +43,8 @@ if ! (sed --version | grep 'GNU sed') > /dev/null 2>&1 ; then
+@@ -53,6 +53,8 @@ if ! (sed --version | grep 'GNU sed') > /dev/null 2>&1 ; then
     fi
 fi
@ -178,7 +192,7 @@ index ad320c2..1f26083 100755
 ret=0
 diff --git a/ui/vnc.c b/ui/vnc.c
-index 1d7138a..1fc55b7 100644
+index 12a1271..89fb616 100644
 --- a/ui/vnc.c
 +++ b/ui/vnc.c
@@ -3972,7 +3972,7 @@ void vnc_display_open(const char *id, Error **errp)
--- a/0006-Enable-disable-devices-for-RHEL.patch
+++ b/0006-Enable-disable-devices-for-RHEL.patch
@ -1,4 +1,4 @@
-From 950e13b225f6e890a2c19223b8a05cdc9ecabfa7 Mon Sep 17 00:00:00 2001
+From b1e6c8e2a9b58d215042adbd0fffdf102ac9a9d7 Mon Sep 17 00:00:00 2001
 From: Miroslav Rezanina <mrezanin@redhat.com>
 Date: Mon, 11 Jan 2016 11:53:33 +0100
 Subject: Enable/disable devices for RHEL
@ -45,6 +45,12 @@ Rebase notes (weekly-200205):
 Rebase notes (weekly-200226):
 - Added CONFIG_NVDIMM
 Rebase notes (weekly-200513)
 - updated cortex-15 disabling to upstream code
 Rebase notes (weekly-200520):
 - Add CONFIG_ACPI_APEI for aarch64
 Merged patches (qemu 3.1.0):
 - d51e082 Re-enable CONFIG_HYPERV_TESTDEV
 - 4b889f3 Declare cirrus-vga as deprecated
@ -65,9 +71,15 @@ Merged patches (4.2.0):
 Merged patches (weekly-200108):
 - 4543a3c i386: Remove cpu64-rhel6 CPU model
 Merged patches (weekly-200520):
 - 96533 aarch64: Remove tcg cpu types (pjw commit)
 Merged patches (weekly-200610):
 - 559d589 Revert "RHEL: disable hostmem-memfd"
 - 441128e enable ramfb
 ---
- backends/Makefile.objs                 |   3 +-
+ default-configs/aarch64-rh-devices.mak |  22 ++++++++
 default-configs/aarch64-rh-devices.mak |  20 +++++++
 default-configs/aarch64-softmmu.mak    |  10 ++--
 default-configs/ppc64-rh-devices.mak   |  34 +++++++++++
 default-configs/ppc64-softmmu.mak      |  10 ++--
@ -81,24 +93,22 @@ Merged patches (weekly-200108):
 hw/block/fdc.c                         |  10 ++++
 hw/bt/Makefile.objs                    |   3 +
 hw/cpu/Makefile.objs                   |   5 +-
 hw/display/Makefile.objs               |   5 +-
 hw/display/cirrus_vga.c                |   3 +
 hw/ide/piix.c                          |   5 +-
 hw/input/pckbd.c                       |   2 +
 hw/net/e1000.c                         |   2 +
 hw/ppc/spapr_cpu_core.c                |   2 +
 hw/usb/Makefile.objs                   |   4 +-
 hw/vfio/pci.c                          |   5 ++
 qemu-options.hx                        |   4 --
 redhat/qemu-kvm.spec.template          |   5 +-
 softmmu/vl.c                           |   2 +-
 target/arm/cpu.c                       |   4 +-
 target/arm/cpu_tcg.c                   |   3 +
 target/i386/cpu.c                      |  17 +++---
 target/ppc/cpu-models.c                |  10 ++++
 target/s390x/cpu_models.c              |   3 +
 target/s390x/kvm.c                     |   8 +++
- util/memfd.c                           |   2 +-
+ 29 files changed, 274 insertions(+), 33 deletions(-)
 32 files changed, 280 insertions(+), 37 deletions(-)
 create mode 100644 default-configs/aarch64-rh-devices.mak
 create mode 100644 default-configs/ppc64-rh-devices.mak
 create mode 100644 default-configs/rh-virtio.mak
@ -106,26 +116,12 @@ Merged patches (weekly-200108):
 create mode 100644 default-configs/x86_64-rh-devices.mak
 create mode 100644 hw/bt/Makefile.objs
 diff --git a/backends/Makefile.objs b/backends/Makefile.objs
 index 28a847c..0eda216 100644
 --- a/backends/Makefile.objs
 +++ b/backends/Makefile.objs
@@ -16,7 +16,8 @@ endif
 common-obj-$(call land,$(CONFIG_VHOST_USER),$(CONFIG_VIRTIO)) += vhost-user.o
 -common-obj-$(CONFIG_LINUX) += hostmem-memfd.o
 +# RHEL: disable memfd
 +# common-obj-$(CONFIG_LINUX) += hostmem-memfd.o
 common-obj-$(CONFIG_GIO) += dbus-vmstate.o
 dbus-vmstate.o-cflags = $(GIO_CFLAGS)
 diff --git a/default-configs/aarch64-rh-devices.mak b/default-configs/aarch64-rh-devices.mak
 new file mode 100644
-index 0000000..a1ed641
+index 0000000..f0cf5a1
 --- /dev/null
 +++ b/default-configs/aarch64-rh-devices.mak
-@@ -0,0 +1,20 @@
+@@ -0,0 +1,22 @@
 +include rh-virtio.mak
 +
 +CONFIG_ARM_GIC_KVM=y
@ -146,6 +142,8 @@ index 0000000..a1ed641
 +CONFIG_VIRTIO_MMIO=y
 +CONFIG_VIRTIO_PCI=y
 +CONFIG_XIO3130=y
 +CONFIG_NVDIMM=y
 +CONFIG_ACPI_APEI=y
 diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-softmmu.mak
 index 958b1e0..8f6867d 100644
 --- a/default-configs/aarch64-softmmu.mak
@ -394,10 +392,10 @@ index 64b2ee2..b5de7e5 100644
 +
 +include x86_64-rh-devices.mak
 diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
-index 336cace..ae86900 100644
+index 2d204ba..7ead029 100644
 --- a/hw/acpi/ich9.c
 +++ b/hw/acpi/ich9.c
-@@ -374,8 +374,8 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
+@@ -374,8 +374,8 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm)
     static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN;
     pm->acpi_memory_hotplug.is_enabled = true;
     pm->cpu_hotplug_legacy = true;
@ -422,10 +420,10 @@ index 534a6a1..bd62442 100644
 obj-$(CONFIG_PXA2XX) += pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o
 obj-$(CONFIG_DIGIC) += digic.o
 diff --git a/hw/block/fdc.c b/hw/block/fdc.c
-index 33bc9e2..3cb8779 100644
+index 3425d56..f4ae220 100644
 --- a/hw/block/fdc.c
 +++ b/hw/block/fdc.c
-@@ -46,6 +46,8 @@
+@@ -47,6 +47,8 @@
 #include "qemu/module.h"
 #include "trace.h"
@ -434,7 +432,7 @@ index 33bc9e2..3cb8779 100644
 /********************************************************/
 /* debug Floppy devices */
-@@ -2613,6 +2615,14 @@ static void fdctrl_realize_common(DeviceState *dev, FDCtrl *fdctrl,
+@@ -2625,6 +2627,14 @@ static void fdctrl_realize_common(DeviceState *dev, FDCtrl *fdctrl,
     int i, j;
     static int command_tables_inited = 0;
@ -448,7 +446,7 @@ index 33bc9e2..3cb8779 100644
 +
     if (fdctrl->fallback == FLOPPY_DRIVE_TYPE_AUTO) {
         error_setg(errp, "Cannot choose a fallback FDrive type of 'auto'");
-     }
+         return;
 diff --git a/hw/bt/Makefile.objs b/hw/bt/Makefile.objs
 new file mode 100644
 index 0000000..e678e9e
@ -471,27 +469,11 @@ index 8db9e8a..1601ea9 100644
 +#obj-$(CONFIG_A15MPCORE) += a15mpcore.o
 +common-obj-y += core.o
 +# cluster.o
 diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs
 index 77a7d62..68c793e 100644
 --- a/hw/display/Makefile.objs
 +++ b/hw/display/Makefile.objs
@@ -1,8 +1,9 @@
 common-obj-$(CONFIG_DDC) += i2c-ddc.o
 common-obj-$(CONFIG_EDID) += edid-generate.o edid-region.o
 -common-obj-$(CONFIG_FW_CFG_DMA) += ramfb.o
 -common-obj-$(CONFIG_FW_CFG_DMA) += ramfb-standalone.o
 +# Disabled for Red Hat Enterprise Linux
 +#common-obj-$(CONFIG_FW_CFG_DMA) += ramfb.o
 +#common-obj-$(CONFIG_FW_CFG_DMA) += ramfb-standalone.o
 common-obj-$(CONFIG_ADS7846) += ads7846.o
 common-obj-$(CONFIG_VGA_CIRRUS) += cirrus_vga.o
 diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
-index 0d391e1..fb1b2c4 100644
+index 212d6f5..f2504e5 100644
 --- a/hw/display/cirrus_vga.c
 +++ b/hw/display/cirrus_vga.c
-@@ -2975,6 +2975,9 @@ static void pci_cirrus_vga_realize(PCIDevice *dev, Error **errp)
+@@ -2958,6 +2958,9 @@ static void pci_cirrus_vga_realize(PCIDevice *dev, Error **errp)
      PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(dev);
      int16_t device_id = pc->device_id;
@ -502,7 +484,7 @@ index 0d391e1..fb1b2c4 100644
        Also accept 8 MB/16 MB for backward compatibility. */
      if (s->vga.vram_size_mb != 4 && s->vga.vram_size_mb != 8 &&
 diff --git a/hw/ide/piix.c b/hw/ide/piix.c
-index 3b2de4c..980c35e 100644
+index b402a93..d3621a4 100644
 --- a/hw/ide/piix.c
 +++ b/hw/ide/piix.c
@@ -221,7 +221,8 @@ static void piix3_ide_class_init(ObjectClass *klass, void *data)
@ -525,12 +507,12 @@ index 3b2de4c..980c35e 100644
 static const TypeInfo piix4_ide_info = {
 diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
-index 60a4130..b2f1f91 100644
+index 29d633c..1442f46 100644
 --- a/hw/input/pckbd.c
 +++ b/hw/input/pckbd.c
-@@ -568,6 +568,8 @@ static void i8042_class_initfn(ObjectClass *klass, void *data)
+@@ -599,6 +599,8 @@ static void i8042_class_initfn(ObjectClass *klass, void *data)
     dc->realize = i8042_realizefn;
     dc->vmsd = &vmstate_kbd_isa;
     isa->build_aml = i8042_build_aml;
     set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
 +    /* Disabled for Red Hat Enterprise Linux: */
 +    dc->user_creatable = false;
@ -538,7 +520,7 @@ index 60a4130..b2f1f91 100644
 static const TypeInfo i8042_info = {
 diff --git a/hw/net/e1000.c b/hw/net/e1000.c
-index 2a69eee..af3ec17 100644
+index a18f80e..960b2f0 100644
 --- a/hw/net/e1000.c
 +++ b/hw/net/e1000.c
@@ -1797,6 +1797,7 @@ static const E1000Info e1000_devices[] = {
@ -558,10 +540,10 @@ index 2a69eee..af3ec17 100644
 static void e1000_register_types(void)
 diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
-index ac1c109..542c19e 100644
+index 26ad566..bfdf6b3 100644
 --- a/hw/ppc/spapr_cpu_core.c
 +++ b/hw/ppc/spapr_cpu_core.c
-@@ -399,10 +399,12 @@ static const TypeInfo spapr_cpu_core_type_infos[] = {
+@@ -396,10 +396,12 @@ static const TypeInfo spapr_cpu_core_type_infos[] = {
         .instance_size = sizeof(SpaprCpuCore),
         .class_size = sizeof(SpaprCpuCoreClass),
     },
@ -575,10 +557,10 @@ index ac1c109..542c19e 100644
     DEFINE_SPAPR_CPU_CORE_TYPE("power7+_v2.1"),
     DEFINE_SPAPR_CPU_CORE_TYPE("power8_v2.0"),
 diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
-index 66835e5..1b03645 100644
+index fa5c3fa..854094c 100644
 --- a/hw/usb/Makefile.objs
 +++ b/hw/usb/Makefile.objs
-@@ -29,7 +29,9 @@ common-obj-$(CONFIG_USB_NETWORK)      += dev-network.o
+@@ -30,7 +30,9 @@ common-obj-$(CONFIG_USB_NETWORK)      += dev-network.o
 ifeq ($(CONFIG_USB_SMARTCARD),y)
 common-obj-y                          += dev-smartcard-reader.o
 common-obj-$(CONFIG_SMARTCARD)        += smartcard.mo
@ -589,39 +571,11 @@ index 66835e5..1b03645 100644
 smartcard.mo-cflags := $(SMARTCARD_CFLAGS)
 smartcard.mo-libs := $(SMARTCARD_LIBS)
 endif
 diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
 index 5e75a95..e265d77 100644
 --- a/hw/vfio/pci.c
 +++ b/hw/vfio/pci.c
@@ -3222,6 +3222,7 @@ static const TypeInfo vfio_pci_dev_info = {
     },
 };
 +#if 0 /* Disabled for Red Hat Enterprise Linux */
 static Property vfio_pci_dev_nohotplug_properties[] = {
     DEFINE_PROP_BOOL("ramfb", VFIOPCIDevice, enable_ramfb, false),
     DEFINE_PROP_END_OF_LIST(),
@@ -3241,11 +3242,15 @@ static const TypeInfo vfio_pci_nohotplug_dev_info = {
     .instance_size = sizeof(VFIOPCIDevice),
     .class_init = vfio_pci_nohotplug_dev_class_init,
 };
 +#endif
 static void register_vfio_pci_dev_type(void)
 {
     type_register_static(&vfio_pci_dev_info);
 +
 +#if 0 /* Disabled for Red Hat Enterprise Linux */
     type_register_static(&vfio_pci_nohotplug_dev_info);
 +#endif
 }
 type_init(register_vfio_pci_dev_type)
 diff --git a/qemu-options.hx b/qemu-options.hx
-index 292d4e7..1df25ae 100644
+index 196f468..43b0dbc 100644
 --- a/qemu-options.hx
 +++ b/qemu-options.hx
-@@ -2239,10 +2239,6 @@ ERST
+@@ -2248,10 +2248,6 @@ ERST
 DEF("no-hpet", 0, QEMU_OPTION_no_hpet,
     "-no-hpet        disable HPET\n", QEMU_ARCH_I386)
@ -633,10 +587,10 @@ index 292d4e7..1df25ae 100644
 DEF("acpitable", HAS_ARG, QEMU_OPTION_acpitable,
     "-acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,{data|file}=file1[:file2]...]\n"
 diff --git a/softmmu/vl.c b/softmmu/vl.c
-index 32c0047..46b4d98 100644
+index 3e15ee2..3693dfb 100644
 --- a/softmmu/vl.c
 +++ b/softmmu/vl.c
-@@ -144,7 +144,7 @@ static Chardev **serial_hds;
+@@ -145,7 +145,7 @@ static Chardev **serial_hds;
 Chardev *parallel_hds[MAX_PARALLEL_PORTS];
 int win2k_install_hack = 0;
 int singlestep = 0;
@ -646,25 +600,39 @@ index 32c0047..46b4d98 100644
 static int no_reboot;
 int no_shutdown = 0;
 diff --git a/target/arm/cpu.c b/target/arm/cpu.c
-index a79f233..dcdf3b2 100644
+index 5050e18..79adfe2 100644
 --- a/target/arm/cpu.c
 +++ b/target/arm/cpu.c
-@@ -2905,7 +2905,9 @@ static void arm_cpu_register_types(void)
+@@ -2335,7 +2335,9 @@ static void arm_cpu_register_types(void)
     type_register_static(&idau_interface_type_info);
-     while (info->name) {
+         type_register_static(&idau_interface_type_info);
-        cpu_register(info);
+         for (i = 0; i < cpu_count; ++i) {
-+        /* RHEL specific: Filter out unsupported cpu models */
+-            arm_cpu_register(&arm_cpus[i]);
-+        if (!strcmp(info->name, "cortex-a15"))
+            /* RHEL specific: Filter out unsupported cpu models */
-+            cpu_register(info);
+            if (!strcmp(arm_cpus[i].name, "cortex-a15"))
-         info++;
+                arm_cpu_register(&arm_cpus[i]);
         }
     }
 }
 diff --git a/target/arm/cpu_tcg.c b/target/arm/cpu_tcg.c
 index 00b0e08..94d429b 100644
 --- a/target/arm/cpu_tcg.c
 +++ b/target/arm/cpu_tcg.c
@@ -655,6 +655,9 @@ static void arm_tcg_cpu_register_types(void)
 {
     size_t i;
 +    /* Disable TCG cpu types for Red Hat Enterprise Linux */
 +    return;
 +
     for (i = 0; i < ARRAY_SIZE(arm_tcg_cpus); ++i) {
         arm_cpu_register(&arm_tcg_cpus[i]);
     }
 diff --git a/target/i386/cpu.c b/target/i386/cpu.c
-index 90ffc5f..d98618c 100644
+index 36cbd3d..55a30cd 100644
 --- a/target/i386/cpu.c
 +++ b/target/i386/cpu.c
-@@ -1801,20 +1801,21 @@ static CPUCaches epyc_rome_cache_info = {
+@@ -1825,20 +1825,21 @@ static CPUCaches epyc_rome_cache_info = {
 static X86CPUDefinition builtin_x86_defs[] = {
     {
@ -765,7 +733,7 @@ index 4ad1686..16b2185 100644
     { NULL, NULL }
 };
 diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
-index 7c32180..88bf4a9 100644
+index 2fa609b..f6bee32 100644
 --- a/target/s390x/cpu_models.c
 +++ b/target/s390x/cpu_models.c
@@ -404,6 +404,9 @@ static void check_unavailable_features(const S390CPUModel *max_model,
@ -779,10 +747,10 @@ index 7c32180..88bf4a9 100644
     /* detect missing features if any to properly report them */
 diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
-index 7f7ebab..8dc2df2 100644
+index f2f75d2..8970e4c 100644
 --- a/target/s390x/kvm.c
 +++ b/target/s390x/kvm.c
-@@ -2429,6 +2429,14 @@ void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp)
+@@ -2494,6 +2494,14 @@ void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp)
         error_setg(errp, "KVM doesn't support CPU models");
         return;
     }
@ -797,19 +765,6 @@ index 7f7ebab..8dc2df2 100644
     prop.cpuid = s390_cpuid_from_cpu_model(model);
     prop.ibc = s390_ibc_from_cpu_model(model);
     /* configure cpu features indicated via STFL(e) */
 diff --git a/util/memfd.c b/util/memfd.c
 index 4a3c07e..3303ec9 100644
 --- a/util/memfd.c
 +++ b/util/memfd.c
@@ -193,7 +193,7 @@ bool qemu_memfd_alloc_check(void)
  */
 bool qemu_memfd_check(unsigned int flags)
 {
 -#ifdef CONFIG_LINUX
 +#if 0 /* RHEL: memfd support disabled */
     int mfd = memfd_create("test", flags | MFD_CLOEXEC);
     if (mfd >= 0) {
 -- 
 1.8.3.1
--- a/0007-Machine-type-related-general-changes.patch
+++ b/0007-Machine-type-related-general-changes.patch
@ -1,4 +1,4 @@
-From 355248605abeab3ad30da6be267d6352dfea65f0 Mon Sep 17 00:00:00 2001
+From 1266dec11bec3867e8eda3062384b07986a89d3b Mon Sep 17 00:00:00 2001
 From: Miroslav Rezanina <mrezanin@redhat.com>
 Date: Fri, 11 Jan 2019 09:54:45 +0100
 Subject: Machine type related general changes
@ -35,8 +35,14 @@ Merged patches (4.2.0):
 Merged patches (weekly-200318):
 - e6c3fbf hw/smbios: set new default SMBIOS fields for Windows driver support (partialy)
 Merged patches (weekly-200506):
 - 8f9f4d8 compat: disable 'edid' for virtio-gpu-ccw
 Conflicts:
 	hw/core/machine.c
 ---
- hw/acpi/ich9.c               |  16 ++++
+ hw/acpi/ich9.c               |  15 ++++
 hw/acpi/piix4.c              |   5 +-
 hw/arm/virt.c                |   2 +-
 hw/char/serial.c             |  16 ++++
@ -59,10 +65,10 @@ Merged patches (weekly-200318):
 include/hw/usb.h             |   4 +
 migration/migration.c        |   2 +
 migration/migration.h        |   5 ++
- 23 files changed, 355 insertions(+), 11 deletions(-)
+ 23 files changed, 354 insertions(+), 11 deletions(-)
 diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
-index ae86900..9a8a627 100644
+index 7ead029..3b8501f 100644
 --- a/hw/acpi/ich9.c
 +++ b/hw/acpi/ich9.c
@@ -369,6 +369,18 @@ static void ich9_pm_set_enable_tco(Object *obj, bool value, Error **errp)
@ -81,25 +87,24 @@ index ae86900..9a8a627 100644
 +    s->pm.force_rev1_fadt = value;
 +}
 +
- void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
+ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm)
 {
     static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN;
-@@ -393,6 +405,10 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
+@@ -391,6 +403,9 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm)
     object_property_add_bool(obj, "cpu-hotplug-legacy",
                              ich9_pm_get_cpu_hotplug_legacy,
-                              ich9_pm_set_cpu_hotplug_legacy,
+                              ich9_pm_set_cpu_hotplug_legacy);
                              NULL);
 +    object_property_add_bool(obj, "__com.redhat_force-rev1-fadt",
 +                             ich9_pm_get_force_rev1_fadt,
-+                             ich9_pm_set_force_rev1_fadt,
+                             ich9_pm_set_force_rev1_fadt);
 +                             NULL);
     object_property_add_uint8_ptr(obj, ACPI_PM_PROP_S3_DISABLED,
-                                   &pm->disable_s3, OBJ_PROP_FLAG_READWRITE,
+                                   &pm->disable_s3, OBJ_PROP_FLAG_READWRITE);
-                                   NULL);
+     object_property_add_uint8_ptr(obj, ACPI_PM_PROP_S4_DISABLED,
 diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
-index 964d6f5..b8458ba 100644
+index 630ca6e..715bc17 100644
 --- a/hw/acpi/piix4.c
 +++ b/hw/acpi/piix4.c
-@@ -275,6 +275,7 @@ static const VMStateDescription vmstate_acpi = {
+@@ -276,6 +276,7 @@ static const VMStateDescription vmstate_acpi = {
     .name = "piix4_pm",
     .version_id = 3,
     .minimum_version_id = 3,
@ -107,7 +112,7 @@ index 964d6f5..b8458ba 100644
     .post_load = vmstate_acpi_post_load,
     .fields = (VMStateField[]) {
         VMSTATE_PCI_DEVICE(parent_obj, PIIX4PMState),
-@@ -628,8 +629,8 @@ static void piix4_send_gpe(AcpiDeviceIf *adev, AcpiEventStatusBits ev)
+@@ -630,8 +631,8 @@ static void piix4_send_gpe(AcpiDeviceIf *adev, AcpiEventStatusBits ev)
 static Property piix4_pm_properties[] = {
     DEFINE_PROP_UINT32("smb_io_base", PIIX4PMState, smb_io_base, 0),
@ -117,12 +122,12 @@ index 964d6f5..b8458ba 100644
 +    DEFINE_PROP_UINT8(ACPI_PM_PROP_S4_DISABLED, PIIX4PMState, disable_s4, 1),
     DEFINE_PROP_UINT8(ACPI_PM_PROP_S4_VAL, PIIX4PMState, s4_val, 2),
     DEFINE_PROP_BOOL("acpi-pci-hotplug-with-bridge-support", PIIX4PMState,
-                      use_acpi_pci_hotplug, true),
+                      use_acpi_hotplug_bridge, true),
 diff --git a/hw/arm/virt.c b/hw/arm/virt.c
-index 7dc96ab..1f8d6bf 100644
+index cd0834c..2e3efd3 100644
 --- a/hw/arm/virt.c
 +++ b/hw/arm/virt.c
-@@ -1413,7 +1413,7 @@ static void virt_build_smbios(VirtMachineState *vms)
+@@ -1450,7 +1450,7 @@ static void virt_build_smbios(VirtMachineState *vms)
     smbios_set_defaults("QEMU", product,
                         vmc->smbios_old_sys_ver ? "1.0" : mc->name, false,
@ -132,7 +137,7 @@ index 7dc96ab..1f8d6bf 100644
     smbios_get_tables(MACHINE(vms), NULL, 0, &smbios_tables, &smbios_tables_len,
                       &smbios_anchor, &smbios_anchor_len);
 diff --git a/hw/char/serial.c b/hw/char/serial.c
-index c822a9a..0c7f1ff 100644
+index 9eebcb2..11d2d08 100644
 --- a/hw/char/serial.c
 +++ b/hw/char/serial.c
@@ -35,6 +35,7 @@
@ -187,7 +192,7 @@ index c822a9a..0c7f1ff 100644
 }
 diff --git a/hw/core/machine.c b/hw/core/machine.c
-index c1a444c..3c45365 100644
+index 211b4e0..ef6b320 100644
 --- a/hw/core/machine.c
 +++ b/hw/core/machine.c
@@ -28,6 +28,176 @@
@ -239,7 +244,7 @@ index c1a444c..3c45365 100644
 +    /* hw_compat_rhel_8_0 from hw_compat_4_0 */
 +    { "virtio-vga",     "edid", "false" },
 +    /* hw_compat_rhel_8_0 from hw_compat_4_0 */
-+    { "virtio-gpu-pci", "edid", "false" },
+    { "virtio-gpu-device", "edid", "false" },
 +    /* hw_compat_rhel_8_0 from hw_compat_4_0 */
 +    { "virtio-device", "use-started", "false" },
 +    /* hw_compat_rhel_8_0 from hw_compat_3_1 - that was added in 4.1 */
@ -364,11 +369,11 @@ index c1a444c..3c45365 100644
 +};
 +const size_t hw_compat_rhel_7_1_len = G_N_ELEMENTS(hw_compat_rhel_7_1);
 +
- GlobalProperty hw_compat_4_2[] = {
+ GlobalProperty hw_compat_5_0[] = {
-     { "virtio-blk-device", "queue-size", "128"},
+     { "virtio-balloon-device", "page-poison", "false" },
-     { "virtio-scsi-device", "virtqueue_size", "128"},
+     { "vmport", "x-read-set-eax", "off" },
 diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
-index 0633ed3..b703e9e 100644
+index 3aaeeec..d88f52a 100644
 --- a/hw/display/vga-isa.c
 +++ b/hw/display/vga-isa.c
@@ -84,7 +84,7 @@ static void vga_isa_realizefn(DeviceState *dev, Error **errp)
@ -381,10 +386,10 @@ index 0633ed3..b703e9e 100644
 };
 diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
-index 22dee0e..26ff640 100644
+index 1d832b2..82a33b4 100644
 --- a/hw/i386/pc_piix.c
 +++ b/hw/i386/pc_piix.c
-@@ -176,6 +176,8 @@ static void pc_init1(MachineState *machine,
+@@ -179,6 +179,8 @@ static void pc_init1(MachineState *machine,
         smbios_set_defaults("QEMU", "Standard PC (i440FX + PIIX, 1996)",
                             mc->name, pcmc->smbios_legacy_mode,
                             pcmc->smbios_uuid_encoded,
@ -394,10 +399,10 @@ index 22dee0e..26ff640 100644
     }
 diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
-index d37c425..f67232e 100644
+index 047ea8d..1818d31 100644
 --- a/hw/i386/pc_q35.c
 +++ b/hw/i386/pc_q35.c
-@@ -201,6 +201,8 @@ static void pc_q35_init(MachineState *machine)
+@@ -204,6 +204,8 @@ static void pc_q35_init(MachineState *machine)
         smbios_set_defaults("QEMU", "Standard PC (Q35 + ICH9, 2009)",
                             mc->name, pcmc->smbios_legacy_mode,
                             pcmc->smbios_uuid_encoded,
@ -407,7 +412,7 @@ index d37c425..f67232e 100644
     }
 diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
-index 79ba158..311dbe0 100644
+index fda3451..be64a6b 100644
 --- a/hw/net/e1000e.c
 +++ b/hw/net/e1000e.c
@@ -79,6 +79,11 @@ typedef struct E1000EState {
@ -481,7 +486,7 @@ index 79ba158..311dbe0 100644
                         e1000e_prop_disable_vnet, bool),
     DEFINE_PROP_SIGNED("subsys_ven", E1000EState, subsys_ven,
 diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
-index 70aca7e..0950cee 100644
+index ab93d78..48a8135 100644
 --- a/hw/net/rtl8139.c
 +++ b/hw/net/rtl8139.c
@@ -3179,7 +3179,7 @@ static int rtl8139_pre_save(void *opaque)
@ -504,10 +509,10 @@ index 70aca7e..0950cee 100644
         VMSTATE_UINT16(tally_counters.TxUndrn, RTL8139State),
 diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c
-index dc4269c..3fb9469 100644
+index 7a38540..377d861 100644
 --- a/hw/rtc/mc146818rtc.c
 +++ b/hw/rtc/mc146818rtc.c
-@@ -42,6 +42,7 @@
+@@ -43,6 +43,7 @@
 #include "qapi/visitor.h"
 #include "exec/address-spaces.h"
 #include "hw/rtc/mc146818rtc_regs.h"
@ -515,7 +520,7 @@ index dc4269c..3fb9469 100644
 #ifdef TARGET_I386
 #include "qapi/qapi-commands-misc-target.h"
-@@ -820,6 +821,11 @@ static int rtc_post_load(void *opaque, int version_id)
+@@ -821,6 +822,11 @@ static int rtc_post_load(void *opaque, int version_id)
 static bool rtc_irq_reinject_on_ack_count_needed(void *opaque)
 {
     RTCState *s = (RTCState *)opaque;
@ -684,7 +689,7 @@ index b330e36..b25cce8 100644
     }
 };
 diff --git a/hw/usb/hcd-xhci.h b/hw/usb/hcd-xhci.h
-index 2fad4df..f554b67 100644
+index 946af51..cc91a7e 100644
 --- a/hw/usb/hcd-xhci.h
 +++ b/hw/usb/hcd-xhci.h
@@ -157,6 +157,8 @@ typedef struct XHCIEvent {
@ -697,7 +702,7 @@ index 2fad4df..f554b67 100644
 typedef struct XHCIInterrupter {
 diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h
-index 41568d1..1a23ccc 100644
+index 28a5318..ff4a672 100644
 --- a/include/hw/acpi/ich9.h
 +++ b/include/hw/acpi/ich9.h
@@ -61,6 +61,9 @@ typedef struct ICH9LPCPMRegs {
@ -711,10 +716,10 @@ index 41568d1..1a23ccc 100644
 #define ACPI_PM_PROP_TCO_ENABLED "enable_tco"
 diff --git a/include/hw/boards.h b/include/hw/boards.h
-index fd4d62b..0046ab5 100644
+index 18815d9..2224fbc 100644
 --- a/include/hw/boards.h
 +++ b/include/hw/boards.h
-@@ -369,4 +369,28 @@ extern const size_t hw_compat_2_2_len;
+@@ -372,4 +372,28 @@ extern const size_t hw_compat_2_2_len;
 extern GlobalProperty hw_compat_2_1[];
 extern const size_t hw_compat_2_1_len;
@ -760,10 +765,10 @@ index 02a0ced..67e38a1 100644
 void smbios_get_tables(MachineState *ms,
                        const struct smbios_phys_mem_area *mem_array,
 diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
-index 6ab6eda..69fca4e 100644
+index dce1273..665c430 100644
 --- a/include/hw/i386/pc.h
 +++ b/include/hw/i386/pc.h
-@@ -100,6 +100,9 @@ typedef struct PCMachineClass {
+@@ -102,6 +102,9 @@ typedef struct PCMachineClass {
     bool smbios_defaults;
     bool smbios_legacy_mode;
     bool smbios_uuid_encoded;
@ -774,10 +779,10 @@ index 6ab6eda..69fca4e 100644
     /* RAM / address space compat: */
     bool gigabyte_align;
 diff --git a/include/hw/usb.h b/include/hw/usb.h
-index c24d968..b353438 100644
+index e29a376..35ac38c 100644
 --- a/include/hw/usb.h
 +++ b/include/hw/usb.h
-@@ -605,4 +605,8 @@ int usb_get_quirks(uint16_t vendor_id, uint16_t product_id,
+@@ -575,4 +575,8 @@ int usb_get_quirks(uint16_t vendor_id, uint16_t product_id,
                    uint8_t interface_class, uint8_t interface_subclass,
                    uint8_t interface_protocol);
@ -787,7 +792,7 @@ index c24d968..b353438 100644
 +
 #endif
 diff --git a/migration/migration.c b/migration/migration.c
-index 187ac04..041b773 100644
+index 481a590..a5a64f9 100644
 --- a/migration/migration.c
 +++ b/migration/migration.c
@@ -128,6 +128,8 @@ enum mig_rp_message_type {
@ -800,7 +805,7 @@ index 187ac04..041b773 100644
    migrations at once.  For now we don't need to add
    dynamic creation of migration */
 diff --git a/migration/migration.h b/migration/migration.h
-index 507284e..0baa337 100644
+index f617960..b8bc10d 100644
 --- a/migration/migration.h
 +++ b/migration/migration.h
@@ -339,6 +339,11 @@ void init_dirty_bitmap_incoming_migration(void);
--- a/0008-Add-aarch64-machine-types.patch
+++ b/0008-Add-aarch64-machine-types.patch
@ -1,4 +1,4 @@
-From 449b1fd5bc6075a535cb57e6e0b0eda837663a52 Mon Sep 17 00:00:00 2001
+From 9506867ddf6d00d2dc502f69cfc0d274a2f1040c Mon Sep 17 00:00:00 2001
 From: Miroslav Rezanina <mrezanin@redhat.com>
 Date: Fri, 19 Oct 2018 12:53:31 +0200
 Subject: Add aarch64 machine types
@ -29,6 +29,12 @@ Rebase notes (weekly-200226):
 Rebase notes (5.0.0-rc1):
 - Added setting acpi properties
 Rebase notes (weekly-200520):
 - Added ras property
 Rebase notes (weekly-200701):
 - Added to virt_machine_device_unplug_cb to machine type (upstream)
 Merged patches (4.0.0):
 - 7bfdb4c aarch64: Add virt-rhel8.0.0 machine type for ARM
 - 3433e69 aarch64: Set virt-rhel8.0.0 max_cpus to 512
@ -38,23 +44,23 @@ Merged patches (4.1.0):
 - c3e39ef aarch64: Add virt-rhel8.1.0 machine type for ARM
 - 59a46d1 aarch64: Allow ARM VIRT iommu option in RHEL8.1 machine
 ---
- hw/arm/virt.c         | 168 +++++++++++++++++++++++++++++++++++++++++++++++++-
+ hw/arm/virt.c         | 172 +++++++++++++++++++++++++++++++++++++++++++++++++-
 include/hw/arm/virt.h |  11 ++++
- 2 files changed, 178 insertions(+), 1 deletion(-)
+ 2 files changed, 182 insertions(+), 1 deletion(-)
 diff --git a/hw/arm/virt.c b/hw/arm/virt.c
-index 1f8d6bf..1559689 100644
+index 2e3efd3..abbc7d5 100644
 --- a/hw/arm/virt.c
 +++ b/hw/arm/virt.c
-@@ -78,6 +78,7 @@
+@@ -79,6 +79,7 @@
 #include "hw/virtio/virtio-iommu.h"
 #include "hw/char/pl011.h"
 #include "qemu/guest-random.h"
 +#if 0 /* Disabled for Red Hat Enterprise Linux */
 #define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \
     static void virt_##major##_##minor##_class_init(ObjectClass *oc, \
                                                     void *data) \
-@@ -104,7 +105,49 @@
+@@ -105,7 +106,49 @@
     DEFINE_VIRT_MACHINE_LATEST(major, minor, true)
 #define DEFINE_VIRT_MACHINE(major, minor) \
     DEFINE_VIRT_MACHINE_LATEST(major, minor, false)
@ -105,7 +111,7 @@ index 1f8d6bf..1559689 100644
 /* Number of external interrupt lines to configure the GIC with */
 #define NUM_IRQS 256
-@@ -1879,6 +1922,7 @@ static void machvirt_init(MachineState *machine)
+@@ -1964,6 +2007,7 @@ static void machvirt_init(MachineState *machine)
     qemu_add_machine_init_done_notifier(&vms->machine_done);
 }
@ -113,7 +119,7 @@ index 1f8d6bf..1559689 100644
 static bool virt_get_secure(Object *obj, Error **errp)
 {
     VirtMachineState *vms = VIRT_MACHINE(obj);
-@@ -1907,6 +1951,7 @@ static void virt_set_virt(Object *obj, bool value, Error **errp)
+@@ -1992,6 +2036,7 @@ static void virt_set_virt(Object *obj, bool value, Error **errp)
     vms->virt = value;
 }
@ -121,7 +127,7 @@ index 1f8d6bf..1559689 100644
 static bool virt_get_highmem(Object *obj, Error **errp)
 {
     VirtMachineState *vms = VIRT_MACHINE(obj);
-@@ -2176,6 +2221,7 @@ static int virt_kvm_type(MachineState *ms, const char *type_str)
+@@ -2339,6 +2384,7 @@ static int virt_kvm_type(MachineState *ms, const char *type_str)
     return requested_pa_size > 40 ? requested_pa_size : 0;
 }
@ -129,7 +135,7 @@ index 1f8d6bf..1559689 100644
 static void virt_machine_class_init(ObjectClass *oc, void *data)
 {
     MachineClass *mc = MACHINE_CLASS(oc);
-@@ -2435,3 +2481,123 @@ static void virt_machine_2_6_options(MachineClass *mc)
+@@ -2604,3 +2650,127 @@ static void virt_machine_2_6_options(MachineClass *mc)
     vmc->no_pmu = true;
 }
 DEFINE_VIRT_MACHINE(2, 6)
@ -162,15 +168,17 @@ index 1f8d6bf..1559689 100644
 +    hc->pre_plug = virt_machine_device_pre_plug_cb;
 +    hc->plug = virt_machine_device_plug_cb;
 +    hc->unplug_request = virt_machine_device_unplug_request_cb;
 +    hc->unplug = virt_machine_device_unplug_cb;
 +    mc->numa_mem_supported = true;
 +    mc->nvdimm_supported = true;
 +    mc->auto_enable_numa_with_memhp = true;
 +    mc->default_ram_id = "mach-virt.ram";
 +
 +    object_class_property_add(oc, "acpi", "OnOffAuto",
 +        virt_get_acpi, virt_set_acpi,
-+        NULL, NULL, &error_abort);
+        NULL, NULL);
 +    object_class_property_set_description(oc, "acpi",
-+        "Enable ACPI", &error_abort);
+        "Enable ACPI");
 +}
 +
 +static const TypeInfo rhel_machine_info = {
@ -204,11 +212,10 @@ index 1f8d6bf..1559689 100644
 +    /* High memory is enabled by default for RHEL */
 +    vms->highmem = true;
 +    object_property_add_bool(obj, "highmem", virt_get_highmem,
-+                             virt_set_highmem, NULL);
+                             virt_set_highmem);
 +    object_property_set_description(obj, "highmem",
 +                                    "Set on/off to enable/disable using "
-+                                    "physical address space above 32 bits",
+                                    "physical address space above 32 bits");
 +                                    NULL);
 +    /*
 +     * Default GIC type is still v2, but became configurable for RHEL. We
 +     * keep v2 instead of max as TCG CI test cases require an MSI controller
@ -216,10 +223,10 @@ index 1f8d6bf..1559689 100644
 +     */
 +    vms->gic_version = 2;
 +    object_property_add_str(obj, "gic-version", virt_get_gic_version,
-+                        virt_set_gic_version, NULL);
+                        virt_set_gic_version);
 +    object_property_set_description(obj, "gic-version",
 +                                    "Set GIC version. "
-+                                    "Valid values are 2, 3 and host", NULL);
+                                    "Valid values are 2, 3 and host");
 +
 +    vms->highmem_ecam = !vmc->no_highmem_ecam;
 +
@ -229,21 +236,24 @@ index 1f8d6bf..1559689 100644
 +        /* Default allows ITS instantiation */
 +        vms->its = true;
 +        object_property_add_bool(obj, "its", virt_get_its,
-+                                 virt_set_its, NULL);
+                                 virt_set_its);
 +        object_property_set_description(obj, "its",
 +                                        "Set on/off to enable/disable "
-+                                        "ITS instantiation",
+                                        "ITS instantiation");
 +                                        NULL);
 +    }
 +
 +    /* Default disallows iommu instantiation */
 +    vms->iommu = VIRT_IOMMU_NONE;
-+    object_property_add_str(obj, "iommu", virt_get_iommu, virt_set_iommu, NULL);
+    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",
+                                    "Valid values are none and smmuv3");
-+                                    NULL);
+    vms->ras = false;
-+
+    object_property_add_bool(obj, "ras", virt_get_ras,
 +                             virt_set_ras);
 +    object_property_set_description(obj, "ras",
 +                                    "Set on/off to enable/disable reporting host memory errors "
 +                                    "to a KVM guest using ACPI and guest external abort exceptions");
 +    vms->irqmap=a15irqmap;
 +    virt_flash_create(vms);
 +}
@ -254,10 +264,10 @@ index 1f8d6bf..1559689 100644
 +}
 +DEFINE_RHEL_MACHINE_AS_LATEST(8, 2, 0)
 diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
-index 60b2f52..ae44797 100644
+index 31878dd..5582fba 100644
 --- a/include/hw/arm/virt.h
 +++ b/include/hw/arm/virt.h
-@@ -155,6 +155,7 @@ typedef struct {
+@@ -157,6 +157,7 @@ typedef struct {
 #define VIRT_ECAM_ID(high) (high ? VIRT_HIGH_PCIE_ECAM : VIRT_PCIE_ECAM)
@ -265,7 +275,7 @@ index 60b2f52..ae44797 100644
 #define TYPE_VIRT_MACHINE   MACHINE_TYPE_NAME("virt")
 #define VIRT_MACHINE(obj) \
     OBJECT_CHECK(VirtMachineState, (obj), TYPE_VIRT_MACHINE)
-@@ -163,6 +164,16 @@ typedef struct {
+@@ -165,6 +166,16 @@ typedef struct {
 #define VIRT_MACHINE_CLASS(klass) \
     OBJECT_CLASS_CHECK(VirtMachineClass, klass, TYPE_VIRT_MACHINE)
--- a/0009-Add-ppc64-machine-types.patch
+++ b/0009-Add-ppc64-machine-types.patch
@ -1,4 +1,4 @@
-From a07369c763a13a1bbc97b162f5d029a0d98d6fd3 Mon Sep 17 00:00:00 2001
+From d27b53512182f6aa6d9ccfcaf64e7aab1a064146 Mon Sep 17 00:00:00 2001
 From: Miroslav Rezanina <mrezanin@redhat.com>
 Date: Fri, 19 Oct 2018 13:27:13 +0200
 Subject: Add ppc64 machine types
@ -42,10 +42,10 @@ Merged patches (weekly-200226):
 5 files changed, 307 insertions(+), 1 deletion(-)
 diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
-index 9a2bd50..20b3437 100644
+index 4c185bc..2fa25b1 100644
 --- a/hw/ppc/spapr.c
 +++ b/hw/ppc/spapr.c
-@@ -4549,6 +4549,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
+@@ -4530,6 +4530,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
     smc->smp_threads_vsmt = true;
     smc->nr_xirqs = SPAPR_NR_XIRQS;
     xfc->match_nvt = spapr_match_nvt;
@ -53,15 +53,15 @@ index 9a2bd50..20b3437 100644
 }
 static const TypeInfo spapr_machine_info = {
-@@ -4599,6 +4600,7 @@ static void spapr_machine_latest_class_options(MachineClass *mc)
+@@ -4580,6 +4581,7 @@ static void spapr_machine_latest_class_options(MachineClass *mc)
     }                                                                \
     type_init(spapr_machine_register_##suffix)
 +#if 0 /* Disabled for Red Hat Enterprise Linux */
 /*
-  * pseries-5.0
+  * pseries-5.1
  */
-@@ -4645,6 +4647,7 @@ static void spapr_machine_4_1_class_options(MachineClass *mc)
+@@ -4638,6 +4640,7 @@ static void spapr_machine_4_1_class_options(MachineClass *mc)
 }
 DEFINE_SPAPR_MACHINE(4_1, "4.1", false);
@ -69,7 +69,7 @@ index 9a2bd50..20b3437 100644
 /*
  * pseries-4.0
-@@ -4661,6 +4664,7 @@ static void phb_placement_4_0(SpaprMachineState *spapr, uint32_t index,
+@@ -4654,6 +4657,7 @@ static void phb_placement_4_0(SpaprMachineState *spapr, uint32_t index,
     *nv2atsd = 0;
 }
@ -77,7 +77,7 @@ index 9a2bd50..20b3437 100644
 static void spapr_machine_4_0_class_options(MachineClass *mc)
 {
     SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
-@@ -4820,6 +4824,7 @@ DEFINE_SPAPR_MACHINE(2_8, "2.8", false);
+@@ -4813,6 +4817,7 @@ DEFINE_SPAPR_MACHINE(2_8, "2.8", false);
 /*
  * pseries-2.7
  */
@ -85,7 +85,7 @@ index 9a2bd50..20b3437 100644
 static void phb_placement_2_7(SpaprMachineState *spapr, uint32_t index,
                               uint64_t *buid, hwaddr *pio,
-@@ -4874,6 +4879,7 @@ static void phb_placement_2_7(SpaprMachineState *spapr, uint32_t index,
+@@ -4867,6 +4872,7 @@ static void phb_placement_2_7(SpaprMachineState *spapr, uint32_t index,
     *nv2atsd = 0;
 }
@ -93,7 +93,7 @@ index 9a2bd50..20b3437 100644
 static void spapr_machine_2_7_class_options(MachineClass *mc)
 {
     SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
-@@ -4988,6 +4994,280 @@ static void spapr_machine_2_1_class_options(MachineClass *mc)
+@@ -4981,6 +4987,280 @@ static void spapr_machine_2_1_class_options(MachineClass *mc)
     compat_props_add(mc->compat_props, hw_compat_2_1, hw_compat_2_1_len);
 }
 DEFINE_SPAPR_MACHINE(2_1, "2.1", false);
@ -375,7 +375,7 @@ index 9a2bd50..20b3437 100644
 static void spapr_machine_register_types(void)
 {
 diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
-index 542c19e..916ab0e 100644
+index bfdf6b3..39fcaf8 100644
 --- a/hw/ppc/spapr_cpu_core.c
 +++ b/hw/ppc/spapr_cpu_core.c
@@ -24,6 +24,7 @@
@ -392,7 +392,7 @@ index 542c19e..916ab0e 100644
     Error *local_err = NULL;
 +    SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
-     object_property_set_bool(OBJECT(cpu), true, "realized", &local_err);
+     qdev_realize(DEVICE(cpu), NULL, &local_err);
     if (local_err) {
@@ -250,6 +252,17 @@ static void spapr_realize_vcpu(PowerPCCPU *cpu, SpaprMachineState *spapr,
     cpu_ppc_set_vhyp(cpu, PPC_VIRTUAL_HYPERVISOR(spapr));
@ -413,10 +413,10 @@ index 542c19e..916ab0e 100644
         goto error_intc_create;
     }
 diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
-index 42d64a0..c03611f 100644
+index c421410..5190d6a 100644
 --- a/include/hw/ppc/spapr.h
 +++ b/include/hw/ppc/spapr.h
-@@ -128,6 +128,7 @@ struct SpaprMachineClass {
+@@ -130,6 +130,7 @@ struct SpaprMachineClass {
     bool smp_threads_vsmt; /* set VSMT to smp_threads by default */
     hwaddr rma_limit;          /* clamp the RMA to this size */
@ -425,7 +425,7 @@ index 42d64a0..c03611f 100644
                           uint64_t *buid, hwaddr *pio, 
                           hwaddr *mmio32, hwaddr *mmio64,
 diff --git a/target/ppc/compat.c b/target/ppc/compat.c
-index f48df25..34e3d0f 100644
+index fda0dfe..ab8e3b2 100644
 --- a/target/ppc/compat.c
 +++ b/target/ppc/compat.c
@@ -114,8 +114,19 @@ static const CompatInfo *compat_by_pvr(uint32_t pvr)
@ -450,10 +450,10 @@ index f48df25..34e3d0f 100644
     const CompatInfo *compat = compat_by_pvr(compat_pvr);
     const CompatInfo *min = compat_by_pvr(min_compat_pvr);
 diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
-index 88d9449..0d7f5f5 100644
+index e7d382a..3cf209d 100644
 --- a/target/ppc/cpu.h
 +++ b/target/ppc/cpu.h
-@@ -1323,6 +1323,7 @@ static inline int cpu_mmu_index(CPUPPCState *env, bool ifetch)
+@@ -1352,6 +1352,7 @@ static inline int cpu_mmu_index(CPUPPCState *env, bool ifetch)
 /* Compatibility modes */
 #if defined(TARGET_PPC64)
--- a/0010-Add-s390x-machine-types.patch
+++ b/0010-Add-s390x-machine-types.patch
@ -1,4 +1,4 @@
-From d51b2da2b2f22313593ec618f510ebf7452b94af Mon Sep 17 00:00:00 2001
+From bf565781e2deb548173e7530e29d886f6c1eaad8 Mon Sep 17 00:00:00 2001
 From: Miroslav Rezanina <mrezanin@redhat.com>
 Date: Fri, 19 Oct 2018 13:47:32 +0200
 Subject: Add s390x machine types
@ -25,10 +25,10 @@ Merged patches (4.2.0):
 1 file changed, 70 insertions(+), 1 deletion(-)
 diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
-index 0fa00a9..d61d85d 100644
+index b111406..f1b1722 100644
 --- a/hw/s390x/s390-virtio-ccw.c
 +++ b/hw/s390x/s390-virtio-ccw.c
-@@ -648,7 +648,7 @@ bool css_migration_enabled(void)
+@@ -774,7 +774,7 @@ bool css_migration_enabled(void)
     {                                                                         \
         MachineClass *mc = MACHINE_CLASS(oc);                                 \
         ccw_machine_##suffix##_class_options(mc);                             \
@ -37,15 +37,15 @@ index 0fa00a9..d61d85d 100644
         if (latest) {                                                         \
             mc->alias = "s390-ccw-virtio";                                    \
             mc->is_default = true;                                            \
-@@ -672,6 +672,7 @@ bool css_migration_enabled(void)
+@@ -798,6 +798,7 @@ bool css_migration_enabled(void)
     }                                                                         \
     type_init(ccw_machine_register_##suffix)
 +#if 0 /* Disabled for Red Hat Enterprise Linux */
- static void ccw_machine_5_0_instance_options(MachineState *machine)
+ static void ccw_machine_5_1_instance_options(MachineState *machine)
 {
 }
-@@ -912,6 +913,74 @@ static void ccw_machine_2_4_class_options(MachineClass *mc)
+@@ -1050,6 +1051,74 @@ static void ccw_machine_2_4_class_options(MachineClass *mc)
     compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
 }
 DEFINE_CCW_MACHINE(2_4, "2.4", false);
--- a/0011-Add-x86_64-machine-types.patch
+++ b/0011-Add-x86_64-machine-types.patch
@ -1,4 +1,4 @@
-From fa1624d37542a12fc2668b23b2a7a9a650457dcc Mon Sep 17 00:00:00 2001
+From 04955c10da93ce94d73693a0be07b2a4c81246fe Mon Sep 17 00:00:00 2001
 From: Miroslav Rezanina <mrezanin@redhat.com>
 Date: Fri, 19 Oct 2018 13:10:31 +0200
 Subject: Add x86_64 machine types
@ -42,6 +42,9 @@ Merged patches (weekly-200122):
 Merged patches (weekly-200318):
 - e6c3fbf hw/smbios: set new default SMBIOS fields for Windows driver support (partialy)
 Conflicts:
 	hw/i386/pc_piix.c
 ---
 hw/i386/acpi-build.c |   3 +
 hw/i386/pc.c         | 265 ++++++++++++++++++++++++++++++++++++++++++++++++++-
@ -54,10 +57,10 @@ Merged patches (weekly-200318):
 8 files changed, 675 insertions(+), 7 deletions(-)
 diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
-index 23c77ee..6cfcdfc 100644
+index b7bcbbb..fe815c5 100644
 --- a/hw/i386/acpi-build.c
 +++ b/hw/i386/acpi-build.c
-@@ -207,6 +207,9 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm)
+@@ -212,6 +212,9 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm)
         pm->fadt.reset_reg = r;
         pm->fadt.reset_val = 0xf;
         pm->fadt.flags |= 1 << ACPI_FADT_F_RESET_REG_SUP;
@ -68,10 +71,10 @@ index 23c77ee..6cfcdfc 100644
     }
 diff --git a/hw/i386/pc.c b/hw/i386/pc.c
-index 5143c51..382a17b 100644
+index 4af9679..d17d6f8 100644
 --- a/hw/i386/pc.c
 +++ b/hw/i386/pc.c
-@@ -340,6 +340,263 @@ GlobalProperty pc_compat_1_4[] = {
+@@ -345,6 +345,263 @@ GlobalProperty pc_compat_1_4[] = {
 };
 const size_t pc_compat_1_4_len = G_N_ELEMENTS(pc_compat_1_4);
@ -335,7 +338,7 @@ index 5143c51..382a17b 100644
 GSIState *pc_gsi_create(qemu_irq **irqs, bool pci_enabled)
 {
     GSIState *s;
-@@ -1030,7 +1287,8 @@ void pc_memory_init(PCMachineState *pcms,
+@@ -1010,7 +1267,8 @@ void pc_memory_init(PCMachineState *pcms,
     option_rom_mr = g_malloc(sizeof(*option_rom_mr));
     memory_region_init_ram(option_rom_mr, NULL, "pc.rom", PC_ROM_SIZE,
                            &error_fatal);
@ -345,7 +348,7 @@ index 5143c51..382a17b 100644
         memory_region_set_readonly(option_rom_mr, true);
     }
     memory_region_add_subregion_overlap(rom_memory,
-@@ -1936,6 +2194,8 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
+@@ -1960,6 +2218,8 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
     pcmc->linuxboot_dma_enabled = true;
     pcmc->pvh_enabled = true;
     assert(!mc->get_hotplug_handler);
@ -354,7 +357,7 @@ index 5143c51..382a17b 100644
     mc->get_hotplug_handler = pc_get_hotplug_handler;
     mc->hotplug_allowed = pc_hotplug_allowed;
     mc->cpu_index_to_instance_props = x86_cpu_index_to_props;
-@@ -1947,7 +2207,8 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
+@@ -1971,7 +2231,8 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
     mc->hot_add_cpu = pc_hot_add_cpu;
     mc->smp_parse = pc_smp_parse;
     mc->block_default_type = IF_IDE;
@ -365,18 +368,18 @@ index 5143c51..382a17b 100644
     mc->wakeup = pc_machine_wakeup;
     hc->pre_plug = pc_machine_device_pre_plug_cb;
 diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
-index 26ff640..74a434d 100644
+index 82a33b4..b195f26 100644
 --- a/hw/i386/pc_piix.c
 +++ b/hw/i386/pc_piix.c
-@@ -53,6 +53,7 @@
+@@ -54,6 +54,7 @@
 #include "cpu.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "sysemu/xen.h"
 +#include "migration/migration.h"
 #ifdef CONFIG_XEN
 #include <xen/hvm/hvm_info_table.h>
 #include "hw/xen/xen_pt.h"
-@@ -173,8 +174,8 @@ static void pc_init1(MachineState *machine,
+@@ -176,8 +177,8 @@ static void pc_init1(MachineState *machine,
     if (pcmc->smbios_defaults) {
         MachineClass *mc = MACHINE_GET_CLASS(machine);
         /* These values are guest ABI, do not change */
@ -387,7 +390,7 @@ index 26ff640..74a434d 100644
                             pcmc->smbios_uuid_encoded,
                             pcmc->smbios_stream_product,
                             pcmc->smbios_stream_version,
-@@ -310,6 +311,7 @@ static void pc_init1(MachineState *machine,
+@@ -314,6 +315,7 @@ static void pc_init1(MachineState *machine,
  * hw_compat_*, pc_compat_*, or * pc_*_machine_options().
  */
@ -395,7 +398,7 @@ index 26ff640..74a434d 100644
 static void pc_compat_2_3_fn(MachineState *machine)
 {
     X86MachineState *x86ms = X86_MACHINE(machine);
-@@ -973,3 +975,207 @@ static void xenfv_3_1_machine_options(MachineClass *m)
+@@ -991,3 +993,207 @@ static void xenfv_3_1_machine_options(MachineClass *m)
 DEFINE_PC_MACHINE(xenfv, "xenfv-3.1", pc_xen_hvm_init,
                   xenfv_3_1_machine_options);
 #endif
@ -604,10 +607,10 @@ index 26ff640..74a434d 100644
 +DEFINE_PC_MACHINE(rhel700, "pc-i440fx-rhel7.0.0", pc_init_rhel700,
 +                  pc_machine_rhel700_options);
 diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
-index f67232e..daa05f4 100644
+index 1818d31..6c49a50 100644
 --- a/hw/i386/pc_q35.c
 +++ b/hw/i386/pc_q35.c
-@@ -198,8 +198,8 @@ static void pc_q35_init(MachineState *machine)
+@@ -201,8 +201,8 @@ static void pc_q35_init(MachineState *machine)
     if (pcmc->smbios_defaults) {
         /* These values are guest ABI, do not change */
@ -618,7 +621,7 @@ index f67232e..daa05f4 100644
                             pcmc->smbios_uuid_encoded,
                             pcmc->smbios_stream_product,
                             pcmc->smbios_stream_version,
-@@ -333,6 +333,7 @@ static void pc_q35_init(MachineState *machine)
+@@ -337,6 +337,7 @@ static void pc_q35_init(MachineState *machine)
     DEFINE_PC_MACHINE(suffix, name, pc_init_##suffix, optionfn)
@ -626,7 +629,7 @@ index f67232e..daa05f4 100644
 static void pc_q35_machine_options(MachineClass *m)
 {
     PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
-@@ -547,3 +548,160 @@ static void pc_q35_2_4_machine_options(MachineClass *m)
+@@ -564,3 +565,160 @@ static void pc_q35_2_4_machine_options(MachineClass *m)
 DEFINE_Q35_MACHINE(v2_4, "pc-q35-2.4", NULL,
                    pc_q35_2_4_machine_options);
@ -788,7 +791,7 @@ index f67232e..daa05f4 100644
 +DEFINE_PC_MACHINE(q35_rhel730, "pc-q35-rhel7.3.0", pc_q35_init_rhel730,
 +                  pc_q35_machine_rhel730_options);
 diff --git a/include/hw/boards.h b/include/hw/boards.h
-index 0046ab5..d81225b 100644
+index 2224fbc..24c1348 100644
 --- a/include/hw/boards.h
 +++ b/include/hw/boards.h
@@ -207,6 +207,8 @@ struct MachineClass {
@ -801,10 +804,10 @@ index 0046ab5..d81225b 100644
                                  int nb_nodes, ram_addr_t size);
     bool ignore_boot_device_suffixes;
 diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
-index 69fca4e..2e0395b 100644
+index 665c430..95d07f8 100644
 --- a/include/hw/i386/pc.h
 +++ b/include/hw/i386/pc.h
-@@ -118,6 +118,9 @@ typedef struct PCMachineClass {
+@@ -120,6 +120,9 @@ typedef struct PCMachineClass {
     /* use PVH to load kernels that support this feature */
     bool pvh_enabled;
@ -814,7 +817,7 @@ index 69fca4e..2e0395b 100644
 } PCMachineClass;
 #define TYPE_PC_MACHINE "generic-pc-machine"
-@@ -273,6 +276,36 @@ extern const size_t pc_compat_1_5_len;
+@@ -264,6 +267,36 @@ extern const size_t pc_compat_1_5_len;
 extern GlobalProperty pc_compat_1_4[];
 extern const size_t pc_compat_1_4_len;
@ -852,10 +855,10 @@ index 69fca4e..2e0395b 100644
  * depending on QEMU versions up to QEMU 2.4.
  */
 diff --git a/target/i386/cpu.c b/target/i386/cpu.c
-index d98618c..4cfaf91 100644
+index 55a30cd..5477433 100644
 --- a/target/i386/cpu.c
 +++ b/target/i386/cpu.c
-@@ -1806,7 +1806,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
+@@ -1830,7 +1830,7 @@ static X86CPUDefinition builtin_x86_defs[] = {
         .level = 0xd,
         .vendor = CPUID_VENDOR_AMD,
         .family = 6,
@ -864,7 +867,7 @@ index d98618c..4cfaf91 100644
         .stepping = 3,
         .features[FEAT_1_EDX] = CPUID_SSE2 | CPUID_SSE | CPUID_FXSR |
             CPUID_MMX | CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV |
-@@ -4085,6 +4085,7 @@ static PropValue kvm_default_props[] = {
+@@ -4114,6 +4114,7 @@ static PropValue kvm_default_props[] = {
     { "acpi", "off" },
     { "monitor", "off" },
     { "svm", "off" },
@ -873,10 +876,10 @@ index d98618c..4cfaf91 100644
 };
 diff --git a/target/i386/kvm.c b/target/i386/kvm.c
-index 4901c6d..e41cff2 100644
+index 6adbff3..51fbfd5 100644
 --- a/target/i386/kvm.c
 +++ b/target/i386/kvm.c
-@@ -3113,6 +3113,7 @@ static int kvm_get_msrs(X86CPU *cpu)
+@@ -3139,6 +3139,7 @@ static int kvm_get_msrs(X86CPU *cpu)
     struct kvm_msr_entry *msrs = cpu->kvm_msr_buf->entries;
     int ret, i;
     uint64_t mtrr_top_bits;
@ -884,7 +887,7 @@ index 4901c6d..e41cff2 100644
     kvm_msr_buf_reset(cpu);
-@@ -3422,6 +3423,9 @@ static int kvm_get_msrs(X86CPU *cpu)
+@@ -3448,6 +3449,9 @@ static int kvm_get_msrs(X86CPU *cpu)
             break;
         case MSR_KVM_ASYNC_PF_EN:
             env->async_pf_en_msr = msrs[i].data;
--- a/0012-Enable-make-check.patch
+++ b/0012-Enable-make-check.patch
@ -1,4 +1,4 @@
-From 19bc7ed029e014148be05551a2f36b7d41035b1c Mon Sep 17 00:00:00 2001
+From 8704d7b6ca7438f10d162caf70572b62509b6341 Mon Sep 17 00:00:00 2001
 From: Miroslav Rezanina <mrezanin@redhat.com>
 Date: Fri, 19 Oct 2018 13:48:41 +0200
 Subject: Enable make check
@ -26,7 +26,7 @@ Rebase changes (weekly-200129):
 - Disable qtest/q35-test (uses upstream machine types)
 Rebased changes (weekly-200212):
- Do not run iotests on make check
+- Do not run iotests on make checka
 Merged patches (4.0.0):
 - f7ffd13 Remove 7 qcow2 and luks iotests that are taking > 25 sec to run during the fast train build proce
@ -82,7 +82,7 @@ index 034d3a3..aadc413 100755
      *)
         ;;
 diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
-index 435dccd..4ad61bc 100644
+index d886fa0..37dd761 100644
 --- a/tests/qemu-iotests/group
 +++ b/tests/qemu-iotests/group
@@ -92,7 +92,7 @@
@ -104,7 +104,7 @@ index 435dccd..4ad61bc 100644
 101 rw quick
 102 rw quick
 diff --git a/tests/qtest/Makefile.include b/tests/qtest/Makefile.include
-index 9e5a51d..0732f59 100644
+index 98af2c2..d370459 100644
 --- a/tests/qtest/Makefile.include
 +++ b/tests/qtest/Makefile.include
@@ -29,7 +29,7 @@ check-qtest-i386-y += ide-test
@ -266,7 +266,7 @@ index 60e6ec3..f9d6adc 100644
         add_tests(sparc_machines);
     } else if (!strcmp(arch, "sparc64")) {
 diff --git a/tests/qtest/test-x86-cpuid-compat.c b/tests/qtest/test-x86-cpuid-compat.c
-index 772287b..e7c075e 100644
+index 7ca1883..983aa07 100644
 --- a/tests/qtest/test-x86-cpuid-compat.c
 +++ b/tests/qtest/test-x86-cpuid-compat.c
@@ -300,6 +300,7 @@ int main(int argc, char **argv)
@ -279,7 +279,7 @@ index 772287b..e7c075e 100644
@@ -350,6 +351,7 @@ int main(int argc, char **argv)
     add_cpuid_test("x86/cpuid/xlevel-compat/pc-i440fx-2.4/npt-on",
-                    "-machine pc-i440fx-2.4 -cpu SandyBridge,+npt",
+                    "-machine pc-i440fx-2.4 -cpu SandyBridge,+svm,+npt",
                    "xlevel", 0x80000008);
 +#endif
--- a/0013-vfio-cap-number-of-devices-that-can-be-assigned.patch
+++ b/0013-vfio-cap-number-of-devices-that-can-be-assigned.patch
@ -1,4 +1,4 @@
-From 59faef98f835eb3522a0b49f6af6302b20b17b72 Mon Sep 17 00:00:00 2001
+From a7132dd3a148a8990ef18b38baa2fb2aa89484b4 Mon Sep 17 00:00:00 2001
 From: Bandan Das <bsd@redhat.com>
 Date: Tue, 3 Dec 2013 20:05:13 +0100
 Subject: vfio: cap number of devices that can be assigned
@ -41,7 +41,7 @@ Merged patches (2.9.0):
 2 files changed, 29 insertions(+), 1 deletion(-)
 diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
-index e265d77..41d00a3 100644
+index 6838bcc..ac109b4 100644
 --- a/hw/vfio/pci.c
 +++ b/hw/vfio/pci.c
@@ -47,6 +47,9 @@
@ -54,7 +54,7 @@ index e265d77..41d00a3 100644
 static void vfio_disable_interrupts(VFIOPCIDevice *vdev);
 static void vfio_mmap_set_enabled(VFIOPCIDevice *vdev, bool enabled);
-@@ -2722,9 +2725,30 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
+@@ -2715,9 +2718,30 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
     ssize_t len;
     struct stat st;
     int groupid;
@ -86,7 +86,7 @@ index e265d77..41d00a3 100644
     if (!vdev->vbasedev.sysfsdev) {
         if (!(~vdev->host.domain || ~vdev->host.bus ||
               ~vdev->host.slot || ~vdev->host.function)) {
-@@ -3169,6 +3193,9 @@ static Property vfio_pci_dev_properties[] = {
+@@ -3162,6 +3186,9 @@ static Property vfio_pci_dev_properties[] = {
     DEFINE_PROP_BOOL("x-no-kvm-msix", VFIOPCIDevice, no_kvm_msix, false),
     DEFINE_PROP_BOOL("x-no-geforce-quirks", VFIOPCIDevice,
                      no_geforce_quirks, false),
--- a/0014-Add-support-statement-to-help-output.patch
+++ b/0014-Add-support-statement-to-help-output.patch
@ -1,4 +1,4 @@
-From 583a53be6a7c1c7291ab3fa0d2a4b864ad07358f Mon Sep 17 00:00:00 2001
+From b87487f40dcc351fb7c31a37b6facbdaab285b0c Mon Sep 17 00:00:00 2001
 From: Eduardo Habkost <ehabkost@redhat.com>
 Date: Wed, 4 Dec 2013 18:53:17 +0100
 Subject: Add support statement to -help output
@ -23,7 +23,7 @@ Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
 1 file changed, 9 insertions(+)
 diff --git a/softmmu/vl.c b/softmmu/vl.c
-index 46b4d98..552bae5 100644
+index 3693dfb..9d2e2d3 100644
 --- a/softmmu/vl.c
 +++ b/softmmu/vl.c
@@ -1674,9 +1674,17 @@ static void version(void)
--- a/0015-globally-limit-the-maximum-number-of-CPUs.patch
+++ b/0015-globally-limit-the-maximum-number-of-CPUs.patch
@ -1,4 +1,4 @@
-From 08d4d4615d252407ba4753e1b53087df813eb9d1 Mon Sep 17 00:00:00 2001
+From 0aa24293cae6e15d483b9aa34f5c27ace53e478c Mon Sep 17 00:00:00 2001
 From: Andrew Jones <drjones@redhat.com>
 Date: Tue, 21 Jan 2014 10:46:52 +0100
 Subject: globally limit the maximum number of CPUs
@ -80,10 +80,10 @@ This commit matches the limit to current KVM_CAP_NR_VCPUS value.
 2 files changed, 30 insertions(+)
 diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
-index 439a4ef..6f804b8 100644
+index d54a870..aa562c2 100644
 --- a/accel/kvm/kvm-all.c
 +++ b/accel/kvm/kvm-all.c
-@@ -1975,6 +1975,18 @@ static int kvm_init(MachineState *ms)
+@@ -2089,6 +2089,18 @@ static int kvm_init(MachineState *ms)
     soft_vcpus_limit = kvm_recommended_vcpus(s);
     hard_vcpus_limit = kvm_max_vcpus(s);
@ -103,10 +103,10 @@ index 439a4ef..6f804b8 100644
         if (nc->num > soft_vcpus_limit) {
             warn_report("Number of %s cpus requested (%d) exceeds "
 diff --git a/softmmu/vl.c b/softmmu/vl.c
-index 552bae5..bdc4f7f 100644
+index 9d2e2d3..accccd8 100644
 --- a/softmmu/vl.c
 +++ b/softmmu/vl.c
-@@ -115,6 +115,8 @@
+@@ -116,6 +116,8 @@
 #define MAX_VIRTIO_CONSOLES 1
@ -136,7 +136,7 @@ index 552bae5..bdc4f7f 100644
 static int machine_help_func(QemuOpts *opts, MachineState *machine)
 {
     ObjectProperty *prop;
-@@ -3829,6 +3845,8 @@ void qemu_init(int argc, char **argv, char **envp)
+@@ -3831,6 +3847,8 @@ void qemu_init(int argc, char **argv, char **envp)
                      "mutually exclusive");
         exit(EXIT_FAILURE);
     }
--- a/0016-Add-support-for-simpletrace.patch
+++ b/0016-Add-support-for-simpletrace.patch
@ -1,4 +1,4 @@
-From 6941da1d2cca51e23c525630610e10202db3434b Mon Sep 17 00:00:00 2001
+From dbf4ed3ddf5439d9563eb408bb95396b3b2c650f Mon Sep 17 00:00:00 2001
 From: Miroslav Rezanina <mrezanin@redhat.com>
 Date: Thu, 8 Oct 2015 09:50:17 +0200
 Subject: Add support for simpletrace
@ -37,10 +37,10 @@ Merged patches (2.3.0):
 create mode 100644 scripts/systemtap/script.d/qemu_kvm.stp
 diff --git a/Makefile b/Makefile
-index a89cc44..dcd088e 100644
+index 88b7565..045eeb5 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -1000,6 +1000,10 @@ endif
+@@ -995,6 +995,10 @@ endif
 		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/keymaps/$$x "$(DESTDIR)$(qemu_datadir)/keymaps"; \
 	done
 	$(INSTALL_DATA) $(BUILD_DIR)/trace-events-all "$(DESTDIR)$(qemu_datadir)/trace-events-all"
--- a/0017-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch
+++ b/0017-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch
@ -1,4 +1,4 @@
-From aaf64f4f80e6266921d9547f0b3b71e57abaf922 Mon Sep 17 00:00:00 2001
+From 9c4bcb1912ff003bc74c0bb3d49c78b1aca995d9 Mon Sep 17 00:00:00 2001
 From: Miroslav Rezanina <mrezanin@redhat.com>
 Date: Wed, 29 Jan 2020 09:30:03 +0100
 Subject: Use qemu-kvm in documentation instead of qemu-system-<arch>
@ -3692,10 +3692,10 @@ index 0000000..10cd1de
 +
 +@bye
 diff --git a/qemu-options.hx b/qemu-options.hx
-index 1df25ae..8c48b40 100644
+index 43b0dbc..9b14fe8 100644
 --- a/qemu-options.hx
 +++ b/qemu-options.hx
-@@ -2878,11 +2878,11 @@ SRST
+@@ -2887,11 +2887,11 @@ SRST
     ::
--- a/0018-usb-xhci-Fix-PCI-capability-order.patch
+++ b/0018-usb-xhci-Fix-PCI-capability-order.patch
@ -1,4 +1,4 @@
-From ffa7a8516256750abd8c3bfb6964811582d36835 Mon Sep 17 00:00:00 2001
+From 6a0ad69ff5249d19e497ea902cd456c442febb80 Mon Sep 17 00:00:00 2001
 From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
 Date: Fri, 5 May 2017 19:06:14 +0200
 Subject: usb-xhci: Fix PCI capability order
--- a/0019-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch
+++ b/0019-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch
@ -1,4 +1,4 @@
-From 6f3b48a5ead2663197589066dfd4ed81d4658fe2 Mon Sep 17 00:00:00 2001
+From fed8a416435347899223bbfc260e57d8f8ddd20a Mon Sep 17 00:00:00 2001
 From: Fam Zheng <famz@redhat.com>
 Date: Wed, 14 Jun 2017 15:37:01 +0200
 Subject: virtio-scsi: Reject scsi-cd if data plane enabled [RHEL only]
@ -45,7 +45,7 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
 1 file changed, 9 insertions(+)
 diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
-index 472bbd2..ba2dac8 100644
+index 9b72094..71614b4 100644
 --- a/hw/scsi/virtio-scsi.c
 +++ b/hw/scsi/virtio-scsi.c
@@ -814,6 +814,15 @@ static void virtio_scsi_hotplug(HotplugHandler *hotplug_dev, DeviceState *dev,
--- a/0020-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch
+++ b/0020-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch
@ -1,4 +1,4 @@
-From 45b492a99791a4a463486be35e9ab44986507efe Mon Sep 17 00:00:00 2001
+From 00aeb546c0f989cf0c4a9623bbac9b187b051d68 Mon Sep 17 00:00:00 2001
 From: David Gibson <dgibson@redhat.com>
 Date: Wed, 6 Feb 2019 03:58:56 +0000
 Subject: BZ1653590: Require at least 64kiB pages for downstream guests & hosts
@ -32,10 +32,10 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
 1 file changed, 7 insertions(+)
 diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c
-index eb54f94..ecefb08 100644
+index 0c2bc8e..15bef3d 100644
 --- a/hw/ppc/spapr_caps.c
 +++ b/hw/ppc/spapr_caps.c
-@@ -351,12 +351,19 @@ void spapr_check_pagesize(SpaprMachineState *spapr, hwaddr pagesize,
+@@ -335,12 +335,19 @@ void spapr_check_pagesize(SpaprMachineState *spapr, hwaddr pagesize,
 static void cap_hpt_maxpagesize_apply(SpaprMachineState *spapr,
                                       uint8_t val, Error **errp)
 {
--- a/0021-block-Versioned-x-blockdev-reopen-API-with-feature-f.patch
+++ b/0021-block-Versioned-x-blockdev-reopen-API-with-feature-f.patch
@ -1,4 +1,4 @@
-From ce12fa518d472f85d7d036c65867f40ec69ca759 Mon Sep 17 00:00:00 2001
+From 79b1a539f271440baa5d3ef4264c761175ca1c9d Mon Sep 17 00:00:00 2001
 From: Kevin Wolf <kwolf@redhat.com>
 Date: Fri, 13 Mar 2020 12:34:32 +0000
 Subject: block: Versioned x-blockdev-reopen API with feature flag
@ -29,10 +29,10 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
 1 file changed, 8 insertions(+), 1 deletion(-)
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index 943df19..50b99fb 100644
+index 0e1c6a5..6d94f92 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
-@@ -4126,10 +4126,17 @@
+@@ -4135,10 +4135,17 @@
 # image does not have a default backing file name as part of its
 # metadata.
 #
--- a/0023-RHEL-only-Enable-vTPM-for-POWER-in-downstream-config.patch
+++ b/0023-RHEL-only-Enable-vTPM-for-POWER-in-downstream-config.patch
@ -0,0 +1,41 @@
 From c3b099b389455b919b4b22011ed2fa3e7fd49510 Mon Sep 17 00:00:00 2001
 From: David Gibson <dgibson@redhat.com>
 Date: Wed, 1 Jul 2020 12:24:02 +0200
 Subject: RHEL-only: Enable vTPM for POWER in downstream configs
 RH-Author: David Gibson <dgibson@redhat.com>
 Message-id: <20200522032718.387731-1-dgibson@redhat.com>
 Patchwork-id: 96743
 O-Subject: [RHEL-AV-8.3.0 qemu-kvm PATCH] RHEL-only: Enable vTPM for POWER in downstream configs
 Bugzilla: 1781911
 From: David Gibson <david@gibson.dropbear.id.au>
 With the rebase to 5.0 we have the necessary code to implement virtual TPMs
 for POWER targets.  However, it's not enabled in the Red Hat configuration.
 This downstream only patch corrects that.
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1781911
 Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=28742072
 Testing: With brewed qemu was able to see a vTPM device in a guest
 Signed-off-by: David Gibson <dgibson@redhat.com>
 Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 ---
 default-configs/ppc64-rh-devices.mak | 3 +++
 1 file changed, 3 insertions(+)
 diff --git a/default-configs/ppc64-rh-devices.mak b/default-configs/ppc64-rh-devices.mak
 index ecbe53f..032422e 100644
 --- a/default-configs/ppc64-rh-devices.mak
 +++ b/default-configs/ppc64-rh-devices.mak
@@ -32,3 +32,6 @@ CONFIG_XICS_SPAPR=y
 CONFIG_XIVE=y
 CONFIG_XIVE_SPAPR=y
 CONFIG_XIVE_KVM=y
 +CONFIG_TPM_SPAPR=y
 +CONFIG_TPM_EMULATOR=y
 +CONFIG_TPM_PASSTHROUGH=y
 -- 
 1.8.3.1
--- a/0024-redhat-fix-5.0-rebase-missing-ISA-TPM-TIS.patch
+++ b/0024-redhat-fix-5.0-rebase-missing-ISA-TPM-TIS.patch
@ -0,0 +1,43 @@
 From 7fd82f454755e0c7c68faac76a156c9ddb322124 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
 Date: Wed, 1 Jul 2020 12:24:02 +0200
 Subject: redhat: fix 5.0 rebase missing ISA TPM TIS
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 RH-Author: Marc-André Lureau <marcandre.lureau@redhat.com>
 Message-id: <20200608155426.112078-1-marcandre.lureau@redhat.com>
 Patchwork-id: 97457
 O-Subject: [RHEL-AV-8.3.0 qemu-kvm PATCH] redhat: fix 5.0 rebase missing ISA TPM TIS
 Bugzilla: 1841529
 RH-Acked-by: Auger Eric <eric.auger@redhat.com>
 RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
 RH-Acked-by: Danilo de Paula <ddepaula@redhat.com>
 BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1841529
 BRANCH: rhel-av-8.3.0-preview-2020-04-29
 UPSTREAM: N/A
 BREW: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=29172313
 Signed-off-by: Marc-AndrÃ© Lureau <marcandre.lureau@redhat.com>
 Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 ---
 default-configs/x86_64-rh-devices.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/default-configs/x86_64-rh-devices.mak b/default-configs/x86_64-rh-devices.mak
 index d59b6d9..1469e05 100644
 --- a/default-configs/x86_64-rh-devices.mak
 +++ b/default-configs/x86_64-rh-devices.mak
@@ -95,6 +95,6 @@ CONFIG_WDT_IB6300ESB=y
 CONFIG_WDT_IB700=y
 CONFIG_XIO3130=y
 CONFIG_TPM_CRB=y
 -CONFIG_TPM_TIS=y
 +CONFIG_TPM_TIS_ISA=y
 CONFIG_TPM_EMULATOR=y
 CONFIG_TPM_PASSTHROUGH=y
 -- 
 1.8.3.1
--- a/0025-redhat-define-hw_compat_8_2.patch
+++ b/0025-redhat-define-hw_compat_8_2.patch
@ -0,0 +1,81 @@
 From 3be5878b68235837729f452f0940105505bf4a55 Mon Sep 17 00:00:00 2001
 From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
 Date: Wed, 1 Jul 2020 12:24:02 +0200
 Subject: redhat: define hw_compat_8_2
 RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
 Message-id: <20200619154227.23845-2-dgilbert@redhat.com>
 Patchwork-id: 97662
 O-Subject: [RHEL-AV 8.3.0 qemu-kvm PATCH 1/2] redhat: define hw_compat_8_2
 Bugzilla: 1842902
 RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
 RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
 From: Laurent Vivier <lvivier@redhat.com>
 Signed-off-by: Laurent Vivier <lvivier@redhat.com>
 Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
   For minor fix
 Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 ---
 hw/core/machine.c   | 28 ++++++++++++++++++++++++++++
 include/hw/boards.h |  3 +++
 2 files changed, 31 insertions(+)
 diff --git a/hw/core/machine.c b/hw/core/machine.c
 index ef6b320..b837399 100644
 --- a/hw/core/machine.c
 +++ b/hw/core/machine.c
@@ -29,6 +29,34 @@
 #include "migration/vmstate.h"
 /*
 + * The same as hw_compat_4_2
 + */
 +GlobalProperty hw_compat_rhel_8_2[] = {
 +    /* hw_compat_rhel_8_2 from hw_compat_4_2 */
 +    { "virtio-blk-device", "queue-size", "128"},
 +    /* hw_compat_rhel_8_2 from hw_compat_4_2 */
 +    { "virtio-scsi-device", "virtqueue_size", "128"},
 +    /* hw_compat_rhel_8_2 from hw_compat_4_2 */
 +    { "virtio-blk-device", "x-enable-wce-if-config-wce", "off" },
 +    /* hw_compat_rhel_8_2 from hw_compat_4_2 */
 +    { "virtio-blk-device", "seg-max-adjust", "off"},
 +    /* hw_compat_rhel_8_2 from hw_compat_4_2 */
 +    { "virtio-scsi-device", "seg_max_adjust", "off"},
 +    /* hw_compat_rhel_8_2 from hw_compat_4_2 */
 +    { "vhost-blk-device", "seg_max_adjust", "off"},
 +    /* hw_compat_rhel_8_2 from hw_compat_4_2 */
 +    { "usb-host", "suppress-remote-wake", "off" },
 +    /* hw_compat_rhel_8_2 from hw_compat_4_2 */
 +    { "usb-redir", "suppress-remote-wake", "off" },
 +    /* hw_compat_rhel_8_2 from hw_compat_4_2 */
 +    { "qxl", "revision", "4" },
 +    /* hw_compat_rhel_8_2 from hw_compat_4_2 */
 +    { "qxl-vga", "revision", "4" },
 +    /* hw_compat_rhel_8_2 from hw_compat_4_2 */
 +    { "fw_cfg", "acpi-mr-restore", "false" },
 +};
 +const size_t hw_compat_rhel_8_2_len = G_N_ELEMENTS(hw_compat_rhel_8_2);
 +/*
  * The same as hw_compat_4_1
  */
 GlobalProperty hw_compat_rhel_8_1[] = {
 diff --git a/include/hw/boards.h b/include/hw/boards.h
 index 24c1348..26ac91d 100644
 --- a/include/hw/boards.h
 +++ b/include/hw/boards.h
@@ -374,6 +374,9 @@ extern const size_t hw_compat_2_2_len;
 extern GlobalProperty hw_compat_2_1[];
 extern const size_t hw_compat_2_1_len;
 +extern GlobalProperty hw_compat_rhel_8_2[];
 +extern const size_t hw_compat_rhel_8_2_len;
 +
 extern GlobalProperty hw_compat_rhel_8_1[];
 extern const size_t hw_compat_rhel_8_1_len;
 -- 
 1.8.3.1
--- a/0026-x86-Add-8.3.0-x86_64-machine-type.patch
+++ b/0026-x86-Add-8.3.0-x86_64-machine-type.patch
@ -0,0 +1,117 @@
 From 16e1749209e7df15f7ce12418886117c2259dee7 Mon Sep 17 00:00:00 2001
 From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
 Date: Wed, 1 Jul 2020 12:24:02 +0200
 Subject: x86: Add 8.3.0 x86_64 machine type
 RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
 Message-id: <20200619154227.23845-3-dgilbert@redhat.com>
 Patchwork-id: 97663
 O-Subject: [RHEL-AV 8.3.0 qemu-kvm PATCH 2/2] x86: Add 8.3.0 x86_64 machine type
 Bugzilla: 1842902
 RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
 RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
 From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
 Not much change, just the smbase-smram.
 Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
 Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 ---
 hw/i386/pc.c         |  6 ++++++
 hw/i386/pc_piix.c    |  4 ++++
 hw/i386/pc_q35.c     | 22 ++++++++++++++++++++++
 include/hw/i386/pc.h |  3 +++
 4 files changed, 35 insertions(+)
 diff --git a/hw/i386/pc.c b/hw/i386/pc.c
 index d17d6f8..aaf3ef4 100644
 --- a/hw/i386/pc.c
 +++ b/hw/i386/pc.c
@@ -359,6 +359,12 @@ GlobalProperty pc_rhel_compat[] = {
 };
 const size_t pc_rhel_compat_len = G_N_ELEMENTS(pc_rhel_compat);
 +GlobalProperty pc_rhel_8_2_compat[] = {
 +    /* pc_rhel_8_2_compat from pc_compat_4_2 */
 +    { "mch", "smbase-smram", "off" },
 +};
 +const size_t pc_rhel_8_2_compat_len = G_N_ELEMENTS(pc_rhel_8_2_compat);
 +
 /* pc_rhel_8_1_compat is empty since pc_4_1_compat is */
 GlobalProperty pc_rhel_8_1_compat[] = { };
 const size_t pc_rhel_8_1_compat_len = G_N_ELEMENTS(pc_rhel_8_1_compat);
 diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
 index b195f26..c951107 100644
 --- a/hw/i386/pc_piix.c
 +++ b/hw/i386/pc_piix.c
@@ -1027,6 +1027,10 @@ static void pc_machine_rhel760_options(MachineClass *m)
     m->smbus_no_migration_support = true;
     pcmc->pvh_enabled = false;
     pcmc->default_cpu_version = CPU_VERSION_LEGACY;
 +    compat_props_add(m->compat_props, hw_compat_rhel_8_2,
 +                     hw_compat_rhel_8_2_len);
 +    compat_props_add(m->compat_props, pc_rhel_8_2_compat,
 +                     pc_rhel_8_2_compat_len);
     compat_props_add(m->compat_props, hw_compat_rhel_8_1, hw_compat_rhel_8_1_len);
     compat_props_add(m->compat_props, pc_rhel_8_1_compat, pc_rhel_8_1_compat_len);
     compat_props_add(m->compat_props, hw_compat_rhel_8_0, hw_compat_rhel_8_0_len);
 diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
 index 6c49a50..ef0b6e3 100644
 --- a/hw/i386/pc_q35.c
 +++ b/hw/i386/pc_q35.c
@@ -589,6 +589,23 @@ static void pc_q35_machine_rhel_options(MachineClass *m)
     compat_props_add(m->compat_props, pc_rhel_compat, pc_rhel_compat_len);
 }
 +static void pc_q35_init_rhel830(MachineState *machine)
 +{
 +    pc_q35_init(machine);
 +}
 +
 +static void pc_q35_machine_rhel830_options(MachineClass *m)
 +{
 +    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
 +    pc_q35_machine_rhel_options(m);
 +    m->desc = "RHEL-8.3.0 PC (Q35 + ICH9, 2009)";
 +    pcmc->smbios_stream_product = "RHEL-AV";
 +    pcmc->smbios_stream_version = "8.3.0";
 +}
 +
 +DEFINE_PC_MACHINE(q35_rhel830, "pc-q35-rhel8.3.0", pc_q35_init_rhel830,
 +                  pc_q35_machine_rhel830_options);
 +
 static void pc_q35_init_rhel820(MachineState *machine)
 {
     pc_q35_init(machine);
@@ -599,8 +616,13 @@ static void pc_q35_machine_rhel820_options(MachineClass *m)
     PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
     pc_q35_machine_rhel_options(m);
     m->desc = "RHEL-8.2.0 PC (Q35 + ICH9, 2009)";
 +    m->alias = NULL;
     pcmc->smbios_stream_product = "RHEL-AV";
     pcmc->smbios_stream_version = "8.2.0";
 +    compat_props_add(m->compat_props, hw_compat_rhel_8_2,
 +                     hw_compat_rhel_8_2_len);
 +    compat_props_add(m->compat_props, pc_rhel_8_2_compat,
 +                     pc_rhel_8_2_compat_len);
 }
 DEFINE_PC_MACHINE(q35_rhel820, "pc-q35-rhel8.2.0", pc_q35_init_rhel820,
 diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
 index 95d07f8..e67468b 100644
 --- a/include/hw/i386/pc.h
 +++ b/include/hw/i386/pc.h
@@ -270,6 +270,9 @@ extern const size_t pc_compat_1_4_len;
 extern GlobalProperty pc_rhel_compat[];
 extern const size_t pc_rhel_compat_len;
 +extern GlobalProperty pc_rhel_8_2_compat[];
 +extern const size_t pc_rhel_8_2_compat_len;
 +
 extern GlobalProperty pc_rhel_8_1_compat[];
 extern const size_t pc_rhel_8_1_compat_len;
 -- 
 1.8.3.1
--- a/0027-hw-arm-Changes-to-rhel820-machine.patch
+++ b/0027-hw-arm-Changes-to-rhel820-machine.patch
@ -0,0 +1,78 @@
 From b3f4822d380a046220749314c9a05cdb0d5d2718 Mon Sep 17 00:00:00 2001
 From: Gavin Shan <gshan@redhat.com>
 Date: Wed, 1 Jul 2020 12:24:02 +0200
 Subject: hw/arm: Changes to rhel820 machine
 RH-Author: Gavin Shan <gshan@redhat.com>
 Message-id: <20200630013648.101937-1-gshan@redhat.com>
 Patchwork-id: 97844
 O-Subject: [RHEL-AV 8.3.0 qemu-kvm PATCH v5 1/3] hw/arm: Changes to rhel820 machine
 Bugzilla: 1818843
 This applies two changes to rhel820 machine:
   * Set the gic version to VIRT_GIC_VERSION_NOSEL by default, which
     doesn't cause functional changes.
   * Disallow to configure the RAS property, which is hidden by default.
 Signed-off-by: Gavin Shan <gshan@redhat.com>
 RH-Acked-by: Auger Eric <eric.auger@redhat.com>
 RH-Acked-by: Andrew Jones <drjones@redhat.com>
 Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 ---
 hw/arm/virt.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)
 diff --git a/hw/arm/virt.c b/hw/arm/virt.c
 index abbc7d5..07c5c14 100644
 --- a/hw/arm/virt.c
 +++ b/hw/arm/virt.c
@@ -2090,6 +2090,7 @@ 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);
@@ -2103,6 +2104,7 @@ static void virt_set_ras(Object *obj, bool value, Error **errp)
     vms->ras = value;
 }
 +#endif /* disabled for RHEL */
 static char *virt_get_gic_version(Object *obj, Error **errp)
 {
@@ -2727,12 +2729,8 @@ static void rhel820_virt_instance_init(Object *obj)
     object_property_set_description(obj, "highmem",
                                     "Set on/off to enable/disable using "
                                     "physical address space above 32 bits");
 -    /*
 -     * Default GIC type is still v2, but became configurable for RHEL. We
 -     * keep v2 instead of max as TCG CI test cases require an MSI controller
 -     * and there is no userspace ITS MSI emulation available.
 -     */
 -    vms->gic_version = 2;
 +
 +    vms->gic_version = VIRT_GIC_VERSION_NOSEL;
     object_property_add_str(obj, "gic-version", virt_get_gic_version,
                         virt_set_gic_version);
     object_property_set_description(obj, "gic-version",
@@ -2759,12 +2757,9 @@ static void rhel820_virt_instance_init(Object *obj)
     object_property_set_description(obj, "iommu",
                                     "Set the IOMMU type. "
                                     "Valid values are none and smmuv3");
 +
     vms->ras = false;
 -    object_property_add_bool(obj, "ras", virt_get_ras,
 -                             virt_set_ras);
 -    object_property_set_description(obj, "ras",
 -                                    "Set on/off to enable/disable reporting host memory errors "
 -                                    "to a KVM guest using ACPI and guest external abort exceptions");
 +
     vms->irqmap=a15irqmap;
     virt_flash_create(vms);
 }
 -- 
 1.8.3.1
--- a/0028-hw-arm-Introduce-rhel_virt_instance_init-helper.patch
+++ b/0028-hw-arm-Introduce-rhel_virt_instance_init-helper.patch
@ -0,0 +1,50 @@
 From 75c705bcd0e6adb903889dd031c6f867a1ca7a63 Mon Sep 17 00:00:00 2001
 From: Gavin Shan <gshan@redhat.com>
 Date: Wed, 1 Jul 2020 12:24:02 +0200
 Subject: hw/arm: Introduce rhel_virt_instance_init() helper
 RH-Author: Gavin Shan <gshan@redhat.com>
 Message-id: <20200629022939.76453-3-gshan@redhat.com>
 Patchwork-id: 97838
 O-Subject: [RHEL-AV 8.3.0 qemu-kvm PATCH v4 2/3] hw/arm: Introduce rhel_virt_instance_init() helper
 Bugzilla: 1818843
 RH-Acked-by: Andrew Jones <drjones@redhat.com>
 This introduces rhel_virt_instance_init() helper function so that
 it can be shared by rhel820 and rhel830 machine. This shouldn't
 cause functional changes.
 Signed-off-by: Gavin Shan <gshan@redhat.com>
 Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 ---
 hw/arm/virt.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
 diff --git a/hw/arm/virt.c b/hw/arm/virt.c
 index 07c5c14..c1bc866 100644
 --- a/hw/arm/virt.c
 +++ b/hw/arm/virt.c
@@ -2713,7 +2713,7 @@ static void rhel_machine_init(void)
 }
 type_init(rhel_machine_init);
 -static void rhel820_virt_instance_init(Object *obj)
 +static void rhel_virt_instance_init(Object *obj)
 {
     VirtMachineState *vms = VIRT_MACHINE(obj);
     VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);
@@ -2764,6 +2764,11 @@ static void rhel820_virt_instance_init(Object *obj)
     virt_flash_create(vms);
 }
 +static void rhel820_virt_instance_init(Object *obj)
 +{
 +    rhel_virt_instance_init(obj);
 +}
 +
 static void rhel820_virt_options(MachineClass *mc)
 {
     compat_props_add(mc->compat_props, arm_rhel_compat, arm_rhel_compat_len);
 -- 
 1.8.3.1
--- a/0029-hw-arm-Add-rhel830-machine-type.patch
+++ b/0029-hw-arm-Add-rhel830-machine-type.patch
@ -0,0 +1,58 @@
 From c0c64a417f65d388526c62b2d82f29fc4f5aed76 Mon Sep 17 00:00:00 2001
 From: Gavin Shan <gshan@redhat.com>
 Date: Wed, 1 Jul 2020 12:24:02 +0200
 Subject: hw/arm: Add rhel830 machine type
 RH-Author: Gavin Shan <gshan@redhat.com>
 Message-id: <20200630014756.102753-1-gshan@redhat.com>
 Patchwork-id: 97845
 O-Subject: [RHEL-AV 8.3.0 qemu-kvm PATCH v5 3/3] hw/arm: Add rhel830 machine type
 Bugzilla: 1818843
 RH-Acked-by: Andrew Jones <drjones@redhat.com>
 This adds rhel830 machine type, whose properties are same as to
 rhel820.
 Signed-off-by: Gavin Shan <gshan@redhat.com>
 RH-Acked-by: Auger Eric <eric.auger@redhat.com>
 Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 ---
 hw/arm/virt.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
 diff --git a/hw/arm/virt.c b/hw/arm/virt.c
 index c1bc866..48af222 100644
 --- a/hw/arm/virt.c
 +++ b/hw/arm/virt.c
@@ -2764,6 +2764,17 @@ static void rhel_virt_instance_init(Object *obj)
     virt_flash_create(vms);
 }
 +static void rhel830_virt_instance_init(Object *obj)
 +{
 +    rhel_virt_instance_init(obj);
 +}
 +
 +static void rhel830_virt_options(MachineClass *mc)
 +{
 +    compat_props_add(mc->compat_props, arm_rhel_compat, arm_rhel_compat_len);
 +}
 +DEFINE_RHEL_MACHINE_AS_LATEST(8, 3, 0)
 +
 static void rhel820_virt_instance_init(Object *obj)
 {
     rhel_virt_instance_init(obj);
@@ -2771,6 +2782,8 @@ static void rhel820_virt_instance_init(Object *obj)
 static void rhel820_virt_options(MachineClass *mc)
 {
 -    compat_props_add(mc->compat_props, arm_rhel_compat, arm_rhel_compat_len);
 +    rhel830_virt_options(mc);
 +    compat_props_add(mc->compat_props, hw_compat_rhel_8_2,
 +                     hw_compat_rhel_8_2_len);
 }
 -DEFINE_RHEL_MACHINE_AS_LATEST(8, 2, 0)
 +DEFINE_RHEL_MACHINE(8, 2, 0)
 -- 
 1.8.3.1
--- a/qemu-kvm.spec
+++ b/qemu-kvm.spec
@ -68,7 +68,7 @@ Obsoletes: %1-rhev
 Summary: QEMU is a machine emulator and virtualizer
 Name: qemu-kvm
 Version: 5.0.0
-Release: 0%{?dist}
+Release: 0%{?dist}.wrb200701
 # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
 Epoch: 15
 License: GPLv2 and GPLv2+ and CC-BY
@ -105,6 +105,7 @@ Source35: udev-kvm-check.c
 Source36: README.tests
 Patch0001: 0001-redhat-Adding-slirp-to-the-exploded-tree.patch
 Patch0005: 0005-Initial-redhat-build.patch
 Patch0006: 0006-Enable-disable-devices-for-RHEL.patch
 Patch0007: 0007-Machine-type-related-general-changes.patch
@ -122,6 +123,13 @@ Patch0018: 0018-usb-xhci-Fix-PCI-capability-order.patch
 Patch0019: 0019-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch
 Patch0020: 0020-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch
 Patch0021: 0021-block-Versioned-x-blockdev-reopen-API-with-feature-f.patch
 Patch0023: 0023-RHEL-only-Enable-vTPM-for-POWER-in-downstream-config.patch
 Patch0024: 0024-redhat-fix-5.0-rebase-missing-ISA-TPM-TIS.patch
 Patch0025: 0025-redhat-define-hw_compat_8_2.patch
 Patch0026: 0026-x86-Add-8.3.0-x86_64-machine-type.patch
 Patch0027: 0027-hw-arm-Changes-to-rhel820-machine.patch
 Patch0028: 0028-hw-arm-Introduce-rhel_virt_instance_init-helper.patch
 Patch0029: 0029-hw-arm-Add-rhel830-machine-type.patch
 BuildRequires: wget
 BuildRequires: rpm-build
@ -406,6 +414,9 @@ the Secure Shell (SSH) protocol.
 %prep
 %setup -n qemu-%{version}
 # Remove slirp content in scratchbuilds because it's being applyed as a patch
 rm -fr slirp
 mkdir slirp
 %autopatch -p1
 mkdir qemu-kvm-build
@ -665,11 +676,12 @@ cp -R scripts/qmp/* $RPM_BUILD_ROOT%{testsdir}/scripts/qmp
 install -p -m 0755 ../tests/Makefile.include $RPM_BUILD_ROOT%{testsdir}/tests/
 # Install qemu-iotests
-cp -R tests/qemu-iotests/* $RPM_BUILD_ROOT%{testsdir}/tests/qemu-iotests/
+cp -R ../tests/qemu-iotests/* $RPM_BUILD_ROOT%{testsdir}/tests/qemu-iotests/
 cp -u tests/qemu-iotests/* $RPM_BUILD_ROOT%{testsdir}/tests/qemu-iotests/
 # Avoid ambiguous 'python' interpreter name
-find $RPM_BUILD_ROOT%{testsdir}/tests/qemu-iotests/* -maxdepth 1 -type f -exec sed -i -e '1 s+/usr/bin/env python+%{__python3}+' {} \;
+find $RPM_BUILD_ROOT%{testsdir}/tests/qemu-iotests/* -maxdepth 1 -type f -exec sed -i -e '1 s+/usr/bin/env \(python\|python3\)+%{__python3}+' {} \;
-find $RPM_BUILD_ROOT%{testsdir}/scripts/qmp/* -maxdepth 1 -type f -exec sed -i -e '1 s+/usr/bin/env python3+%{__python3}+' {} \;
+find $RPM_BUILD_ROOT%{testsdir}/scripts/qmp/* -maxdepth 1 -type f -exec sed -i -e '1 s+/usr/bin/env \(python\|python3\)+%{__python3}+' {} \;
-find $RPM_BUILD_ROOT%{testsdir}/scripts/qmp/* -maxdepth 1 -type f -exec sed -i -e '1 s+/usr/bin/python+%{__python3}+' {} \;
+find $RPM_BUILD_ROOT%{testsdir}/scripts/qmp/* -maxdepth 1 -type f -exec sed -i -e '1 s+/usr/bin/\(python\|python3\)+%{__python3}+' {} \;
 install -p -m 0644 %{SOURCE36} $RPM_BUILD_ROOT%{testsdir}/README
@ -930,10 +942,6 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 %doc %{qemudocdir}/LICENSE
 %doc %{qemudocdir}/README.systemtap
 %doc %{qemudocdir}/qmp-spec.txt
 %doc %{qemudocdir}/qemu-ga-ref.html
 %doc %{qemudocdir}/qemu-ga-ref.txt
 %doc %{qemudocdir}/qemu-qmp-ref.html
 %doc %{qemudocdir}/qemu-qmp-ref.txt
 %doc %{qemudocdir}/interop/*
 %doc %{qemudocdir}/index.html
 %doc %{qemudocdir}/system/*
@ -942,7 +950,7 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 %{_mandir}/man7/qemu-qmp-ref.7*
 %{_mandir}/man7/qemu-cpu-models.7*
 %{_bindir}/qemu-keymap
-%{_bindir}/qemu-pr-helper
+%{_libexecdir}/qemu-pr-helper
 %{_bindir}/qemu-edid
 %{_bindir}/qemu-trace-stap
 %{_unitdir}/qemu-pr-helper.service
@ -1073,9 +1081,152 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 %changelog
-* Tue May 12 2020 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 5.0.0-0
+* Sun Jun 28 2020 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.2.0-28.el8
- Temporary rebase of qemu-kvm to 5.0.0
+- kvm-virtio-blk-Refactor-the-code-that-processes-queued-r.patch [bz#1812765]
- Updated the tarball to actually point to 5.0.0 GA
+- kvm-virtio-blk-On-restart-process-queued-requests-in-the.patch [bz#1812765]
 - kvm-Fix-use-afte-free-in-ip_reass-CVE-2020-1983.patch [bz#1838082]
 - Resolves: bz#1812765
  (qemu with iothreads enabled crashes on resume after enospc pause for disk extension)
 - Resolves: bz#1838082
  (CVE-2020-1983 virt:8.2/qemu-kvm: QEMU: slirp: use-after-free in ip_reass() function in ip_input.c [rhel-av-8])
 * Thu Jun 18 2020 Eduardo Lima (Etrunko) <elima@redhat.com> - 4.2.0-27.el8
 - kvm-hw-pci-pcie-Move-hot-plug-capability-check-to-pre_pl.patch [bz#1820531]
 - kvm-spec-Fix-python-shenigans-for-tests.patch [bz#1845779]
 - kvm-target-i386-Add-ARCH_CAPABILITIES-related-bits-into-.patch [bz#1840342]
 - Resolves: bz#1820531
  (qmp command query-pci get wrong result after hotplug device under hotplug=off controller)
 - Resolves: bz#1840342
  ([Intel 8.2.1 Bug] qemu-kvm Add ARCH_CAPABILITIES to Icelake-Server cpu model - Fast Train)
 - Resolves: bz#1845779
  (Install 'qemu-kvm-tests' failed as nothing provides /usr/libexec/platform-python3 - virt module 6972)
 * Wed Jun 17 2020 Eduardo Lima (Etrunko) <elima@redhat.com> - 4.2.0-26.el8
 - kvm-nbd-server-Avoid-long-error-message-assertions-CVE-2.patch [bz#1845384]
 - kvm-block-Call-attention-to-truncation-of-long-NBD-expor.patch [bz#1845384]
 - Resolves: bz#1845384
  (CVE-2020-10761 virt:8.2/qemu-kvm: QEMU: nbd: reachable assertion failure in nbd_negotiate_send_rep_verr via remote client [rhel-av-8])
 * Tue Jun 09 2020 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.2.0-25.el8
 - kvm-enable-ramfb.patch [bz#1841068]
 - kvm-block-Add-flags-to-BlockDriver.bdrv_co_truncate.patch [bz#1780574]
 - kvm-block-Add-flags-to-bdrv-_co-_truncate.patch [bz#1780574]
 - kvm-block-backend-Add-flags-to-blk_truncate.patch [bz#1780574]
 - kvm-qcow2-Support-BDRV_REQ_ZERO_WRITE-for-truncate.patch [bz#1780574]
 - kvm-raw-format-Support-BDRV_REQ_ZERO_WRITE-for-truncate.patch [bz#1780574]
 - kvm-file-posix-Support-BDRV_REQ_ZERO_WRITE-for-truncate.patch [bz#1780574]
 - kvm-block-truncate-Don-t-make-backing-file-data-visible.patch [bz#1780574]
 - kvm-iotests-Add-qemu_io_log.patch [bz#1780574]
 - kvm-iotests-Filter-testfiles-out-in-filter_img_info.patch [bz#1780574]
 - kvm-iotests-Test-committing-to-short-backing-file.patch [bz#1780574]
 - kvm-qcow2-Forward-ZERO_WRITE-flag-for-full-preallocation.patch [bz#1780574]
 - kvm-i386-Add-MSR-feature-bit-for-MDS-NO.patch [bz#1769912]
 - kvm-i386-Add-macro-for-stibp.patch [bz#1769912]
 - kvm-target-i386-Add-new-bit-definitions-of-MSR_IA32_ARCH.patch [bz#1769912]
 - kvm-i386-Add-new-CPU-model-Cooperlake.patch [bz#1769912]
 - kvm-target-i386-Add-missed-features-to-Cooperlake-CPU-mo.patch [bz#1769912]
 - Resolves: bz#1769912
  ([Intel 8.2.1 Feature] introduce Cooper Lake cpu model - qemu-kvm Fast Train)
 - Resolves: bz#1780574
  (Data corruption with resizing short overlay over longer backing files)
 - Resolves: bz#1841068
  (RFE: please support the "ramfb" display device model)
 * Mon Jun 08 2020 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.2.0-24.el8
 - kvm-target-i386-set-the-CPUID-level-to-0x14-on-old-machi.patch [bz#1513681]
 - kvm-block-curl-HTTP-header-fields-allow-whitespace-aroun.patch [bz#1841038]
 - kvm-block-curl-HTTP-header-field-names-are-case-insensit.patch [bz#1841038]
 - kvm-MAINTAINERS-fix-qcow2-bitmap.c-under-Dirty-Bitmaps-h.patch [bz#1779893 bz#1779904]
 - kvm-iotests-Let-_make_test_img-parse-its-parameters.patch [bz#1779893 bz#1779904]
 - kvm-qemu_img-add-cvtnum_full-to-print-error-reports.patch [bz#1779893 bz#1779904]
 - kvm-block-Make-it-easier-to-learn-which-BDS-support-bitm.patch [bz#1779893 bz#1779904]
 - kvm-blockdev-Promote-several-bitmap-functions-to-non-sta.patch [bz#1779893 bz#1779904]
 - kvm-blockdev-Split-off-basic-bitmap-operations-for-qemu-.patch [bz#1779893 bz#1779904]
 - kvm-qemu-img-Add-bitmap-sub-command.patch [bz#1779893 bz#1779904]
 - kvm-iotests-Fix-test-178.patch [bz#1779893 bz#1779904]
 - kvm-qcow2-Expose-bitmaps-size-during-measure.patch [bz#1779893 bz#1779904]
 - kvm-qemu-img-Factor-out-code-for-merging-bitmaps.patch [bz#1779893 bz#1779904]
 - kvm-qemu-img-Add-convert-bitmaps-option.patch [bz#1779893 bz#1779904]
 - kvm-iotests-Add-test-291-to-for-qemu-img-bitmap-coverage.patch [bz#1779893 bz#1779904]
 - kvm-iotests-Add-more-skip_if_unsupported-statements-to-t.patch [bz#1778593]
 - kvm-iotests-don-t-use-format-for-drive_add.patch [bz#1778593]
 - kvm-iotests-055-refactor-compressed-backup-to-vmdk.patch [bz#1778593]
 - kvm-iotests-055-skip-vmdk-target-tests-if-vmdk-is-not-wh.patch [bz#1778593]
 - kvm-backup-Improve-error-for-bdrv_getlength-failure.patch [bz#1778593]
 - kvm-backup-Make-sure-that-source-and-target-size-match.patch [bz#1778593]
 - kvm-iotests-Backup-with-different-source-target-size.patch [bz#1778593]
 - kvm-iotests-109-Don-t-mirror-with-mismatched-size.patch [bz#1778593]
 - kvm-iotests-229-Use-blkdebug-to-inject-an-error.patch [bz#1778593]
 - kvm-mirror-Make-sure-that-source-and-target-size-match.patch [bz#1778593]
 - kvm-iotests-Mirror-with-different-source-target-size.patch [bz#1778593]
 - Resolves: bz#1513681
  ([Intel 8.2.1 Feat] qemu-kvm PT VMX -- Fast Train)
 - Resolves: bz#1778593
  (Qemu coredump when backup to a existing small size image)
 - Resolves: bz#1779893
  (RFE: Copy bitmaps with qemu-img convert)
 - Resolves: bz#1779904
  (RFE: ability to estimate bitmap space utilization for qcow2)
 - Resolves: bz#1841038
  (qemu-img: /var/tmp/v2vovl56bced.qcow2: CURL: Error opening file: Server does not support 'range' (byte ranges) with HTTP/2 server in VMware ESXi 7)
 * Thu Jun 04 2020 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.2.0-23.el8
 - kvm-target-arm-Fix-PAuth-sbox-functions.patch [bz#1813940]
 - kvm-Don-t-leak-memory-when-reallocation-fails.patch [bz#1749737]
 - kvm-Replace-remaining-malloc-free-user-with-glib.patch [bz#1749737]
 - kvm-Revert-RHEL-disable-hostmem-memfd.patch [bz#1839030]
 - kvm-block-introducing-bdrv_co_delete_file-interface.patch [bz#1827630]
 - kvm-block.c-adding-bdrv_co_delete_file.patch [bz#1827630]
 - kvm-crypto.c-cleanup-created-file-when-block_crypto_co_c.patch [bz#1827630]
 - Resolves: bz#1749737
  (CVE-2019-15890 qemu-kvm: QEMU: Slirp: use-after-free during packet reassembly [rhel-av-8])
 - Resolves: bz#1813940
  (CVE-2020-10702 virt:8.1/qemu-kvm: qemu: weak signature generation in Pointer Authentication support for ARM [rhel-av-8])
 - Resolves: bz#1827630
  (volume creation leaving uncleaned stuff behind on error (vol-clone/libvirt/qemu-kvm))
 - Resolves: bz#1839030
  (RFE: enable the "memfd" memory backend)
 * Mon May 25 2020 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.2.0-22.el8
 - kvm-block-always-fill-entire-LUKS-header-space-with-zero.patch [bz#1775462]
 - kvm-numa-remove-not-needed-check.patch [bz#1600217]
 - kvm-numa-properly-check-if-numa-is-supported.patch [bz#1600217]
 - kvm-numa-Extend-CLI-to-provide-initiator-information-for.patch [bz#1600217]
 - kvm-numa-Extend-CLI-to-provide-memory-latency-and-bandwi.patch [bz#1600217]
 - kvm-numa-Extend-CLI-to-provide-memory-side-cache-informa.patch [bz#1600217]
 - kvm-hmat-acpi-Build-Memory-Proximity-Domain-Attributes-S.patch [bz#1600217]
 - kvm-hmat-acpi-Build-System-Locality-Latency-and-Bandwidt.patch [bz#1600217]
 - kvm-hmat-acpi-Build-Memory-Side-Cache-Information-Struct.patch [bz#1600217]
 - kvm-tests-numa-Add-case-for-QMP-build-HMAT.patch [bz#1600217]
 - kvm-tests-bios-tables-test-add-test-cases-for-ACPI-HMAT.patch [bz#1600217]
 - kvm-ACPI-add-expected-files-for-HMAT-tests-acpihmat.patch [bz#1600217]
 - Resolves: bz#1600217
  ([Intel 8.2.1 FEAT] KVM ACPI HMAT support - qemu-kvm  Fast Train)
 - Resolves: bz#1775462
  (Creating luks-inside-qcow2 images with cluster_size=2k/4k will get a corrupted image)
 * Mon May 11 2020 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.2.0-21.el8
 - kvm-hw-pci-pcie-Forbid-hot-plug-if-it-s-disabled-on-the-.patch [bz#1820531]
 - kvm-hw-pci-pcie-Replace-PCI_DEVICE-casts-with-existing-v.patch [bz#1820531]
 - kvm-tools-virtiofsd-passthrough_ll-Fix-double-close.patch [bz#1817445]
 - kvm-virtiofsd-add-rlimit-nofile-NUM-option.patch [bz#1817445]
 - kvm-virtiofsd-stay-below-fs.file-max-sysctl-value-CVE-20.patch [bz#1817445]
 - kvm-virtiofsd-jail-lo-proc_self_fd.patch [bz#1817445]
 - kvm-virtiofsd-Show-submounts.patch [bz#1817445]
 - kvm-virtiofsd-only-retain-file-system-capabilities.patch [bz#1817445]
 - kvm-virtiofsd-drop-all-capabilities-in-the-wait-parent-p.patch [bz#1817445]
 - Resolves: bz#1817445
  (CVE-2020-10717 virt:8.2/qemu-kvm: QEMU: virtiofsd: guest may open maximum file descriptor to cause DoS [rhel-av-8])
 - Resolves: bz#1820531
  (qmp command query-pci get wrong result after hotplug device under hotplug=off controller)
 * Fri May 01 2020 Jon Maloy <jmaloy@redhat.com> - 4.2.0-20.el8
 - kvm-pcie_root_port-Add-hotplug-disabling-option.patch [bz#1790899]
 - kvm-compat-disable-edid-for-virtio-gpu-ccw.patch [bz#1816793]
 - Resolves: bz#1790899
  ([RFE] QEMU devices should have the option to enable/disable hotplug/unplug)
 - Resolves: bz#1816793
  ('edid' compat handling missing for virtio-gpu-ccw)
 * Tue Apr 14 2020 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.2.0-19.el8_2
 - kvm-target-i386-do-not-set-unsupported-VMX-secondary-exe.patch [bz#1822682]
--- a/qemu-pr-helper.service
+++ b/qemu-pr-helper.service
@ -4,7 +4,7 @@ Description=Persistent Reservation Daemon for QEMU
 [Service]
 WorkingDirectory=/tmp
 Type=simple
-ExecStart=/usr/bin/qemu-pr-helper
+ExecStart=/usr/libexec/qemu-pr-helper
 PrivateTmp=yes
 ProtectSystem=strict
 ReadWritePaths=/var/run
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (qemu-5.0.0.tar.xz) = 21ef0cbe107c468a40f0fa2635db2a40048c8790b629dfffca5cd62bb1b502ea8eb133bfc40df5ecf1489e2bffe87f6829aee041cb8a380ff04a8afa23b39fcf
+SHA512 (qemu-5.0.0.tar.xz) = d39a728aac20baa56eaa02afb456cff0b220180682f922602428fd45b566e2fb9944142207cb56db68149110df79720137fe1f84d79c0b266b8b23c6eca909e3
`@ -1 +1 @@`
	`SHA512 (qemu-5.0.0.tar.xz) = 21ef0cbe107c468a40f0fa2635db2a40048c8790b629dfffca5cd62bb1b502ea8eb133bfc40df5ecf1489e2bffe87f6829aee041cb8a380ff04a8afa23b39fcf`	`SHA512 (qemu-5.0.0.tar.xz) = d39a728aac20baa56eaa02afb456cff0b220180682f922602428fd45b566e2fb9944142207cb56db68149110df79720137fe1f84d79c0b266b8b23c6eca909e3`