Rebase to qemu 4.2

- Rebase to qemu-4.2
- Resolves: bz#1783250
  (rebase qemu-kvm to 4.2)

.gitignore

@@ -1,6 +1 @@
-/qemu-3.1.0.tar.xz
+/qemu-4.2.0.tar.xz
-/qemu-4.0.0.tar.xz
-/qemu-4.1.0-rc4.tar.xz
-/qemu-4.1.0.tar.xz
-/qemu-4.2.0-rc1.tar.xz
-/qemu-4.2.0-rc4.tar.xz

0005-Initial-redhat-build.patch

@@ -1,4 +1,4 @@
-From 1285db562351e2233413d163bfef3ed002b10259 Mon Sep 17 00:00:00 2001
+From 4df157781801c50224373be57fa3c8c3741c0535 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
@@ -13,7 +13,7 @@ several issues are fixed in QEMU tree:
  - Use "/share/qemu-kvm" as SHARE_SUFFIX
   - We reconfigured our share to qemu-kvm to be consistent with used name
 
-This rebase includes changes up to qemu-kvm-4.1.0-14.el8
+This rebase includes changes up to qemu-kvm-4.1.0-18.el8
 
 Rebase notes (3.1.0):
 - added new configure options
@@ -67,10 +67,8 @@ Merged patches (4.1.0):
 - 27b7c44 rh: set CONFIG_BOCHS_DISPLAY=y for x86 (partial)
 - e1fe9fe x86_64-rh-devices: enable TPM emulation (partial)
 
-Merged patches (weekly-190830):
+Merged patches (4.2.0):
 - 69e1fb2 enable virgla
-
-Merged patches (weekly-190906):
 - d4f6115 enable virgl, for real this time ...
 
 Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
@@ -79,21 +77,21 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
  Makefile                          |    3 +-
  configure                         |    1 +
  os-posix.c                        |    2 +-
- redhat/Makefile                   |   82 ++
+ redhat/Makefile                   |   82 +
  redhat/Makefile.common            |   51 +
  redhat/README.tests               |   39 +
- redhat/qemu-kvm.spec.template     | 2369 +++++++++++++++++++++++++++++++++++++
+ redhat/qemu-kvm.spec.template     | 2434 +++++++++++++++++++++++++++++
  redhat/scripts/process-patches.sh |    7 +-
  tests/Makefile.include            |    2 +-
  ui/vnc.c                          |    2 +-
- 11 files changed, 2550 insertions(+), 9 deletions(-)
+ 11 files changed, 2615 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 b437a34..086727d 100644
+index b437a346d7..086727dbb9 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -512,6 +512,7 @@ CAP_CFLAGS += -DCAPSTONE_HAS_ARM
@@ -114,7 +112,7 @@ index b437a34..086727d 100644
  	$(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7"
  	$(INSTALL_DATA) docs/qemu-block-drivers.7 "$(DESTDIR)$(mandir)/man7"
 diff --git a/configure b/configure
-index 6099be1..16564f8 100755
+index 6099be1d84..16564f8ccc 100755
 --- a/configure
 +++ b/configure
 @@ -2424,6 +2424,7 @@ if test "$seccomp" != "no" ; then
@@ -126,7 +124,7 @@ index 6099be1..16564f8 100755
  # xen probe
  
 diff --git a/os-posix.c b/os-posix.c
-index 86cffd2..1c9f867 100644
+index 86cffd2c7d..1c9f86768d 100644
 --- a/os-posix.c
 +++ b/os-posix.c
 @@ -83,7 +83,7 @@ void os_setup_signal_handling(void)
@@ -139,7 +137,7 @@ index 86cffd2..1c9f867 100644
  char *os_find_datadir(void)
  {
 diff --git a/tests/Makefile.include b/tests/Makefile.include
-index 8566f5f..b483790 100644
+index 8566f5f119..b483790cf3 100644
 --- a/tests/Makefile.include
 +++ b/tests/Makefile.include
 @@ -1194,7 +1194,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR)
@@ -152,7 +150,7 @@ index 8566f5f..b483790 100644
  	rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y)
  	rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y)) $(check-qtest-generic-y))
 diff --git a/ui/vnc.c b/ui/vnc.c
-index 87b8045..ecf6276 100644
+index 87b8045afe..ecf6276f5b 100644
 --- a/ui/vnc.c
 +++ b/ui/vnc.c
 @@ -3987,7 +3987,7 @@ void vnc_display_open(const char *id, Error **errp)
@@ -165,5 +163,5 @@ index 87b8045..ecf6276 100644
          if (saslErr != SASL_OK) {
              error_setg(errp, "Failed to initialize SASL auth: %s",
 -- 
-1.8.3.1
+2.21.0
 

0006-Enable-disable-devices-for-RHEL.patch

@@ -1,4 +1,4 @@
-From e75b1c31b76463b4b8f30cb6dbd23ded014e9269 Mon Sep 17 00:00:00 2001
+From 67511676246cce57becbd2dcf5abccf08d9ef737 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
@@ -54,25 +54,25 @@ Merged patches (4.1.0):
 - 495a27d x86_64-rh-devices: add missing TPM passthrough
 - e1fe9fe x86_64-rh-devices: enable TPM emulation (partial)
 
-Merged patches (weekly-190823):
+Merged patches (4.2.0):
 - f7587dd RHEL: disable hostmem-memfd
 
 Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
 ---
  Makefile.objs                          |   4 +-
  backends/Makefile.objs                 |   3 +-
- default-configs/aarch64-rh-devices.mak |  20 +++++++
+ default-configs/aarch64-rh-devices.mak |  20 +++++
- default-configs/aarch64-softmmu.mak    |  10 ++--
+ default-configs/aarch64-softmmu.mak    |  10 ++-
- default-configs/ppc64-rh-devices.mak   |  32 +++++++++++
+ default-configs/ppc64-rh-devices.mak   |  32 ++++++++
- default-configs/ppc64-softmmu.mak      |   8 ++-
+ default-configs/ppc64-softmmu.mak      |   8 +-
- default-configs/rh-virtio.mak          |  10 ++++
+ default-configs/rh-virtio.mak          |  10 +++
- default-configs/s390x-rh-devices.mak   |  15 +++++
+ default-configs/s390x-rh-devices.mak   |  15 ++++
  default-configs/s390x-softmmu.mak      |   4 +-
- default-configs/x86_64-rh-devices.mak  | 100 +++++++++++++++++++++++++++++++++
+ default-configs/x86_64-rh-devices.mak  | 100 +++++++++++++++++++++++++
  default-configs/x86_64-softmmu.mak     |   4 +-
  hw/acpi/ich9.c                         |   4 +-
  hw/arm/Makefile.objs                   |   2 +-
- hw/block/fdc.c                         |  10 ++++
+ hw/block/fdc.c                         |  10 +++
  hw/bt/Makefile.objs                    |   4 +-
  hw/cpu/Makefile.objs                   |   5 +-
  hw/display/Makefile.objs               |   5 +-
@@ -80,20 +80,20 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
  hw/ide/piix.c                          |   5 +-
  hw/input/pckbd.c                       |   2 +
  hw/net/e1000.c                         |   2 +
- hw/pci-host/i440fx.c                   |   4 ++
+ hw/pci-host/i440fx.c                   |   4 +
  hw/ppc/spapr_cpu_core.c                |   2 +
  hw/usb/Makefile.objs                   |   4 +-
  hw/vfio/pci-quirks.c                   |   9 +++
  hw/vfio/pci.c                          |   5 ++
- qemu-options.hx                        |   7 +--
+ qemu-options.hx                        |   7 +-
  redhat/qemu-kvm.spec.template          |   5 +-
  target/arm/cpu.c                       |   4 +-
- target/i386/cpu.c                      |  35 +++++++++---
+ target/i386/cpu.c                      |  35 +++++++--
- target/ppc/cpu-models.c                |  10 ++++
+ target/ppc/cpu-models.c                |  10 +++
  target/s390x/cpu_models.c              |   3 +
- target/s390x/kvm.c                     |   8 +++
+ target/s390x/kvm.c                     |   8 ++
  util/memfd.c                           |   2 +-
- vl.c                                   |   8 ++-
+ vl.c                                   |   8 +-
  35 files changed, 317 insertions(+), 41 deletions(-)
  create mode 100644 default-configs/aarch64-rh-devices.mak
  create mode 100644 default-configs/ppc64-rh-devices.mak
@@ -102,7 +102,7 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
  create mode 100644 default-configs/x86_64-rh-devices.mak
 
 diff --git a/Makefile.objs b/Makefile.objs
-index 11ba1a3..fcf63e1 100644
+index 11ba1a36bd..fcf63e1096 100644
 --- a/Makefile.objs
 +++ b/Makefile.objs
 @@ -65,8 +65,8 @@ common-obj-y += replay/
@@ -117,7 +117,7 @@ index 11ba1a3..fcf63e1 100644
  common-obj-y += dma-helpers.o
  common-obj-y += vl.o
 diff --git a/backends/Makefile.objs b/backends/Makefile.objs
-index f069111..f328d40 100644
+index f0691116e8..f328d404bf 100644
 --- a/backends/Makefile.objs
 +++ b/backends/Makefile.objs
 @@ -16,4 +16,5 @@ endif
@@ -129,7 +129,7 @@ index f069111..f328d40 100644
 +# common-obj-$(CONFIG_LINUX) += hostmem-memfd.o
 diff --git a/default-configs/aarch64-rh-devices.mak b/default-configs/aarch64-rh-devices.mak
 new file mode 100644
-index 0000000..a1ed641
+index 0000000000..a1ed641174
 --- /dev/null
 +++ b/default-configs/aarch64-rh-devices.mak
 @@ -0,0 +1,20 @@
@@ -154,7 +154,7 @@ index 0000000..a1ed641
 +CONFIG_VIRTIO_PCI=y
 +CONFIG_XIO3130=y
 diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-softmmu.mak
-index 958b1e0..8f6867d 100644
+index 958b1e08e4..8f6867d48a 100644
 --- a/default-configs/aarch64-softmmu.mak
 +++ b/default-configs/aarch64-softmmu.mak
 @@ -1,8 +1,10 @@
@@ -174,7 +174,7 @@ index 958b1e0..8f6867d 100644
 +include aarch64-rh-devices.mak
 diff --git a/default-configs/ppc64-rh-devices.mak b/default-configs/ppc64-rh-devices.mak
 new file mode 100644
-index 0000000..35f2106
+index 0000000000..35f2106d06
 --- /dev/null
 +++ b/default-configs/ppc64-rh-devices.mak
 @@ -0,0 +1,32 @@
@@ -211,7 +211,7 @@ index 0000000..35f2106
 +CONFIG_XIVE_SPAPR=y
 +CONFIG_XIVE_KVM=y
 diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
-index cca5266..fec354f 100644
+index cca52665d9..fec354f327 100644
 --- a/default-configs/ppc64-softmmu.mak
 +++ b/default-configs/ppc64-softmmu.mak
 @@ -1,10 +1,12 @@
@@ -232,7 +232,7 @@ index cca5266..fec354f 100644
 +include ppc64-rh-devices.mak
 diff --git a/default-configs/rh-virtio.mak b/default-configs/rh-virtio.mak
 new file mode 100644
-index 0000000..94ede1b
+index 0000000000..94ede1b5f6
 --- /dev/null
 +++ b/default-configs/rh-virtio.mak
 @@ -0,0 +1,10 @@
@@ -248,7 +248,7 @@ index 0000000..94ede1b
 +CONFIG_VIRTIO_SERIAL=y
 diff --git a/default-configs/s390x-rh-devices.mak b/default-configs/s390x-rh-devices.mak
 new file mode 100644
-index 0000000..c3c73fe
+index 0000000000..c3c73fe752
 --- /dev/null
 +++ b/default-configs/s390x-rh-devices.mak
 @@ -0,0 +1,15 @@
@@ -268,7 +268,7 @@ index 0000000..c3c73fe
 +CONFIG_VIRTIO_CCW=y
 +CONFIG_WDT_DIAG288=y
 diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak
-index f2287a1..3e2e388 100644
+index f2287a133f..3e2e388e91 100644
 --- a/default-configs/s390x-softmmu.mak
 +++ b/default-configs/s390x-softmmu.mak
 @@ -10,4 +10,6 @@
@@ -281,7 +281,7 @@ index f2287a1..3e2e388 100644
 +include s390x-rh-devices.mak
 diff --git a/default-configs/x86_64-rh-devices.mak b/default-configs/x86_64-rh-devices.mak
 new file mode 100644
-index 0000000..d59b6d9
+index 0000000000..d59b6d9bb5
 --- /dev/null
 +++ b/default-configs/x86_64-rh-devices.mak
 @@ -0,0 +1,100 @@
@@ -386,7 +386,7 @@ index 0000000..d59b6d9
 +CONFIG_TPM_EMULATOR=y
 +CONFIG_TPM_PASSTHROUGH=y
 diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
-index 64b2ee2..b5de7e5 100644
+index 64b2ee2960..b5de7e5279 100644
 --- a/default-configs/x86_64-softmmu.mak
 +++ b/default-configs/x86_64-softmmu.mak
 @@ -1,3 +1,5 @@
@@ -397,7 +397,7 @@ index 64b2ee2..b5de7e5 100644
 +
 +include x86_64-rh-devices.mak
 diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
-index 2034dd7..ab203ad 100644
+index 2034dd749e..ab203ad448 100644
 --- a/hw/acpi/ich9.c
 +++ b/hw/acpi/ich9.c
 @@ -449,8 +449,8 @@ void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp)
@@ -412,7 +412,7 @@ index 2034dd7..ab203ad 100644
  
      object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_BASE,
 diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
-index fe749f6..2aa1a9e 100644
+index fe749f65fd..2aa1a9efdd 100644
 --- a/hw/arm/Makefile.objs
 +++ b/hw/arm/Makefile.objs
 @@ -27,7 +27,7 @@ obj-$(CONFIG_VEXPRESS) += vexpress.o
@@ -425,7 +425,7 @@ index fe749f6..2aa1a9e 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 ac5d31e..e925bac 100644
+index ac5d31e8c1..e925bac002 100644
 --- a/hw/block/fdc.c
 +++ b/hw/block/fdc.c
 @@ -46,6 +46,8 @@
@@ -453,7 +453,7 @@ index ac5d31e..e925bac 100644
          error_setg(errp, "Cannot choose a fallback FDrive type of 'auto'");
      }
 diff --git a/hw/bt/Makefile.objs b/hw/bt/Makefile.objs
-index 867a7d2..e678e9e 100644
+index 867a7d2e8a..e678e9ee3c 100644
 --- a/hw/bt/Makefile.objs
 +++ b/hw/bt/Makefile.objs
 @@ -1,3 +1,3 @@
@@ -463,7 +463,7 @@ index 867a7d2..e678e9e 100644
 +#common-obj-y += hci-csr.o
  
 diff --git a/hw/cpu/Makefile.objs b/hw/cpu/Makefile.objs
-index 8db9e8a..1601ea9 100644
+index 8db9e8a7b3..1601ea93c7 100644
 --- a/hw/cpu/Makefile.objs
 +++ b/hw/cpu/Makefile.objs
 @@ -1,5 +1,6 @@
@@ -476,7 +476,7 @@ index 8db9e8a..1601ea9 100644
 +common-obj-y += core.o
 +# cluster.o
 diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs
-index f2182e3..3d0cda1 100644
+index f2182e3bef..3d0cda1b52 100644
 --- a/hw/display/Makefile.objs
 +++ b/hw/display/Makefile.objs
 @@ -1,8 +1,9 @@
@@ -492,7 +492,7 @@ index f2182e3..3d0cda1 100644
  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 cd283e5..93afa26 100644
+index cd283e53b4..93afa26fda 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)
@@ -506,7 +506,7 @@ index cd283e5..93afa26 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 db313dd..e14858c 100644
+index db313dd3b1..e14858ca64 100644
 --- a/hw/ide/piix.c
 +++ b/hw/ide/piix.c
 @@ -251,7 +251,8 @@ static void piix3_ide_class_init(ObjectClass *klass, void *data)
@@ -529,7 +529,7 @@ index db313dd..e14858c 100644
  
  static const TypeInfo piix4_ide_info = {
 diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
-index f0acfd8..390eb65 100644
+index f0acfd86f7..390eb6579c 100644
 --- a/hw/input/pckbd.c
 +++ b/hw/input/pckbd.c
 @@ -571,6 +571,8 @@ static void i8042_class_initfn(ObjectClass *klass, void *data)
@@ -542,7 +542,7 @@ index f0acfd8..390eb65 100644
  
  static const TypeInfo i8042_info = {
 diff --git a/hw/net/e1000.c b/hw/net/e1000.c
-index a73f8d4..fc73fdd 100644
+index a73f8d404e..fc73fdd6fa 100644
 --- a/hw/net/e1000.c
 +++ b/hw/net/e1000.c
 @@ -1795,6 +1795,7 @@ static const E1000Info e1000_devices[] = {
@@ -562,7 +562,7 @@ index a73f8d4..fc73fdd 100644
  
  static void e1000_register_types(void)
 diff --git a/hw/pci-host/i440fx.c b/hw/pci-host/i440fx.c
-index f271311..17f10ef 100644
+index f27131102d..17f10efae2 100644
 --- a/hw/pci-host/i440fx.c
 +++ b/hw/pci-host/i440fx.c
 @@ -386,6 +386,7 @@ static const TypeInfo i440fx_info = {
@@ -592,7 +592,7 @@ index f271311..17f10ef 100644
  }
  
 diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
-index 8339c4c..301cd7b 100644
+index 8339c4c0f8..301cd7b4e4 100644
 --- a/hw/ppc/spapr_cpu_core.c
 +++ b/hw/ppc/spapr_cpu_core.c
 @@ -403,10 +403,12 @@ static const TypeInfo spapr_cpu_core_type_infos[] = {
@@ -609,7 +609,7 @@ index 8339c4c..301cd7b 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 303ac08..700a918 100644
+index 303ac084a0..700a91886e 100644
 --- a/hw/usb/Makefile.objs
 +++ b/hw/usb/Makefile.objs
 @@ -30,7 +30,9 @@ common-obj-$(CONFIG_USB_BLUETOOTH)    += dev-bluetooth.o
@@ -624,7 +624,7 @@ index 303ac08..700a918 100644
  smartcard.mo-libs := $(SMARTCARD_LIBS)
  endif
 diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
-index 136f3a9..4505ffe 100644
+index 136f3a9ad6..4505ffe48a 100644
 --- a/hw/vfio/pci-quirks.c
 +++ b/hw/vfio/pci-quirks.c
 @@ -1166,6 +1166,7 @@ static void vfio_probe_rtl8168_bar2_quirk(VFIOPCIDevice *vdev, int nr)
@@ -689,7 +689,7 @@ index 136f3a9..4505ffe 100644
  
  /*
 diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
-index 2d40b39..c8534d3 100644
+index 2d40b396f2..c8534d3035 100644
 --- a/hw/vfio/pci.c
 +++ b/hw/vfio/pci.c
 @@ -3220,6 +3220,7 @@ static const TypeInfo vfio_pci_dev_info = {
@@ -717,7 +717,7 @@ index 2d40b39..c8534d3 100644
  
  type_init(register_vfio_pci_dev_type)
 diff --git a/qemu-options.hx b/qemu-options.hx
-index 65c9473..fc17aca 100644
+index 65c9473b73..fc17aca631 100644
 --- a/qemu-options.hx
 +++ b/qemu-options.hx
 @@ -2111,11 +2111,6 @@ ETEXI
@@ -749,7 +749,7 @@ index 65c9473..fc17aca 100644
  #ifdef CONFIG_TPM
  DEFHEADING(TPM device options:)
 diff --git a/target/arm/cpu.c b/target/arm/cpu.c
-index 7a4ac93..3788fc3 100644
+index 7a4ac9339b..3788fc3c4a 100644
 --- a/target/arm/cpu.c
 +++ b/target/arm/cpu.c
 @@ -2744,7 +2744,9 @@ static void arm_cpu_register_types(void)
@@ -764,7 +764,7 @@ index 7a4ac93..3788fc3 100644
      }
  
 diff --git a/target/i386/cpu.c b/target/i386/cpu.c
-index 69f518a..1b7880a 100644
+index 69f518a21a..1b7880ae3a 100644
 --- a/target/i386/cpu.c
 +++ b/target/i386/cpu.c
 @@ -1835,14 +1835,14 @@ static X86CPUDefinition builtin_x86_defs[] = {
@@ -790,10 +790,11 @@ index 69f518a..1b7880a 100644
          .features[FEAT_8000_0001_ECX] =
              CPUID_EXT3_LAHF_LM | CPUID_EXT3_SVM,
          .xlevel = 0x8000000A,
-@@ -2129,6 +2129,25 @@ static X86CPUDefinition builtin_x86_defs[] = {
+@@ -2128,6 +2128,25 @@ static X86CPUDefinition builtin_x86_defs[] = {
+         .xlevel = 0x80000008,
          .model_id = "Intel(R) Atom(TM) CPU N270   @ 1.60GHz",
      },
-     {
++    {
 +        .name = "cpu64-rhel6",
 +        .level = 4,
 +        .vendor = CPUID_VENDOR_AMD,
@@ -812,12 +813,11 @@ index 69f518a..1b7880a 100644
 +        .xlevel = 0x8000000A,
 +        .model_id = "QEMU Virtual CPU version (cpu64-rhel6)",
 +    },
-+    {
+     {
          .name = "Conroe",
          .level = 10,
-         .vendor = CPUID_VENDOR_INTEL,
 diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c
-index 086548e..1bbf378 100644
+index 086548e9b9..1bbf378c18 100644
 --- a/target/ppc/cpu-models.c
 +++ b/target/ppc/cpu-models.c
 @@ -66,6 +66,7 @@
@@ -887,7 +887,7 @@ index 086548e..1bbf378 100644
      { NULL, NULL }
  };
 diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
-index 7e92fb2..be71822 100644
+index 7e92fb2e15..be718220d7 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,
@@ -901,7 +901,7 @@ index 7e92fb2..be71822 100644
  
      /* detect missing features if any to properly report them */
 diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
-index 0c9d14b..a02d569 100644
+index 0c9d14b4b1..a02d569537 100644
 --- a/target/s390x/kvm.c
 +++ b/target/s390x/kvm.c
 @@ -2387,6 +2387,14 @@ void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp)
@@ -920,7 +920,7 @@ index 0c9d14b..a02d569 100644
      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
+index 4a3c07e0be..3303ec9da4 100644
 --- a/util/memfd.c
 +++ b/util/memfd.c
 @@ -193,7 +193,7 @@ bool qemu_memfd_alloc_check(void)
@@ -933,7 +933,7 @@ index 4a3c07e..3303ec9 100644
  
      if (mfd >= 0) {
 diff --git a/vl.c b/vl.c
-index 6a65a64..668a345 100644
+index 6a65a64bfd..668a34577e 100644
 --- a/vl.c
 +++ b/vl.c
 @@ -166,7 +166,7 @@ Chardev *parallel_hds[MAX_PARALLEL_PORTS];
@@ -990,5 +990,5 @@ index 6a65a64..668a345 100644
      if (!xen_enabled()) {
          /* On 32-bit hosts, QEMU is limited by virtual address space */
 -- 
-1.8.3.1
+2.21.0
 

0007-Machine-type-related-general-changes.patch

@@ -1,4 +1,4 @@
-From c47eea7192e103a6cc57cd7d07421b8e684d3db5 Mon Sep 17 00:00:00 2001
+From 113078b23a4747b07eb363719d7cbc0af403dd2a 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
@@ -28,34 +28,35 @@ Merged patches (4.1.0):
 - 479ad30 redhat: fix cut'n'paste garbage in hw_compat comments
 - f19738e compat: Generic hw_compat_rhel_8_0
 
-Merged patches (weekly-190823):
+Merged patches (4.2.0):
 - 9f2bfaa machine types: Update hw_compat_rhel_8_0 from hw_compat_4_0
 - ca4a5e8 virtio: Make disable-legacy/disable-modern compat properties optional
+- compat: Generic hw_compat_rhel_8_1 (patch 93040/92956)
 
 Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
 ---
- hw/acpi/ich9.c          |  16 +++++
+ hw/acpi/ich9.c          |  16 ++++
  hw/acpi/piix4.c         |   5 +-
- hw/char/serial.c        |  16 +++++
+ hw/char/serial.c        |  16 ++++
- hw/core/machine.c       | 161 ++++++++++++++++++++++++++++++++++++++++++++++++
+ hw/core/machine.c       | 170 ++++++++++++++++++++++++++++++++++++++++
  hw/display/vga-isa.c    |   2 +-
- hw/net/e1000e.c         |  21 +++++++
+ hw/net/e1000e.c         |  21 +++++
  hw/net/rtl8139.c        |   4 +-
  hw/rtc/mc146818rtc.c    |   6 ++
  hw/smbios/smbios.c      |   1 +
  hw/timer/i8254_common.c |   2 +-
  hw/usb/hcd-uhci.c       |   4 +-
- hw/usb/hcd-xhci.c       |  20 ++++++
+ hw/usb/hcd-xhci.c       |  20 +++++
  hw/usb/hcd-xhci.h       |   2 +
  include/hw/acpi/ich9.h  |   3 +
- include/hw/boards.h     |  21 +++++++
+ include/hw/boards.h     |  24 ++++++
- include/hw/usb.h        |   4 ++
+ include/hw/usb.h        |   4 +
  migration/migration.c   |   2 +
  migration/migration.h   |   5 ++
- 18 files changed, 289 insertions(+), 6 deletions(-)
+ 18 files changed, 301 insertions(+), 6 deletions(-)
 
 diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
-index ab203ad..7ec2688 100644
+index ab203ad448..7ec26884e8 100644
 --- a/hw/acpi/ich9.c
 +++ b/hw/acpi/ich9.c
 @@ -444,6 +444,18 @@ static void ich9_pm_set_enable_tco(Object *obj, bool value, Error **errp)
@@ -89,7 +90,7 @@ index ab203ad..7ec2688 100644
                          ich9_pm_get_disable_s3,
                          ich9_pm_set_disable_s3,
 diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
-index 93aec2d..3a26193 100644
+index 93aec2dd2c..3a26193cbe 100644
 --- a/hw/acpi/piix4.c
 +++ b/hw/acpi/piix4.c
 @@ -274,6 +274,7 @@ static const VMStateDescription vmstate_acpi = {
@@ -112,7 +113,7 @@ index 93aec2d..3a26193 100644
      DEFINE_PROP_BOOL("acpi-pci-hotplug-with-bridge-support", PIIX4PMState,
                       use_acpi_pci_hotplug, true),
 diff --git a/hw/char/serial.c b/hw/char/serial.c
-index b4aa250..0012f0e 100644
+index b4aa250950..0012f0e44d 100644
 --- a/hw/char/serial.c
 +++ b/hw/char/serial.c
 @@ -34,6 +34,7 @@
@@ -167,13 +168,22 @@ index b4aa250..0012f0e 100644
  }
  
 diff --git a/hw/core/machine.c b/hw/core/machine.c
-index 1689ad3..2b130bb 100644
+index 1689ad3bf8..e0e0eec8bf 100644
 --- a/hw/core/machine.c
 +++ b/hw/core/machine.c
-@@ -27,6 +27,167 @@
+@@ -27,6 +27,176 @@
  #include "hw/pci/pci.h"
  #include "hw/mem/nvdimm.h"
  
++/*
++ * The same as hw_compat_4_1
++ */
++GlobalProperty hw_compat_rhel_8_1[] = {
++    /* hw_compat_rhel_8_1 from hw_compat_4_1 */
++    { "virtio-pci", "x-pcie-flr-init", "off" },
++};
++const size_t hw_compat_rhel_8_1_len = G_N_ELEMENTS(hw_compat_rhel_8_1);
++
 +/* The same as hw_compat_3_1
 + * format of array has been changed by:
 + *     6c36bddf5340 ("machine: Use shorter format for GlobalProperty arrays")
@@ -339,7 +349,7 @@ index 1689ad3..2b130bb 100644
      { "virtio-pci", "x-pcie-flr-init", "off" },
  };
 diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
-index 873e5e9..d1a2efe 100644
+index 873e5e9706..d1a2efe47e 100644
 --- a/hw/display/vga-isa.c
 +++ b/hw/display/vga-isa.c
 @@ -82,7 +82,7 @@ static void vga_isa_realizefn(DeviceState *dev, Error **errp)
@@ -352,7 +362,7 @@ index 873e5e9..d1a2efe 100644
  };
  
 diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
-index b69fd7d..d8be50a 100644
+index b69fd7d8ad..d8be50a1ce 100644
 --- a/hw/net/e1000e.c
 +++ b/hw/net/e1000e.c
 @@ -79,6 +79,11 @@ typedef struct E1000EState {
@@ -426,7 +436,7 @@ index b69fd7d..d8be50a 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 88a97d7..21d80e9 100644
+index 88a97d756d..21d80e96cf 100644
 --- a/hw/net/rtl8139.c
 +++ b/hw/net/rtl8139.c
 @@ -3177,7 +3177,7 @@ static int rtl8139_pre_save(void *opaque)
@@ -449,7 +459,7 @@ index 88a97d7..21d80e9 100644
          VMSTATE_UINT16(tally_counters.TxUndrn, RTL8139State),
  
 diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c
-index 74ae74b..7382051 100644
+index 74ae74bc5c..73820517df 100644
 --- a/hw/rtc/mc146818rtc.c
 +++ b/hw/rtc/mc146818rtc.c
 @@ -42,6 +42,7 @@
@@ -473,7 +483,7 @@ index 74ae74b..7382051 100644
  }
  
 diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
-index 11d476c..e6e9355 100644
+index 11d476c4a2..e6e9355384 100644
 --- a/hw/smbios/smbios.c
 +++ b/hw/smbios/smbios.c
 @@ -777,6 +777,7 @@ void smbios_set_defaults(const char *manufacturer, const char *product,
@@ -485,7 +495,7 @@ index 11d476c..e6e9355 100644
      SMBIOS_SET_DEFAULT(type2.product, product);
      SMBIOS_SET_DEFAULT(type2.version, version);
 diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c
-index 050875b..32935da 100644
+index 050875b497..32935da46c 100644
 --- a/hw/timer/i8254_common.c
 +++ b/hw/timer/i8254_common.c
 @@ -231,7 +231,7 @@ static const VMStateDescription vmstate_pit_common = {
@@ -498,7 +508,7 @@ index 050875b..32935da 100644
                               vmstate_pit_channel, PITChannelState),
          VMSTATE_INT64(channels[0].next_transition_time,
 diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
-index 23507ad..9fd87a7 100644
+index 23507ad3b5..9fd87a7ad9 100644
 --- a/hw/usb/hcd-uhci.c
 +++ b/hw/usb/hcd-uhci.c
 @@ -1219,12 +1219,14 @@ static void usb_uhci_common_realize(PCIDevice *dev, Error **errp)
@@ -518,7 +528,7 @@ index 23507ad..9fd87a7 100644
      if (s->masterbus) {
          USBPort *ports[NB_PORTS];
 diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
-index 80988bb..8fed2ee 100644
+index 80988bb305..8fed2eedd6 100644
 --- a/hw/usb/hcd-xhci.c
 +++ b/hw/usb/hcd-xhci.c
 @@ -3590,9 +3590,27 @@ static const VMStateDescription vmstate_xhci_slot = {
@@ -559,7 +569,7 @@ index 80988bb..8fed2ee 100644
      }
  };
 diff --git a/hw/usb/hcd-xhci.h b/hw/usb/hcd-xhci.h
-index 2fad4df..f554b67 100644
+index 2fad4df2a7..f554b671e3 100644
 --- a/hw/usb/hcd-xhci.h
 +++ b/hw/usb/hcd-xhci.h
 @@ -157,6 +157,8 @@ typedef struct XHCIEvent {
@@ -572,7 +582,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 41568d1837..1a23ccc412 100644
 --- a/include/hw/acpi/ich9.h
 +++ b/include/hw/acpi/ich9.h
 @@ -61,6 +61,9 @@ typedef struct ICH9LPCPMRegs {
@@ -586,13 +596,16 @@ 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 de45087..cc11116 100644
+index de45087f34..6f85a0e032 100644
 --- a/include/hw/boards.h
 +++ b/include/hw/boards.h
-@@ -377,4 +377,25 @@ extern const size_t hw_compat_2_2_len;
+@@ -377,4 +377,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;
  
++extern GlobalProperty hw_compat_rhel_8_1[];
++extern const size_t hw_compat_rhel_8_1_len;
++
 +extern GlobalProperty hw_compat_rhel_8_0[];
 +extern const size_t hw_compat_rhel_8_0_len;
 +
@@ -616,7 +629,7 @@ index de45087..cc11116 100644
 +
  #endif
 diff --git a/include/hw/usb.h b/include/hw/usb.h
-index c24d968..b353438 100644
+index c24d968a19..b353438ea0 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,
@@ -629,7 +642,7 @@ index c24d968..b353438 100644
 +
  #endif
 diff --git a/migration/migration.c b/migration/migration.c
-index 354ad07..30c53c6 100644
+index 354ad072fa..30c53c623b 100644
 --- a/migration/migration.c
 +++ b/migration/migration.c
 @@ -121,6 +121,8 @@ enum mig_rp_message_type {
@@ -642,7 +655,7 @@ index 354ad07..30c53c6 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 79b3dda..0b1b0d4 100644
+index 79b3dda146..0b1b0d4df5 100644
 --- a/migration/migration.h
 +++ b/migration/migration.h
 @@ -335,6 +335,11 @@ void init_dirty_bitmap_incoming_migration(void);
@@ -658,5 +671,5 @@ index 79b3dda..0b1b0d4 100644
  #define qemu_ram_foreach_block \
    #warning "Use foreach_not_ignored_block in migration code"
 -- 
-1.8.3.1
+2.21.0
 

0008-Add-aarch64-machine-types.patch

@@ -1,4 +1,4 @@
-From e9fbad8d9e530189a029533f738bac62559e4d52 Mon Sep 17 00:00:00 2001
+From 49164264d9928f73961acbbe4d56d8dfa23d8099 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
@@ -34,12 +34,12 @@ Merged patches (4.1.0):
 
 Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
 ---
- hw/arm/virt.c         | 161 +++++++++++++++++++++++++++++++++++++++++++++++++-
+ hw/arm/virt.c         | 161 +++++++++++++++++++++++++++++++++++++++++-
- include/hw/arm/virt.h |  11 ++++
+ include/hw/arm/virt.h |  11 +++
  2 files changed, 171 insertions(+), 1 deletion(-)
 
 diff --git a/hw/arm/virt.c b/hw/arm/virt.c
-index d4bedc2..e108391 100644
+index d4bedc2607..e10839100e 100644
 --- a/hw/arm/virt.c
 +++ b/hw/arm/virt.c
 @@ -72,6 +72,7 @@
@@ -243,7 +243,7 @@ index d4bedc2..e108391 100644
 +}
 +DEFINE_RHEL_MACHINE_AS_LATEST(8, 2, 0)
 diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
-index 0b41083..53fdf16 100644
+index 0b41083e9d..53fdf16563 100644
 --- a/include/hw/arm/virt.h
 +++ b/include/hw/arm/virt.h
 @@ -142,6 +142,7 @@ typedef struct {
@@ -272,5 +272,5 @@ index 0b41083..53fdf16 100644
  
  /* Return the number of used redistributor regions  */
 -- 
-1.8.3.1
+2.21.0
 

0009-Add-ppc64-machine-types.patch

@@ -1,4 +1,4 @@
-From 4a62a0bf849ff8f533d3fc5bd3faec6bd09cf562 Mon Sep 17 00:00:00 2001
+From 136eae41007e2e5b0d693cc656f3ec36cbabf16f 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
@@ -26,20 +26,22 @@ Merged patches (4.1.0):
 - 2511c63 redhat: sync pseries-rhel7.6.0 with rhel-av-8.0.1
 - 89f01da redhat: define pseries-rhel8.1.0 machine type
 
-Merged patches (weekly-190830):
+Merged patches (4.2.0):
 - bcba728 redhat: update pseries-rhel8.1.0 machine type
+- redhat: update pseries-rhel-7.6.0 machine type (patch 93039)
+- redhat: define pseries-rhel8.2.0 machine type (patch 93041)
 
 Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
 ---
- hw/ppc/spapr.c          | 251 ++++++++++++++++++++++++++++++++++++++++++++++++
+ hw/ppc/spapr.c          | 278 ++++++++++++++++++++++++++++++++++++++++
- hw/ppc/spapr_cpu_core.c |  13 +++
+ hw/ppc/spapr_cpu_core.c |  13 ++
  include/hw/ppc/spapr.h  |   1 +
- target/ppc/compat.c     |  13 ++-
+ target/ppc/compat.c     |  13 +-
  target/ppc/cpu.h        |   1 +
- 5 files changed, 278 insertions(+), 1 deletion(-)
+ 5 files changed, 305 insertions(+), 1 deletion(-)
 
 diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
-index e076f60..f3652ed 100644
+index e076f6023c..8749c72066 100644
 --- a/hw/ppc/spapr.c
 +++ b/hw/ppc/spapr.c
 @@ -4447,6 +4447,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
@@ -90,22 +92,48 @@ index e076f60..f3652ed 100644
  static void spapr_machine_2_7_class_options(MachineClass *mc)
  {
      SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
-@@ -4863,6 +4869,251 @@ static void spapr_machine_2_1_class_options(MachineClass *mc)
+@@ -4863,6 +4869,278 @@ 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);
 +#endif
 +
 +/*
-+ * pseries-rhel8.1.0
++ * pseries-rhel8.2.0
 + */
 +
-+static void spapr_machine_rhel810_class_options(MachineClass *mc)
++static void spapr_machine_rhel820_class_options(MachineClass *mc)
 +{
 +    /* Defaults for the latest behaviour inherited from the base class */
 +}
 +
-+DEFINE_SPAPR_MACHINE(rhel810, "rhel8.1.0", true);
++DEFINE_SPAPR_MACHINE(rhel820, "rhel8.2.0", true);
++
++/*
++ * pseries-rhel8.1.0
++ * like pseries-4.1
++ */
++
++static void spapr_machine_rhel810_class_options(MachineClass *mc)
++{
++    SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
++    static GlobalProperty compat[] = {
++        /* Only allow 4kiB and 64kiB IOMMU pagesizes */
++        { TYPE_SPAPR_PCI_HOST_BRIDGE, "pgsz", "0x11000" },
++    };
++
++    spapr_machine_rhel820_class_options(mc);
++
++    /* from pseries-4.1 */
++    smc->linux_pci_probe = false;
++    smc->smp_threads_vsmt = false;
++    compat_props_add(mc->compat_props, hw_compat_rhel_8_1,
++                     hw_compat_rhel_8_1_len);
++    compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));
++
++}
++
++DEFINE_SPAPR_MACHINE(rhel810, "rhel8.1.0", false);
 +
 +/*
 + * pseries-rhel8.0.0
@@ -159,6 +187,7 @@ index e076f60..f3652ed 100644
 +
 +    /* from spapr_machine_3_0_class_options() */
 +    smc->legacy_irq_allocation = true;
++    smc->nr_xirqs = 0x400;
 +    smc->irq = &spapr_irq_xics_legacy;
 +
 +    /* from spapr_machine_2_12_class_options() */
@@ -343,7 +372,7 @@ index e076f60..f3652ed 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 301cd7b..ba5a8fb 100644
+index 301cd7b4e4..ba5a8fb82b 100644
 --- a/hw/ppc/spapr_cpu_core.c
 +++ b/hw/ppc/spapr_cpu_core.c
 @@ -24,6 +24,7 @@
@@ -381,7 +410,7 @@ index 301cd7b..ba5a8fb 100644
          goto error_intc_create;
      }
 diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
-index d5ab5ea..aa89cc4 100644
+index d5ab5ea7b2..aa89cc4a95 100644
 --- a/include/hw/ppc/spapr.h
 +++ b/include/hw/ppc/spapr.h
 @@ -125,6 +125,7 @@ struct SpaprMachineClass {
@@ -393,7 +422,7 @@ index d5ab5ea..aa89cc4 100644
                            uint64_t *buid, hwaddr *pio, 
                            hwaddr *mmio32, hwaddr *mmio64,
 diff --git a/target/ppc/compat.c b/target/ppc/compat.c
-index 7de4bf3..3e2e353 100644
+index 7de4bf3122..3e2e35342d 100644
 --- a/target/ppc/compat.c
 +++ b/target/ppc/compat.c
 @@ -105,8 +105,19 @@ static const CompatInfo *compat_by_pvr(uint32_t pvr)
@@ -418,7 +447,7 @@ index 7de4bf3..3e2e353 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 e3e8232..5c53801 100644
+index e3e82327b7..5c53801cfd 100644
 --- a/target/ppc/cpu.h
 +++ b/target/ppc/cpu.h
 @@ -1367,6 +1367,7 @@ static inline int cpu_mmu_index(CPUPPCState *env, bool ifetch)
@@ -430,5 +459,5 @@ index e3e8232..5c53801 100644
                        uint32_t min_compat_pvr, uint32_t max_compat_pvr);
  bool ppc_type_check_compat(const char *cputype, uint32_t compat_pvr,
 -- 
-1.8.3.1
+2.21.0
 

0010-Add-s390x-machine-types.patch

@@ -1,4 +1,4 @@
-From 88abdedad4c594c86eb2b92d490b676fa7494d6c Mon Sep 17 00:00:00 2001
+From 0842700b3a01891c316e9169fa651f26714cafa5 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
@@ -7,7 +7,7 @@ Adding changes to add RHEL machine types for s390x architecture.
 
 Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 
-Rebase changes (weekly-190111):
+Rebase changes (weekly-4.1.0):
 - Use upstream compat handling
 
 Merged patches (3.1.0):
@@ -16,17 +16,18 @@ Merged patches (3.1.0):
 Merged patches (4.1.0):
 - 6c200d665b hw/s390x/s390-virtio-ccw: Add machine types for RHEL8.0.0
 
-Merged patches (weekly-190830):
+Merged patches (4.2.0):
 - fb192e5 redhat: s390x: Rename s390-ccw-virtio-rhel8.0.0 to s390-ccw-virtio-rhel8.1.0
 - a9b22e8 redhat: s390x: Add proper compatibility options for the -rhel7.6.0 machine
+- hw/s390x: Add the s390-ccw-virtio-rhel8.2.0 machine types (patch 92954)
 
 Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
 ---
- hw/s390x/s390-virtio-ccw.c | 80 +++++++++++++++++++++++++++++++++++++++++++++-
+ hw/s390x/s390-virtio-ccw.c | 70 +++++++++++++++++++++++++++++++++++++-
- 1 file changed, 79 insertions(+), 1 deletion(-)
+ 1 file changed, 69 insertions(+), 1 deletion(-)
 
 diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
-index d3edeef..7bca634 100644
+index d3edeef0ad..c2c83d2fce 100644
 --- a/hw/s390x/s390-virtio-ccw.c
 +++ b/hw/s390x/s390-virtio-ccw.c
 @@ -615,7 +615,7 @@ bool css_migration_enabled(void)
@@ -46,44 +47,26 @@ index d3edeef..7bca634 100644
  static void ccw_machine_4_2_instance_options(MachineState *machine)
  {
  }
-@@ -866,6 +867,83 @@ static void ccw_machine_2_4_class_options(MachineClass *mc)
+@@ -866,6 +867,73 @@ 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);
 +#endif
-+/*
-+ * like CCW_COMPAT_2_12 + CCW_COMPAT_3_0 (which are empty), but includes
-+ * HW_COMPAT_RHEL7_6 instead of HW_COMPAT_2_11 and HW_COMPAT_3_0
-+ */
 +
-+GlobalProperty ccw_compat_rhel_7_6[] =
++static void ccw_machine_rhel820_instance_options(MachineState *machine)
-+{
-+};
-+const size_t ccw_compat_rhel_7_6_len = G_N_ELEMENTS(ccw_compat_rhel_7_6);
-+
-+GlobalProperty ccw_compat_rhel_7_5[] = {
-+        {
-+            .driver   = TYPE_SCLP_EVENT_FACILITY,
-+            .property = "allow_all_mask_sizes",
-+            .value    = "off",
-+        },
-+};
-+const size_t ccw_compat_rhel_7_5_len = G_N_ELEMENTS(ccw_compat_rhel_7_5);
-+
-+static void ccw_machine_rhel810_instance_options(MachineState *machine)
 +{
 +}
 +
-+static void ccw_machine_rhel810_class_options(MachineClass *mc)
++static void ccw_machine_rhel820_class_options(MachineClass *mc)
 +{
 +}
-+DEFINE_CCW_MACHINE(rhel810, "rhel8.1.0", true);
++DEFINE_CCW_MACHINE(rhel820, "rhel8.2.0", true);
 +
 +static void ccw_machine_rhel760_instance_options(MachineState *machine)
 +{
 +    static const S390FeatInit qemu_cpu_feat = { S390_FEAT_LIST_QEMU_V3_1 };
 +
-+    ccw_machine_rhel810_instance_options(machine);
++    ccw_machine_rhel820_instance_options(machine);
 +
 +    s390_set_qemu_cpu_model(0x2827, 12, 2, qemu_cpu_feat);
 +
@@ -97,11 +80,10 @@ index d3edeef..7bca634 100644
 +
 +static void ccw_machine_rhel760_class_options(MachineClass *mc)
 +{
-+    ccw_machine_rhel810_class_options(mc);
++    ccw_machine_rhel820_class_options(mc);
-+    /* We never published the s390x version of RHEL8.0 AV, so add this here */
++    /* We never published the s390x version of RHEL-AV 8.0 and 8.1, so add this here */
 +    compat_props_add(mc->compat_props, hw_compat_rhel_8_0, hw_compat_rhel_8_0_len);
 +    compat_props_add(mc->compat_props, hw_compat_rhel_7_6, hw_compat_rhel_7_6_len);
-+    compat_props_add(mc->compat_props, ccw_compat_rhel_7_6, ccw_compat_rhel_7_6_len);
 +}
 +DEFINE_CCW_MACHINE(rhel760, "rhel7.6.0", false);
 +
@@ -119,6 +101,15 @@ index d3edeef..7bca634 100644
 +    s390_cpudef_featoff_greater(11, 1, S390_FEAT_BPB);
 +}
 +
++GlobalProperty ccw_compat_rhel_7_5[] = {
++        {
++            .driver   = TYPE_SCLP_EVENT_FACILITY,
++            .property = "allow_all_mask_sizes",
++            .value    = "off",
++        },
++};
++const size_t ccw_compat_rhel_7_5_len = G_N_ELEMENTS(ccw_compat_rhel_7_5);
++
 +static void ccw_machine_rhel750_class_options(MachineClass *mc)
 +{
 +    ccw_machine_rhel760_class_options(mc);
@@ -131,5 +122,5 @@ index d3edeef..7bca634 100644
  static void ccw_machine_register_types(void)
  {
 -- 
-1.8.3.1
+2.21.0
 

0011-Add-x86_64-machine-types.patch

@@ -1,4 +1,4 @@
-From aef82bbd0ad99c43bc0b97932cf87fd16303bf5e Mon Sep 17 00:00:00 2001
+From 2ebaeca6e26950f401a8169d1324be2bafd11741 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
@@ -29,27 +29,28 @@ Merged patches (4.1.0):
 - 18cf0d7 target/i386: Disable MPX support on named CPU models (partialy)
 - 2660667 rhel: Set host-phys-bits-limit=48 on rhel machine-types
 
-Merged patches (weekly-190823):
+Merged patches (4.2.0):
 - 7d5c2ef pc: Don't make die-id mandatory unless necessary
 - e42808c x86 machine types: pc_rhel_8_0_compat
 - 9de83a8 x86 machine types: q35: Fixup units_per_default_bus
 - 6df1559 x86 machine types: Fixup dynamic sysbus entries
 - 0784125 x86 machine types: add pc-q35-rhel8.1.0
+- machines/x86: Add rhel 8.2 machine type (patch 92959)
 
 Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
 ---
  hw/i386/acpi-build.c |   3 +
- hw/i386/pc.c         | 259 ++++++++++++++++++++++++++++++++++++++++++++++++++-
+ hw/i386/pc.c         | 263 ++++++++++++++++++++++++++++++++++++++++++-
- hw/i386/pc_piix.c    | 208 ++++++++++++++++++++++++++++++++++++++++-
+ hw/i386/pc_piix.c    | 210 +++++++++++++++++++++++++++++++++-
- hw/i386/pc_q35.c     | 139 ++++++++++++++++++++++++++-
+ hw/i386/pc_q35.c     | 156 ++++++++++++++++++++++++-
  include/hw/boards.h  |   2 +
- include/hw/i386/pc.h |  30 ++++++
+ include/hw/i386/pc.h |  33 ++++++
  target/i386/cpu.c    |   9 +-
  target/i386/kvm.c    |   4 +
- 8 files changed, 647 insertions(+), 7 deletions(-)
+ 8 files changed, 673 insertions(+), 7 deletions(-)
 
 diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
-index 12ff55f..6400189 100644
+index 12ff55fcfb..64001893ab 100644
 --- a/hw/i386/acpi-build.c
 +++ b/hw/i386/acpi-build.c
 @@ -204,6 +204,9 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm)
@@ -63,10 +64,10 @@ index 12ff55f..6400189 100644
      }
  
 diff --git a/hw/i386/pc.c b/hw/i386/pc.c
-index ac08e63..28850ae 100644
+index ac08e63604..61e70e4811 100644
 --- a/hw/i386/pc.c
 +++ b/hw/i386/pc.c
-@@ -344,6 +344,257 @@ GlobalProperty pc_compat_1_4[] = {
+@@ -344,6 +344,261 @@ GlobalProperty pc_compat_1_4[] = {
  };
  const size_t pc_compat_1_4_len = G_N_ELEMENTS(pc_compat_1_4);
  
@@ -82,6 +83,10 @@ index ac08e63..28850ae 100644
 +};
 +const size_t pc_rhel_compat_len = G_N_ELEMENTS(pc_rhel_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);
++
 +GlobalProperty pc_rhel_8_0_compat[] = {
 +    /* pc_rhel_8_0_compat from pc_compat_3_1 */
 +    { "intel-iommu", "dma-drain", "off" },
@@ -324,7 +329,7 @@ index ac08e63..28850ae 100644
  void gsi_handler(void *opaque, int n, int level)
  {
      GSIState *s = opaque;
-@@ -1225,7 +1476,8 @@ void pc_memory_init(PCMachineState *pcms,
+@@ -1225,7 +1480,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);
@@ -334,7 +339,7 @@ index ac08e63..28850ae 100644
          memory_region_set_readonly(option_rom_mr, true);
      }
      memory_region_add_subregion_overlap(rom_memory,
-@@ -2198,6 +2450,8 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
+@@ -2198,6 +2454,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);
@@ -343,7 +348,7 @@ index ac08e63..28850ae 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;
-@@ -2209,7 +2463,8 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
+@@ -2209,7 +2467,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;
@@ -354,7 +359,7 @@ index ac08e63..28850ae 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 1bd70d1..7f2ee97 100644
+index 1bd70d1abb..bd7fdb99bb 100644
 --- a/hw/i386/pc_piix.c
 +++ b/hw/i386/pc_piix.c
 @@ -53,6 +53,7 @@
@@ -384,7 +389,7 @@ index 1bd70d1..7f2ee97 100644
  static void pc_compat_2_3_fn(MachineState *machine)
  {
      PCMachineState *pcms = PC_MACHINE(machine);
-@@ -1026,3 +1028,205 @@ static void xenfv_machine_options(MachineClass *m)
+@@ -1026,3 +1028,207 @@ static void xenfv_machine_options(MachineClass *m)
  DEFINE_PC_MACHINE(xenfv, "xenfv", pc_xen_hvm_init,
                    xenfv_machine_options);
  #endif
@@ -422,6 +427,8 @@ index 1bd70d1..7f2ee97 100644
 +    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_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);
 +    compat_props_add(m->compat_props, pc_rhel_8_0_compat, pc_rhel_8_0_compat_len);
 +    compat_props_add(m->compat_props, hw_compat_rhel_7_6, hw_compat_rhel_7_6_len);
@@ -591,7 +598,7 @@ index 1bd70d1..7f2ee97 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 385e5cf..4598db2 100644
+index 385e5cffb1..7531d8ed76 100644
 --- a/hw/i386/pc_q35.c
 +++ b/hw/i386/pc_q35.c
 @@ -197,8 +197,8 @@ static void pc_q35_init(MachineState *machine)
@@ -613,7 +620,7 @@ index 385e5cf..4598db2 100644
  static void pc_q35_machine_options(MachineClass *m)
  {
      PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
-@@ -533,3 +534,137 @@ static void pc_q35_2_4_machine_options(MachineClass *m)
+@@ -533,3 +534,154 @@ 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);
@@ -641,6 +648,20 @@ index 385e5cf..4598db2 100644
 +    compat_props_add(m->compat_props, pc_rhel_compat, pc_rhel_compat_len);
 +}
 +
++static void pc_q35_init_rhel820(MachineState *machine)
++{
++    pc_q35_init(machine);
++}
++
++static void pc_q35_machine_rhel820_options(MachineClass *m)
++{
++    pc_q35_machine_rhel_options(m);
++    m->desc = "RHEL-8.2.0 PC (Q35 + ICH9, 2009)";
++}
++
++DEFINE_PC_MACHINE(q35_rhel820, "pc-q35-rhel8.2.0", pc_q35_init_rhel820,
++                  pc_q35_machine_rhel820_options);
++
 +static void pc_q35_init_rhel810(MachineState *machine)
 +{
 +    pc_q35_init(machine);
@@ -648,8 +669,11 @@ index 385e5cf..4598db2 100644
 +
 +static void pc_q35_machine_rhel810_options(MachineClass *m)
 +{
-+    pc_q35_machine_rhel_options(m);
++    pc_q35_machine_rhel820_options(m);
 +    m->desc = "RHEL-8.1.0 PC (Q35 + ICH9, 2009)";
++    m->alias = NULL;
++    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);
 +}
 +
 +DEFINE_PC_MACHINE(q35_rhel810, "pc-q35-rhel8.1.0", pc_q35_init_rhel810,
@@ -752,7 +776,7 @@ index 385e5cf..4598db2 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 cc11116..3cc126f 100644
+index 6f85a0e032..2920bdef5b 100644
 --- a/include/hw/boards.h
 +++ b/include/hw/boards.h
 @@ -222,6 +222,8 @@ struct MachineClass {
@@ -765,7 +789,7 @@ index cc11116..3cc126f 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 1f86eba..dd680ae 100644
+index 1f86eba3f9..2e362c8faa 100644
 --- a/include/hw/i386/pc.h
 +++ b/include/hw/i386/pc.h
 @@ -124,6 +124,9 @@ typedef struct PCMachineClass {
@@ -778,13 +802,16 @@ index 1f86eba..dd680ae 100644
  } PCMachineClass;
  
  #define TYPE_PC_MACHINE "generic-pc-machine"
-@@ -300,6 +303,33 @@ extern const size_t pc_compat_1_5_len;
+@@ -300,6 +303,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;
  
 +extern GlobalProperty pc_rhel_compat[];
 +extern const size_t pc_rhel_compat_len;
 +
++extern GlobalProperty pc_rhel_8_1_compat[];
++extern const size_t pc_rhel_8_1_compat_len;
++
 +extern GlobalProperty pc_rhel_8_0_compat[];
 +extern const size_t pc_rhel_8_0_compat_len;
 +
@@ -813,7 +840,7 @@ index 1f86eba..dd680ae 100644
   * depending on QEMU versions up to QEMU 2.4.
   */
 diff --git a/target/i386/cpu.c b/target/i386/cpu.c
-index 1b7880a..790db77 100644
+index 1b7880ae3a..790db778ab 100644
 --- a/target/i386/cpu.c
 +++ b/target/i386/cpu.c
 @@ -1829,11 +1829,17 @@ static CPUCaches epyc_cache_info = {
@@ -844,10 +871,10 @@ index 1b7880a..790db77 100644
  };
  
 diff --git a/target/i386/kvm.c b/target/i386/kvm.c
-index bf16556..1b19797 100644
+index 1d10046a6c..86d9a1f364 100644
 --- a/target/i386/kvm.c
 +++ b/target/i386/kvm.c
-@@ -3071,6 +3071,7 @@ static int kvm_get_msrs(X86CPU *cpu)
+@@ -3079,6 +3079,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;
@@ -855,7 +882,7 @@ index bf16556..1b19797 100644
  
      kvm_msr_buf_reset(cpu);
  
-@@ -3380,6 +3381,9 @@ static int kvm_get_msrs(X86CPU *cpu)
+@@ -3388,6 +3389,9 @@ static int kvm_get_msrs(X86CPU *cpu)
              break;
          case MSR_KVM_ASYNC_PF_EN:
              env->async_pf_en_msr = msrs[i].data;
@@ -866,5 +893,5 @@ index bf16556..1b19797 100644
          case MSR_KVM_PV_EOI_EN:
              env->pv_eoi_en_msr = msrs[i].data;
 -- 
-1.8.3.1
+2.21.0
 

0012-Enable-make-check.patch

@@ -1,4 +1,4 @@
-From 88d09fe5c46c80214f883bd097ca86a99ca1ca41 Mon Sep 17 00:00:00 2001
+From 154215041df085271a780a2989f4f481226e3e34 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
@@ -44,7 +44,7 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
  11 files changed, 37 insertions(+), 17 deletions(-)
 
 diff --git a/tests/Makefile.include b/tests/Makefile.include
-index b483790..53bdbdf 100644
+index b483790cf3..53bdbdfee0 100644
 --- a/tests/Makefile.include
 +++ b/tests/Makefile.include
 @@ -172,7 +172,7 @@ check-qtest-i386-y += tests/ide-test$(EXESUF)
@@ -86,7 +86,7 @@ index b483790..53bdbdf 100644
  check-qtest-s390x-y += tests/cpu-plug-test$(EXESUF)
  check-qtest-s390x-y += tests/migration-test$(EXESUF)
 diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
-index d3a54a0..33ce72b 100644
+index d3a54a0ba5..33ce72b89c 100644
 --- a/tests/boot-serial-test.c
 +++ b/tests/boot-serial-test.c
 @@ -108,19 +108,23 @@ static testdef_t tests[] = {
@@ -115,7 +115,7 @@ index d3a54a0..33ce72b 100644
      { "sparc", "LX", "", "TMS390S10" },
      { "sparc", "SS-4", "", "MB86904" },
 diff --git a/tests/cpu-plug-test.c b/tests/cpu-plug-test.c
-index 30e514b..a04beae 100644
+index 30e514bbfb..a04beae1c6 100644
 --- a/tests/cpu-plug-test.c
 +++ b/tests/cpu-plug-test.c
 @@ -185,8 +185,8 @@ static void add_pseries_test_case(const char *mname)
@@ -130,7 +130,7 @@ index 30e514b..a04beae 100644
      }
      data = g_new(PlugTestData, 1);
 diff --git a/tests/e1000-test.c b/tests/e1000-test.c
-index c387984..c89112d 100644
+index c387984ef6..c89112d6f8 100644
 --- a/tests/e1000-test.c
 +++ b/tests/e1000-test.c
 @@ -22,9 +22,11 @@ struct QE1000 {
@@ -146,7 +146,7 @@ index c387984..c89112d 100644
  
  static void *e1000_get_driver(void *obj, const char *interface)
 diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c
-index 7e86c54..cc068ba 100644
+index 7e86c5416c..cc068bad87 100644
 --- a/tests/hd-geo-test.c
 +++ b/tests/hd-geo-test.c
 @@ -732,6 +732,7 @@ static void test_override_ide(void)
@@ -178,7 +178,7 @@ index 7e86c54..cc068ba 100644
          qtest_add_func("hd-geo/override/zero_chs", test_override_zero_chs);
          qtest_add_func("hd-geo/override/scsi_hot_unplug",
 diff --git a/tests/prom-env-test.c b/tests/prom-env-test.c
-index 61bc1d1..028d45c 100644
+index 61bc1d1e7b..028d45c7d7 100644
 --- a/tests/prom-env-test.c
 +++ b/tests/prom-env-test.c
 @@ -88,10 +88,14 @@ int main(int argc, char *argv[])
@@ -197,7 +197,7 @@ index 61bc1d1..028d45c 100644
          add_tests(sparc_machines);
      } else if (!strcmp(arch, "sparc64")) {
 diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
-index 53bcdbc..b387e0c 100755
+index 53bcdbc911..b387e0c233 100755
 --- a/tests/qemu-iotests/051
 +++ b/tests/qemu-iotests/051
 @@ -181,11 +181,11 @@ run_qemu -drive if=virtio
@@ -231,7 +231,7 @@ index 53bcdbc..b387e0c 100755
       *)
          ;;
 diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
-index 6b10a6a..06cc734 100644
+index 6b10a6a762..06cc734b26 100644
 --- a/tests/qemu-iotests/group
 +++ b/tests/qemu-iotests/group
 @@ -92,7 +92,7 @@
@@ -253,7 +253,7 @@ index 6b10a6a..06cc734 100644
  101 rw quick
  102 rw quick
 diff --git a/tests/test-x86-cpuid-compat.c b/tests/test-x86-cpuid-compat.c
-index 772287b..e7c075e 100644
+index 772287bdb4..e7c075ed98 100644
 --- a/tests/test-x86-cpuid-compat.c
 +++ b/tests/test-x86-cpuid-compat.c
 @@ -300,6 +300,7 @@ int main(int argc, char **argv)
@@ -273,7 +273,7 @@ index 772287b..e7c075e 100644
      /* Test feature parsing */
      add_feature_test("x86/cpuid/features/plus",
 diff --git a/tests/usb-hcd-xhci-test.c b/tests/usb-hcd-xhci-test.c
-index 10ef9d2..3855873 100644
+index 10ef9d2a91..3855873050 100644
 --- a/tests/usb-hcd-xhci-test.c
 +++ b/tests/usb-hcd-xhci-test.c
 @@ -21,6 +21,7 @@ static void test_xhci_hotplug(void)
@@ -303,5 +303,5 @@ index 10ef9d2..3855873 100644
  
      qtest_start("-device nec-usb-xhci,id=xhci"
 -- 
-1.8.3.1
+2.21.0
 

0013-vfio-cap-number-of-devices-that-can-be-assigned.patch

@@ -1,4 +1,4 @@
-From 58e199b5cb9364f46b68d8cf618dff7564d427bb Mon Sep 17 00:00:00 2001
+From de433da59448eaad4ac1b902d07d57b57f922aff 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
@@ -42,7 +42,7 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
  2 files changed, 29 insertions(+), 1 deletion(-)
 
 diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
-index c8534d3..309535f 100644
+index c8534d3035..309535f306 100644
 --- a/hw/vfio/pci.c
 +++ b/hw/vfio/pci.c
 @@ -47,6 +47,9 @@
@@ -98,7 +98,7 @@ index c8534d3..309535f 100644
                       false),
      DEFINE_PROP_BOOL("x-no-vfio-ioeventfd", VFIOPCIDevice, no_vfio_ioeventfd,
 diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h
-index 35626cd..0cd4803 100644
+index 35626cd63e..0cd4803aee 100644
 --- a/hw/vfio/pci.h
 +++ b/hw/vfio/pci.h
 @@ -135,6 +135,7 @@ typedef struct VFIOPCIDevice {
@@ -110,5 +110,5 @@ index 35626cd..0cd4803 100644
      uint32_t device_id;
      uint32_t sub_vendor_id;
 -- 
-1.8.3.1
+2.21.0
 

0014-Add-support-statement-to-help-output.patch

@@ -1,4 +1,4 @@
-From 73edca2e4885b3f2b65edb08b6cdb53d68494c13 Mon Sep 17 00:00:00 2001
+From 2754dd8da8975757753fd491985d5e7b36966106 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
@@ -24,7 +24,7 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
  1 file changed, 9 insertions(+)
 
 diff --git a/vl.c b/vl.c
-index 668a345..9f3e7e7 100644
+index 668a34577e..9f3e7e7733 100644
 --- a/vl.c
 +++ b/vl.c
 @@ -1822,9 +1822,17 @@ static void version(void)
@@ -54,5 +54,5 @@ index 668a345..9f3e7e7 100644
  }
  
 -- 
-1.8.3.1
+2.21.0
 

0015-globally-limit-the-maximum-number-of-CPUs.patch

@@ -1,4 +1,4 @@
-From 9647d94ec17c7fa645336a881147a7e841cb78c2 Mon Sep 17 00:00:00 2001
+From c9c3cf721b0e9e359418f64c2a5121c3f8b5d27a 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
@@ -82,7 +82,7 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
  2 files changed, 30 insertions(+)
 
 diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
-index ca00daa..dc3ed7f 100644
+index ca00daa2f5..dc3ed7f04e 100644
 --- a/accel/kvm/kvm-all.c
 +++ b/accel/kvm/kvm-all.c
 @@ -1943,6 +1943,18 @@ static int kvm_init(MachineState *ms)
@@ -105,7 +105,7 @@ index ca00daa..dc3ed7f 100644
          if (nc->num > soft_vcpus_limit) {
              warn_report("Number of %s cpus requested (%d) exceeds "
 diff --git a/vl.c b/vl.c
-index 9f3e7e7..1550aa2 100644
+index 9f3e7e7733..1550aa2aaa 100644
 --- a/vl.c
 +++ b/vl.c
 @@ -134,6 +134,8 @@ int main(int argc, char **argv)
@@ -148,5 +148,5 @@ index 9f3e7e7..1550aa2 100644
      configure_rtc(qemu_find_opts_singleton("rtc"));
  
 -- 
-1.8.3.1
+2.21.0
 

0016-Add-support-for-simpletrace.patch

@@ -1,4 +1,4 @@
-From d78f2713725382c792154ce482a1b03b749b909f Mon Sep 17 00:00:00 2001
+From 26128b3ede339e292a3c50a84e3248af46ecd0ec 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
@@ -26,8 +26,8 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
 ---
  .gitignore                              |  2 ++
  Makefile                                |  4 +++
- README.systemtap                        | 43 +++++++++++++++++++++++++++++++++
+ README.systemtap                        | 43 +++++++++++++++++++++++++
- redhat/qemu-kvm.spec.template           | 26 +++++++++++++++++++-
+ redhat/qemu-kvm.spec.template           | 26 ++++++++++++++-
  scripts/systemtap/conf.d/qemu_kvm.conf  |  4 +++
  scripts/systemtap/script.d/qemu_kvm.stp |  1 +
  6 files changed, 79 insertions(+), 1 deletion(-)
@@ -36,7 +36,7 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
  create mode 100644 scripts/systemtap/script.d/qemu_kvm.stp
 
 diff --git a/Makefile b/Makefile
-index 086727d..4254950 100644
+index 086727dbb9..4254950f7f 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -939,6 +939,10 @@ endif
@@ -52,7 +52,7 @@ index 086727d..4254950 100644
  ctags:
 diff --git a/README.systemtap b/README.systemtap
 new file mode 100644
-index 0000000..ad913fc
+index 0000000000..ad913fc990
 --- /dev/null
 +++ b/README.systemtap
 @@ -0,0 +1,43 @@
@@ -101,7 +101,7 @@ index 0000000..ad913fc
 +  # /usr/share/qemu-kvm/simpletrace.py --no-header /usr/share/qemu-kvm/trace-events /tmp/trace.log
 diff --git a/scripts/systemtap/conf.d/qemu_kvm.conf b/scripts/systemtap/conf.d/qemu_kvm.conf
 new file mode 100644
-index 0000000..372d816
+index 0000000000..372d8160a4
 --- /dev/null
 +++ b/scripts/systemtap/conf.d/qemu_kvm.conf
 @@ -0,0 +1,4 @@
@@ -111,11 +111,11 @@ index 0000000..372d816
 +qemu_kvm_OPT="-s4" # per-CPU buffer size, in megabytes
 diff --git a/scripts/systemtap/script.d/qemu_kvm.stp b/scripts/systemtap/script.d/qemu_kvm.stp
 new file mode 100644
-index 0000000..c04abf9
+index 0000000000..c04abf9449
 --- /dev/null
 +++ b/scripts/systemtap/script.d/qemu_kvm.stp
 @@ -0,0 +1 @@
 +probe qemu.kvm.simpletrace.handle_qmp_command,qemu.kvm.simpletrace.monitor_protocol_*,qemu.kvm.simpletrace.migrate_set_state {}
 -- 
-1.8.3.1
+2.21.0
 

0017-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch

@@ -1,4 +1,4 @@
-From 4dcf2dac71a39d2e5b44cf6a4a43abdd89a11c60 Mon Sep 17 00:00:00 2001
+From 97ed62562b883c384346bfef3e1c7e379f03ccab Mon Sep 17 00:00:00 2001
 From: Miroslav Rezanina <mrezanin@redhat.com>
 Date: Fri, 30 Nov 2018 09:11:03 +0100
 Subject: Use qemu-kvm in documentation instead of qemu-system-<arch>
@@ -25,7 +25,7 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
  4 files changed, 13 insertions(+), 13 deletions(-)
 
 diff --git a/docs/qemu-block-drivers.texi b/docs/qemu-block-drivers.texi
-index 2c7ea49..5d0afb3 100644
+index 2c7ea49c32..5d0afb3dee 100644
 --- a/docs/qemu-block-drivers.texi
 +++ b/docs/qemu-block-drivers.texi
 @@ -2,7 +2,7 @@
@@ -38,7 +38,7 @@ index 2c7ea49..5d0afb3 100644
  @c man begin DESCRIPTION
  
 diff --git a/docs/qemu-cpu-models.texi b/docs/qemu-cpu-models.texi
-index f88a1de..c82cf8f 100644
+index f88a1def0d..c82cf8fab7 100644
 --- a/docs/qemu-cpu-models.texi
 +++ b/docs/qemu-cpu-models.texi
 @@ -2,7 +2,7 @@
@@ -51,7 +51,7 @@ index f88a1de..c82cf8f 100644
  @c man begin DESCRIPTION
  
 diff --git a/qemu-doc.texi b/qemu-doc.texi
-index 3ddf5c0..d460f8d 100644
+index 3ddf5c0a68..d460f8d2c0 100644
 --- a/qemu-doc.texi
 +++ b/qemu-doc.texi
 @@ -11,8 +11,8 @@
@@ -75,7 +75,7 @@ index 3ddf5c0..d460f8d 100644
   -prom-env 'boot-args=conf=hd:2,\yaboot.conf'
  @end example
 diff --git a/qemu-options.hx b/qemu-options.hx
-index fc17aca..df1d27b 100644
+index fc17aca631..df1d27b6f2 100644
 --- a/qemu-options.hx
 +++ b/qemu-options.hx
 @@ -2737,11 +2737,11 @@ be created for multiqueue vhost-user.
@@ -114,5 +114,5 @@ index fc17aca..df1d27b 100644
  ETEXI
  
 -- 
-1.8.3.1
+2.21.0
 

0018-usb-xhci-Fix-PCI-capability-order.patch

@@ -1,4 +1,4 @@
-From eba5ef4e161aeb71df26b1c43577945ae3093f2b Mon Sep 17 00:00:00 2001
+From b13a7d3527c5c91e7a50236de30a2244b8453911 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
@@ -62,7 +62,7 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
-index 8fed2ee..d2b9744 100644
+index 8fed2eedd6..d2b9744030 100644
 --- a/hw/usb/hcd-xhci.c
 +++ b/hw/usb/hcd-xhci.c
 @@ -3403,6 +3403,12 @@ static void usb_xhci_realize(struct PCIDevice *dev, Error **errp)
@@ -92,5 +92,5 @@ index 8fed2ee..d2b9744 100644
          /* TODO check for errors, and should fail when msix=on */
          msix_init(dev, xhci->numintrs,
 -- 
-1.8.3.1
+2.21.0
 

0019-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch

@@ -1,4 +1,4 @@
-From 033166f31288a5104d4e55a828ce8d62c9ccca1c Mon Sep 17 00:00:00 2001
+From 3fab8f5e8a9e190c1ed6916ac13c7c4d65e874b7 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 e8b2b64..54108c0 100644
+index e8b2b64d09..54108c0056 100644
 --- a/hw/scsi/virtio-scsi.c
 +++ b/hw/scsi/virtio-scsi.c
 @@ -808,6 +808,15 @@ static void virtio_scsi_hotplug(HotplugHandler *hotplug_dev, DeviceState *dev,
@@ -65,5 +65,5 @@ index e8b2b64..54108c0 100644
          if (blk_op_is_blocked(sd->conf.blk, BLOCK_OP_TYPE_DATAPLANE, errp)) {
              return;
 -- 
-1.8.3.1
+2.21.0
 

0020-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch

@@ -1,4 +1,4 @@
-From 6ce9df118313e3b2d21c70994d0b42b33b59d27c Mon Sep 17 00:00:00 2001
+From 148e9e80a3a430615b552075082fad22d007d851 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,7 +32,7 @@ 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 481dfd2..805f385 100644
+index 481dfd2a27..805f38533e 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,
@@ -56,5 +56,5 @@ index 481dfd2..805f385 100644
      spapr_check_pagesize(spapr, qemu_minrampagesize(), errp);
  }
 -- 
-1.8.3.1
+2.21.0
 

0021-Using-ip_deq-after-m_free-might-read-pointers-from-a.patch

@@ -1,4 +1,4 @@
-From a0059f1ef0bfd6852f838491120adf1be20857cc Mon Sep 17 00:00:00 2001
+From ab9ebc29bb9bb142e73a160750a451d40bfe9746 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
 Date: Mon, 16 Sep 2019 17:07:00 +0100
 Subject: Using ip_deq after m_free might read pointers from an allocation
@@ -31,7 +31,7 @@ Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/slirp/src/ip_input.c b/slirp/src/ip_input.c
-index 8c75d91..df1c846 100644
+index 8c75d91495..df1c846ade 100644
 --- a/slirp/src/ip_input.c
 +++ b/slirp/src/ip_input.c
 @@ -292,6 +292,7 @@ static struct ip *ip_reass(Slirp *slirp, struct ip *ip, struct ipq *fp)
@@ -57,5 +57,5 @@ index 8c75d91..df1c846 100644
  
  insert:
 -- 
-1.8.3.1
+2.21.0
 

0023-Temporarily-update-VERSION-to-8.2.0.patch

@@ -1,28 +0,0 @@
-From 2a87b3e90278f47395975a77fc056d2f964f4725 Mon Sep 17 00:00:00 2001
-From: "Danilo C. L. de Paula" <ddepaula@redhat.com>
-Date: Tue, 19 Nov 2019 08:41:33 -0300
-Subject: Temporarily update VERSION to 8.2.0
-
-rhbz#1773397
-
-This will change when the official release appears.
-But, to make qemu-kvm --version happy, we need to fix this now.
-
-Conflicts:
-	VERSION
-
-Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
----
- VERSION | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/VERSION b/VERSION
-index dcd8753..6aba2b2 100644
---- a/VERSION
-+++ b/VERSION
-@@ -1 +1 @@
--4.1.94
-+4.2.0
--- 
-1.8.3.1
-

qemu-kvm.spec

@@ -1,6 +1,5 @@
 %global SLOF_gittagdate 20191022
 %global SLOF_gittagcommit 899d9883
-%global rcversion -rc4
 
 %global have_usbredir 1
 %global have_spice    1
@@ -68,7 +67,7 @@ Obsoletes: %1-rhev
 Summary: QEMU is a machine emulator and virtualizer
 Name: qemu-kvm
 Version: 4.2.0
-Release: 2%{?dist}
+Release: 4%{?dist}
 # 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
@@ -77,7 +76,7 @@ URL: http://www.qemu.org/
 ExclusiveArch: x86_64 %{power64} aarch64 s390x
 
 
-Source0: http://wiki.qemu.org/download/qemu-4.2.0-rc4.tar.xz
+Source0: http://wiki.qemu.org/download/qemu-4.2.0.tar.xz
 
 # KSM control scripts
 Source4: ksm.service
@@ -105,7 +104,6 @@ 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
@@ -123,7 +121,6 @@ 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-Using-ip_deq-after-m_free-might-read-pointers-from-a.patch
-Patch0023: 0023-Temporarily-update-VERSION-to-8.2.0.patch
 
 BuildRequires: wget
 BuildRequires: rpm-build
@@ -409,10 +406,7 @@ the Secure Shell (SSH) protocol.
 
 
 %prep
-%setup -n qemu-%{version}%{rcversion}
+%setup -n qemu-%{version}
-# Remove slirp content in scratchbuilds because it's being applyed as a patch
-rm -fr slirp
-mkdir slirp
 %autopatch -p1
 
 %build
@@ -1061,13 +1055,76 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 
 
 %changelog
+* Fri Dec 13 2019 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.2.0-4.el8
+- Rebase to qemu-4.2
+- Resolves: bz#1783250
+  (rebase qemu-kvm to 4.2)
 
-* Tue Nov 19 2019 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.2.0-2.el8
+* Tue Dec 10 2019 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.1.0-18.el8
-- 0023-Temporarily-update-VERSION-to-8.2.0.patch [bz#1773397]
+- kvm-LUKS-support-preallocation.patch [bz#1534951]
-- Resolves: bz#1773397
+- kvm-nbd-add-empty-.bdrv_reopen_prepare.patch [bz#1718727]
-  (QEMU emulator version is "4.1.91" for qemu-kvm-4.2.0-0.module+el8.2.0+471
+- kvm-qdev-qbus-add-hidden-device-support.patch [bz#1757796]
-- Resoves: bz#1773392
+- kvm-pci-add-option-for-net-failover.patch [bz#1757796]
-  ([ppc] Need to rebase SLOF image for qemu-kvm-4.2)
+- kvm-pci-mark-devices-partially-unplugged.patch [bz#1757796]
+- kvm-pci-mark-device-having-guest-unplug-request-pending.patch [bz#1757796]
+- kvm-qapi-add-unplug-primary-event.patch [bz#1757796]
+- kvm-qapi-add-failover-negotiated-event.patch [bz#1757796]
+- kvm-migration-allow-unplug-during-migration-for-failover.patch [bz#1757796]
+- kvm-migration-add-new-migration-state-wait-unplug.patch [bz#1757796]
+- kvm-libqos-tolerate-wait-unplug-migration-state.patch [bz#1757796]
+- kvm-net-virtio-add-failover-support.patch [bz#1757796]
+- kvm-vfio-unplug-failover-primary-device-before-migration.patch [bz#1757796]
+- kvm-net-virtio-fix-dev_unplug_pending.patch [bz#1757796]
+- kvm-net-virtio-return-early-when-failover-primary-alread.patch [bz#1757796]
+- kvm-net-virtio-fix-re-plugging-of-primary-device.patch [bz#1757796]
+- kvm-net-virtio-return-error-when-device_opts-arg-is-NULL.patch [bz#1757796]
+- kvm-vfio-don-t-ignore-return-value-of-migrate_add_blocke.patch [bz#1757796]
+- kvm-hw-vfio-pci-Fix-double-free-of-migration_blocker.patch [bz#1757796]
+- Resolves: bz#1534951
+  (RFE: Support preallocation mode for luks format)
+- Resolves: bz#1718727
+  (Committing changes to the backing file over NBD fails with reopening files not supported)
+- Resolves: bz#1757796
+  (RFE: support for net failover devices in qemu)
+
+* Mon Dec 02 2019 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.1.0-17.el8
+- kvm-qemu-pr-helper-fix-crash-in-mpath_reconstruct_sense.patch [bz#1772322]
+- Resolves: bz#1772322
+  (qemu-pr-helper: fix crash in mpath_reconstruct_sense)
+
+* Wed Nov 27 2019 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.1.0-16.el8
+- kvm-curl-Keep-pointer-to-the-CURLState-in-CURLSocket.patch [bz#1745209]
+- kvm-curl-Keep-socket-until-the-end-of-curl_sock_cb.patch [bz#1745209]
+- kvm-curl-Check-completion-in-curl_multi_do.patch [bz#1745209]
+- kvm-curl-Pass-CURLSocket-to-curl_multi_do.patch [bz#1745209]
+- kvm-curl-Report-only-ready-sockets.patch [bz#1745209]
+- kvm-curl-Handle-success-in-multi_check_completion.patch [bz#1745209]
+- kvm-curl-Check-curl_multi_add_handle-s-return-code.patch [bz#1745209]
+- kvm-vhost-user-save-features-if-the-char-dev-is-closed.patch [bz#1738768]
+- kvm-block-snapshot-Restrict-set-of-snapshot-nodes.patch [bz#1658981]
+- kvm-iotests-Test-internal-snapshots-with-blockdev.patch [bz#1658981]
+- kvm-qapi-Add-feature-flags-to-commands-in-qapi-introspec.patch [bz#1658981]
+- kvm-qapi-Allow-introspecting-fix-for-savevm-s-cooperatio.patch [bz#1658981]
+- kvm-block-Remove-backing-null-from-bs-explicit_-options.patch [bz#1773925]
+- kvm-iotests-Test-multiple-blockdev-snapshot-calls.patch [bz#1773925]
+- Resolves: bz#1658981
+  (qemu failed to create internal snapshot via 'savevm' when using blockdev)
+- Resolves: bz#1738768
+  (Guest fails to recover receiving packets after vhost-user reconnect)
+- Resolves: bz#1745209
+  (qemu-img gets stuck when stream-converting from http)
+- Resolves: bz#1773925
+  (Fail to do blockcommit with more than one snapshots)
+
+* Thu Nov 14 2019 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.1.0-15.el8
+- kvm-virtio-blk-Add-blk_drain-to-virtio_blk_device_unreal.patch [bz#1706759]
+- kvm-Revert-qcow2-skip-writing-zero-buffers-to-empty-COW-.patch [bz#1772473]
+- kvm-coroutine-Add-qemu_co_mutex_assert_locked.patch [bz#1772473]
+- kvm-qcow2-Fix-corruption-bug-in-qcow2_detect_metadata_pr.patch [bz#1772473]
+- Resolves: bz#1706759
+  (qemu core dump when unplug a 16T GPT type disk from win2019 guest)
+- Resolves: bz#1772473
+  (Import fixes from 8.1.0 into 8.1.1 branch)
 
 * Tue Oct 29 2019 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.1.0-14.el8
 - kvm-Revert-qcow2-skip-writing-zero-buffers-to-empty-COW-.patch [bz#1751934]

sources

@@ -1 +1 @@
-SHA512 (qemu-4.2.0-rc4.tar.xz) = 01d7fd8368b37ce9239b5884654962c947e2c597c0042b256bb9d1ebf2fd5159b1182e43094e966e54368c792b390f48ce12bce7ee878f5f3ab685fc118aa7db
+SHA512 (qemu-4.2.0.tar.xz) = 2a79973c2b07c53e8c57a808ea8add7b6b2cbca96488ed5d4b669ead8c9318907dec2b6109f180fc8ca8f04c0f73a56e82b3a527b5626b799d7e849f2474ec56