diff --git a/.gitignore b/.gitignore
index 6df5e29..6ad53a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
 /qemu-7.1.0.tar.xz
 /qemu-7.2.0.tar.xz
 /qemu-8.0.0.tar.xz
+/qemu-8.1.0.tar.xz
diff --git a/0004-Initial-redhat-build.patch b/0004-Initial-redhat-build.patch
index 612633e..543ece0 100644
--- a/0004-Initial-redhat-build.patch
+++ b/0004-Initial-redhat-build.patch
@@ -1,4 +1,4 @@
-From 84039bfc860878f3c3421de4a1836ac5d6300ed7 Mon Sep 17 00:00:00 2001
+From b8538e2099c040bfe7c98a3af1423abb30d91ab7 Mon Sep 17 00:00:00 2001
 From: Miroslav Rezanina <mrezanin@redhat.com>
 Date: Wed, 26 May 2021 10:56:02 +0200
 Subject: Initial redhat build
@@ -13,7 +13,7 @@ several issues are fixed in QEMU tree:
 
 We disable make check due to issues with some of the tests.
 
-This rebase is based on qemu-kvm-7.2.0-14.el9
+This rebase is based on qemu-kvm-8.0.0-13.el9
 
 Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 --
@@ -50,32 +50,34 @@ Rebase changes (7.0.0):
 - Change permissions on installing tests/Makefile.include
 - Remove ssh block driver
 
-Rebase changes (7.1.0 rc0):
+Rebase changes (7.1.0):
 - --disable-vnc-png renamed to --disable-png (upstream)
 - removed --disable-vhost-vsock and --disable-vhost-scsi
 - capstone submodule removed
 - Temporary include capstone build
 
-Rebase changes (7.2.0 rc0):
+Rebase changes (7.2.0):
 - Switch --enable-slirp=system to --enable-slirp
-
-Rebaes changes (7.2.0 rc2):
 - Added new configure options (blkio and sndio, both disabled)
 
 Rebase changes (7.2.0):
 - Fix SRPM name generation to work on Fedora 37
 - Switch back to system meson
 
-Rebase changes (8.0.0-rc1):
+Rebase changes (8.0.0):
 - use enable-dtrace-backands instead of enable-dtrace-backend
 - Removed qemu virtiofsd bits
-
-Rebase changes (8.0.0-rc2):
 - test/check-block.sh removed (upstream)
-
-Rebase changes (8.0.0-rc3):
 - Add new --disable-* options for configure
 
+Rebase changes (8.1.0):
+- qmp-spec.txt installed by make
+- Removed --meson configure option
+- Add --disable-pypi
+- Removed --with-git and -with-gitsubmodules
+- Renamed --disable-pypi to --disable-downloads
+- Minor updates in README.tests
+
 Merged patches (6.0.0):
  - 605758c902 Limit build on Power to qemu-img and qemu-ga only
 
@@ -168,22 +170,29 @@ Merged patches (7.0.0):
 - d46d2710b2 spec: Obsolete old usb redir subpackage
 - 6f52a50b68 spec: Obsolete ssh driver
 
-Merged patches (7.2.0 rc4):
+Merged patches (7.2.0):
 - 8c6834feb6 Remove opengl display device subpackages (C9S MR 124)
 - 0ecc97f29e spec: Add requires for packages with additional virtio-gpu variants (C9S MR 124)
 
-Merged patches (8.0.0-rc1):
+Merged patches (8.0.0):
 - 7754f6ba78 Minor packaging fixes
 - 401af56187 spec: Disable VDUSE
 
+Merged patches (8.1.0):
+- 0c2306676f Enable Linux io_uring
+- b7fa6426d5 Enable libblkio block drivers
+- 19f6d7a6f4 Fix virtio-blk-vhost-vdpa typo in spec file
+- f356cae88f spec: Build DBUS display
+- 77b763efd5 Provide elf2dmp binary in qemu-tools
+
 Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 ---
  .distro/Makefile                        |  100 +
- .distro/Makefile.common                 |   41 +
+ .distro/Makefile.common                 |   42 +
  .distro/README.tests                    |   39 +
  .distro/modules-load.conf               |    4 +
  .distro/qemu-guest-agent.service        |    1 -
- .distro/qemu-kvm.spec.template          | 4528 +++++++++++++++++++++++
+ .distro/qemu-kvm.spec.template          | 4860 +++++++++++++++++++++++
  .distro/rpminspect.yaml                 |    6 +-
  .distro/scripts/extract_build_cmd.py    |   12 +
  .distro/scripts/process-patches.sh      |    4 +
@@ -193,7 +202,7 @@ Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
  scripts/systemtap/conf.d/qemu_kvm.conf  |    4 +
  scripts/systemtap/script.d/qemu_kvm.stp |    1 +
  ui/vnc-auth-sasl.c                      |    2 +-
- 15 files changed, 4784 insertions(+), 4 deletions(-)
+ 15 files changed, 5117 insertions(+), 4 deletions(-)
  create mode 100644 .distro/Makefile
  create mode 100644 .distro/Makefile.common
  create mode 100644 .distro/README.tests
@@ -296,5 +305,5 @@ index 47fdae5b21..2a950caa2a 100644
      if (saslErr != SASL_OK) {
          error_setg(errp, "Failed to initialize SASL auth: %s",
 -- 
-2.39.1
+2.39.3
 
diff --git a/0005-Enable-disable-devices-for-RHEL.patch b/0005-Enable-disable-devices-for-RHEL.patch
index 14dd3f9..8d68b3d 100644
--- a/0005-Enable-disable-devices-for-RHEL.patch
+++ b/0005-Enable-disable-devices-for-RHEL.patch
@@ -1,4 +1,4 @@
-From 63829772dbc2075fc014a9d52e3968735d228018 Mon Sep 17 00:00:00 2001
+From ebbe3b0dc13b2f8ee7a1fcf9f6e687637a59ea35 Mon Sep 17 00:00:00 2001
 From: Miroslav Rezanina <mrezanin@redhat.com>
 Date: Wed, 7 Dec 2022 03:05:48 -0500
 Subject: Enable/disable devices for RHEL
@@ -22,21 +22,25 @@ Rebase notes (7.0.0):
 - Renamed CONFIG_ARM_GIC_TCG to CONFIG_ARM_GICV3_TCG
 - Removed upstream devices
 
-Rebase notes (7.1.0 rc0):
+Rebase notes (7.1.0):
 - Added CONFIG_VHOST_VSOCK and CONFIG_VHOST_USER_VSOCK configs
 - Added CONFIG_CXL and CONFIG_CXL_MEM_DEVICE for aarch64 and x86_64
-
-Rebase notes (7.1.0 rc3):
 - Added CONFIG_VHOST_USER_FS option (all archs)
 
-Rebase notes (7.2.0 rc20):
+Rebase notes (7.2.0):
 - Removed disabling a15mpcore.c as no longer needed
 
-Rebase notes (8.0.0-rc1):
+Rebase notes (8.0.0):
 - Rename CONFIG_ACPI_X86_ICH to CONFIG_ACPI_ICH9
 - Inlude qemu/error-report.h in hw/display/cirrus_vga.c
 - Change virtiofsd dependency version
 
+Rebase notes (8.1.0):
+- Added CONFIG_PCIE_PCI_BRIDGE for x86_64
+- Disabling tcg cpus for aarch64
+- Disable CONFIG_ARM_V7M and remove related hack
+- Moved aarch64 tcg cpu disabling from arm machine type commit
+
 Merged patches (6.1.0):
 - c51bf45304 Remove SPICE and QXL from x86_64-rh-devices.mak
 - 02fc745601 aarch64-rh-devices: add CONFIG_PVPANIC_PCI
@@ -53,32 +57,44 @@ Merged patches (7.0.0):
 - fd7c45a5a8 redhat: Enable virtio-mem as tech-preview on x86-64
 - c9e68ea451 Enable SGX -- RH Only
 
-Merged patches (7.1.0 rc0):
+Merged patches (7.1.0):
 - 38b89dc245 pc: Move s3/s4 suspend disabling to compat (only hw/acpi/ich9.c chunk)
 - 8f663466c6 configs/devices/aarch64-softmmu: Enable CONFIG_VIRTIO_MEM
 - 1bf372717a Enable virtio-iommu-pci on aarch64
 - ae3f269458 Enable virtio-iommu-pci on x86_64
+
+Merged patches (8.1.0):
+- 8173d2eaba Disable unwanted new devices
 ---
  .distro/qemu-kvm.spec.template                |  18 +--
  .../aarch64-softmmu/aarch64-rh-devices.mak    |  41 +++++++
  .../ppc64-softmmu/ppc64-rh-devices.mak        |  37 ++++++
  configs/devices/rh-virtio.mak                 |  10 ++
  .../s390x-softmmu/s390x-rh-devices.mak        |  18 +++
- .../x86_64-softmmu/x86_64-rh-devices.mak      | 109 ++++++++++++++++++
- hw/arm/meson.build                            |   2 +-
+ .../x86_64-softmmu/x86_64-rh-devices.mak      | 110 ++++++++++++++++++
+ hw/arm/virt.c                                 |   2 +
  hw/block/fdc.c                                |  10 ++
  hw/cpu/meson.build                            |   3 +-
- hw/display/cirrus_vga.c                       |   7 +-
+ hw/display/cirrus_vga.c                       |   4 +
  hw/ide/piix.c                                 |   5 +-
+ hw/ide/qdev.c                                 |   9 ++
  hw/input/pckbd.c                              |   2 +
+ hw/misc/meson.build                           |   3 +-
  hw/net/e1000.c                                |   2 +
  hw/ppc/spapr_cpu_core.c                       |   2 +
  hw/usb/meson.build                            |   2 +-
- target/arm/cpu_tcg.c                          |  10 ++
+ target/arm/arm-qmp-cmds.c                     |   2 +
+ target/arm/cpu-qom.h                          |   1 +
+ target/arm/cpu.c                              |   5 +
+ target/arm/cpu.h                              |   2 +
+ target/arm/cpu64.c                            |  12 +-
+ target/arm/tcg/cpu32.c                        |   2 +
+ target/arm/tcg/cpu64.c                        |   8 ++
  target/ppc/cpu-models.c                       |   9 ++
  target/s390x/cpu_models_sysemu.c              |   3 +
  target/s390x/kvm/kvm.c                        |   8 ++
- 19 files changed, 285 insertions(+), 13 deletions(-)
+ tests/qtest/arm-cpu-features.c                |   4 +
+ 28 files changed, 321 insertions(+), 13 deletions(-)
  create mode 100644 configs/devices/aarch64-softmmu/aarch64-rh-devices.mak
  create mode 100644 configs/devices/ppc64-softmmu/ppc64-rh-devices.mak
  create mode 100644 configs/devices/rh-virtio.mak
@@ -87,7 +103,7 @@ Merged patches (7.1.0 rc0):
 
 diff --git a/configs/devices/aarch64-softmmu/aarch64-rh-devices.mak b/configs/devices/aarch64-softmmu/aarch64-rh-devices.mak
 new file mode 100644
-index 0000000000..720ec0cb57
+index 0000000000..aec1831199
 --- /dev/null
 +++ b/configs/devices/aarch64-softmmu/aarch64-rh-devices.mak
 @@ -0,0 +1,41 @@
@@ -97,12 +113,12 @@ index 0000000000..720ec0cb57
 +CONFIG_ARM_GICV3_TCG=y
 +CONFIG_ARM_GIC=y
 +CONFIG_ARM_SMMUV3=y
-+CONFIG_ARM_V7M=y
 +CONFIG_ARM_VIRT=y
 +CONFIG_CXL=y
 +CONFIG_CXL_MEM_DEVICE=y
 +CONFIG_EDID=y
 +CONFIG_PCIE_PORT=y
++CONFIG_PCIE_PCI_BRIDGE=y
 +CONFIG_PCI_DEVICES=y
 +CONFIG_PCI_TESTDEV=y
 +CONFIG_PFLASH_CFI01=y
@@ -217,10 +233,10 @@ index 0000000000..69a799adbd
 +CONFIG_VHOST_USER_FS=y
 diff --git a/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak b/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak
 new file mode 100644
-index 0000000000..668b2d0e18
+index 0000000000..6d16d81296
 --- /dev/null
 +++ b/configs/devices/x86_64-softmmu/x86_64-rh-devices.mak
-@@ -0,0 +1,109 @@
+@@ -0,0 +1,110 @@
 +include ../rh-virtio.mak
 +
 +CONFIG_ACPI=y
@@ -282,6 +298,7 @@ index 0000000000..668b2d0e18
 +CONFIG_PCSPK=y
 +CONFIG_PC_ACPI=y
 +CONFIG_PC_PCI=y
++CONFIG_PCIE_PCI_BRIDGE=y
 +CONFIG_PFLASH_CFI01=y
 +CONFIG_PVPANIC_ISA=y
 +CONFIG_PXB=y
@@ -330,19 +347,26 @@ index 0000000000..668b2d0e18
 +CONFIG_VHOST_VSOCK=y
 +CONFIG_VHOST_USER_VSOCK=y
 +CONFIG_VHOST_USER_FS=y
-diff --git a/hw/arm/meson.build b/hw/arm/meson.build
-index b545ba0e4f..a41a16cba7 100644
---- a/hw/arm/meson.build
-+++ b/hw/arm/meson.build
-@@ -29,7 +29,7 @@ arm_ss.add(when: 'CONFIG_VEXPRESS', if_true: files('vexpress.c'))
- arm_ss.add(when: 'CONFIG_ZYNQ', if_true: files('xilinx_zynq.c'))
- arm_ss.add(when: 'CONFIG_SABRELITE', if_true: files('sabrelite.c'))
+diff --git a/hw/arm/virt.c b/hw/arm/virt.c
+index 7d9dbc2663..3fbe942822 100644
+--- a/hw/arm/virt.c
++++ b/hw/arm/virt.c
+@@ -204,6 +204,7 @@ static const int a15irqmap[] = {
+ };
  
--arm_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m.c'))
-+#arm_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m.c'))
- arm_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210.c'))
- arm_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx.c', 'pxa2xx_gpio.c', 'pxa2xx_pic.c'))
- arm_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic.c'))
+ static const char *valid_cpus[] = {
++#if 0 /* Disabled for Red Hat Enterprise Linux */
+ #ifdef CONFIG_TCG
+     ARM_CPU_TYPE_NAME("cortex-a7"),
+     ARM_CPU_TYPE_NAME("cortex-a15"),
+@@ -216,6 +217,7 @@ static const char *valid_cpus[] = {
+     ARM_CPU_TYPE_NAME("neoverse-v1"),
+ #endif
+     ARM_CPU_TYPE_NAME("cortex-a53"),
++#endif /* disabled for RHEL */
+     ARM_CPU_TYPE_NAME("cortex-a57"),
+     ARM_CPU_TYPE_NAME("host"),
+     ARM_CPU_TYPE_NAME("max"),
 diff --git a/hw/block/fdc.c b/hw/block/fdc.c
 index d7cc4d3ec1..12d0a60905 100644
 --- a/hw/block/fdc.c
@@ -372,18 +396,18 @@ index d7cc4d3ec1..12d0a60905 100644
          error_setg(errp, "Cannot choose a fallback FDrive type of 'auto'");
          return;
 diff --git a/hw/cpu/meson.build b/hw/cpu/meson.build
-index e37490074f..4431e3731c 100644
+index 6d319947ca..91962fd863 100644
 --- a/hw/cpu/meson.build
 +++ b/hw/cpu/meson.build
 @@ -1,4 +1,5 @@
--softmmu_ss.add(files('core.c', 'cluster.c'))
-+#softmmu_ss.add(files('core.c', 'cluster.c'))
-+softmmu_ss.add(files('core.c'))
+-system_ss.add(files('core.c', 'cluster.c'))
++#system_ss.add(files('core.c', 'cluster.c'))
++system_ss.add(files('core.c'))
  
- softmmu_ss.add(when: 'CONFIG_ARM11MPCORE', if_true: files('arm11mpcore.c'))
- softmmu_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview_mpcore.c'))
+ system_ss.add(when: 'CONFIG_ARM11MPCORE', if_true: files('arm11mpcore.c'))
+ system_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview_mpcore.c'))
 diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
-index b80f98b6c4..cbde6a8f15 100644
+index b80f98b6c4..0370cf8a64 100644
 --- a/hw/display/cirrus_vga.c
 +++ b/hw/display/cirrus_vga.c
 @@ -36,6 +36,7 @@
@@ -394,31 +418,21 @@ index b80f98b6c4..cbde6a8f15 100644
  #include "sysemu/reset.h"
  #include "qapi/error.h"
  #include "trace.h"
-@@ -47,6 +48,7 @@
- #include "qom/object.h"
- #include "ui/console.h"
- 
-+
- /*
-  * TODO:
-  *    - destination write mask support not complete (bits 5..7)
-@@ -2946,7 +2948,10 @@ static void pci_cirrus_vga_realize(PCIDevice *dev, Error **errp)
+@@ -2946,6 +2947,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;
  
--    /*
-+     warn_report("'cirrus-vga' is deprecated, "
-+                 "please use a different VGA card instead");
++    warn_report("'cirrus-vga' is deprecated, "
++                "please use a different VGA card instead");
 +
-+     /*
+     /*
       * Follow real hardware, cirrus card emulated has 4 MB video memory.
       * Also accept 8 MB/16 MB for backward compatibility.
-      */
 diff --git a/hw/ide/piix.c b/hw/ide/piix.c
-index 41d60921e3..a4af45b4e8 100644
+index 4e5e12935f..03ca06bb17 100644
 --- a/hw/ide/piix.c
 +++ b/hw/ide/piix.c
-@@ -193,7 +193,8 @@ static void piix3_ide_class_init(ObjectClass *klass, void *data)
+@@ -190,7 +190,8 @@ static void piix3_ide_class_init(ObjectClass *klass, void *data)
      k->device_id = PCI_DEVICE_ID_INTEL_82371SB_1;
      k->class_id = PCI_CLASS_STORAGE_IDE;
      set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
@@ -428,7 +442,7 @@ index 41d60921e3..a4af45b4e8 100644
  }
  
  static const TypeInfo piix3_ide_info = {
-@@ -216,6 +217,8 @@ static void piix4_ide_class_init(ObjectClass *klass, void *data)
+@@ -214,6 +215,8 @@ static void piix4_ide_class_init(ObjectClass *klass, void *data)
      k->class_id = PCI_CLASS_STORAGE_IDE;
      set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
      dc->hotpluggable = false;
@@ -437,6 +451,52 @@ index 41d60921e3..a4af45b4e8 100644
  }
  
  static const TypeInfo piix4_ide_info = {
+diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
+index 1b3b4da01d..454bfa5783 100644
+--- a/hw/ide/qdev.c
++++ b/hw/ide/qdev.c
+@@ -283,10 +283,13 @@ static void ide_cd_realize(IDEDevice *dev, Error **errp)
+     ide_dev_initfn(dev, IDE_CD, errp);
+ }
+ 
++/* Disabled for Red Hat Enterprise Linux */
++#if 0
+ static void ide_cf_realize(IDEDevice *dev, Error **errp)
+ {
+     ide_dev_initfn(dev, IDE_CFATA, errp);
+ }
++#endif
+ 
+ #define DEFINE_IDE_DEV_PROPERTIES()                     \
+     DEFINE_BLOCK_PROPERTIES(IDEDrive, dev.conf),        \
+@@ -346,6 +349,8 @@ static const TypeInfo ide_cd_info = {
+     .class_init    = ide_cd_class_init,
+ };
+ 
++/* Disabled for Red Hat Enterprise Linux */
++#if 0
+ static Property ide_cf_properties[] = {
+     DEFINE_IDE_DEV_PROPERTIES(),
+     DEFINE_BLOCK_CHS_PROPERTIES(IDEDrive, dev.conf),
+@@ -371,6 +376,7 @@ static const TypeInfo ide_cf_info = {
+     .instance_size = sizeof(IDEDrive),
+     .class_init    = ide_cf_class_init,
+ };
++#endif
+ 
+ static void ide_device_class_init(ObjectClass *klass, void *data)
+ {
+@@ -396,7 +402,10 @@ static void ide_register_types(void)
+     type_register_static(&ide_bus_info);
+     type_register_static(&ide_hd_info);
+     type_register_static(&ide_cd_info);
++/* Disabled for Red Hat Enterprise Linux */
++#if 0
+     type_register_static(&ide_cf_info);
++#endif
+     type_register_static(&ide_device_type_info);
+ }
+ 
 diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
 index b92b63bedc..3b6235dde6 100644
 --- a/hw/input/pckbd.c
@@ -450,11 +510,25 @@ index b92b63bedc..3b6235dde6 100644
  }
  
  static const TypeInfo i8042_info = {
+diff --git a/hw/misc/meson.build b/hw/misc/meson.build
+index 892f8b91c5..736512a5c1 100644
+--- a/hw/misc/meson.build
++++ b/hw/misc/meson.build
+@@ -132,7 +132,8 @@ system_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_rng.c'))
+ 
+ system_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_ahb_apb_pnp.c'))
+ 
+-system_ss.add(when: 'CONFIG_I2C', if_true: files('i2c-echo.c'))
++# Disabled for Red Hat Enterprise Linux
++#system_ss.add(when: 'CONFIG_I2C', if_true: files('i2c-echo.c'))
+ 
+ specific_ss.add(when: 'CONFIG_AVR_POWER', if_true: files('avr_power.c'))
+ 
 diff --git a/hw/net/e1000.c b/hw/net/e1000.c
-index 23d660619f..b75c9aa799 100644
+index 093c2d4531..198562808d 100644
 --- a/hw/net/e1000.c
 +++ b/hw/net/e1000.c
-@@ -1805,6 +1805,7 @@ static const E1000Info e1000_devices[] = {
+@@ -1770,6 +1770,7 @@ static const E1000Info e1000_devices[] = {
          .revision  = 0x03,
          .phy_id2   = E1000_PHY_ID2_8254xx_DEFAULT,
      },
@@ -462,7 +536,7 @@ index 23d660619f..b75c9aa799 100644
      {
          .name      = "e1000-82544gc",
          .device_id = E1000_DEV_ID_82544GC_COPPER,
-@@ -1817,6 +1818,7 @@ static const E1000Info e1000_devices[] = {
+@@ -1782,6 +1783,7 @@ static const E1000Info e1000_devices[] = {
          .revision  = 0x03,
          .phy_id2   = E1000_PHY_ID2_8254xx_DEFAULT,
      },
@@ -471,10 +545,10 @@ index 23d660619f..b75c9aa799 100644
  
  static void e1000_register_types(void)
 diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
-index 8a4861f45a..fcb5dfe792 100644
+index b482d9754a..5c52e01fb7 100644
 --- a/hw/ppc/spapr_cpu_core.c
 +++ b/hw/ppc/spapr_cpu_core.c
-@@ -379,10 +379,12 @@ static const TypeInfo spapr_cpu_core_type_infos[] = {
+@@ -384,10 +384,12 @@ static const TypeInfo spapr_cpu_core_type_infos[] = {
          .instance_size = sizeof(SpaprCpuCore),
          .class_size = sizeof(SpaprCpuCoreClass),
      },
@@ -488,10 +562,10 @@ index 8a4861f45a..fcb5dfe792 100644
      DEFINE_SPAPR_CPU_CORE_TYPE("power7+_v2.1"),
      DEFINE_SPAPR_CPU_CORE_TYPE("power8_v2.0"),
 diff --git a/hw/usb/meson.build b/hw/usb/meson.build
-index 599dc24f0d..905a994c3a 100644
+index e94149ebde..4a8adbf3dc 100644
 --- a/hw/usb/meson.build
 +++ b/hw/usb/meson.build
-@@ -52,7 +52,7 @@ softmmu_ss.add(when: 'CONFIG_USB_SMARTCARD', if_true: files('dev-smartcard-reade
+@@ -52,7 +52,7 @@ system_ss.add(when: 'CONFIG_USB_SMARTCARD', if_true: files('dev-smartcard-reader
  if cacard.found()
    usbsmartcard_ss = ss.source_set()
    usbsmartcard_ss.add(when: 'CONFIG_USB_SMARTCARD',
@@ -500,86 +574,197 @@ index 599dc24f0d..905a994c3a 100644
    hw_usb_modules += {'smartcard': usbsmartcard_ss}
  endif
  
-diff --git a/target/arm/cpu_tcg.c b/target/arm/cpu_tcg.c
-index df0c45e523..c154a4dcf2 100644
---- a/target/arm/cpu_tcg.c
-+++ b/target/arm/cpu_tcg.c
-@@ -155,6 +155,7 @@ void define_cortex_a72_a57_a53_cp_reginfo(ARMCPU *cpu)
+diff --git a/target/arm/arm-qmp-cmds.c b/target/arm/arm-qmp-cmds.c
+index c8fa524002..3aa089abf3 100644
+--- a/target/arm/arm-qmp-cmds.c
++++ b/target/arm/arm-qmp-cmds.c
+@@ -231,6 +231,7 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type,
+ static void arm_cpu_add_definition(gpointer data, gpointer user_data)
+ {
+     ObjectClass *oc = data;
++    CPUClass *cc = CPU_CLASS(oc);
+     CpuDefinitionInfoList **cpu_list = user_data;
+     CpuDefinitionInfo *info;
+     const char *typename;
+@@ -240,6 +241,7 @@ static void arm_cpu_add_definition(gpointer data, gpointer user_data)
+     info->name = g_strndup(typename,
+                            strlen(typename) - strlen("-" TYPE_ARM_CPU));
+     info->q_typename = g_strdup(typename);
++    info->deprecated = !!cc->deprecation_note;
+ 
+     QAPI_LIST_PREPEND(*cpu_list, info);
+ }
+diff --git a/target/arm/cpu-qom.h b/target/arm/cpu-qom.h
+index 514c22ced9..f789173451 100644
+--- a/target/arm/cpu-qom.h
++++ b/target/arm/cpu-qom.h
+@@ -35,6 +35,7 @@ typedef struct ARMCPUInfo {
+     const char *name;
+     void (*initfn)(Object *obj);
+     void (*class_init)(ObjectClass *oc, void *data);
++    const char *deprecation_note;
+ } ARMCPUInfo;
+ 
+ void arm_cpu_register(const ARMCPUInfo *info);
+diff --git a/target/arm/cpu.c b/target/arm/cpu.c
+index 93c28d50e5..a8ecc1d474 100644
+--- a/target/arm/cpu.c
++++ b/target/arm/cpu.c
+@@ -2376,8 +2376,13 @@ static void arm_cpu_instance_init(Object *obj)
+ static void cpu_register_class_init(ObjectClass *oc, void *data)
+ {
+     ARMCPUClass *acc = ARM_CPU_CLASS(oc);
++    CPUClass *cc = CPU_CLASS(oc);
+ 
+     acc->info = data;
++
++    if (acc->info->deprecation_note) {
++        cc->deprecation_note = acc->info->deprecation_note;
++    }
+ }
+ 
+ void arm_cpu_register(const ARMCPUInfo *info)
+diff --git a/target/arm/cpu.h b/target/arm/cpu.h
+index 88e5accda6..6e191f6cc5 100644
+--- a/target/arm/cpu.h
++++ b/target/arm/cpu.h
+@@ -34,6 +34,8 @@
+ #define KVM_HAVE_MCE_INJECTION 1
+ #endif
+ 
++#define RHEL_CPU_DEPRECATION "use 'host' / 'max'"
++
+ #define EXCP_UDEF            1   /* undefined instruction */
+ #define EXCP_SWI             2   /* software interrupt */
+ #define EXCP_PREFETCH_ABORT  3
+diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
+index 96158093cc..446e88aba8 100644
+--- a/target/arm/cpu64.c
++++ b/target/arm/cpu64.c
+@@ -609,6 +609,7 @@ static void aarch64_a57_initfn(Object *obj)
+     define_cortex_a72_a57_a53_cp_reginfo(cpu);
+ }
+ 
++#if 0 /* Disabled for Red Hat Enterprise Linux */
+ static void aarch64_a53_initfn(Object *obj)
+ {
+     ARMCPU *cpu = ARM_CPU(obj);
+@@ -665,6 +666,7 @@ static void aarch64_a53_initfn(Object *obj)
+     cpu->gic_pribits = 5;
+     define_cortex_a72_a57_a53_cp_reginfo(cpu);
+ }
++#endif
+ 
+ static void aarch64_host_initfn(Object *obj)
+ {
+@@ -703,8 +705,11 @@ static void aarch64_max_initfn(Object *obj)
+ }
+ 
+ static const ARMCPUInfo aarch64_cpus[] = {
+-    { .name = "cortex-a57",         .initfn = aarch64_a57_initfn },
++    { .name = "cortex-a57",         .initfn = aarch64_a57_initfn,
++      .deprecation_note = RHEL_CPU_DEPRECATION },
++#if 0 /* Disabled for Red Hat Enterprise Linux */
+     { .name = "cortex-a53",         .initfn = aarch64_a53_initfn },
++#endif /* disabled for RHEL */
+     { .name = "max",                .initfn = aarch64_max_initfn },
+ #if defined(CONFIG_KVM) || defined(CONFIG_HVF)
+     { .name = "host",               .initfn = aarch64_host_initfn },
+@@ -776,8 +781,13 @@ static void aarch64_cpu_instance_init(Object *obj)
+ static void cpu_register_class_init(ObjectClass *oc, void *data)
+ {
+     ARMCPUClass *acc = ARM_CPU_CLASS(oc);
++    CPUClass *cc = CPU_CLASS(oc);
+ 
+     acc->info = data;
++
++    if (acc->info->deprecation_note) {
++        cc->deprecation_note = acc->info->deprecation_note;
++    }
+ }
+ 
+ void aarch64_cpu_register(const ARMCPUInfo *info)
+diff --git a/target/arm/tcg/cpu32.c b/target/arm/tcg/cpu32.c
+index 47d2e8e781..0501c5ac27 100644
+--- a/target/arm/tcg/cpu32.c
++++ b/target/arm/tcg/cpu32.c
+@@ -94,6 +94,7 @@ void aa32_max_features(ARMCPU *cpu)
  /* CPU models. These are not needed for the AArch64 linux-user build. */
  #if !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64)
  
 +#if 0 /* Disabled for Red Hat Enterprise Linux */
- #if !defined(CONFIG_USER_ONLY) && defined(CONFIG_TCG)
+ #if !defined(CONFIG_USER_ONLY)
  static bool arm_v7m_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
  {
-@@ -508,6 +509,7 @@ static void cortex_a9_initfn(Object *obj)
-     cpu->isar.reset_pmcr_el0 = 0x41093000;
-     define_arm_cp_regs(cpu, cortexa9_cp_reginfo);
- }
-+#endif /* disabled for RHEL */
+@@ -1183,3 +1184,4 @@ static void arm_tcg_cpu_register_types(void)
+ type_init(arm_tcg_cpu_register_types)
  
- #ifndef CONFIG_USER_ONLY
- static uint64_t a15_l2ctlr_read(CPUARMState *env, const ARMCPRegInfo *ri)
-@@ -532,6 +534,7 @@ static const ARMCPRegInfo cortexa15_cp_reginfo[] = {
-       .access = PL1_RW, .type = ARM_CP_CONST, .resetvalue = 0 },
- };
+ #endif /* !CONFIG_USER_ONLY || !TARGET_AARCH64 */
++#endif /* disabled for RHEL */
+diff --git a/target/arm/tcg/cpu64.c b/target/arm/tcg/cpu64.c
+index 8019f00bc3..bf191113d8 100644
+--- a/target/arm/tcg/cpu64.c
++++ b/target/arm/tcg/cpu64.c
+@@ -27,6 +27,7 @@
+ #include "internals.h"
+ #include "cpregs.h"
  
 +#if 0 /* Disabled for Red Hat Enterprise Linux */
- static void cortex_a7_initfn(Object *obj)
+ static void aarch64_a35_initfn(Object *obj)
  {
      ARMCPU *cpu = ARM_CPU(obj);
-@@ -580,6 +583,7 @@ static void cortex_a7_initfn(Object *obj)
-     cpu->isar.reset_pmcr_el0 = 0x41072000;
-     define_arm_cp_regs(cpu, cortexa15_cp_reginfo); /* Same as A15 */
+@@ -106,6 +107,7 @@ static void aarch64_a35_initfn(Object *obj)
+     /* These values are the same with A53/A57/A72. */
+     define_cortex_a72_a57_a53_cp_reginfo(cpu);
  }
-+#endif /* disabled for RHEL */
++#endif
  
- static void cortex_a15_initfn(Object *obj)
- {
-@@ -628,6 +632,7 @@ static void cortex_a15_initfn(Object *obj)
-     define_arm_cp_regs(cpu, cortexa15_cp_reginfo);
- }
+ static void cpu_max_get_sve_max_vq(Object *obj, Visitor *v, const char *name,
+                                    void *opaque, Error **errp)
+@@ -195,6 +197,7 @@ static void cpu_max_get_l0gptsz(Object *obj, Visitor *v, const char *name,
+ static Property arm_cpu_lpa2_property =
+     DEFINE_PROP_BOOL("lpa2", ARMCPU, prop_lpa2, true);
  
 +#if 0 /* Disabled for Red Hat Enterprise Linux */
- static void cortex_m0_initfn(Object *obj)
+ static void aarch64_a55_initfn(Object *obj)
  {
      ARMCPU *cpu = ARM_CPU(obj);
-@@ -1110,6 +1115,7 @@ static void arm_v7m_class_init(ObjectClass *oc, void *data)
- 
-     cc->gdb_core_xml_file = "arm-m-profile.xml";
+@@ -699,6 +702,7 @@ static void aarch64_neoverse_v1_initfn(Object *obj)
+     aarch64_add_pauth_properties(obj);
+     aarch64_add_sve_properties(obj);
  }
-+#endif /* disabled for RHEL */
++#endif
  
- #ifndef TARGET_AARCH64
  /*
-@@ -1177,6 +1183,7 @@ static void arm_max_initfn(Object *obj)
- #endif /* !TARGET_AARCH64 */
+  * -cpu max: a CPU with as many features enabled as our emulation supports.
+@@ -883,6 +887,7 @@ void aarch64_max_tcg_initfn(Object *obj)
+     qdev_property_add_static(DEVICE(obj), &arm_cpu_lpa2_property);
+ }
  
- static const ARMCPUInfo arm_tcg_cpus[] = {
 +#if 0 /* Disabled for Red Hat Enterprise Linux */
-     { .name = "arm926",      .initfn = arm926_initfn },
-     { .name = "arm946",      .initfn = arm946_initfn },
-     { .name = "arm1026",     .initfn = arm1026_initfn },
-@@ -1192,7 +1199,9 @@ static const ARMCPUInfo arm_tcg_cpus[] = {
-     { .name = "cortex-a7",   .initfn = cortex_a7_initfn },
-     { .name = "cortex-a8",   .initfn = cortex_a8_initfn },
-     { .name = "cortex-a9",   .initfn = cortex_a9_initfn },
-+#endif /* disabled for RHEL */
-     { .name = "cortex-a15",  .initfn = cortex_a15_initfn },
+ static const ARMCPUInfo aarch64_cpus[] = {
+     { .name = "cortex-a35",         .initfn = aarch64_a35_initfn },
+     { .name = "cortex-a55",         .initfn = aarch64_a55_initfn },
+@@ -892,14 +897,17 @@ static const ARMCPUInfo aarch64_cpus[] = {
+     { .name = "neoverse-n1",        .initfn = aarch64_neoverse_n1_initfn },
+     { .name = "neoverse-v1",        .initfn = aarch64_neoverse_v1_initfn },
+ };
++#endif
+ 
+ static void aarch64_cpu_register_types(void)
+ {
 +#if 0 /* Disabled for Red Hat Enterprise Linux */
-     { .name = "cortex-m0",   .initfn = cortex_m0_initfn,
-                              .class_init = arm_v7m_class_init },
-     { .name = "cortex-m3",   .initfn = cortex_m3_initfn,
-@@ -1224,6 +1233,7 @@ static const ARMCPUInfo arm_tcg_cpus[] = {
-     { .name = "pxa270-b1",   .initfn = pxa270b1_initfn },
-     { .name = "pxa270-c0",   .initfn = pxa270c0_initfn },
-     { .name = "pxa270-c5",   .initfn = pxa270c5_initfn },
-+#endif /* disabled for RHEL */
- #ifndef TARGET_AARCH64
-     { .name = "max",         .initfn = arm_max_initfn },
- #endif
+     size_t i;
+ 
+     for (i = 0; i < ARRAY_SIZE(aarch64_cpus); ++i) {
+         aarch64_cpu_register(&aarch64_cpus[i]);
+     }
++#endif
+ }
+ 
+ type_init(aarch64_cpu_register_types)
 diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c
-index 912b037c63..cd3ff700ac 100644
+index 7dbb47de64..69fddb05bc 100644
 --- a/target/ppc/cpu-models.c
 +++ b/target/ppc/cpu-models.c
 @@ -66,6 +66,7 @@
@@ -609,7 +794,7 @@ index 912b037c63..cd3ff700ac 100644
      POWERPC_DEF("power7_v2.3",   CPU_POWERPC_POWER7_v23,             POWER7,
                  "POWER7 v2.3")
      POWERPC_DEF("power7+_v2.1",  CPU_POWERPC_POWER7P_v21,            POWER7,
-@@ -896,12 +900,15 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
+@@ -898,12 +902,15 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
      { "7447a", "7447a_v1.2" },
      { "7457a", "7457a_v1.2" },
      { "apollo7pm", "7457a_v1.0" },
@@ -625,7 +810,7 @@ index 912b037c63..cd3ff700ac 100644
      { "power7", "power7_v2.3" },
      { "power7+", "power7+_v2.1" },
      { "power8e", "power8e_v2.1" },
-@@ -911,12 +918,14 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
+@@ -913,12 +920,14 @@ PowerPCCPUAlias ppc_cpu_aliases[] = {
      { "power10", "power10_v2.0" },
  #endif
  
@@ -655,7 +840,7 @@ index 63981bf36b..87a4480c05 100644
  
      /* detect missing features if any to properly report them */
 diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c
-index 3ac7ec9acf..97da1a6424 100644
+index a9e5880349..4b5df17983 100644
 --- a/target/s390x/kvm/kvm.c
 +++ b/target/s390x/kvm/kvm.c
 @@ -2529,6 +2529,14 @@ void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp)
@@ -673,6 +858,37 @@ index 3ac7ec9acf..97da1a6424 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/tests/qtest/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c
+index 3fc33fc24d..e5e4007e9f 100644
+--- a/tests/qtest/arm-cpu-features.c
++++ b/tests/qtest/arm-cpu-features.c
+@@ -441,8 +441,10 @@ static void test_query_cpu_model_expansion(const void *data)
+     assert_error(qts, "host", "The CPU type 'host' requires KVM", NULL);
+ 
+     /* Test expected feature presence/absence for some cpu types */
++#if 0 /* Disabled for Red Hat Enterprise Linux */
+     assert_has_feature_enabled(qts, "cortex-a15", "pmu");
+     assert_has_not_feature(qts, "cortex-a15", "aarch64");
++#endif /* disabled for RHEL */
+ 
+     /* Enabling and disabling pmu should always work. */
+     assert_has_feature_enabled(qts, "max", "pmu");
+@@ -459,6 +461,7 @@ static void test_query_cpu_model_expansion(const void *data)
+         assert_has_feature_enabled(qts, "cortex-a57", "pmu");
+         assert_has_feature_enabled(qts, "cortex-a57", "aarch64");
+ 
++#if 0 /* Disabled for Red Hat Enterprise Linux */
+         assert_has_feature_enabled(qts, "a64fx", "pmu");
+         assert_has_feature_enabled(qts, "a64fx", "aarch64");
+         /*
+@@ -471,6 +474,7 @@ static void test_query_cpu_model_expansion(const void *data)
+                      "{ 'sve384': true }");
+         assert_error(qts, "a64fx", "cannot enable sve640",
+                      "{ 'sve640': true }");
++#endif /* disabled for RHEL */
+ 
+         sve_tests_default(qts, "max");
+         pauth_tests_default(qts, "max");
 -- 
-2.39.1
+2.39.3
 
diff --git a/0006-Machine-type-related-general-changes.patch b/0006-Machine-type-related-general-changes.patch
index 5dd591f..198d4ab 100644
--- a/0006-Machine-type-related-general-changes.patch
+++ b/0006-Machine-type-related-general-changes.patch
@@ -1,4 +1,4 @@
-From c13f8e21b32aa06b08847e88080f2fdea5084a9b Mon Sep 17 00:00:00 2001
+From 145fbe0a1526bb68a7bd7acaf5b41539faf5f04a 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
@@ -19,10 +19,13 @@ Rebase notes (7.0.0):
 - Remove downstream changes leftovers in hw/rtc/mc146818rtc.c
 - Remove unnecessary change in hw/usb/hcd-uhci.c
 
-Rebase notes (7.1.0 rc0):
+Rebase notes (7.1.0):
 - Moved adding rhel_old_machine_deprecation variable from s390x to general machine types commit
 - Moved adding hw_compat_rhel_8_6 struct from x86_64 to general machine types commit
 
+Rebase notes (8.1.0):
+- Do not modify unused vga-isa.c
+
 Merged patches (6.1.0):
 - f2fb42a3c6 redhat: add missing entries in hw_compat_rhel_8_4
 - 1949ec258e hw/arm/virt: Disable PL011 clock migration through hw_compat_rhel_8_3
@@ -40,33 +43,36 @@ Merged patches (7.0.0):
 - ef5afcc86d Fix virtio-net-pci* "vectors" compat
 - 168f0d56e3 compat: Update hw_compat_rhel_8_5 with 6.2.0 RC2 changes
 
-Merged patches (7.1.0 rc0):
+Merged patches (7.1.0):
 - 38b89dc245 pc: Move s3/s4 suspend disabling to compat (only hw/acpi/piix4.c chunk)
 - 1d6439527a WRB: Introduce RHEL 9.0.0 hw compat structure (only hw/core/machine.c and include/hw/boards.h chunk)
 
-Merged patches (7.2.0 rc0):
+Merged patches (7.2.0):
 - 0be2889fa2 Introduce upstream 7.0 compat changes (only applicable parts)
 
-Merged patches (8.0.0-rc1):
+Merged patches (8.0.0):
 - 21ed34787b Addd 7.2 compat bits for RHEL 9.1 machine type
 - e5c8d5d603 virtio-rng-pci: fix migration compat for vectors
 - 5a5fa77059 virtio-rng-pci: fix transitional migration compat for vectors
+
+Merged patches (8.1.0):
+- bd5d81d286 Add RHEL 9.2.0 compat structure (general part)
+- 1165e24c6b hw/pci: Disable PCI_ERR_UNCOR_MASK reg for machine type <= pc-q35-rhel9.2.0
 ---
  hw/acpi/piix4.c              |   2 +-
  hw/arm/virt.c                |   2 +-
- hw/core/machine.c            | 229 +++++++++++++++++++++++++++++++++++
- hw/display/vga-isa.c         |   2 +-
+ hw/core/machine.c            | 241 +++++++++++++++++++++++++++++++++++
  hw/i386/pc_piix.c            |   2 +
  hw/i386/pc_q35.c             |   2 +
  hw/net/rtl8139.c             |   4 +-
  hw/smbios/smbios.c           |  46 ++++++-
  hw/timer/i8254_common.c      |   2 +-
- hw/usb/hcd-xhci-pci.c        |  59 ++++++---
+ hw/usb/hcd-xhci-pci.c        |  59 +++++++--
  hw/usb/hcd-xhci-pci.h        |   1 +
- include/hw/boards.h          |  31 +++++
+ include/hw/boards.h          |  34 +++++
  include/hw/firmware/smbios.h |   5 +-
  include/hw/i386/pc.h         |   3 +
- 14 files changed, 367 insertions(+), 23 deletions(-)
+ 13 files changed, 381 insertions(+), 22 deletions(-)
 
 diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
 index 63d2113b86..a24b9aac92 100644
@@ -82,7 +88,7 @@ index 63d2113b86..a24b9aac92 100644
      .fields = (VMStateField[]) {
          VMSTATE_PCI_DEVICE(parent_obj, PIIX4PMState),
 diff --git a/hw/arm/virt.c b/hw/arm/virt.c
-index ac626b3bef..4a6e89c7bc 100644
+index 3fbe942822..33a36112da 100644
 --- a/hw/arm/virt.c
 +++ b/hw/arm/virt.c
 @@ -1629,7 +1629,7 @@ static void virt_build_smbios(VirtMachineState *vms)
@@ -95,10 +101,10 @@ index ac626b3bef..4a6e89c7bc 100644
      /* build the array of physical mem area from base_memmap */
      mem_array.address = vms->memmap[VIRT_MEM].base;
 diff --git a/hw/core/machine.c b/hw/core/machine.c
-index cd13b8b0a3..5aa567fad3 100644
+index f0d35c6401..2e54c7ae7c 100644
 --- a/hw/core/machine.c
 +++ b/hw/core/machine.c
-@@ -46,6 +46,235 @@ GlobalProperty hw_compat_7_2[] = {
+@@ -53,6 +53,247 @@ GlobalProperty hw_compat_7_2[] = {
  };
  const size_t hw_compat_7_2_len = G_N_ELEMENTS(hw_compat_7_2);
  
@@ -108,6 +114,18 @@ index cd13b8b0a3..5aa567fad3 100644
 +const char *rhel_old_machine_deprecation =
 +    "machine types for previous major releases are deprecated";
 +
++GlobalProperty hw_compat_rhel_9_2[] = {
++  /* hw_compat_rhel_9_2 from hw_compat_7_2 */
++  { "e1000e", "migrate-timadj", "off" },
++  /* hw_compat_rhel_9_2 from hw_compat_7_2 */
++  { "virtio-mem", "x-early-migration", "false" },
++  /* hw_compat_rhel_9_2 from hw_compat_7_2 */
++  { "migration", "x-preempt-pre-7-2", "true" },
++  /* hw_compat_rhel_9_2 from hw_compat_7_2 */
++  { TYPE_PCI_DEVICE, "x-pcie-err-unc-mask", "off" },
++};
++const size_t hw_compat_rhel_9_2_len = G_N_ELEMENTS(hw_compat_rhel_9_2);
++
 +/*
 + * Mostly the same as hw_compat_7_0
 + */
@@ -334,25 +352,12 @@ index cd13b8b0a3..5aa567fad3 100644
  GlobalProperty hw_compat_7_1[] = {
      { "virtio-device", "queue_reset", "false" },
      { "virtio-rng-pci", "vectors", "0" },
-diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
-index 2a5437d803..0db2c2b2a1 100644
---- a/hw/display/vga-isa.c
-+++ b/hw/display/vga-isa.c
-@@ -89,7 +89,7 @@ static void vga_isa_realizefn(DeviceState *dev, Error **errp)
- }
- 
- static Property vga_isa_properties[] = {
--    DEFINE_PROP_UINT32("vgamem_mb", ISAVGAState, state.vram_size_mb, 8),
-+    DEFINE_PROP_UINT32("vgamem_mb", ISAVGAState, state.vram_size_mb, 16),
-     DEFINE_PROP_END_OF_LIST(),
- };
- 
 diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
-index 30eedd62a3..14a794081e 100644
+index ac72e8f5be..2ecd9bb2d8 100644
 --- a/hw/i386/pc_piix.c
 +++ b/hw/i386/pc_piix.c
-@@ -201,6 +201,8 @@ static void pc_init1(MachineState *machine,
-         smbios_set_defaults("QEMU", "Standard PC (i440FX + PIIX, 1996)",
+@@ -240,6 +240,8 @@ static void pc_init1(MachineState *machine,
+         smbios_set_defaults("QEMU", mc->desc,
                              mc->name, pcmc->smbios_legacy_mode,
                              pcmc->smbios_uuid_encoded,
 +                            pcmc->smbios_stream_product,
@@ -361,11 +366,11 @@ index 30eedd62a3..14a794081e 100644
      }
  
 diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
-index 797ba347fd..dc0ba5f9e7 100644
+index dc27a9e223..27a4ec0641 100644
 --- a/hw/i386/pc_q35.c
 +++ b/hw/i386/pc_q35.c
 @@ -202,6 +202,8 @@ static void pc_q35_init(MachineState *machine)
-         smbios_set_defaults("QEMU", "Standard PC (Q35 + ICH9, 2009)",
+         smbios_set_defaults("QEMU", mc->desc,
                              mc->name, pcmc->smbios_legacy_mode,
                              pcmc->smbios_uuid_encoded,
 +                            pcmc->smbios_stream_product,
@@ -374,10 +379,10 @@ index 797ba347fd..dc0ba5f9e7 100644
      }
  
 diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
-index 5a5aaf868d..3d473d5869 100644
+index b4df75b2c9..fce2af5dd2 100644
 --- a/hw/net/rtl8139.c
 +++ b/hw/net/rtl8139.c
-@@ -3178,7 +3178,7 @@ static int rtl8139_pre_save(void *opaque)
+@@ -3169,7 +3169,7 @@ static int rtl8139_pre_save(void *opaque)
  
  static const VMStateDescription vmstate_rtl8139 = {
      .name = "rtl8139",
@@ -386,7 +391,7 @@ index 5a5aaf868d..3d473d5869 100644
      .minimum_version_id = 3,
      .post_load = rtl8139_post_load,
      .pre_save  = rtl8139_pre_save,
-@@ -3259,7 +3259,9 @@ static const VMStateDescription vmstate_rtl8139 = {
+@@ -3250,7 +3250,9 @@ static const VMStateDescription vmstate_rtl8139 = {
          VMSTATE_UINT32(tally_counters.TxMCol, RTL8139State),
          VMSTATE_UINT64(tally_counters.RxOkPhy, RTL8139State),
          VMSTATE_UINT64(tally_counters.RxOkBrd, RTL8139State),
@@ -397,7 +402,7 @@ index 5a5aaf868d..3d473d5869 100644
          VMSTATE_UINT16(tally_counters.TxUndrn, RTL8139State),
  
 diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
-index d2007e70fb..319eae9e9d 100644
+index 10cd22f610..944b2c31e3 100644
 --- a/hw/smbios/smbios.c
 +++ b/hw/smbios/smbios.c
 @@ -58,6 +58,9 @@ static bool smbios_legacy = true;
@@ -419,7 +424,7 @@ index d2007e70fb..319eae9e9d 100644
  
      SMBIOS_TABLE_SET_STR(2, manufacturer_str, type2.manufacturer);
      SMBIOS_TABLE_SET_STR(2, product_str, type2.product);
-@@ -980,7 +983,10 @@ void smbios_set_cpuid(uint32_t version, uint32_t features)
+@@ -985,7 +988,10 @@ void smbios_set_cpuid(uint32_t version, uint32_t features)
  
  void smbios_set_defaults(const char *manufacturer, const char *product,
                           const char *version, bool legacy_mode,
@@ -431,7 +436,7 @@ index d2007e70fb..319eae9e9d 100644
  {
      smbios_have_defaults = true;
      smbios_legacy = legacy_mode;
-@@ -1001,11 +1007,45 @@ void smbios_set_defaults(const char *manufacturer, const char *product,
+@@ -1006,11 +1012,45 @@ void smbios_set_defaults(const char *manufacturer, const char *product,
          g_free(smbios_entries);
      }
  
@@ -479,7 +484,7 @@ index d2007e70fb..319eae9e9d 100644
      SMBIOS_SET_DEFAULT(type3.manufacturer, manufacturer);
      SMBIOS_SET_DEFAULT(type3.version, version);
 diff --git a/hw/timer/i8254_common.c b/hw/timer/i8254_common.c
-index 050875b497..32935da46c 100644
+index e4093e2904..3a6588b46d 100644
 --- a/hw/timer/i8254_common.c
 +++ b/hw/timer/i8254_common.c
 @@ -231,7 +231,7 @@ static const VMStateDescription vmstate_pit_common = {
@@ -603,13 +608,16 @@ index 08f70ce97c..1be7527c1b 100644
  
  #endif
 diff --git a/include/hw/boards.h b/include/hw/boards.h
-index 6fbbfd56c8..c5a965d27f 100644
+index ed83360198..6dafe2c3a9 100644
 --- a/include/hw/boards.h
 +++ b/include/hw/boards.h
-@@ -459,4 +459,35 @@ extern const size_t hw_compat_2_2_len;
+@@ -471,4 +471,38 @@ 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_9_2[];
++extern const size_t hw_compat_rhel_9_2_len;
++
 +extern GlobalProperty hw_compat_rhel_9_1[];
 +extern const size_t hw_compat_rhel_9_1_len;
 +
@@ -659,13 +667,13 @@ index 7f3259a630..d24b3ccd32 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 8206d5405a..908a275736 100644
+index d54e8b1101..ae0f49b93c 100644
 --- a/include/hw/i386/pc.h
 +++ b/include/hw/i386/pc.h
-@@ -111,6 +111,9 @@ struct PCMachineClass {
-     bool smbios_defaults;
+@@ -110,6 +110,9 @@ struct PCMachineClass {
      bool smbios_legacy_mode;
      bool smbios_uuid_encoded;
+     SmbiosEntryPointType default_smbios_ep_type;
 +    /* New fields needed for Windows HardwareID-6 matching */
 +    const char *smbios_stream_product;
 +    const char *smbios_stream_version;
@@ -673,5 +681,5 @@ index 8206d5405a..908a275736 100644
      /* RAM / address space compat: */
      bool gigabyte_align;
 -- 
-2.39.1
+2.39.3
 
diff --git a/0007-Add-aarch64-machine-types.patch b/0007-Add-aarch64-machine-types.patch
index f47bbd0..aad3725 100644
--- a/0007-Add-aarch64-machine-types.patch
+++ b/0007-Add-aarch64-machine-types.patch
@@ -1,4 +1,4 @@
-From ec6468b65a3af0e2b84575c9f965f61916d0d8ea Mon Sep 17 00:00:00 2001
+From f68fb44c79615701195203b2548135579b1fd596 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
@@ -17,18 +17,19 @@ Rebase notes (7.0.0):
 - Added dtb-kaslr-seed option
 - Set no_tcg_lpa2 to true
 
-Rebase notes (7.1.0 rc0):
+Rebase notes (7.1.0):
 - replace dtb_kaslr_seed by dtb_randomness
-
-Rebase notes (7.1.0 rc3):
 - Updated dtb_randomness comment
 
-Rebase notes (7.2.0 rc0):
+Rebase notes (7.2.0):
 - Disabled cortex-a35
 
-Rebase notes (8.0.0-rc1):
+Rebase notes (8.0.0):
 - Moved changed code from target/arm/helper.c to target/arm/arm-qmp-cmds.c
 
+Rebase notes (8.1.0):
+- Added setting default_nic
+
 Merged patches (6.2.0):
 - 9a3d4fde0e hw/arm/virt: Remove 9.0 machine type
 - f7d04d6695 hw: arm: virt: Add hw_compat_rhel_8_5 to 8.5 machine type
@@ -46,30 +47,27 @@ Merged patches (7.0.0):
 - f79b31bdef hw/arm/virt: Remove the dtb-kaslr-seed machine option
 - b6fca85f4a hw/arm/virt: Fix missing initialization in instance/class_init()
 
-Merged patches (7.1.0 rc0):
+Merged patches (7.1.0):
 - ac97dd4f9f RHEL-only: AArch64: Drop unsupported CPU types
 - e9c0a70664 target/arm: deprecate named CPU models
 
-Merged patches (7.2.0 rc0):
+Merged patches (7.2.0):
 - 0be2889fa2 Introduce upstream 7.0 compat changes (only applicable parts)
 
-Merged patches (8.0.0-rc1):
+Merged patches (8.0.0):
 - c1a21266d8 redhat: aarch64: add rhel9.2.0 virt machine type
 - d97cd7c513 redhat: fix virt-rhel9.2.0 compat props
+
+Merged patches (8.1.0):
+- bd5d81d286 Add RHEL 9.2.0 compat structure (arm part)
+- c07f666086 hw/arm/virt: Validate cluster and NUMA node boundary for RHEL machines
 ---
- hw/arm/virt.c                  | 251 ++++++++++++++++++++++++++++++++-
- include/hw/arm/virt.h          |   8 ++
- target/arm/arm-qmp-cmds.c      |   2 +
- target/arm/cpu-qom.h           |   1 +
- target/arm/cpu.c               |   5 +
- target/arm/cpu.h               |   2 +
- target/arm/cpu64.c             |  16 ++-
- target/arm/cpu_tcg.c           |  12 +-
- tests/qtest/arm-cpu-features.c |   6 +
- 9 files changed, 289 insertions(+), 14 deletions(-)
+ hw/arm/virt.c         | 248 +++++++++++++++++++++++++++++++++++++++++-
+ include/hw/arm/virt.h |   8 ++
+ 2 files changed, 255 insertions(+), 1 deletion(-)
 
 diff --git a/hw/arm/virt.c b/hw/arm/virt.c
-index 4a6e89c7bc..1ae1654be5 100644
+index 33a36112da..3c36106eb5 100644
 --- a/hw/arm/virt.c
 +++ b/hw/arm/virt.c
 @@ -81,6 +81,7 @@
@@ -84,9 +82,8 @@ index 4a6e89c7bc..1ae1654be5 100644
      DEFINE_VIRT_MACHINE_LATEST(major, minor, true)
  #define DEFINE_VIRT_MACHINE(major, minor) \
      DEFINE_VIRT_MACHINE_LATEST(major, minor, false)
--
 +#endif /* disabled for RHEL */
-+
+ 
 +#define DEFINE_RHEL_MACHINE_LATEST(m, n, s, latest)                     \
 +    static void rhel##m##n##s##_virt_class_init(ObjectClass *oc,        \
 +                                                void *data)             \
@@ -130,28 +127,7 @@ index 4a6e89c7bc..1ae1654be5 100644
  
  /* Number of external interrupt lines to configure the GIC with */
  #define NUM_IRQS 256
-@@ -204,16 +246,20 @@ static const int a15irqmap[] = {
- };
- 
- static const char *valid_cpus[] = {
-+#if 0 /* Disabled for Red Hat Enterprise Linux */
-     ARM_CPU_TYPE_NAME("cortex-a7"),
-     ARM_CPU_TYPE_NAME("cortex-a15"),
-     ARM_CPU_TYPE_NAME("cortex-a35"),
-     ARM_CPU_TYPE_NAME("cortex-a53"),
-     ARM_CPU_TYPE_NAME("cortex-a55"),
-+#endif /* disabled for RHEL */
-     ARM_CPU_TYPE_NAME("cortex-a57"),
-+#if 0 /* Disabled for Red Hat Enterprise Linux */
-     ARM_CPU_TYPE_NAME("cortex-a72"),
-     ARM_CPU_TYPE_NAME("cortex-a76"),
-     ARM_CPU_TYPE_NAME("a64fx"),
-     ARM_CPU_TYPE_NAME("neoverse-n1"),
-+#endif /* disabled for RHEL */
-     ARM_CPU_TYPE_NAME("host"),
-     ARM_CPU_TYPE_NAME("max"),
- };
-@@ -2339,6 +2385,7 @@ static void machvirt_init(MachineState *machine)
+@@ -2332,6 +2374,7 @@ static void machvirt_init(MachineState *machine)
      qemu_add_machine_init_done_notifier(&vms->machine_done);
  }
  
@@ -159,7 +135,7 @@ index 4a6e89c7bc..1ae1654be5 100644
  static bool virt_get_secure(Object *obj, Error **errp)
  {
      VirtMachineState *vms = VIRT_MACHINE(obj);
-@@ -2366,6 +2413,7 @@ static void virt_set_virt(Object *obj, bool value, Error **errp)
+@@ -2359,6 +2402,7 @@ static void virt_set_virt(Object *obj, bool value, Error **errp)
  
      vms->virt = value;
  }
@@ -167,16 +143,15 @@ index 4a6e89c7bc..1ae1654be5 100644
  
  static bool virt_get_highmem(Object *obj, Error **errp)
  {
-@@ -2380,7 +2428,7 @@ static void virt_set_highmem(Object *obj, bool value, Error **errp)
- 
+@@ -2374,6 +2418,7 @@ static void virt_set_highmem(Object *obj, bool value, Error **errp)
      vms->highmem = value;
  }
--
+ 
 +#if 0 /* Disabled for Red Hat Enterprise Linux */
  static bool virt_get_compact_highmem(Object *obj, Error **errp)
  {
      VirtMachineState *vms = VIRT_MACHINE(obj);
-@@ -2436,7 +2484,7 @@ static void virt_set_highmem_mmio(Object *obj, bool value, Error **errp)
+@@ -2429,7 +2474,7 @@ static void virt_set_highmem_mmio(Object *obj, bool value, Error **errp)
  
      vms->highmem_mmio = value;
  }
@@ -185,7 +160,7 @@ index 4a6e89c7bc..1ae1654be5 100644
  
  static bool virt_get_its(Object *obj, Error **errp)
  {
-@@ -2452,6 +2500,7 @@ static void virt_set_its(Object *obj, bool value, Error **errp)
+@@ -2445,6 +2490,7 @@ static void virt_set_its(Object *obj, bool value, Error **errp)
      vms->its = value;
  }
  
@@ -193,7 +168,7 @@ index 4a6e89c7bc..1ae1654be5 100644
  static bool virt_get_dtb_randomness(Object *obj, Error **errp)
  {
      VirtMachineState *vms = VIRT_MACHINE(obj);
-@@ -2465,6 +2514,7 @@ static void virt_set_dtb_randomness(Object *obj, bool value, Error **errp)
+@@ -2458,6 +2504,7 @@ static void virt_set_dtb_randomness(Object *obj, bool value, Error **errp)
  
      vms->dtb_randomness = value;
  }
@@ -201,7 +176,7 @@ index 4a6e89c7bc..1ae1654be5 100644
  
  static char *virt_get_oem_id(Object *obj, Error **errp)
  {
-@@ -2548,6 +2598,7 @@ static void virt_set_ras(Object *obj, bool value, Error **errp)
+@@ -2541,6 +2588,7 @@ static void virt_set_ras(Object *obj, bool value, Error **errp)
      vms->ras = value;
  }
  
@@ -209,7 +184,7 @@ index 4a6e89c7bc..1ae1654be5 100644
  static bool virt_get_mte(Object *obj, Error **errp)
  {
      VirtMachineState *vms = VIRT_MACHINE(obj);
-@@ -2561,6 +2612,7 @@ static void virt_set_mte(Object *obj, bool value, Error **errp)
+@@ -2554,6 +2602,7 @@ static void virt_set_mte(Object *obj, bool value, Error **errp)
  
      vms->mte = value;
  }
@@ -217,7 +192,7 @@ index 4a6e89c7bc..1ae1654be5 100644
  
  static char *virt_get_gic_version(Object *obj, Error **errp)
  {
-@@ -2988,6 +3040,7 @@ static int virt_kvm_type(MachineState *ms, const char *type_str)
+@@ -2925,6 +2974,7 @@ static int virt_kvm_type(MachineState *ms, const char *type_str)
      return fixed_ipa ? 0 : requested_pa_size;
  }
  
@@ -225,7 +200,7 @@ index 4a6e89c7bc..1ae1654be5 100644
  static void virt_machine_class_init(ObjectClass *oc, void *data)
  {
      MachineClass *mc = MACHINE_CLASS(oc);
-@@ -3441,3 +3494,195 @@ static void virt_machine_2_6_options(MachineClass *mc)
+@@ -3388,3 +3438,199 @@ static void virt_machine_2_6_options(MachineClass *mc)
      vmc->no_pmu = true;
  }
  DEFINE_VIRT_MACHINE(2, 6)
@@ -263,7 +238,10 @@ index 4a6e89c7bc..1ae1654be5 100644
 +    mc->smp_props.clusters_supported = true;
 +    mc->auto_enable_numa_with_memhp = true;
 +    mc->auto_enable_numa_with_memdev = true;
++    /* platform instead of architectural choice */
++    mc->cpu_cluster_has_numa_boundary = true;
 +    mc->default_ram_id = "mach-virt.ram";
++    mc->default_nic = "virtio-net-pci";
 +
 +    object_class_property_add(oc, "acpi", "OnOffAuto",
 +        virt_get_acpi, virt_set_acpi,
@@ -404,6 +382,7 @@ index 4a6e89c7bc..1ae1654be5 100644
 +static void rhel920_virt_options(MachineClass *mc)
 +{
 +    compat_props_add(mc->compat_props, arm_rhel_compat, arm_rhel_compat_len);
++    compat_props_add(mc->compat_props, hw_compat_rhel_9_2, hw_compat_rhel_9_2_len);
 +}
 +DEFINE_RHEL_MACHINE_AS_LATEST(9, 2, 0)
 +
@@ -443,270 +422,6 @@ index e1ddbea96b..81c2363a40 100644
  void virt_acpi_setup(VirtMachineState *vms);
  bool virt_is_acpi_enabled(VirtMachineState *vms);
  
-diff --git a/target/arm/arm-qmp-cmds.c b/target/arm/arm-qmp-cmds.c
-index c8fa524002..3aa089abf3 100644
---- a/target/arm/arm-qmp-cmds.c
-+++ b/target/arm/arm-qmp-cmds.c
-@@ -231,6 +231,7 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type,
- static void arm_cpu_add_definition(gpointer data, gpointer user_data)
- {
-     ObjectClass *oc = data;
-+    CPUClass *cc = CPU_CLASS(oc);
-     CpuDefinitionInfoList **cpu_list = user_data;
-     CpuDefinitionInfo *info;
-     const char *typename;
-@@ -240,6 +241,7 @@ static void arm_cpu_add_definition(gpointer data, gpointer user_data)
-     info->name = g_strndup(typename,
-                            strlen(typename) - strlen("-" TYPE_ARM_CPU));
-     info->q_typename = g_strdup(typename);
-+    info->deprecated = !!cc->deprecation_note;
- 
-     QAPI_LIST_PREPEND(*cpu_list, info);
- }
-diff --git a/target/arm/cpu-qom.h b/target/arm/cpu-qom.h
-index 514c22ced9..f789173451 100644
---- a/target/arm/cpu-qom.h
-+++ b/target/arm/cpu-qom.h
-@@ -35,6 +35,7 @@ typedef struct ARMCPUInfo {
-     const char *name;
-     void (*initfn)(Object *obj);
-     void (*class_init)(ObjectClass *oc, void *data);
-+    const char *deprecation_note;
- } ARMCPUInfo;
- 
- void arm_cpu_register(const ARMCPUInfo *info);
-diff --git a/target/arm/cpu.c b/target/arm/cpu.c
-index 5182ed0c91..6740a8b940 100644
---- a/target/arm/cpu.c
-+++ b/target/arm/cpu.c
-@@ -2290,8 +2290,13 @@ static void arm_cpu_instance_init(Object *obj)
- static void cpu_register_class_init(ObjectClass *oc, void *data)
- {
-     ARMCPUClass *acc = ARM_CPU_CLASS(oc);
-+    CPUClass *cc = CPU_CLASS(oc);
- 
-     acc->info = data;
-+
-+    if (acc->info->deprecation_note) {
-+        cc->deprecation_note = acc->info->deprecation_note;
-+    }
- }
- 
- void arm_cpu_register(const ARMCPUInfo *info)
-diff --git a/target/arm/cpu.h b/target/arm/cpu.h
-index c097cae988..829d4a2328 100644
---- a/target/arm/cpu.h
-+++ b/target/arm/cpu.h
-@@ -34,6 +34,8 @@
- #define KVM_HAVE_MCE_INJECTION 1
- #endif
- 
-+#define RHEL_CPU_DEPRECATION "use 'host' / 'max'"
-+
- #define EXCP_UDEF            1   /* undefined instruction */
- #define EXCP_SWI             2   /* software interrupt */
- #define EXCP_PREFETCH_ABORT  3
-diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
-index 0fb07cc7b6..47459627fb 100644
---- a/target/arm/cpu64.c
-+++ b/target/arm/cpu64.c
-@@ -31,6 +31,7 @@
- #include "hw/qdev-properties.h"
- #include "internals.h"
- 
-+#if 0 /* Disabled for Red Hat Enterprise Linux */
- static void aarch64_a35_initfn(Object *obj)
- {
-     ARMCPU *cpu = ARM_CPU(obj);
-@@ -110,6 +111,7 @@ static void aarch64_a35_initfn(Object *obj)
-     /* These values are the same with A53/A57/A72. */
-     define_cortex_a72_a57_a53_cp_reginfo(cpu);
- }
-+#endif /* disabled for RHEL */
- 
- void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp)
- {
-@@ -730,6 +732,7 @@ static void aarch64_a57_initfn(Object *obj)
-     define_cortex_a72_a57_a53_cp_reginfo(cpu);
- }
- 
-+#if 0 /* Disabled for Red Hat Enterprise Linux */
- static void aarch64_a53_initfn(Object *obj)
- {
-     ARMCPU *cpu = ARM_CPU(obj);
-@@ -1164,6 +1167,7 @@ static void aarch64_neoverse_n1_initfn(Object *obj)
- 
-     define_neoverse_n1_cp_reginfo(cpu);
- }
-+#endif /* disabled for RHEL */
- 
- static void aarch64_host_initfn(Object *obj)
- {
-@@ -1373,14 +1377,19 @@ static void aarch64_max_initfn(Object *obj)
- }
- 
- static const ARMCPUInfo aarch64_cpus[] = {
-+#if 0 /* Disabled for Red Hat Enterprise Linux */
-     { .name = "cortex-a35",         .initfn = aarch64_a35_initfn },
--    { .name = "cortex-a57",         .initfn = aarch64_a57_initfn },
-+#endif /* disabled for RHEL */
-+    { .name = "cortex-a57",         .initfn = aarch64_a57_initfn,
-+      .deprecation_note = RHEL_CPU_DEPRECATION },
-+#if 0 /* Disabled for Red Hat Enterprise Linux */
-     { .name = "cortex-a53",         .initfn = aarch64_a53_initfn },
-     { .name = "cortex-a55",         .initfn = aarch64_a55_initfn },
-     { .name = "cortex-a72",         .initfn = aarch64_a72_initfn },
-     { .name = "cortex-a76",         .initfn = aarch64_a76_initfn },
-     { .name = "a64fx",              .initfn = aarch64_a64fx_initfn },
-     { .name = "neoverse-n1",        .initfn = aarch64_neoverse_n1_initfn },
-+#endif /* disabled for RHEL */
-     { .name = "max",                .initfn = aarch64_max_initfn },
- #if defined(CONFIG_KVM) || defined(CONFIG_HVF)
-     { .name = "host",               .initfn = aarch64_host_initfn },
-@@ -1452,8 +1461,13 @@ static void aarch64_cpu_instance_init(Object *obj)
- static void cpu_register_class_init(ObjectClass *oc, void *data)
- {
-     ARMCPUClass *acc = ARM_CPU_CLASS(oc);
-+    CPUClass *cc = CPU_CLASS(oc);
- 
-     acc->info = data;
-+
-+    if (acc->info->deprecation_note) {
-+        cc->deprecation_note = acc->info->deprecation_note;
-+    }
- }
- 
- void aarch64_cpu_register(const ARMCPUInfo *info)
-diff --git a/target/arm/cpu_tcg.c b/target/arm/cpu_tcg.c
-index c154a4dcf2..f29425b656 100644
---- a/target/arm/cpu_tcg.c
-+++ b/target/arm/cpu_tcg.c
-@@ -152,10 +152,10 @@ void define_cortex_a72_a57_a53_cp_reginfo(ARMCPU *cpu)
- }
- #endif /* !CONFIG_USER_ONLY */
- 
-+#if 0 /* Disabled for Red Hat Enterprise Linux */
- /* CPU models. These are not needed for the AArch64 linux-user build. */
- #if !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64)
- 
--#if 0 /* Disabled for Red Hat Enterprise Linux */
- #if !defined(CONFIG_USER_ONLY) && defined(CONFIG_TCG)
- static bool arm_v7m_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
- {
-@@ -509,7 +509,6 @@ static void cortex_a9_initfn(Object *obj)
-     cpu->isar.reset_pmcr_el0 = 0x41093000;
-     define_arm_cp_regs(cpu, cortexa9_cp_reginfo);
- }
--#endif /* disabled for RHEL */
- 
- #ifndef CONFIG_USER_ONLY
- static uint64_t a15_l2ctlr_read(CPUARMState *env, const ARMCPRegInfo *ri)
-@@ -534,7 +533,6 @@ static const ARMCPRegInfo cortexa15_cp_reginfo[] = {
-       .access = PL1_RW, .type = ARM_CP_CONST, .resetvalue = 0 },
- };
- 
--#if 0 /* Disabled for Red Hat Enterprise Linux */
- static void cortex_a7_initfn(Object *obj)
- {
-     ARMCPU *cpu = ARM_CPU(obj);
-@@ -583,7 +581,6 @@ static void cortex_a7_initfn(Object *obj)
-     cpu->isar.reset_pmcr_el0 = 0x41072000;
-     define_arm_cp_regs(cpu, cortexa15_cp_reginfo); /* Same as A15 */
- }
--#endif /* disabled for RHEL */
- 
- static void cortex_a15_initfn(Object *obj)
- {
-@@ -632,7 +629,6 @@ static void cortex_a15_initfn(Object *obj)
-     define_arm_cp_regs(cpu, cortexa15_cp_reginfo);
- }
- 
--#if 0 /* Disabled for Red Hat Enterprise Linux */
- static void cortex_m0_initfn(Object *obj)
- {
-     ARMCPU *cpu = ARM_CPU(obj);
-@@ -1115,7 +1111,6 @@ static void arm_v7m_class_init(ObjectClass *oc, void *data)
- 
-     cc->gdb_core_xml_file = "arm-m-profile.xml";
- }
--#endif /* disabled for RHEL */
- 
- #ifndef TARGET_AARCH64
- /*
-@@ -1183,7 +1178,6 @@ static void arm_max_initfn(Object *obj)
- #endif /* !TARGET_AARCH64 */
- 
- static const ARMCPUInfo arm_tcg_cpus[] = {
--#if 0 /* Disabled for Red Hat Enterprise Linux */
-     { .name = "arm926",      .initfn = arm926_initfn },
-     { .name = "arm946",      .initfn = arm946_initfn },
-     { .name = "arm1026",     .initfn = arm1026_initfn },
-@@ -1199,9 +1193,7 @@ static const ARMCPUInfo arm_tcg_cpus[] = {
-     { .name = "cortex-a7",   .initfn = cortex_a7_initfn },
-     { .name = "cortex-a8",   .initfn = cortex_a8_initfn },
-     { .name = "cortex-a9",   .initfn = cortex_a9_initfn },
--#endif /* disabled for RHEL */
-     { .name = "cortex-a15",  .initfn = cortex_a15_initfn },
--#if 0 /* Disabled for Red Hat Enterprise Linux */
-     { .name = "cortex-m0",   .initfn = cortex_m0_initfn,
-                              .class_init = arm_v7m_class_init },
-     { .name = "cortex-m3",   .initfn = cortex_m3_initfn,
-@@ -1233,7 +1225,6 @@ static const ARMCPUInfo arm_tcg_cpus[] = {
-     { .name = "pxa270-b1",   .initfn = pxa270b1_initfn },
-     { .name = "pxa270-c0",   .initfn = pxa270c0_initfn },
-     { .name = "pxa270-c5",   .initfn = pxa270c5_initfn },
--#endif /* disabled for RHEL */
- #ifndef TARGET_AARCH64
-     { .name = "max",         .initfn = arm_max_initfn },
- #endif
-@@ -1261,3 +1252,4 @@ static void arm_tcg_cpu_register_types(void)
- type_init(arm_tcg_cpu_register_types)
- 
- #endif /* !CONFIG_USER_ONLY || !TARGET_AARCH64 */
-+#endif /* disabled for RHEL */
-diff --git a/tests/qtest/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c
-index 1cb08138ad..834497dfec 100644
---- a/tests/qtest/arm-cpu-features.c
-+++ b/tests/qtest/arm-cpu-features.c
-@@ -441,8 +441,10 @@ static void test_query_cpu_model_expansion(const void *data)
-     assert_error(qts, "host", "The CPU type 'host' requires KVM", NULL);
- 
-     /* Test expected feature presence/absence for some cpu types */
-+#if 0 /* Disabled for Red Hat Enterprise Linux */
-     assert_has_feature_enabled(qts, "cortex-a15", "pmu");
-     assert_has_not_feature(qts, "cortex-a15", "aarch64");
-+#endif /* disabled for RHEL */
- 
-     /* Enabling and disabling pmu should always work. */
-     assert_has_feature_enabled(qts, "max", "pmu");
-@@ -459,6 +461,7 @@ static void test_query_cpu_model_expansion(const void *data)
-         assert_has_feature_enabled(qts, "cortex-a57", "pmu");
-         assert_has_feature_enabled(qts, "cortex-a57", "aarch64");
- 
-+#if 0 /* Disabled for Red Hat Enterprise Linux */
-         assert_has_feature_enabled(qts, "a64fx", "pmu");
-         assert_has_feature_enabled(qts, "a64fx", "aarch64");
-         /*
-@@ -471,6 +474,7 @@ static void test_query_cpu_model_expansion(const void *data)
-                      "{ 'sve384': true }");
-         assert_error(qts, "a64fx", "cannot enable sve640",
-                      "{ 'sve640': true }");
-+#endif /* disabled for RHEL */
- 
-         sve_tests_default(qts, "max");
-         pauth_tests_default(qts, "max");
-@@ -506,9 +510,11 @@ static void test_query_cpu_model_expansion_kvm(const void *data)
-         QDict *resp;
-         char *error;
- 
-+#if 0 /* Disabled for Red Hat Enterprise Linux */
-         assert_error(qts, "cortex-a15",
-             "We cannot guarantee the CPU type 'cortex-a15' works "
-             "with KVM on this host", NULL);
-+#endif /* disabled for RHEL */
- 
-         assert_has_feature_enabled(qts, "host", "aarch64");
- 
 -- 
-2.39.1
+2.39.3
 
diff --git a/0008-Add-ppc64-machine-types.patch b/0008-Add-ppc64-machine-types.patch
index ab78cae..fec672d 100644
--- a/0008-Add-ppc64-machine-types.patch
+++ b/0008-Add-ppc64-machine-types.patch
@@ -1,4 +1,4 @@
-From 401d0ebf1ee959fd944df6b5b4ae9c51c36d1244 Mon Sep 17 00:00:00 2001
+From bfe11e8d63f27ebc5bba4ca915e6e641af3a340b 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
@@ -20,7 +20,7 @@ Merged patches (6.1.0):
 - af69d1ca6e Remove RHEL 7.4.0 machine types (only ppc64 changes)
 - 8f7a74ab78 Remove RHEL 7.5.0 machine types (only ppc64 changes)
 
-Merged patches (7.1.0 rc0):
+Merged patches (7.1.0):
 - baa6790171 target/ppc/cpu-models: Fix ppc_cpu_aliases list for RHEL
 ---
  hw/ppc/spapr.c          | 243 ++++++++++++++++++++++++++++++++++++++++
@@ -34,10 +34,10 @@ Merged patches (7.1.0 rc0):
  8 files changed, 314 insertions(+), 1 deletion(-)
 
 diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
-index 4921198b9d..e24b3e22e3 100644
+index 1c8b8d57a7..e6c6be9e1d 100644
 --- a/hw/ppc/spapr.c
 +++ b/hw/ppc/spapr.c
-@@ -1634,6 +1634,9 @@ static void spapr_machine_reset(MachineState *machine, ShutdownCause reason)
+@@ -1640,6 +1640,9 @@ static void spapr_machine_reset(MachineState *machine, ShutdownCause reason)
  
      pef_kvm_reset(machine->cgs, &error_fatal);
      spapr_caps_apply(spapr);
@@ -47,7 +47,7 @@ index 4921198b9d..e24b3e22e3 100644
  
      first_ppc_cpu = POWERPC_CPU(first_cpu);
      if (kvm_enabled() && kvmppc_has_cap_mmu_radix() &&
-@@ -3348,6 +3351,20 @@ static void spapr_set_host_serial(Object *obj, const char *value, Error **errp)
+@@ -3359,6 +3362,20 @@ static void spapr_set_host_serial(Object *obj, const char *value, Error **errp)
      spapr->host_serial = g_strdup(value);
  }
  
@@ -68,7 +68,7 @@ index 4921198b9d..e24b3e22e3 100644
  static void spapr_instance_init(Object *obj)
  {
      SpaprMachineState *spapr = SPAPR_MACHINE(obj);
-@@ -3426,6 +3443,12 @@ static void spapr_instance_init(Object *obj)
+@@ -3437,6 +3454,12 @@ static void spapr_instance_init(Object *obj)
          spapr_get_host_serial, spapr_set_host_serial);
      object_property_set_description(obj, "host-serial",
          "Host serial number to advertise in guest device tree");
@@ -81,7 +81,7 @@ index 4921198b9d..e24b3e22e3 100644
  }
  
  static void spapr_machine_finalizefn(Object *obj)
-@@ -4683,6 +4706,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
+@@ -4701,6 +4724,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
      vmc->client_architecture_support = spapr_vof_client_architecture_support;
      vmc->quiesce = spapr_vof_quiesce;
      vmc->setprop = spapr_vof_setprop;
@@ -89,15 +89,15 @@ index 4921198b9d..e24b3e22e3 100644
  }
  
  static const TypeInfo spapr_machine_info = {
-@@ -4734,6 +4758,7 @@ static void spapr_machine_latest_class_options(MachineClass *mc)
+@@ -4752,6 +4776,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-8.0
+  * pseries-8.1
   */
-@@ -4894,6 +4919,7 @@ static void spapr_machine_4_1_class_options(MachineClass *mc)
+@@ -4923,6 +4948,7 @@ static void spapr_machine_4_1_class_options(MachineClass *mc)
  }
  
  DEFINE_SPAPR_MACHINE(4_1, "4.1", false);
@@ -105,7 +105,7 @@ index 4921198b9d..e24b3e22e3 100644
  
  /*
   * pseries-4.0
-@@ -4913,6 +4939,8 @@ static bool phb_placement_4_0(SpaprMachineState *spapr, uint32_t index,
+@@ -4942,6 +4968,8 @@ static bool phb_placement_4_0(SpaprMachineState *spapr, uint32_t index,
      *nv2atsd = 0;
      return true;
  }
@@ -114,7 +114,7 @@ index 4921198b9d..e24b3e22e3 100644
  static void spapr_machine_4_0_class_options(MachineClass *mc)
  {
      SpaprMachineClass *smc = SPAPR_MACHINE_CLASS(mc);
-@@ -5240,6 +5268,221 @@ static void spapr_machine_2_1_class_options(MachineClass *mc)
+@@ -5269,6 +5297,221 @@ 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);
@@ -337,7 +337,7 @@ index 4921198b9d..e24b3e22e3 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 fcb5dfe792..ab8fb5bf62 100644
+index 5c52e01fb7..27ec35f98a 100644
 --- a/hw/ppc/spapr_cpu_core.c
 +++ b/hw/ppc/spapr_cpu_core.c
 @@ -25,6 +25,7 @@
@@ -356,7 +356,7 @@ index fcb5dfe792..ab8fb5bf62 100644
  
      if (!qdev_realize(DEVICE(cpu), NULL, errp)) {
          return false;
-@@ -270,6 +272,17 @@ static bool spapr_realize_vcpu(PowerPCCPU *cpu, SpaprMachineState *spapr,
+@@ -275,6 +277,17 @@ static bool spapr_realize_vcpu(PowerPCCPU *cpu, SpaprMachineState *spapr,
      /* Set time-base frequency to 512 MHz. vhyp must be set first. */
      cpu_ppc_tb_init(env, SPAPR_TIMEBASE_FREQ);
  
@@ -375,10 +375,10 @@ index fcb5dfe792..ab8fb5bf62 100644
          qdev_unrealize(DEVICE(cpu));
          return false;
 diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
-index 5c8aabd444..04489d5808 100644
+index 538b2dfb89..7d5aea4e28 100644
 --- a/include/hw/ppc/spapr.h
 +++ b/include/hw/ppc/spapr.h
-@@ -155,6 +155,7 @@ struct SpaprMachineClass {
+@@ -157,6 +157,7 @@ struct SpaprMachineClass {
      bool pre_5_2_numa_associativity;
      bool pre_6_2_numa_affinity;
  
@@ -386,7 +386,7 @@ index 5c8aabd444..04489d5808 100644
      bool (*phb_placement)(SpaprMachineState *spapr, uint32_t index,
                            uint64_t *buid, hwaddr *pio,
                            hwaddr *mmio32, hwaddr *mmio64,
-@@ -257,6 +258,9 @@ struct SpaprMachineState {
+@@ -259,6 +260,9 @@ struct SpaprMachineState {
      /* Set by -boot */
      char *boot_device;
  
@@ -422,10 +422,10 @@ index 7949a24f5a..f207a9ba01 100644
      const CompatInfo *compat = compat_by_pvr(compat_pvr);
      const CompatInfo *min = compat_by_pvr(min_compat_pvr);
 diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c
-index cd3ff700ac..1cb49c8087 100644
+index 69fddb05bc..64a05aaef3 100644
 --- a/target/ppc/cpu-models.c
 +++ b/target/ppc/cpu-models.c
-@@ -746,6 +746,7 @@
+@@ -748,6 +748,7 @@
  /* PowerPC CPU aliases                                                     */
  
  PowerPCCPUAlias ppc_cpu_aliases[] = {
@@ -434,10 +434,10 @@ index cd3ff700ac..1cb49c8087 100644
      { "405cr", "405crc" },
      { "405gp", "405gpd" },
 diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
-index 557d736dab..6646ec1c27 100644
+index 25fac9577a..26e4a5cd00 100644
 --- a/target/ppc/cpu.h
 +++ b/target/ppc/cpu.h
-@@ -1482,6 +1482,7 @@ static inline int cpu_mmu_index(CPUPPCState *env, bool ifetch)
+@@ -1486,6 +1486,7 @@ static inline int cpu_mmu_index(CPUPPCState *env, bool ifetch)
  
  /* Compatibility modes */
  #if defined(TARGET_PPC64)
@@ -446,18 +446,18 @@ index 557d736dab..6646ec1c27 100644
                        uint32_t min_compat_pvr, uint32_t max_compat_pvr);
  bool ppc_type_check_compat(const char *cputype, uint32_t compat_pvr,
 diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
-index 78f6fc50cd..68d06c3f8f 100644
+index a8a935e267..5471407d02 100644
 --- a/target/ppc/kvm.c
 +++ b/target/ppc/kvm.c
-@@ -88,6 +88,7 @@ static int cap_ppc_nested_kvm_hv;
- static int cap_large_decr;
+@@ -89,6 +89,7 @@ static int cap_large_decr;
  static int cap_fwnmi;
  static int cap_rpt_invalidate;
+ static int cap_ail_mode_3;
 +static int cap_ppc_secure_guest;
  
  static uint32_t debug_inst_opcode;
  
-@@ -135,6 +136,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
+@@ -136,6 +137,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
      cap_resize_hpt = kvm_vm_check_extension(s, KVM_CAP_SPAPR_RESIZE_HPT);
      kvmppc_get_cpu_characteristics(s);
      cap_ppc_nested_kvm_hv = kvm_vm_check_extension(s, KVM_CAP_PPC_NESTED_HV);
@@ -465,8 +465,8 @@ index 78f6fc50cd..68d06c3f8f 100644
      cap_large_decr = kvmppc_get_dec_bits();
      cap_fwnmi = kvm_vm_check_extension(s, KVM_CAP_PPC_FWNMI);
      /*
-@@ -2569,6 +2571,16 @@ int kvmppc_has_cap_rpt_invalidate(void)
-     return cap_rpt_invalidate;
+@@ -2579,6 +2581,16 @@ bool kvmppc_supports_ail_3(void)
+     return cap_ail_mode_3;
  }
  
 +bool kvmppc_has_cap_secure_guest(void)
@@ -482,7 +482,7 @@ index 78f6fc50cd..68d06c3f8f 100644
  PowerPCCPUClass *kvm_ppc_get_host_cpu_class(void)
  {
      uint32_t host_pvr = mfpvr();
-@@ -2969,3 +2981,18 @@ bool kvm_arch_cpu_check_are_resettable(void)
+@@ -2979,3 +2991,18 @@ bool kvm_arch_cpu_check_are_resettable(void)
  void kvm_arch_accel_class_init(ObjectClass *oc)
  {
  }
@@ -502,27 +502,27 @@ index 78f6fc50cd..68d06c3f8f 100644
 +    }
 +}
 diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h
-index 5fd9753953..b5ebfe2be0 100644
+index 6a4dd9c560..e0cd6fb1c7 100644
 --- a/target/ppc/kvm_ppc.h
 +++ b/target/ppc/kvm_ppc.h
-@@ -43,6 +43,7 @@ int kvmppc_booke_watchdog_enable(PowerPCCPU *cpu);
+@@ -42,6 +42,7 @@ int kvmppc_booke_watchdog_enable(PowerPCCPU *cpu);
  target_ulong kvmppc_configure_v3_mmu(PowerPCCPU *cpu,
                                       bool radix, bool gtse,
                                       uint64_t proc_tbl);
 +void kvmppc_svm_allow(Error **errp);
- #ifndef CONFIG_USER_ONLY
  bool kvmppc_spapr_use_multitce(void);
  int kvmppc_spapr_enable_inkernel_multitce(void);
-@@ -77,6 +78,8 @@ int kvmppc_get_cap_large_decr(void);
- int kvmppc_enable_cap_large_decr(PowerPCCPU *cpu, int enable);
+ void *kvmppc_create_spapr_tce(uint32_t liobn, uint32_t page_shift,
+@@ -75,6 +76,8 @@ int kvmppc_enable_cap_large_decr(PowerPCCPU *cpu, int enable);
  int kvmppc_has_cap_rpt_invalidate(void);
+ bool kvmppc_supports_ail_3(void);
  int kvmppc_enable_hwrng(void);
 +bool kvmppc_has_cap_secure_guest(void);
 +int kvmppc_enable_cap_secure_guest(void);
  int kvmppc_put_books_sregs(PowerPCCPU *cpu);
  PowerPCCPUClass *kvm_ppc_get_host_cpu_class(void);
  void kvmppc_check_papr_resize_hpt(Error **errp);
-@@ -396,6 +399,16 @@ static inline int kvmppc_has_cap_rpt_invalidate(void)
+@@ -423,6 +426,16 @@ static inline bool kvmppc_supports_ail_3(void)
      return false;
  }
  
@@ -540,5 +540,5 @@ index 5fd9753953..b5ebfe2be0 100644
  {
      return -1;
 -- 
-2.39.1
+2.39.3
 
diff --git a/0009-Add-s390x-machine-types.patch b/0009-Add-s390x-machine-types.patch
index 07dfb57..b81ed24 100644
--- a/0009-Add-s390x-machine-types.patch
+++ b/0009-Add-s390x-machine-types.patch
@@ -1,4 +1,4 @@
-From 3c7647197729fcd76e219070c6f359bb3667d04d Mon Sep 17 00:00:00 2001
+From a3b5d9d0d0b59de4956ad88e5e855fe1a56ae215 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
@@ -8,7 +8,7 @@ Adding changes to add RHEL machine types for s390x architecture.
 Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
 --
 
-Rebase changes (7.1.0 rc0):
+Rebase changes (7.1.0):
 - Moved adding rhel_old_machine_deprecation variable to general machine types commit
 
 Merged patches (6.1.0):
@@ -23,38 +23,41 @@ Merged patches (7.0.0):
 - 4b0efa7e21 redhat: Add rhel8.6.0 and rhel9.0.0 machine types for s390x
 - dcc64971bf RHEL: mark old machine types as deprecated (partialy)
 
-Merged patches (7.1.0 rc0):
+Merged patches (7.1.0):
 - 1d6439527a WRB: Introduce RHEL 9.0.0 hw compat structure (only hw/s390x/s390-virtio-ccw.c chunk)
 - c8ad21ca31 redhat: Update s390x machine type compatibility for rebase to QEMU 7.0.0
 - 5bcf8d874c target/s390x: deprecate CPUs older than z14
 
-Merged patches (7.2.0 rc0):
+Merged patches (7.2.0):
 - 0be2889fa2 Introduce upstream 7.0 compat changes (only applicable parts)
 
-Merged patches (8.0.0-rc1):
+Merged patches (8.0.0):
 - 27c188c6a4 redhat: Update s390x machine type compatibility for QEMU 7.2.0 update
 - a932b8d429 redhat: Add new rhel-9.2.0 s390x machine type
 - ac88104bad s390x/s390-virtio-ccw: Activate zPCI features on s390-ccw-virtio-rhel8.6.0
+
+Merged patches (8.1.0):
+- bd5d81d286 Add RHEL 9.2.0 compat structure (s390x part)
 ---
- hw/s390x/s390-virtio-ccw.c       | 143 +++++++++++++++++++++++++++++++
+ hw/s390x/s390-virtio-ccw.c       | 144 +++++++++++++++++++++++++++++++
  target/s390x/cpu_models.c        |  11 +++
  target/s390x/cpu_models.h        |   2 +
  target/s390x/cpu_models_sysemu.c |   2 +
- 4 files changed, 158 insertions(+)
+ 4 files changed, 159 insertions(+)
 
 diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
-index 503f212a31..dcd3b966b0 100644
+index 4516d73ff5..2a5dbd2728 100644
 --- a/hw/s390x/s390-virtio-ccw.c
 +++ b/hw/s390x/s390-virtio-ccw.c
-@@ -826,6 +826,7 @@ bool css_migration_enabled(void)
+@@ -828,6 +828,7 @@ bool css_migration_enabled(void)
      }                                                                         \
      type_init(ccw_machine_register_##suffix)
  
 +#if 0 /* Disabled for Red Hat Enterprise Linux */
- static void ccw_machine_8_0_instance_options(MachineState *machine)
+ static void ccw_machine_8_1_instance_options(MachineState *machine)
  {
  }
-@@ -1201,6 +1202,148 @@ static void ccw_machine_2_4_class_options(MachineClass *mc)
+@@ -1215,6 +1216,149 @@ 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);
@@ -67,6 +70,7 @@ index 503f212a31..dcd3b966b0 100644
 +
 +static void ccw_machine_rhel920_class_options(MachineClass *mc)
 +{
++    compat_props_add(mc->compat_props, hw_compat_rhel_9_2, hw_compat_rhel_9_2_len);
 +}
 +DEFINE_CCW_MACHINE(rhel920, "rhel9.2.0", true);
 +
@@ -204,7 +208,7 @@ index 503f212a31..dcd3b966b0 100644
  static void ccw_machine_register_types(void)
  {
 diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
-index 457b5cb10c..ff6b9463cb 100644
+index 91ce896491..2479776573 100644
 --- a/target/s390x/cpu_models.c
 +++ b/target/s390x/cpu_models.c
 @@ -46,6 +46,9 @@
@@ -249,7 +253,7 @@ index 457b5cb10c..ff6b9463cb 100644
  
  static void s390_qemu_cpu_model_class_init(ObjectClass *oc, void *data)
 diff --git a/target/s390x/cpu_models.h b/target/s390x/cpu_models.h
-index fb1adc8b21..d76745afa9 100644
+index cc7305ec21..05abe5b92e 100644
 --- a/target/s390x/cpu_models.h
 +++ b/target/s390x/cpu_models.h
 @@ -38,6 +38,8 @@ struct S390CPUDef {
@@ -282,5 +286,5 @@ index 87a4480c05..28c1b0486c 100644
      if (cpu_list_data->model) {
          Object *obj;
 -- 
-2.39.1
+2.39.3
 
diff --git a/0010-Add-x86_64-machine-types.patch b/0010-Add-x86_64-machine-types.patch
index 9685338..c9fe8aa 100644
--- a/0010-Add-x86_64-machine-types.patch
+++ b/0010-Add-x86_64-machine-types.patch
@@ -1,4 +1,4 @@
-From 510291040cb280e1f68b793a84ec0f7d1c88aafa Mon Sep 17 00:00:00 2001
+From 70b66fab556a893f7f8b328f92bcd94c9b2978dd 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
@@ -13,9 +13,12 @@ Rebase notes (6.1.0):
 Rebase notes (7.0.0):
 - Reset alias for all machine-types except latest one
 
-Rebase notes (8.0.0-rc1):
+Rebase notes (8.0.0):
 - remove legacy_no_rng_seed usage (removed upstream)
 
+Rebase notes (8.1.0):
+- default_nic_model to default_nic
+
 Merged patches (6.1.0):
 - 59c284ad3b x86: Add x86 rhel8.5 machine types
 - a8868b42fe redhat: x86: Enable 'kvm-asyncpf-int' by default
@@ -35,33 +38,38 @@ Merged patches (7.0.0):
 - dcc64971bf RHEL: mark old machine types as deprecated (partialy)
 - 6b396f182b RHEL: disable "seqpacket" for "vhost-vsock-device" in rhel8.6.0
 
-Merged patches (7.1.0 rc0):
+Merged patches (7.1.0):
 -  38b89dc245 pc: Move s3/s4 suspend disabling to compat (only hw/i386/pc.c chunk)
 -  1d6439527a WRB: Introduce RHEL 9.0.0 hw compat structure (x86_64 specific changes)
 - 35b5c8554f target/i386: deprecate CPUs older than x86_64-v2 ABI
 
-Merged patches (7.2.0 rc0):
+Merged patches (7.2.0):
 - 0be2889fa2 Introduce upstream 7.0 compat changes (only applicable parts)
 
-Merged patches (8.0.0-rc1):
+Merged patches (8.0.0):
 - f33ca8aed4 x86: rhel 9.2.0 machine type
+
+Merged patches (8.1.0):
+- bd5d81d286 Add RHEL 9.2.0 compat structure (x86_64 part)
+- c6eaf73add redhat: hw/i386/pc: Update x86 machine type compatibility for QEMU 8.0.0 update
+- 6cbf496e5e hw/acpi: Mark acpi blobs as resizable on RHEL pc machines version 7.6 and above
 ---
- hw/i386/pc.c               | 147 +++++++++++++++++++++-
- hw/i386/pc_piix.c          |  86 ++++++++++++-
- hw/i386/pc_q35.c           | 252 ++++++++++++++++++++++++++++++++++++-
+ hw/i386/pc.c               | 153 +++++++++++++++++++++-
+ hw/i386/pc_piix.c          |  91 ++++++++++++-
+ hw/i386/pc_q35.c           | 257 ++++++++++++++++++++++++++++++++++++-
  include/hw/boards.h        |   2 +
- include/hw/i386/pc.h       |  27 ++++
- target/i386/cpu.c          |  21 ++++
+ include/hw/i386/pc.h       |  30 +++++
+ target/i386/cpu.c          |  21 +++
  target/i386/kvm/kvm-cpu.c  |   1 +
  target/i386/kvm/kvm.c      |   4 +
  tests/qtest/pvpanic-test.c |   5 +-
- 9 files changed, 538 insertions(+), 7 deletions(-)
+ 9 files changed, 557 insertions(+), 7 deletions(-)
 
 diff --git a/hw/i386/pc.c b/hw/i386/pc.c
-index 1489abf010..8abb1f872e 100644
+index 3109d5e0e0..4be9a7db82 100644
 --- a/hw/i386/pc.c
 +++ b/hw/i386/pc.c
-@@ -407,6 +407,149 @@ GlobalProperty pc_compat_1_4[] = {
+@@ -410,6 +410,155 @@ GlobalProperty pc_compat_1_4[] = {
  };
  const size_t pc_compat_1_4_len = G_N_ELEMENTS(pc_compat_1_4);
  
@@ -87,6 +95,12 @@ index 1489abf010..8abb1f872e 100644
 +};
 +const size_t pc_rhel_compat_len = G_N_ELEMENTS(pc_rhel_compat);
 +
++GlobalProperty pc_rhel_9_2_compat[] = {
++    /* pc_rhel_9_2_compat from pc_compat_7_2 */
++    { "ICH9-LPC", "noreboot", "true" },
++};
++const size_t pc_rhel_9_2_compat_len = G_N_ELEMENTS(pc_rhel_9_2_compat);
++
 +GlobalProperty pc_rhel_9_0_compat[] = {
 +    /* pc_rhel_9_0_compat from pc_compat_6_2 */
 +    { "virtio-mem", "unplugged-inaccessible", "off" },
@@ -211,15 +225,15 @@ index 1489abf010..8abb1f872e 100644
  GSIState *pc_gsi_create(qemu_irq **irqs, bool pci_enabled)
  {
      GSIState *s;
-@@ -1944,6 +2087,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
-     pcmc->pvh_enabled = true;
+@@ -1865,6 +2014,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
      pcmc->kvmclock_create_always = true;
+     pcmc->resizable_acpi_blob = true;
      assert(!mc->get_hotplug_handler);
 +    mc->async_pf_vmexit_disable = false;
      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;
-@@ -1954,7 +2098,8 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
+@@ -1875,7 +2025,8 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
      mc->has_hotpluggable_cpus = true;
      mc->default_boot_order = "cad";
      mc->block_default_type = IF_IDE;
@@ -230,10 +244,10 @@ index 1489abf010..8abb1f872e 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 14a794081e..3e330fd36f 100644
+index 2ecd9bb2d8..db7d8e26e1 100644
 --- a/hw/i386/pc_piix.c
 +++ b/hw/i386/pc_piix.c
-@@ -54,6 +54,7 @@
+@@ -56,6 +56,7 @@
  #include "qapi/error.h"
  #include "qemu/error-report.h"
  #include "sysemu/xen.h"
@@ -241,18 +255,18 @@ index 14a794081e..3e330fd36f 100644
  #ifdef CONFIG_XEN
  #include <xen/hvm/hvm_info_table.h>
  #include "hw/xen/xen_pt.h"
-@@ -198,8 +199,8 @@ static void pc_init1(MachineState *machine,
+@@ -237,8 +238,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 */
--        smbios_set_defaults("QEMU", "Standard PC (i440FX + PIIX, 1996)",
+-        smbios_set_defaults("QEMU", mc->desc,
 -                            mc->name, pcmc->smbios_legacy_mode,
 +        smbios_set_defaults("Red Hat", "KVM",
 +                            mc->desc, pcmc->smbios_legacy_mode,
                              pcmc->smbios_uuid_encoded,
                              pcmc->smbios_stream_product,
                              pcmc->smbios_stream_version,
-@@ -351,6 +352,7 @@ static void pc_init1(MachineState *machine,
+@@ -400,6 +401,7 @@ static void pc_init1(MachineState *machine,
   * hw_compat_*, pc_compat_*, or * pc_*_machine_options().
   */
  
@@ -260,7 +274,7 @@ index 14a794081e..3e330fd36f 100644
  static void pc_compat_2_3_fn(MachineState *machine)
  {
      X86MachineState *x86ms = X86_MACHINE(machine);
-@@ -899,3 +901,83 @@ static void xenfv_3_1_machine_options(MachineClass *m)
+@@ -966,3 +968,88 @@ 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
@@ -274,8 +288,9 @@ index 14a794081e..3e330fd36f 100644
 +    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
 +    m->family = "pc_piix_Y";
 +    m->default_machine_opts = "firmware=bios-256k.bin,hpet=off";
-+    pcmc->default_nic_model = "e1000";
 +    pcmc->pci_root_uid = 0;
++    pcmc->resizable_acpi_blob = true;
++    m->default_nic = "e1000";
 +    m->default_display = "std";
 +    m->no_parallel = 1;
 +    m->numa_mem_supported = true;
@@ -310,6 +325,10 @@ index 14a794081e..3e330fd36f 100644
 +    /* From pc_i440fx_5_1_machine_options() */
 +    pcmc->pci_root_uid = 1;
 +    pcmc->enforce_amd_1tb_hole = false;
++    compat_props_add(m->compat_props, hw_compat_rhel_9_2,
++                     hw_compat_rhel_9_2_len);
++    compat_props_add(m->compat_props, pc_rhel_9_2_compat,
++                     pc_rhel_9_2_compat_len);
 +    compat_props_add(m->compat_props, hw_compat_rhel_9_1,
 +                     hw_compat_rhel_9_1_len);
 +    compat_props_add(m->compat_props, hw_compat_rhel_9_0,
@@ -345,21 +364,21 @@ index 14a794081e..3e330fd36f 100644
 +DEFINE_PC_MACHINE(rhel760, "pc-i440fx-rhel7.6.0", pc_init_rhel760,
 +                  pc_machine_rhel760_options);
 diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
-index dc0ba5f9e7..98601bb76f 100644
+index 27a4ec0641..e878bf4626 100644
 --- a/hw/i386/pc_q35.c
 +++ b/hw/i386/pc_q35.c
 @@ -199,8 +199,8 @@ static void pc_q35_init(MachineState *machine)
  
      if (pcmc->smbios_defaults) {
          /* These values are guest ABI, do not change */
--        smbios_set_defaults("QEMU", "Standard PC (Q35 + ICH9, 2009)",
+-        smbios_set_defaults("QEMU", mc->desc,
 -                            mc->name, pcmc->smbios_legacy_mode,
 +        smbios_set_defaults("Red Hat", "KVM",
 +                            mc->desc, pcmc->smbios_legacy_mode,
                              pcmc->smbios_uuid_encoded,
                              pcmc->smbios_stream_product,
                              pcmc->smbios_stream_version,
-@@ -354,6 +354,7 @@ static void pc_q35_init(MachineState *machine)
+@@ -359,6 +359,7 @@ static void pc_q35_init(MachineState *machine)
      DEFINE_PC_MACHINE(suffix, name, pc_init_##suffix, optionfn)
  
  
@@ -367,7 +386,7 @@ index dc0ba5f9e7..98601bb76f 100644
  static void pc_q35_machine_options(MachineClass *m)
  {
      PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
-@@ -663,3 +664,250 @@ static void pc_q35_2_4_machine_options(MachineClass *m)
+@@ -683,3 +684,255 @@ 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);
@@ -379,8 +398,8 @@ index dc0ba5f9e7..98601bb76f 100644
 +static void pc_q35_machine_rhel_options(MachineClass *m)
 +{
 +    PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
-+    pcmc->default_nic_model = "e1000e";
 +    pcmc->pci_root_uid = 0;
++    m->default_nic = "e1000e";
 +    m->family = "pc_q35_Z";
 +    m->units_per_default_bus = 1;
 +    m->default_machine_opts = "firmware=bios-256k.bin,hpet=off";
@@ -408,6 +427,11 @@ index dc0ba5f9e7..98601bb76f 100644
 +    m->desc = "RHEL-9.2.0 PC (Q35 + ICH9, 2009)";
 +    pcmc->smbios_stream_product = "RHEL";
 +    pcmc->smbios_stream_version = "9.2.0";
++
++    compat_props_add(m->compat_props, hw_compat_rhel_9_2,
++                     hw_compat_rhel_9_2_len);
++    compat_props_add(m->compat_props, pc_rhel_9_2_compat,
++                     pc_rhel_9_2_compat_len);
 +}
 +
 +DEFINE_PC_MACHINE(q35_rhel920, "pc-q35-rhel9.2.0", pc_q35_init_rhel920,
@@ -619,10 +643,10 @@ index dc0ba5f9e7..98601bb76f 100644
 +DEFINE_PC_MACHINE(q35_rhel760, "pc-q35-rhel7.6.0", pc_q35_init_rhel760,
 +                  pc_q35_machine_rhel760_options);
 diff --git a/include/hw/boards.h b/include/hw/boards.h
-index c5a965d27f..5e7446ee40 100644
+index 6dafe2c3a9..d9d1ae6dd1 100644
 --- a/include/hw/boards.h
 +++ b/include/hw/boards.h
-@@ -268,6 +268,8 @@ struct MachineClass {
+@@ -272,6 +272,8 @@ struct MachineClass {
      strList *allowed_dynamic_sysbus_devices;
      bool auto_enable_numa_with_memhp;
      bool auto_enable_numa_with_memdev;
@@ -632,16 +656,19 @@ index c5a965d27f..5e7446ee40 100644
      bool smbus_no_migration_support;
      bool nvdimm_supported;
 diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
-index 908a275736..4376f64a47 100644
+index ae0f49b93c..7b569fa254 100644
 --- a/include/hw/i386/pc.h
 +++ b/include/hw/i386/pc.h
-@@ -293,6 +293,33 @@ extern const size_t pc_compat_1_4_len;
+@@ -301,6 +301,36 @@ extern const size_t pc_compat_1_4_len;
  
  int pc_machine_kvm_type(MachineState *machine, const char *vm_type);
  
 +extern GlobalProperty pc_rhel_compat[];
 +extern const size_t pc_rhel_compat_len;
 +
++extern GlobalProperty pc_rhel_9_2_compat[];
++extern const size_t pc_rhel_9_2_compat_len;
++
 +extern GlobalProperty pc_rhel_9_0_compat[];
 +extern const size_t pc_rhel_9_0_compat_len;
 +
@@ -670,10 +697,10 @@ index 908a275736..4376f64a47 100644
      static void pc_machine_##suffix##_class_init(ObjectClass *oc, void *data) \
      { \
 diff --git a/target/i386/cpu.c b/target/i386/cpu.c
-index 6576287e5b..0ef2bf1b93 100644
+index 97ad229d8b..c1c9992e6f 100644
 --- a/target/i386/cpu.c
 +++ b/target/i386/cpu.c
-@@ -1834,9 +1834,13 @@ static const CPUCaches epyc_milan_cache_info = {
+@@ -2183,9 +2183,13 @@ static const CPUCaches epyc_genoa_cache_info = {
   *  PT in VMX operation
   */
  
@@ -687,7 +714,7 @@ index 6576287e5b..0ef2bf1b93 100644
          .level = 0xd,
          .vendor = CPUID_VENDOR_AMD,
          .family = 15,
-@@ -1857,6 +1861,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
+@@ -2206,6 +2210,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
      },
      {
          .name = "phenom",
@@ -695,7 +722,7 @@ index 6576287e5b..0ef2bf1b93 100644
          .level = 5,
          .vendor = CPUID_VENDOR_AMD,
          .family = 16,
-@@ -1889,6 +1894,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
+@@ -2238,6 +2243,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
      },
      {
          .name = "core2duo",
@@ -703,7 +730,7 @@ index 6576287e5b..0ef2bf1b93 100644
          .level = 10,
          .vendor = CPUID_VENDOR_INTEL,
          .family = 6,
-@@ -1931,6 +1937,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
+@@ -2280,6 +2286,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
      },
      {
          .name = "kvm64",
@@ -711,7 +738,7 @@ index 6576287e5b..0ef2bf1b93 100644
          .level = 0xd,
          .vendor = CPUID_VENDOR_INTEL,
          .family = 15,
-@@ -1972,6 +1979,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
+@@ -2321,6 +2328,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
      },
      {
          .name = "qemu32",
@@ -719,7 +746,7 @@ index 6576287e5b..0ef2bf1b93 100644
          .level = 4,
          .vendor = CPUID_VENDOR_INTEL,
          .family = 6,
-@@ -1986,6 +1994,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
+@@ -2335,6 +2343,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
      },
      {
          .name = "kvm32",
@@ -727,7 +754,7 @@ index 6576287e5b..0ef2bf1b93 100644
          .level = 5,
          .vendor = CPUID_VENDOR_INTEL,
          .family = 15,
-@@ -2016,6 +2025,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
+@@ -2365,6 +2374,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
      },
      {
          .name = "coreduo",
@@ -735,7 +762,7 @@ index 6576287e5b..0ef2bf1b93 100644
          .level = 10,
          .vendor = CPUID_VENDOR_INTEL,
          .family = 6,
-@@ -2049,6 +2059,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
+@@ -2398,6 +2408,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
      },
      {
          .name = "486",
@@ -743,7 +770,7 @@ index 6576287e5b..0ef2bf1b93 100644
          .level = 1,
          .vendor = CPUID_VENDOR_INTEL,
          .family = 4,
-@@ -2061,6 +2072,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
+@@ -2410,6 +2421,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
      },
      {
          .name = "pentium",
@@ -751,7 +778,7 @@ index 6576287e5b..0ef2bf1b93 100644
          .level = 1,
          .vendor = CPUID_VENDOR_INTEL,
          .family = 5,
-@@ -2073,6 +2085,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
+@@ -2422,6 +2434,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
      },
      {
          .name = "pentium2",
@@ -759,7 +786,7 @@ index 6576287e5b..0ef2bf1b93 100644
          .level = 2,
          .vendor = CPUID_VENDOR_INTEL,
          .family = 6,
-@@ -2085,6 +2098,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
+@@ -2434,6 +2447,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
      },
      {
          .name = "pentium3",
@@ -767,7 +794,7 @@ index 6576287e5b..0ef2bf1b93 100644
          .level = 3,
          .vendor = CPUID_VENDOR_INTEL,
          .family = 6,
-@@ -2097,6 +2111,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
+@@ -2446,6 +2460,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
      },
      {
          .name = "athlon",
@@ -775,7 +802,7 @@ index 6576287e5b..0ef2bf1b93 100644
          .level = 2,
          .vendor = CPUID_VENDOR_AMD,
          .family = 6,
-@@ -2112,6 +2127,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
+@@ -2461,6 +2476,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
      },
      {
          .name = "n270",
@@ -783,7 +810,7 @@ index 6576287e5b..0ef2bf1b93 100644
          .level = 10,
          .vendor = CPUID_VENDOR_INTEL,
          .family = 6,
-@@ -2137,6 +2153,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
+@@ -2486,6 +2502,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
      },
      {
          .name = "Conroe",
@@ -791,7 +818,7 @@ index 6576287e5b..0ef2bf1b93 100644
          .level = 10,
          .vendor = CPUID_VENDOR_INTEL,
          .family = 6,
-@@ -2177,6 +2194,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
+@@ -2526,6 +2543,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
      },
      {
          .name = "Penryn",
@@ -799,7 +826,7 @@ index 6576287e5b..0ef2bf1b93 100644
          .level = 10,
          .vendor = CPUID_VENDOR_INTEL,
          .family = 6,
-@@ -3893,6 +3911,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
+@@ -4387,6 +4405,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
      },
      {
          .name = "Opteron_G1",
@@ -807,7 +834,7 @@ index 6576287e5b..0ef2bf1b93 100644
          .level = 5,
          .vendor = CPUID_VENDOR_AMD,
          .family = 15,
-@@ -3913,6 +3932,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
+@@ -4407,6 +4426,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
      },
      {
          .name = "Opteron_G2",
@@ -815,7 +842,7 @@ index 6576287e5b..0ef2bf1b93 100644
          .level = 5,
          .vendor = CPUID_VENDOR_AMD,
          .family = 15,
-@@ -3935,6 +3955,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
+@@ -4429,6 +4449,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
      },
      {
          .name = "Opteron_G3",
@@ -836,10 +863,10 @@ index 7237378a7d..7b8a3d5af0 100644
  };
  
 diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
-index de531842f6..8d82304609 100644
+index ebfaf3d24c..147f6c4587 100644
 --- a/target/i386/kvm/kvm.c
 +++ b/target/i386/kvm/kvm.c
-@@ -3822,6 +3822,7 @@ static int kvm_get_msrs(X86CPU *cpu)
+@@ -3826,6 +3826,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;
@@ -847,7 +874,7 @@ index de531842f6..8d82304609 100644
  
      kvm_msr_buf_reset(cpu);
  
-@@ -4177,6 +4178,9 @@ static int kvm_get_msrs(X86CPU *cpu)
+@@ -4181,6 +4182,9 @@ static int kvm_get_msrs(X86CPU *cpu)
              break;
          case MSR_KVM_ASYNC_PF_EN:
              env->async_pf_en_msr = msrs[i].data;
@@ -881,5 +908,5 @@ index 78f1cf8186..ac954c9b06 100644
      val = qtest_inb(qts, 0x505);
      g_assert_cmpuint(val, ==, 3);
 -- 
-2.39.1
+2.39.3
 
diff --git a/0011-Enable-make-check.patch b/0011-Enable-make-check.patch
index cc91302..c5851bd 100644
--- a/0011-Enable-make-check.patch
+++ b/0011-Enable-make-check.patch
@@ -1,4 +1,4 @@
-From 738db8353055eb6fd902513949c6659af8b401d0 Mon Sep 17 00:00:00 2001
+From 301a52cd6a94e98e69b8beac2810e76f1cc47073 Mon Sep 17 00:00:00 2001
 From: Miroslav Rezanina <mrezanin@redhat.com>
 Date: Wed, 2 Sep 2020 09:39:41 +0200
 Subject: Enable make check
@@ -24,40 +24,45 @@ Rebase changes (7.0.0):
 - Remove unnecessary changes in iotest 051
 - Remove changes in bios-tables-test.c and prom-env-test.c qtests
 
-Rebase changes (7.1.0 rc0):
+Rebase changes (7.1.0):
 - Disable bcm2835-dma-test (added upstream)
 
-Rebase changes (8.0.0-rc1):
+Rebase changes (8.0.0):
 - Removed chunks for disabling bios-table-test (protected upstream)
-
-Rebase change (8.0.0-rc2):
 - Disable new qemu-iotests execution
 - Revert change in tco qtest (blocking test run)
 
+Rebase changes (8.1.0):
+- Do not disable device-plug-test for s390x
+
 Merged patches (6.1.0):
 - 2f129df7d3 redhat: Enable the 'test-block-iothread' test again
 
-Merged patches (7.1.0 rc0):
+Merged patches (7.1.0):
 - 64d736640e RHEL-only: tests/avocado: Switch aarch64 tests from a53 to a57
+
+Merged patches (8.1.0):
+- f468163234 iotests: Use alternative CPU type that is not deprecated in RHEL
 ---
  .distro/qemu-kvm.spec.template      |  4 ++--
  tests/avocado/replay_kernel.py      |  2 +-
  tests/avocado/reverse_debugging.py  |  2 +-
  tests/avocado/tcg_plugins.py        |  6 ++---
  tests/qemu-iotests/meson.build      | 34 ++++++++++++++---------------
+ tests/qemu-iotests/testenv.py       |  3 +++
  tests/qtest/fuzz-e1000e-test.c      |  2 +-
  tests/qtest/fuzz-virtio-scsi-test.c |  2 +-
  tests/qtest/intel-hda-test.c        |  2 +-
  tests/qtest/libqos/meson.build      |  2 +-
  tests/qtest/lpc-ich9-test.c         |  2 +-
- tests/qtest/meson.build             |  2 --
+ tests/qtest/meson.build             |  1 -
  tests/qtest/tco-test.c              |  2 +-
  tests/qtest/usb-hcd-xhci-test.c     |  4 ++++
  tests/qtest/virtio-net-failover.c   |  1 +
- 14 files changed, 35 insertions(+), 32 deletions(-)
+ 15 files changed, 38 insertions(+), 31 deletions(-)
 
 diff --git a/tests/avocado/replay_kernel.py b/tests/avocado/replay_kernel.py
-index f13456e1ec..2fee270a42 100644
+index 79c607b0e7..c8827624f8 100644
 --- a/tests/avocado/replay_kernel.py
 +++ b/tests/avocado/replay_kernel.py
 @@ -147,7 +147,7 @@ def test_aarch64_virt(self):
@@ -114,7 +119,7 @@ index 642d2e49e3..93b3afd823 100644
          kernel_path = self._grab_aarch64_kernel()
          kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
 diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build
-index 9735071a29..32002335f4 100644
+index 44761e1e4d..f4b71900f3 100644
 --- a/tests/qemu-iotests/meson.build
 +++ b/tests/qemu-iotests/meson.build
 @@ -51,21 +51,21 @@ foreach format, speed: qemu_iotests_formats
@@ -156,6 +161,20 @@ index 9735071a29..32002335f4 100644
 +#           suite: suites)
 +#  endforeach
  endforeach
+diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py
+index 9a37ad9152..963514aab3 100644
+--- a/tests/qemu-iotests/testenv.py
++++ b/tests/qemu-iotests/testenv.py
+@@ -244,6 +244,9 @@ def __init__(self, source_dir: str, build_dir: str,
+             if self.qemu_prog.endswith(f'qemu-system-{suffix}'):
+                 self.qemu_options += f' -machine {machine}'
+ 
++        if self.qemu_prog.endswith('qemu-system-x86_64'):
++            self.qemu_options += ' -cpu Nehalem'
++
+         # QEMU_DEFAULT_MACHINE
+         self.qemu_default_machine = get_default_machine(self.qemu_prog)
+ 
 diff --git a/tests/qtest/fuzz-e1000e-test.c b/tests/qtest/fuzz-e1000e-test.c
 index 5052883fb6..b5286f4b12 100644
 --- a/tests/qtest/fuzz-e1000e-test.c
@@ -196,7 +215,7 @@ index d4a8db6fd6..1a796ec15a 100644
  
      qtest_outl(s, 0xcf8, 0x80000804);
 diff --git a/tests/qtest/libqos/meson.build b/tests/qtest/libqos/meson.build
-index cc209a8de5..42a7c529c9 100644
+index 90aae42a22..9bc4e41af0 100644
 --- a/tests/qtest/libqos/meson.build
 +++ b/tests/qtest/libqos/meson.build
 @@ -44,7 +44,7 @@ libqos_srcs = files(
@@ -206,8 +225,8 @@ index cc209a8de5..42a7c529c9 100644
 -        'virtio-iommu.c',
 +#        'virtio-iommu.c',
          'virtio-gpio.c',
+         'virtio-scmi.c',
          'generic-pcihost.c',
- 
 diff --git a/tests/qtest/lpc-ich9-test.c b/tests/qtest/lpc-ich9-test.c
 index 8ac95b89f7..cd2102555c 100644
 --- a/tests/qtest/lpc-ich9-test.c
@@ -222,10 +241,10 @@ index 8ac95b89f7..cd2102555c 100644
  
      qtest_outl(s, 0xcf8, 0x8000f840); /* PMBASE */
 diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
-index 85ea4e8d99..893afc8eeb 100644
+index b071d400b3..1c81155565 100644
 --- a/tests/qtest/meson.build
 +++ b/tests/qtest/meson.build
-@@ -94,7 +94,6 @@ qtests_i386 = \
+@@ -97,7 +97,6 @@ qtests_i386 = \
     'drive_del-test',
     'tco-test',
     'cpu-plug-test',
@@ -233,14 +252,6 @@ index 85ea4e8d99..893afc8eeb 100644
     'vmgenid-test',
     'migration-test',
     'test-x86-cpuid-compat',
-@@ -223,7 +222,6 @@ qtests_s390x = \
-   (config_host.has_key('CONFIG_POSIX') ? ['test-filter-redirector'] : []) +                     \
-   ['boot-serial-test',
-    'drive_del-test',
--   'device-plug-test',
-    'virtio-ccw-test',
-    'cpu-plug-test',
-    'migration-test']
 diff --git a/tests/qtest/tco-test.c b/tests/qtest/tco-test.c
 index 0547d41173..3756ce82d8 100644
 --- a/tests/qtest/tco-test.c
@@ -297,5 +308,5 @@ index 4a809590bf..1bf3fa641c 100644
      "-device pcie-root-port,id=root1,addr=0x2,bus=pcie.0,chassis=2 "
  
 -- 
-2.39.1
+2.39.3
 
diff --git a/0012-vfio-cap-number-of-devices-that-can-be-assigned.patch b/0012-vfio-cap-number-of-devices-that-can-be-assigned.patch
index 430959b..6428330 100644
--- a/0012-vfio-cap-number-of-devices-that-can-be-assigned.patch
+++ b/0012-vfio-cap-number-of-devices-that-can-be-assigned.patch
@@ -1,4 +1,4 @@
-From 34cb4f7ddd762ec46ed1a6a4261aebde39360ca4 Mon Sep 17 00:00:00 2001
+From 6e5c0cde105d9250a6c46c06e44c4066cb804bf4 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
@@ -32,7 +32,7 @@ Signed-off-by: Bandan Das <bsd@redhat.com>
  2 files changed, 29 insertions(+), 1 deletion(-)
 
 diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
-index ec9a854361..a779053be3 100644
+index a205c6b113..07ea78beed 100644
 --- a/hw/vfio/pci.c
 +++ b/hw/vfio/pci.c
 @@ -48,6 +48,9 @@
@@ -45,13 +45,15 @@ index ec9a854361..a779053be3 100644
  static void vfio_disable_interrupts(VFIOPCIDevice *vdev);
  static void vfio_mmap_set_enabled(VFIOPCIDevice *vdev, bool enabled);
  static void vfio_msi_disable_common(VFIOPCIDevice *vdev);
-@@ -2854,9 +2857,30 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
+@@ -2985,11 +2988,32 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
      ssize_t len;
      struct stat st;
      int groupid;
 -    int i, ret;
 +    int ret, i = 0;
      bool is_mdev;
+     char uuid[UUID_FMT_LEN];
+     char *name;
  
 +    if (device_limit && device_limit != vdev->assigned_device_limit) {
 +            error_setg(errp, "Assigned device limit has been redefined. "
@@ -77,7 +79,7 @@ index ec9a854361..a779053be3 100644
      if (!vbasedev->sysfsdev) {
          if (!(~vdev->host.domain || ~vdev->host.bus ||
                ~vdev->host.slot || ~vdev->host.function)) {
-@@ -3294,6 +3318,9 @@ static Property vfio_pci_dev_properties[] = {
+@@ -3443,6 +3467,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),
@@ -88,10 +90,10 @@ index ec9a854361..a779053be3 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 177abcc8fb..45235d38ba 100644
+index a2771b9ff3..a69af7bdde 100644
 --- a/hw/vfio/pci.h
 +++ b/hw/vfio/pci.h
-@@ -140,6 +140,7 @@ struct VFIOPCIDevice {
+@@ -141,6 +141,7 @@ struct VFIOPCIDevice {
      EventNotifier err_notifier;
      EventNotifier req_notifier;
      int (*resetfn)(struct VFIOPCIDevice *);
@@ -100,5 +102,5 @@ index 177abcc8fb..45235d38ba 100644
      uint32_t device_id;
      uint32_t sub_vendor_id;
 -- 
-2.39.1
+2.39.3
 
diff --git a/0013-Add-support-statement-to-help-output.patch b/0013-Add-support-statement-to-help-output.patch
index 25db0b8..c208e91 100644
--- a/0013-Add-support-statement-to-help-output.patch
+++ b/0013-Add-support-statement-to-help-output.patch
@@ -1,4 +1,4 @@
-From 8964a3e8835992442902d35b011a708787366d82 Mon Sep 17 00:00:00 2001
+From b6d7732d3fb071c96a86d8e98d8ef9f73932deaf 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
@@ -21,10 +21,10 @@ Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
  1 file changed, 9 insertions(+)
 
 diff --git a/softmmu/vl.c b/softmmu/vl.c
-index ea20b23e4c..ad4173138d 100644
+index b0b96f67fa..e24c74771b 100644
 --- a/softmmu/vl.c
 +++ b/softmmu/vl.c
-@@ -834,9 +834,17 @@ static void version(void)
+@@ -835,9 +835,17 @@ static void version(void)
             QEMU_COPYRIGHT "\n");
  }
  
@@ -42,7 +42,7 @@ index ea20b23e4c..ad4173138d 100644
      printf("usage: %s [options] [disk_image]\n\n"
             "'disk_image' is a raw hard disk image for IDE hard disk 0\n\n",
              g_get_prgname());
-@@ -862,6 +870,7 @@ static void help(int exitcode)
+@@ -863,6 +871,7 @@ static void help(int exitcode)
             "\n"
             QEMU_HELP_BOTTOM "\n");
  
@@ -51,5 +51,5 @@ index ea20b23e4c..ad4173138d 100644
  }
  
 -- 
-2.39.1
+2.39.3
 
diff --git a/0014-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch b/0014-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch
index b97c844..b0c9e13 100644
--- a/0014-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch
+++ b/0014-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch
@@ -1,4 +1,4 @@
-From 0b72d348fa0714de641ee242e5cee97df006e8fd Mon Sep 17 00:00:00 2001
+From 9f13719399c2b07b3fe8d691134363075ccd8a32 Mon Sep 17 00:00:00 2001
 From: Miroslav Rezanina <mrezanin@redhat.com>
 Date: Wed, 8 Jul 2020 08:35:50 +0200
 Subject: Use qemu-kvm in documentation instead of qemu-system-<arch>
@@ -36,10 +36,10 @@ index 52d6454b93..d74dbdeca9 100644
  .. |I2C| replace:: I\ :sup:`2`\ C
  .. |I2S| replace:: I\ :sup:`2`\ S
 diff --git a/qemu-options.hx b/qemu-options.hx
-index 59bdf67a2c..52b49f1f6a 100644
+index 29b98c3d4c..75a6396ed6 100644
 --- a/qemu-options.hx
 +++ b/qemu-options.hx
-@@ -3296,11 +3296,11 @@ SRST
+@@ -3370,11 +3370,11 @@ SRST
  
      ::
  
@@ -57,5 +57,5 @@ index 59bdf67a2c..52b49f1f6a 100644
  ``-netdev vhost-vdpa[,vhostdev=/path/to/dev][,vhostfd=h]``
      Establish a vhost-vdpa netdev.
 -- 
-2.39.1
+2.39.3
 
diff --git a/0015-qcow2-Deprecation-warning-when-opening-v2-images-rw.patch b/0015-qcow2-Deprecation-warning-when-opening-v2-images-rw.patch
index 1e2f8e1..1c8a6a7 100644
--- a/0015-qcow2-Deprecation-warning-when-opening-v2-images-rw.patch
+++ b/0015-qcow2-Deprecation-warning-when-opening-v2-images-rw.patch
@@ -1,4 +1,4 @@
-From bd6bcebfd783fa49e283d035d378fb5240423d84 Mon Sep 17 00:00:00 2001
+From 28f0f014754e68ca5e5e00ba0dfbb38e3f60e77b Mon Sep 17 00:00:00 2001
 From: Kevin Wolf <kwolf@redhat.com>
 Date: Fri, 20 Aug 2021 18:25:12 +0200
 Subject: qcow2: Deprecation warning when opening v2 images rw
@@ -44,10 +44,10 @@ Rebase notes (6.1.0):
  2 files changed, 7 insertions(+)
 
 diff --git a/block/qcow2.c b/block/qcow2.c
-index 30fd53fa64..22084730f9 100644
+index c51388e99d..3afcc6d326 100644
 --- a/block/qcow2.c
 +++ b/block/qcow2.c
-@@ -1337,6 +1337,12 @@ qcow2_do_open(BlockDriverState *bs, QDict *options, int flags,
+@@ -1357,6 +1357,12 @@ qcow2_do_open(BlockDriverState *bs, QDict *options, int flags,
          ret = -ENOTSUP;
          goto fail;
      }
@@ -61,7 +61,7 @@ index 30fd53fa64..22084730f9 100644
      s->qcow_version = header.version;
  
 diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
-index 6b32c7fbfa..6ddda2ee64 100644
+index fc3c64bcb8..4b238954d5 100644
 --- a/tests/qemu-iotests/common.filter
 +++ b/tests/qemu-iotests/common.filter
 @@ -83,6 +83,7 @@ _filter_qemu()
@@ -73,5 +73,5 @@ index 6b32c7fbfa..6ddda2ee64 100644
  }
  
 -- 
-2.39.1
+2.39.3
 
diff --git a/0016-qga-linux-add-usb-support-to-guest-get-fsinfo.patch b/0016-qga-linux-add-usb-support-to-guest-get-fsinfo.patch
deleted file mode 100644
index bb9455a..0000000
--- a/0016-qga-linux-add-usb-support-to-guest-get-fsinfo.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 78a42cf27aa519bb71214443ab570b40e156fa9c Mon Sep 17 00:00:00 2001
-From: Kfir Manor <kfir@daynix.com>
-Date: Sun, 22 Jan 2023 17:33:07 +0200
-Subject: qga/linux: add usb support to guest-get-fsinfo
-
-RH-Author: Kostiantyn Kostiuk <kkostiuk@redhat.com>
-RH-MergeRequest: 140: qga/linux: add usb support to guest-get-fsinfo
-RH-Bugzilla: 2149191
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: yvugenfi <None>
-RH-Commit: [1/1] bae929a2d0d0ad20e7308ede69c26499fc2119c7 (kostyanf14/redhat_centos-stream_src_qemu-kvm)
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2149191
-Upstream patch: https://patchew.org/QEMU/20230122153307.1050593-1-kfir@daynix.com/
-
-Signed-off-by: Kfir Manor <kfir@daynix.com>
-Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
-Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
-
-Patch-name: kvm-qga-linux-add-usb-support-to-guest-get-fsinfo.patch
-Patch-id: 72
-Patch-present-in-specfile: True
----
- qga/commands-posix.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/qga/commands-posix.c b/qga/commands-posix.c
-index 079689d79a..97754930c1 100644
---- a/qga/commands-posix.c
-+++ b/qga/commands-posix.c
-@@ -879,7 +879,9 @@ static bool build_guest_fsinfo_for_pci_dev(char const *syspath,
-                        g_str_equal(driver, "sym53c8xx") ||
-                        g_str_equal(driver, "virtio-pci") ||
-                        g_str_equal(driver, "ahci") ||
--                       g_str_equal(driver, "nvme"))) {
-+                       g_str_equal(driver, "nvme") ||
-+                       g_str_equal(driver, "xhci_hcd") ||
-+                       g_str_equal(driver, "ehci-pci"))) {
-             break;
-         }
- 
-@@ -976,6 +978,8 @@ static bool build_guest_fsinfo_for_pci_dev(char const *syspath,
-         }
-     } else if (strcmp(driver, "nvme") == 0) {
-         disk->bus_type = GUEST_DISK_BUS_TYPE_NVME;
-+    } else if (strcmp(driver, "ehci-pci") == 0 || strcmp(driver, "xhci_hcd") == 0) {
-+        disk->bus_type = GUEST_DISK_BUS_TYPE_USB;
-     } else {
-         g_debug("unknown driver '%s' (sysfs path '%s')", driver, syspath);
-         goto cleanup;
--- 
-2.39.1
-
diff --git a/kvm-vdpa-use-first-queue-SVQ-state-for-CVQ-default.patch b/0016-vdpa-use-first-queue-SVQ-state-for-CVQ-default.patch
similarity index 81%
rename from kvm-vdpa-use-first-queue-SVQ-state-for-CVQ-default.patch
rename to 0016-vdpa-use-first-queue-SVQ-state-for-CVQ-default.patch
index bfb1b8e..afacfe6 100644
--- a/kvm-vdpa-use-first-queue-SVQ-state-for-CVQ-default.patch
+++ b/0016-vdpa-use-first-queue-SVQ-state-for-CVQ-default.patch
@@ -1,7 +1,7 @@
-From 726662aee0bc295f6931b7aba1bd68f033e949aa Mon Sep 17 00:00:00 2001
+From 1b07788415a3d9729a3b11fc14d1d56ce5e6c888 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma@redhat.com>
 Date: Thu, 10 Aug 2023 16:08:18 +0200
-Subject: [PATCH 3/7] vdpa: use first queue SVQ state for CVQ default
+Subject: vdpa: use first queue SVQ state for CVQ default
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -24,15 +24,19 @@ shadowed already covers the previous case, let's just mimic it.
 
 Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
 Acked-by: Jason Wang <jasowang@redhat.com>
+
+Patch-name: kvm-vdpa-use-first-queue-SVQ-state-for-CVQ-default.patch
+Patch-id: 189
+Patch-present-in-specfile: True
 ---
  net/vhost-vdpa.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
-index ce17e4416a..29d3fd3ca6 100644
+index 9795306742..a772540250 100644
 --- a/net/vhost-vdpa.c
 +++ b/net/vhost-vdpa.c
-@@ -494,7 +494,7 @@ static int vhost_vdpa_net_cvq_start(NetClientState *nc)
+@@ -505,7 +505,7 @@ static int vhost_vdpa_net_cvq_start(NetClientState *nc)
  
      s0 = vhost_vdpa_net_first_nc_vdpa(s);
      v->shadow_data = s0->vhost_vdpa.shadow_vqs_enabled;
diff --git a/0017-Add-RHEL-9.2.0-compat-structure.patch b/0017-Add-RHEL-9.2.0-compat-structure.patch
deleted file mode 100644
index ce0ba5c..0000000
--- a/0017-Add-RHEL-9.2.0-compat-structure.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From bd5d81d2865c239ffea0fecf32476732149ad05c Mon Sep 17 00:00:00 2001
-From: Miroslav Rezanina <mrezanin@redhat.com>
-Date: Wed, 15 Feb 2023 02:03:17 -0500
-Subject: Add RHEL 9.2.0 compat structure
-
-Adding compatibility bits necessary to keep 9.2.0 machine
-types same after rebase to 8.0.
-
-Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
-
-Rebase notes (8.0.0 rc4):
-- Added migration.x-preempt-pre-7-2 compat)
----
- hw/arm/virt.c              |  1 +
- hw/core/machine.c          | 10 ++++++++++
- hw/i386/pc_piix.c          |  2 ++
- hw/i386/pc_q35.c           |  3 +++
- hw/s390x/s390-virtio-ccw.c |  1 +
- include/hw/boards.h        |  3 +++
- 6 files changed, 20 insertions(+)
-
-diff --git a/hw/arm/virt.c b/hw/arm/virt.c
-index 1ae1654be5..9be53e9355 100644
---- a/hw/arm/virt.c
-+++ b/hw/arm/virt.c
-@@ -3669,6 +3669,7 @@ type_init(rhel_machine_init);
- static void rhel920_virt_options(MachineClass *mc)
- {
-     compat_props_add(mc->compat_props, arm_rhel_compat, arm_rhel_compat_len);
-+    compat_props_add(mc->compat_props, hw_compat_rhel_9_2, hw_compat_rhel_9_2_len);
- }
- DEFINE_RHEL_MACHINE_AS_LATEST(9, 2, 0)
- 
-diff --git a/hw/core/machine.c b/hw/core/machine.c
-index 5aa567fad3..0e0120b7f2 100644
---- a/hw/core/machine.c
-+++ b/hw/core/machine.c
-@@ -52,6 +52,16 @@ const size_t hw_compat_7_2_len = G_N_ELEMENTS(hw_compat_7_2);
- const char *rhel_old_machine_deprecation =
-     "machine types for previous major releases are deprecated";
- 
-+GlobalProperty hw_compat_rhel_9_2[] = {
-+  /* hw_compat_rhel_9_2 from hw_compat_7_2 */
-+  { "e1000e", "migrate-timadj", "off" },
-+  /* hw_compat_rhel_9_2 from hw_compat_7_2 */
-+  { "virtio-mem", "x-early-migration", "false" },
-+  /* hw_compat_rhel_9_2 from hw_compat_7_2 */
-+  { "migration", "x-preempt-pre-7-2", "true" },
-+};
-+const size_t hw_compat_rhel_9_2_len = G_N_ELEMENTS(hw_compat_rhel_9_2);
-+
- /*
-  * Mostly the same as hw_compat_7_0
-  */
-diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
-index 3e330fd36f..90fb6e2e03 100644
---- a/hw/i386/pc_piix.c
-+++ b/hw/i386/pc_piix.c
-@@ -947,6 +947,8 @@ static void pc_machine_rhel760_options(MachineClass *m)
-     /* From pc_i440fx_5_1_machine_options() */
-     pcmc->pci_root_uid = 1;
-     pcmc->enforce_amd_1tb_hole = false;
-+    compat_props_add(m->compat_props, hw_compat_rhel_9_2,
-+                     hw_compat_rhel_9_2_len);
-     compat_props_add(m->compat_props, hw_compat_rhel_9_1,
-                      hw_compat_rhel_9_1_len);
-     compat_props_add(m->compat_props, hw_compat_rhel_9_0,
-diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
-index 98601bb76f..8945b69175 100644
---- a/hw/i386/pc_q35.c
-+++ b/hw/i386/pc_q35.c
-@@ -701,6 +701,9 @@ static void pc_q35_machine_rhel920_options(MachineClass *m)
-     m->desc = "RHEL-9.2.0 PC (Q35 + ICH9, 2009)";
-     pcmc->smbios_stream_product = "RHEL";
-     pcmc->smbios_stream_version = "9.2.0";
-+
-+    compat_props_add(m->compat_props, hw_compat_rhel_9_2,
-+                     hw_compat_rhel_9_2_len);
- }
- 
- DEFINE_PC_MACHINE(q35_rhel920, "pc-q35-rhel9.2.0", pc_q35_init_rhel920,
-diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
-index dcd3b966b0..6a0b93c63d 100644
---- a/hw/s390x/s390-virtio-ccw.c
-+++ b/hw/s390x/s390-virtio-ccw.c
-@@ -1211,6 +1211,7 @@ static void ccw_machine_rhel920_instance_options(MachineState *machine)
- 
- static void ccw_machine_rhel920_class_options(MachineClass *mc)
- {
-+    compat_props_add(mc->compat_props, hw_compat_rhel_9_2, hw_compat_rhel_9_2_len);
- }
- DEFINE_CCW_MACHINE(rhel920, "rhel9.2.0", true);
- 
-diff --git a/include/hw/boards.h b/include/hw/boards.h
-index 5e7446ee40..5f08bd7550 100644
---- a/include/hw/boards.h
-+++ b/include/hw/boards.h
-@@ -461,6 +461,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_9_2[];
-+extern const size_t hw_compat_rhel_9_2_len;
-+
- extern GlobalProperty hw_compat_rhel_9_1[];
- extern const size_t hw_compat_rhel_9_1_len;
- 
--- 
-2.39.1
-
diff --git a/kvm-vdpa-export-vhost_vdpa_set_vring_ready.patch b/0017-vdpa-export-vhost_vdpa_set_vring_ready.patch
similarity index 87%
rename from kvm-vdpa-export-vhost_vdpa_set_vring_ready.patch
rename to 0017-vdpa-export-vhost_vdpa_set_vring_ready.patch
index 1ab8f02..81ef985 100644
--- a/kvm-vdpa-export-vhost_vdpa_set_vring_ready.patch
+++ b/0017-vdpa-export-vhost_vdpa_set_vring_ready.patch
@@ -1,7 +1,7 @@
-From 636eb63cbf23b31fc9880528490ac4bef680305b Mon Sep 17 00:00:00 2001
+From 90235be168d252feb40376ea5a3cc67fcfe097af Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma@redhat.com>
 Date: Wed, 25 Jan 2023 08:47:34 +0100
-Subject: [PATCH 4/7] vdpa: export vhost_vdpa_set_vring_ready
+Subject: vdpa: export vhost_vdpa_set_vring_ready
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -25,6 +25,10 @@ the scope of this series.
 
 Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
 Acked-by: Jason Wang <jasowang@redhat.com>
+
+Patch-name: kvm-vdpa-export-vhost_vdpa_set_vring_ready.patch
+Patch-id: 190
+Patch-present-in-specfile: True
 ---
  hw/virtio/trace-events         |  2 +-
  hw/virtio/vhost-vdpa.c         | 25 +++++++++++++------------
@@ -32,12 +36,12 @@ Acked-by: Jason Wang <jasowang@redhat.com>
  3 files changed, 15 insertions(+), 13 deletions(-)
 
 diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events
-index 300dec8d3e..85b43cd8fe 100644
+index 7109cf1a3b..1cb9027d1e 100644
 --- a/hw/virtio/trace-events
 +++ b/hw/virtio/trace-events
 @@ -48,7 +48,7 @@ vhost_vdpa_set_features(void *dev, uint64_t features) "dev: %p features: 0x%"PRI
  vhost_vdpa_get_device_id(void *dev, uint32_t device_id) "dev: %p device_id %"PRIu32
- vhost_vdpa_reset_device(void *dev, uint8_t status) "dev: %p status: 0x%"PRIx8
+ vhost_vdpa_reset_device(void *dev) "dev: %p"
  vhost_vdpa_get_vq_index(void *dev, int idx, int vq_idx) "dev: %p idx: %d vq idx: %d"
 -vhost_vdpa_set_vring_ready(void *dev) "dev: %p"
 +vhost_vdpa_set_vring_ready(void *dev, unsigned i, int r) "dev: %p, idx: %u, r: %d"
@@ -45,10 +49,10 @@ index 300dec8d3e..85b43cd8fe 100644
  vhost_vdpa_set_config(void *dev, uint32_t offset, uint32_t size, uint32_t flags) "dev: %p offset: %"PRIu32" size: %"PRIu32" flags: 0x%"PRIx32
  vhost_vdpa_get_config(void *dev, void *config, uint32_t config_len) "dev: %p config: %p config_len: %"PRIu32
 diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
-index c04f14420d..e4d0101327 100644
+index 42f2a4bae9..0d9975b5b5 100644
 --- a/hw/virtio/vhost-vdpa.c
 +++ b/hw/virtio/vhost-vdpa.c
-@@ -733,18 +733,17 @@ static int vhost_vdpa_get_vq_index(struct vhost_dev *dev, int idx)
+@@ -876,18 +876,17 @@ static int vhost_vdpa_get_vq_index(struct vhost_dev *dev, int idx)
      return idx;
  }
  
@@ -77,7 +81,7 @@ index c04f14420d..e4d0101327 100644
  }
  
  static int vhost_vdpa_set_config_call(struct vhost_dev *dev,
-@@ -1155,7 +1154,9 @@ static int vhost_vdpa_dev_start(struct vhost_dev *dev, bool started)
+@@ -1298,7 +1297,9 @@ static int vhost_vdpa_dev_start(struct vhost_dev *dev, bool started)
          if (unlikely(!ok)) {
              return -1;
          }
@@ -89,10 +93,10 @@ index c04f14420d..e4d0101327 100644
          vhost_vdpa_suspend(dev);
          vhost_vdpa_svqs_stop(dev);
 diff --git a/include/hw/virtio/vhost-vdpa.h b/include/hw/virtio/vhost-vdpa.h
-index c278a2a8de..540642d304 100644
+index e64bfc7f98..5407d54fd7 100644
 --- a/include/hw/virtio/vhost-vdpa.h
 +++ b/include/hw/virtio/vhost-vdpa.h
-@@ -55,6 +55,7 @@ typedef struct vhost_vdpa {
+@@ -57,6 +57,7 @@ typedef struct vhost_vdpa {
  } VhostVDPA;
  
  int vhost_vdpa_get_iova_range(int fd, struct vhost_vdpa_iova_range *iova_range);
diff --git a/0018-redhat-hw-i386-pc-Update-x86-machine-type-compatibil.patch b/0018-redhat-hw-i386-pc-Update-x86-machine-type-compatibil.patch
deleted file mode 100644
index 81993e9..0000000
--- a/0018-redhat-hw-i386-pc-Update-x86-machine-type-compatibil.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From c6eaf73adda2e87fe91c9a3836f45dd58a553e06 Mon Sep 17 00:00:00 2001
-From: Thomas Huth <thuth@redhat.com>
-Date: Mon, 27 Mar 2023 15:14:03 +0200
-Subject: redhat: hw/i386/pc: Update x86 machine type compatibility for QEMU
- 8.0.0 update
-
-Add pc_rhel_9_2_compat based on upstream pc_compat_7_2.
-
-Signed-off-by: Thomas Huth <thuth@redhat.com>
----
- hw/i386/pc.c         | 6 ++++++
- hw/i386/pc_piix.c    | 2 ++
- hw/i386/pc_q35.c     | 2 ++
- include/hw/i386/pc.h | 3 +++
- 4 files changed, 13 insertions(+)
-
-diff --git a/hw/i386/pc.c b/hw/i386/pc.c
-index 8abb1f872e..f216922cee 100644
---- a/hw/i386/pc.c
-+++ b/hw/i386/pc.c
-@@ -429,6 +429,12 @@ GlobalProperty pc_rhel_compat[] = {
- };
- const size_t pc_rhel_compat_len = G_N_ELEMENTS(pc_rhel_compat);
- 
-+GlobalProperty pc_rhel_9_2_compat[] = {
-+    /* pc_rhel_9_2_compat from pc_compat_7_2 */
-+    { "ICH9-LPC", "noreboot", "true" },
-+};
-+const size_t pc_rhel_9_2_compat_len = G_N_ELEMENTS(pc_rhel_9_2_compat);
-+
- GlobalProperty pc_rhel_9_0_compat[] = {
-     /* pc_rhel_9_0_compat from pc_compat_6_2 */
-     { "virtio-mem", "unplugged-inaccessible", "off" },
-diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
-index 90fb6e2e03..fc704d783f 100644
---- a/hw/i386/pc_piix.c
-+++ b/hw/i386/pc_piix.c
-@@ -949,6 +949,8 @@ static void pc_machine_rhel760_options(MachineClass *m)
-     pcmc->enforce_amd_1tb_hole = false;
-     compat_props_add(m->compat_props, hw_compat_rhel_9_2,
-                      hw_compat_rhel_9_2_len);
-+    compat_props_add(m->compat_props, pc_rhel_9_2_compat,
-+                     pc_rhel_9_2_compat_len);
-     compat_props_add(m->compat_props, hw_compat_rhel_9_1,
-                      hw_compat_rhel_9_1_len);
-     compat_props_add(m->compat_props, hw_compat_rhel_9_0,
-diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
-index 8945b69175..e97655616a 100644
---- a/hw/i386/pc_q35.c
-+++ b/hw/i386/pc_q35.c
-@@ -704,6 +704,8 @@ static void pc_q35_machine_rhel920_options(MachineClass *m)
- 
-     compat_props_add(m->compat_props, hw_compat_rhel_9_2,
-                      hw_compat_rhel_9_2_len);
-+    compat_props_add(m->compat_props, pc_rhel_9_2_compat,
-+                     pc_rhel_9_2_compat_len);
- }
- 
- DEFINE_PC_MACHINE(q35_rhel920, "pc-q35-rhel9.2.0", pc_q35_init_rhel920,
-diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
-index 4376f64a47..d218ad1628 100644
---- a/include/hw/i386/pc.h
-+++ b/include/hw/i386/pc.h
-@@ -296,6 +296,9 @@ int pc_machine_kvm_type(MachineState *machine, const char *vm_type);
- extern GlobalProperty pc_rhel_compat[];
- extern const size_t pc_rhel_compat_len;
- 
-+extern GlobalProperty pc_rhel_9_2_compat[];
-+extern const size_t pc_rhel_9_2_compat_len;
-+
- extern GlobalProperty pc_rhel_9_0_compat[];
- extern const size_t pc_rhel_9_0_compat_len;
- 
--- 
-2.39.1
-
diff --git a/kvm-vdpa-rename-vhost_vdpa_net_load-to-vhost_vdpa_net_cv.patch b/0018-vdpa-rename-vhost_vdpa_net_load-to-vhost_vdpa_net_cv.patch
similarity index 75%
rename from kvm-vdpa-rename-vhost_vdpa_net_load-to-vhost_vdpa_net_cv.patch
rename to 0018-vdpa-rename-vhost_vdpa_net_load-to-vhost_vdpa_net_cv.patch
index 15dc410..5e6517b 100644
--- a/kvm-vdpa-rename-vhost_vdpa_net_load-to-vhost_vdpa_net_cv.patch
+++ b/0018-vdpa-rename-vhost_vdpa_net_load-to-vhost_vdpa_net_cv.patch
@@ -1,8 +1,7 @@
-From db7ca7692e264e8bf1bd9e08e3de7a92fc76a363 Mon Sep 17 00:00:00 2001
+From 772d982f7aa1101dcd873b2f7d800d9f841d3171 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma@redhat.com>
 Date: Wed, 9 Aug 2023 18:07:26 +0200
-Subject: [PATCH 5/7] vdpa: rename vhost_vdpa_net_load to
- vhost_vdpa_net_cvq_load
+Subject: vdpa: rename vhost_vdpa_net_load to vhost_vdpa_net_cvq_load
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -18,16 +17,20 @@ Next patches will add the corresponding data load.
 
 Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
 Acked-by: Jason Wang <jasowang@redhat.com>
+
+Patch-name: kvm-vdpa-rename-vhost_vdpa_net_load-to-vhost_vdpa_net_cv.patch
+Patch-id: 191
+Patch-present-in-specfile: True
 ---
  net/vhost-vdpa.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
-index 29d3fd3ca6..a1b16bbc52 100644
+index a772540250..9251351b4b 100644
 --- a/net/vhost-vdpa.c
 +++ b/net/vhost-vdpa.c
-@@ -673,7 +673,7 @@ static int vhost_vdpa_net_load_mq(VhostVDPAState *s,
-     return *s->status != VIRTIO_NET_OK;
+@@ -965,7 +965,7 @@ static int vhost_vdpa_net_load_rx(VhostVDPAState *s,
+     return 0;
  }
  
 -static int vhost_vdpa_net_load(NetClientState *nc)
@@ -35,7 +38,7 @@ index 29d3fd3ca6..a1b16bbc52 100644
  {
      VhostVDPAState *s = DO_UPCAST(VhostVDPAState, nc, nc);
      struct vhost_vdpa *v = &s->vhost_vdpa;
-@@ -704,7 +704,7 @@ static NetClientInfo net_vhost_vdpa_cvq_info = {
+@@ -1004,7 +1004,7 @@ static NetClientInfo net_vhost_vdpa_cvq_info = {
      .size = sizeof(VhostVDPAState),
      .receive = vhost_vdpa_receive,
      .start = vhost_vdpa_net_cvq_start,
diff --git a/0019-Disable-unwanted-new-devices.patch b/0019-Disable-unwanted-new-devices.patch
deleted file mode 100644
index f656ca9..0000000
--- a/0019-Disable-unwanted-new-devices.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 8173d2eabaf77312d36b00c618f6770948b80593 Mon Sep 17 00:00:00 2001
-From: Miroslav Rezanina <mrezanin@redhat.com>
-Date: Mon, 17 Apr 2023 01:24:18 -0400
-Subject: Disable unwanted new devices
-
-QEMU 8.0 adds two new device we do not want to support that can't
-be disabled using configure switch.
-
-1) ide-cf - virtual CompactFlash card
-
-2) i2c-echo - testing echo device
-
-Use manual disabling of the device by changing code (1) and meson configs (2).
-
-Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
----
- hw/ide/qdev.c       | 9 +++++++++
- hw/misc/meson.build | 3 ++-
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
-index 1b3b4da01d..454bfa5783 100644
---- a/hw/ide/qdev.c
-+++ b/hw/ide/qdev.c
-@@ -283,10 +283,13 @@ static void ide_cd_realize(IDEDevice *dev, Error **errp)
-     ide_dev_initfn(dev, IDE_CD, errp);
- }
- 
-+/* Disabled for Red Hat Enterprise Linux */
-+#if 0
- static void ide_cf_realize(IDEDevice *dev, Error **errp)
- {
-     ide_dev_initfn(dev, IDE_CFATA, errp);
- }
-+#endif
- 
- #define DEFINE_IDE_DEV_PROPERTIES()                     \
-     DEFINE_BLOCK_PROPERTIES(IDEDrive, dev.conf),        \
-@@ -346,6 +349,8 @@ static const TypeInfo ide_cd_info = {
-     .class_init    = ide_cd_class_init,
- };
- 
-+/* Disabled for Red Hat Enterprise Linux */
-+#if 0
- static Property ide_cf_properties[] = {
-     DEFINE_IDE_DEV_PROPERTIES(),
-     DEFINE_BLOCK_CHS_PROPERTIES(IDEDrive, dev.conf),
-@@ -371,6 +376,7 @@ static const TypeInfo ide_cf_info = {
-     .instance_size = sizeof(IDEDrive),
-     .class_init    = ide_cf_class_init,
- };
-+#endif
- 
- static void ide_device_class_init(ObjectClass *klass, void *data)
- {
-@@ -396,7 +402,10 @@ static void ide_register_types(void)
-     type_register_static(&ide_bus_info);
-     type_register_static(&ide_hd_info);
-     type_register_static(&ide_cd_info);
-+/* Disabled for Red Hat Enterprise Linux */
-+#if 0
-     type_register_static(&ide_cf_info);
-+#endif
-     type_register_static(&ide_device_type_info);
- }
- 
-diff --git a/hw/misc/meson.build b/hw/misc/meson.build
-index a40245ad44..9cc5a61ed7 100644
---- a/hw/misc/meson.build
-+++ b/hw/misc/meson.build
-@@ -128,7 +128,8 @@ softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_rng.c'))
- 
- softmmu_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_ahb_apb_pnp.c'))
- 
--softmmu_ss.add(when: 'CONFIG_I2C', if_true: files('i2c-echo.c'))
-+# Disabled for Red Hat Enterprise Linux
-+# softmmu_ss.add(when: 'CONFIG_I2C', if_true: files('i2c-echo.c'))
- 
- specific_ss.add(when: 'CONFIG_AVR_POWER', if_true: files('avr_power.c'))
- 
--- 
-2.39.1
-
diff --git a/kvm-vdpa-move-vhost_vdpa_set_vring_ready-to-the-caller.patch b/0019-vdpa-move-vhost_vdpa_set_vring_ready-to-the-caller.patch
similarity index 75%
rename from kvm-vdpa-move-vhost_vdpa_set_vring_ready-to-the-caller.patch
rename to 0019-vdpa-move-vhost_vdpa_set_vring_ready-to-the-caller.patch
index 4ebd8bd..a83fdb2 100644
--- a/kvm-vdpa-move-vhost_vdpa_set_vring_ready-to-the-caller.patch
+++ b/0019-vdpa-move-vhost_vdpa_set_vring_ready-to-the-caller.patch
@@ -1,7 +1,7 @@
-From 09bf0febef2512f00e71edca0fcbaf452652c2c7 Mon Sep 17 00:00:00 2001
+From aa519f65c777fd7dbb1236a4f4db73f90e51660c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma@redhat.com>
 Date: Thu, 10 Aug 2023 11:27:28 +0200
-Subject: [PATCH 6/7] vdpa: move vhost_vdpa_set_vring_ready to the caller
+Subject: vdpa: move vhost_vdpa_set_vring_ready to the caller
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -24,20 +24,19 @@ vhost_vdpa_net_data_load stub.
 
 Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
 ---
-v3:
-* Fix subject typo
-* Expand patch message so it explains why
+Rebase notes (8.1.0):
+- Moved additional upstream calls to conditional block
 ---
  hw/virtio/vdpa-dev.c   |  3 +++
  hw/virtio/vhost-vdpa.c |  3 ---
- net/vhost-vdpa.c       | 41 +++++++++++++++++++++++++++++++----------
- 3 files changed, 34 insertions(+), 13 deletions(-)
+ net/vhost-vdpa.c       | 57 +++++++++++++++++++++++++++++-------------
+ 3 files changed, 42 insertions(+), 21 deletions(-)
 
 diff --git a/hw/virtio/vdpa-dev.c b/hw/virtio/vdpa-dev.c
-index 01b41eb0f1..8c47d643bf 100644
+index 363b625243..f22d5d5bc0 100644
 --- a/hw/virtio/vdpa-dev.c
 +++ b/hw/virtio/vdpa-dev.c
-@@ -256,6 +256,9 @@ static int vhost_vdpa_device_start(VirtIODevice *vdev, Error **errp)
+@@ -255,6 +255,9 @@ static int vhost_vdpa_device_start(VirtIODevice *vdev, Error **errp)
          error_setg_errno(errp, -ret, "Error starting vhost");
          goto err_guest_notifiers;
      }
@@ -48,10 +47,10 @@ index 01b41eb0f1..8c47d643bf 100644
  
      /*
 diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
-index e4d0101327..0d9d311abd 100644
+index 0d9975b5b5..8ca2e3800c 100644
 --- a/hw/virtio/vhost-vdpa.c
 +++ b/hw/virtio/vhost-vdpa.c
-@@ -1154,9 +1154,6 @@ static int vhost_vdpa_dev_start(struct vhost_dev *dev, bool started)
+@@ -1297,9 +1297,6 @@ static int vhost_vdpa_dev_start(struct vhost_dev *dev, bool started)
          if (unlikely(!ok)) {
              return -1;
          }
@@ -62,10 +61,10 @@ index e4d0101327..0d9d311abd 100644
          vhost_vdpa_suspend(dev);
          vhost_vdpa_svqs_stop(dev);
 diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
-index a1b16bbc52..47b87bf80d 100644
+index 9251351b4b..3bf60f9431 100644
 --- a/net/vhost-vdpa.c
 +++ b/net/vhost-vdpa.c
-@@ -344,6 +344,22 @@ static int vhost_vdpa_net_data_start(NetClientState *nc)
+@@ -371,6 +371,22 @@ static int vhost_vdpa_net_data_start(NetClientState *nc)
      return 0;
  }
  
@@ -88,7 +87,7 @@ index a1b16bbc52..47b87bf80d 100644
  static void vhost_vdpa_net_client_stop(NetClientState *nc)
  {
      VhostVDPAState *s = DO_UPCAST(VhostVDPAState, nc, nc);
-@@ -366,6 +382,7 @@ static NetClientInfo net_vhost_vdpa_info = {
+@@ -393,6 +409,7 @@ static NetClientInfo net_vhost_vdpa_info = {
          .size = sizeof(VhostVDPAState),
          .receive = vhost_vdpa_receive,
          .start = vhost_vdpa_net_data_start,
@@ -96,7 +95,7 @@ index a1b16bbc52..47b87bf80d 100644
          .stop = vhost_vdpa_net_client_stop,
          .cleanup = vhost_vdpa_cleanup,
          .has_vnet_hdr = vhost_vdpa_has_vnet_hdr,
-@@ -682,18 +699,22 @@ static int vhost_vdpa_net_cvq_load(NetClientState *nc)
+@@ -974,26 +991,30 @@ static int vhost_vdpa_net_cvq_load(NetClientState *nc)
  
      assert(nc->info->type == NET_CLIENT_DRIVER_VHOST_VDPA);
  
@@ -109,6 +108,14 @@ index a1b16bbc52..47b87bf80d 100644
 -    r = vhost_vdpa_net_load_mac(s, n);
 -    if (unlikely(r < 0)) {
 -        return r;
+-    }
+-    r = vhost_vdpa_net_load_mq(s, n);
+-    if (unlikely(r)) {
+-        return r;
+-    }
+-    r = vhost_vdpa_net_load_offloads(s, n);
+-    if (unlikely(r)) {
+-        return r;
 +    if (v->shadow_vqs_enabled) {
 +        n = VIRTIO_NET(v->dev->vdev);
 +        r = vhost_vdpa_net_load_mac(s, n);
@@ -118,9 +125,17 @@ index a1b16bbc52..47b87bf80d 100644
 +        r = vhost_vdpa_net_load_mq(s, n);
 +        if (unlikely(r)) {
 +            return r;
++        }
++        r = vhost_vdpa_net_load_offloads(s, n);
++        if (unlikely(r)) {
++            return r;
++        }
++        r = vhost_vdpa_net_load_rx(s, n);
++        if (unlikely(r)) {
++            return r;
 +        }
      }
--    r = vhost_vdpa_net_load_mq(s, n);
+-    r = vhost_vdpa_net_load_rx(s, n);
 -    if (unlikely(r)) {
 -        return r;
 +
diff --git a/kvm-vdpa-remove-net-cvq-migration-blocker.patch b/0020-vdpa-remove-net-cvq-migration-blocker.patch
similarity index 82%
rename from kvm-vdpa-remove-net-cvq-migration-blocker.patch
rename to 0020-vdpa-remove-net-cvq-migration-blocker.patch
index 9388d75..b61d4af 100644
--- a/kvm-vdpa-remove-net-cvq-migration-blocker.patch
+++ b/0020-vdpa-remove-net-cvq-migration-blocker.patch
@@ -1,7 +1,7 @@
-From 46d5b861a39b7d0d3222162e6b7707526c131230 Mon Sep 17 00:00:00 2001
+From aab6b27d559afb03cac1e9f873a65abc540b04c8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma@redhat.com>
 Date: Fri, 24 Mar 2023 13:28:15 +0100
-Subject: [PATCH 7/7] vdpa: remove net cvq migration blocker
+Subject: vdpa: remove net cvq migration blocker
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -19,15 +19,19 @@ devices with CVQ.
 
 Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
 Acked-by: Jason Wang <jasowang@redhat.com>
+
+Patch-name: kvm-vdpa-remove-net-cvq-migration-blocker.patch
+Patch-id: 193
+Patch-present-in-specfile: True
 ---
  net/vhost-vdpa.c | 12 ------------
  1 file changed, 12 deletions(-)
 
 diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
-index 47b87bf80d..6e03db4afa 100644
+index 3bf60f9431..6bb56f7d94 100644
 --- a/net/vhost-vdpa.c
 +++ b/net/vhost-vdpa.c
-@@ -941,18 +941,6 @@ static NetClientState *net_vhost_vdpa_init(NetClientState *peer,
+@@ -1413,18 +1413,6 @@ static NetClientState *net_vhost_vdpa_init(NetClientState *peer,
          s->vhost_vdpa.shadow_vq_ops = &vhost_vdpa_net_svq_ops;
          s->vhost_vdpa.shadow_vq_ops_opaque = s;
          s->cvq_isolated = cvq_isolated;
diff --git a/0021-Add-machine-types-compat-bits.patch b/0021-Add-machine-types-compat-bits.patch
new file mode 100644
index 0000000..940b697
--- /dev/null
+++ b/0021-Add-machine-types-compat-bits.patch
@@ -0,0 +1,140 @@
+From 4ee284aca9a6fb151f85f266b375a8c1d9213a28 Mon Sep 17 00:00:00 2001
+From: Miroslav Rezanina <mrezanin@redhat.com>
+Date: Wed, 28 Jun 2023 01:40:03 -0400
+Subject: Add machine types compat bits.
+
+Adding upstream compat changes to rhel machine types.
+
+Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
+---
+ hw/arm/virt.c              | 1 +
+ hw/core/machine.c          | 8 ++++++++
+ hw/i386/pc.c               | 6 ++++++
+ hw/i386/pc_piix.c          | 4 ++++
+ hw/i386/pc_q35.c           | 4 ++++
+ hw/s390x/s390-virtio-ccw.c | 1 +
+ include/hw/boards.h        | 3 +++
+ include/hw/i386/pc.h       | 3 +++
+ 8 files changed, 30 insertions(+)
+
+diff --git a/hw/arm/virt.c b/hw/arm/virt.c
+index 3c36106eb5..c2283275b5 100644
+--- a/hw/arm/virt.c
++++ b/hw/arm/virt.c
+@@ -3616,6 +3616,7 @@ type_init(rhel_machine_init);
+ static void rhel920_virt_options(MachineClass *mc)
+ {
+     compat_props_add(mc->compat_props, arm_rhel_compat, arm_rhel_compat_len);
++    compat_props_add(mc->compat_props, hw_compat_rhel_9_3, hw_compat_rhel_9_3_len);
+     compat_props_add(mc->compat_props, hw_compat_rhel_9_2, hw_compat_rhel_9_2_len);
+ }
+ DEFINE_RHEL_MACHINE_AS_LATEST(9, 2, 0)
+diff --git a/hw/core/machine.c b/hw/core/machine.c
+index 2e54c7ae7c..8e23b9263d 100644
+--- a/hw/core/machine.c
++++ b/hw/core/machine.c
+@@ -59,6 +59,14 @@ const size_t hw_compat_7_2_len = G_N_ELEMENTS(hw_compat_7_2);
+ const char *rhel_old_machine_deprecation =
+     "machine types for previous major releases are deprecated";
+ 
++GlobalProperty hw_compat_rhel_9_3[] = {
++  /* hw_compat_rhel_9_3 from hw_compat_8_0 */
++  { "migration", "multifd-flush-after-each-section", "on"},
++  /* hw_compat_rhel_9_3 from hw_compat_8_0 */
++  { TYPE_PCI_DEVICE, "x-pcie-ari-nextfn-1", "on" },
++};
++const size_t hw_compat_rhel_9_3_len = G_N_ELEMENTS(hw_compat_rhel_9_3);
++
+ GlobalProperty hw_compat_rhel_9_2[] = {
+   /* hw_compat_rhel_9_2 from hw_compat_7_2 */
+   { "e1000e", "migrate-timadj", "off" },
+diff --git a/hw/i386/pc.c b/hw/i386/pc.c
+index 4be9a7db82..173815cc7e 100644
+--- a/hw/i386/pc.c
++++ b/hw/i386/pc.c
+@@ -432,6 +432,12 @@ GlobalProperty pc_rhel_compat[] = {
+ };
+ const size_t pc_rhel_compat_len = G_N_ELEMENTS(pc_rhel_compat);
+ 
++GlobalProperty pc_rhel_9_3_compat[] = {
++    /* pc_rhel_9_3_compat from pc_compat_8_0 */
++    { "virtio-mem", "unplugged-inaccessible", "auto" },
++};
++const size_t pc_rhel_9_3_compat_len = G_N_ELEMENTS(pc_rhel_9_3_compat);
++
+ GlobalProperty pc_rhel_9_2_compat[] = {
+     /* pc_rhel_9_2_compat from pc_compat_7_2 */
+     { "ICH9-LPC", "noreboot", "true" },
+diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
+index db7d8e26e1..014c017344 100644
+--- a/hw/i386/pc_piix.c
++++ b/hw/i386/pc_piix.c
+@@ -1015,6 +1015,10 @@ static void pc_machine_rhel760_options(MachineClass *m)
+     /* From pc_i440fx_5_1_machine_options() */
+     pcmc->pci_root_uid = 1;
+     pcmc->enforce_amd_1tb_hole = false;
++    compat_props_add(m->compat_props, hw_compat_rhel_9_3,
++		     hw_compat_rhel_9_3_len);
++    compat_props_add(m->compat_props, pc_rhel_9_3_compat,
++                     pc_rhel_9_3_compat_len);
+     compat_props_add(m->compat_props, hw_compat_rhel_9_2,
+                      hw_compat_rhel_9_2_len);
+     compat_props_add(m->compat_props, pc_rhel_9_2_compat,
+diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
+index e878bf4626..0b8adb0adb 100644
+--- a/hw/i386/pc_q35.c
++++ b/hw/i386/pc_q35.c
+@@ -722,6 +722,10 @@ static void pc_q35_machine_rhel920_options(MachineClass *m)
+     pcmc->smbios_stream_product = "RHEL";
+     pcmc->smbios_stream_version = "9.2.0";
+ 
++    compat_props_add(m->compat_props, hw_compat_rhel_9_3,
++                     hw_compat_rhel_9_3_len);
++     compat_props_add(m->compat_props, pc_rhel_9_3_compat,
++                     pc_rhel_9_3_compat_len);
+     compat_props_add(m->compat_props, hw_compat_rhel_9_2,
+                      hw_compat_rhel_9_2_len);
+     compat_props_add(m->compat_props, pc_rhel_9_2_compat,
+diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
+index 2a5dbd2728..4892db6d04 100644
+--- a/hw/s390x/s390-virtio-ccw.c
++++ b/hw/s390x/s390-virtio-ccw.c
+@@ -1225,6 +1225,7 @@ static void ccw_machine_rhel920_instance_options(MachineState *machine)
+ 
+ static void ccw_machine_rhel920_class_options(MachineClass *mc)
+ {
++    compat_props_add(mc->compat_props, hw_compat_rhel_9_3, hw_compat_rhel_9_3_len);
+     compat_props_add(mc->compat_props, hw_compat_rhel_9_2, hw_compat_rhel_9_2_len);
+ }
+ DEFINE_CCW_MACHINE(rhel920, "rhel9.2.0", true);
+diff --git a/include/hw/boards.h b/include/hw/boards.h
+index d9d1ae6dd1..60cc08865c 100644
+--- a/include/hw/boards.h
++++ b/include/hw/boards.h
+@@ -473,6 +473,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_9_3[];
++extern const size_t hw_compat_rhel_9_3_len;
++
+ extern GlobalProperty hw_compat_rhel_9_2[];
+ extern const size_t hw_compat_rhel_9_2_len;
+ 
+diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
+index 7b569fa254..eb6ff6b099 100644
+--- a/include/hw/i386/pc.h
++++ b/include/hw/i386/pc.h
+@@ -304,6 +304,9 @@ int pc_machine_kvm_type(MachineState *machine, const char *vm_type);
+ extern GlobalProperty pc_rhel_compat[];
+ extern const size_t pc_rhel_compat_len;
+ 
++extern GlobalProperty pc_rhel_9_3_compat[];
++extern const size_t pc_rhel_9_3_compat_len;
++
+ extern GlobalProperty pc_rhel_9_2_compat[];
+ extern const size_t pc_rhel_9_2_compat_len;
+ 
+-- 
+2.39.3
+
diff --git a/0022-Fix-x86-machine-type-compatibility-for-qemu-kvm-8.1..patch b/0022-Fix-x86-machine-type-compatibility-for-qemu-kvm-8.1..patch
new file mode 100644
index 0000000..7fe5c16
--- /dev/null
+++ b/0022-Fix-x86-machine-type-compatibility-for-qemu-kvm-8.1..patch
@@ -0,0 +1,61 @@
+From 719e2ac147c64d3caa1b86fb94a4182e9ff43f1b Mon Sep 17 00:00:00 2001
+From: Thomas Huth <thuth@redhat.com>
+Date: Tue, 22 Aug 2023 14:36:29 +0200
+Subject: Fix x86 machine type compatibility for qemu-kvm 8.1.0
+
+Jira: https://issues.redhat.com/browse/RHEL-874
+Upstream Status: RHEL-only
+
+Upstream changes pcmc->default_smbios_ep_type in the -8.0 machine
+type, so we should reflect this change in our -rhel9.2.0 machine
+types (and older).
+
+While we're at it, add a comment that the pcmc->enforce_amd_1tb_hole
+setting comes from pc_i440fx_7_0_machine_options() in pc_piix.c.
+
+Signed-off-by: Thomas Huth <thuth@redhat.com>
+---
+ hw/i386/pc_piix.c | 6 +++++-
+ hw/i386/pc_q35.c  | 5 ++++-
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
+index 014c017344..10a8d7576d 100644
+--- a/hw/i386/pc_piix.c
++++ b/hw/i386/pc_piix.c
+@@ -1014,9 +1014,13 @@ static void pc_machine_rhel760_options(MachineClass *m)
+     pcmc->kvmclock_create_always = false;
+     /* From pc_i440fx_5_1_machine_options() */
+     pcmc->pci_root_uid = 1;
++    /* From pc_i440fx_7_0_machine_options() */
+     pcmc->enforce_amd_1tb_hole = false;
++    /* From pc_i440fx_8_0_machine_options() */
++    pcmc->default_smbios_ep_type = SMBIOS_ENTRY_POINT_TYPE_32;
++
+     compat_props_add(m->compat_props, hw_compat_rhel_9_3,
+-		     hw_compat_rhel_9_3_len);
++                     hw_compat_rhel_9_3_len);
+     compat_props_add(m->compat_props, pc_rhel_9_3_compat,
+                      pc_rhel_9_3_compat_len);
+     compat_props_add(m->compat_props, hw_compat_rhel_9_2,
+diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
+index 0b8adb0adb..a205226381 100644
+--- a/hw/i386/pc_q35.c
++++ b/hw/i386/pc_q35.c
+@@ -722,9 +722,12 @@ static void pc_q35_machine_rhel920_options(MachineClass *m)
+     pcmc->smbios_stream_product = "RHEL";
+     pcmc->smbios_stream_version = "9.2.0";
+ 
++    /* From pc_q35_8_0_machine_options() */
++    pcmc->default_smbios_ep_type = SMBIOS_ENTRY_POINT_TYPE_32;
++
+     compat_props_add(m->compat_props, hw_compat_rhel_9_3,
+                      hw_compat_rhel_9_3_len);
+-     compat_props_add(m->compat_props, pc_rhel_9_3_compat,
++    compat_props_add(m->compat_props, pc_rhel_9_3_compat,
+                      pc_rhel_9_3_compat_len);
+     compat_props_add(m->compat_props, hw_compat_rhel_9_2,
+                      hw_compat_rhel_9_2_len);
+-- 
+2.39.3
+
diff --git a/README.tests b/README.tests
index 9932773..739e2c6 100644
--- a/README.tests
+++ b/README.tests
@@ -28,7 +28,7 @@ avocado_qemu tests:
 The avocado_qemu tests can be executed by running the following avocado command:
 avocado run -p qemu_bin=/usr/libexec/qemu-kvm /usr/lib64/qemu-kvm/tests/acceptance/
 Avocado needs to be installed separately using either pip or from source as
-Avocado is not being packaged for RHEL-8.
+Avocado is not being packaged for RHEL.
 
 qemu-iotests:
 symlinks to corresponding binaries need to be created for QEMU_PROG,
@@ -36,4 +36,4 @@ QEMU_IO_PROG, QEMU_IMG_PROG, and QEMU_NBD_PROG before the iotests can be
 executed.
 
 The primary purpose of this package is to make these tests available to be
-executed as gating tests for the virt module in the RHEL-8 OSCI environment.
+executed as gating tests for the qemu-kvm in the RHEL OSCI environment.
diff --git a/kvm-acpi-pcihp-allow-repeating-hot-unplug-requests.patch b/kvm-acpi-pcihp-allow-repeating-hot-unplug-requests.patch
deleted file mode 100644
index b937d27..0000000
--- a/kvm-acpi-pcihp-allow-repeating-hot-unplug-requests.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 61256a82ce78f40222455becb8850b5f5ebb5d72 Mon Sep 17 00:00:00 2001
-From: Igor Mammedov <imammedo@redhat.com>
-Date: Tue, 18 Apr 2023 11:04:49 +0200
-Subject: [PATCH 1/3] acpi: pcihp: allow repeating hot-unplug requests
-
-RH-Author: Igor Mammedov <imammedo@redhat.com>
-RH-MergeRequest: 159: acpi: pcihp: allow repeating hot-unplug requests
-RH-Bugzilla: 2087047
-RH-Acked-by: Ani Sinha <None>
-RH-Acked-by: Julia Suvorova <None>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: MST <mst@redhat.com>
-RH-Commit: [1/1] 9c597232466b27d91f127ee6004322d6ba69755f (imammedo/qemu-kvm-c-9-s-imam)
-
-with Q35 using ACPI PCI hotplug by default, user's request to unplug
-device is ignored when it's issued before guest OS has been booted.
-And any additional attempt to request device hot-unplug afterwards
-results in following error:
-
-  "Device XYZ is already in the process of unplug"
-
-arguably it can be considered as a regression introduced by [2],
-before which it was possible to issue unplug request multiple
-times.
-
-Accept new uplug requests after timeout (1ms). This brings ACPI PCI
-hotplug on par with native PCIe unplug behavior [1] and allows user
-to repeat unplug requests at propper times.
-Set expire timeout to arbitrary 1msec so user won't be able to
-flood guest with SCI interrupts by calling device_del in tight loop.
-
-PS:
-ACPI spec doesn't mandate what OSPM can do with GPEx.status
-bits set before it's booted => it's impl. depended.
-Status bits may be retained (I tested with one Windows version)
-or cleared (Linux since 2.6 kernel times) during guest's ACPI
-subsystem initialization.
-Clearing status bits (though not wrong per se) hides the unplug
-event from guest, and it's upto user to repeat device_del later
-when guest is able to handle unplug requests.
-
-1) 18416c62e3 ("pcie: expire pending delete")
-2)
-Fixes: cce8944cc9ef ("qdev-monitor: Forbid repeated device_del")
-Signed-off-by: Igor Mammedov <imammedo@redhat.com>
-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
-CC: mst@redhat.com
-CC: anisinha@redhat.com
-CC: jusual@redhat.com
-CC: kraxel@redhat.com
-Message-Id: <20230418090449.2155757-1-imammedo@redhat.com>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-Reviewed-by: Ani Sinha <anisinha@redhat.com>
-(cherry picked from commit 0f689cf5ada4d5df5ab95c7f7aa9fc221afa855d)
-Signed-off-by: Igor Mammedov <imammedo@redhat.com>
----
- hw/acpi/pcihp.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
-index dcfb779a7a..cdd6f775a1 100644
---- a/hw/acpi/pcihp.c
-+++ b/hw/acpi/pcihp.c
-@@ -357,6 +357,16 @@ void acpi_pcihp_device_unplug_request_cb(HotplugHandler *hotplug_dev,
-      * acpi_pcihp_eject_slot() when the operation is completed.
-      */
-     pdev->qdev.pending_deleted_event = true;
-+    /* if unplug was requested before OSPM is initialized,
-+     * linux kernel will clear GPE0.sts[] bits during boot, which effectively
-+     * hides unplug event. And than followup qmp_device_del() calls remain
-+     * blocked by above flag permanently.
-+     * Unblock qmp_device_del() by setting expire limit, so user can
-+     * repeat unplug request later when OSPM has been booted.
-+     */
-+    pdev->qdev.pending_deleted_expires_ms =
-+        qemu_clock_get_ms(QEMU_CLOCK_VIRTUAL); /* 1 msec */
-+
-     s->acpi_pcihp_pci_status[bsel].down |= (1U << slot);
-     acpi_send_event(DEVICE(hotplug_dev), ACPI_PCI_HOTPLUG_STATUS);
- }
--- 
-2.39.1
-
diff --git a/kvm-apic-disable-reentrancy-detection-for-apic-msi.patch b/kvm-apic-disable-reentrancy-detection-for-apic-msi.patch
deleted file mode 100644
index 69505f8..0000000
--- a/kvm-apic-disable-reentrancy-detection-for-apic-msi.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 5beea8b889a38aa59259679d7f1ba050f09eb0f0 Mon Sep 17 00:00:00 2001
-From: Jon Maloy <jmaloy@redhat.com>
-Date: Tue, 9 May 2023 10:29:03 -0400
-Subject: [PATCH 12/21] apic: disable reentrancy detection for apic-msi
-
-RH-Author: Jon Maloy <jmaloy@redhat.com>
-RH-MergeRequest: 165: memory: prevent dma-reentracy issues
-RH-Jira: RHEL-516
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [8/13] 329f3b1c02fc42d85c821dd14c70e6b885cf849a (jmaloy/jmaloy-qemu-kvm-2)
-
-Jira: https://issues.redhat.com/browse/RHEL-516
-Upstream: Merged
-CVE: CVE-2023-2680
-
-commit 50795ee051a342c681a9b45671c552fbd6274db8
-Author: Alexander Bulekov <alxndr@bu.edu>
-Date:   Thu Apr 27 17:10:13 2023 -0400
-
-    apic: disable reentrancy detection for apic-msi
-
-    As the code is designed for re-entrant calls to apic-msi, mark apic-msi
-    as reentrancy-safe.
-
-    Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
-    Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
-    Message-Id: <20230427211013.2994127-9-alxndr@bu.edu>
-    Signed-off-by: Thomas Huth <thuth@redhat.com>
-
-Signed-off-by: Jon Maloy <jmaloy@redhat.com>
----
- hw/intc/apic.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/hw/intc/apic.c b/hw/intc/apic.c
-index 20b5a94073..ac3d47d231 100644
---- a/hw/intc/apic.c
-+++ b/hw/intc/apic.c
-@@ -885,6 +885,13 @@ static void apic_realize(DeviceState *dev, Error **errp)
-     memory_region_init_io(&s->io_memory, OBJECT(s), &apic_io_ops, s, "apic-msi",
-                           APIC_SPACE_SIZE);
- 
-+    /*
-+     * apic-msi's apic_mem_write can call into ioapic_eoi_broadcast, which can
-+     * write back to apic-msi. As such mark the apic-msi region re-entrancy
-+     * safe.
-+     */
-+    s->io_memory.disable_reentrancy_guard = true;
-+
-     s->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, apic_timer, s);
-     local_apics[s->id] = s;
- 
--- 
-2.39.3
-
diff --git a/kvm-async-Add-an-optional-reentrancy-guard-to-the-BH-API.patch b/kvm-async-Add-an-optional-reentrancy-guard-to-the-BH-API.patch
deleted file mode 100644
index 65ba3be..0000000
--- a/kvm-async-Add-an-optional-reentrancy-guard-to-the-BH-API.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-From f6db359f543723e2eb840653d35004af357ea5ac Mon Sep 17 00:00:00 2001
-From: Jon Maloy <jmaloy@redhat.com>
-Date: Tue, 9 May 2023 10:29:03 -0400
-Subject: [PATCH 06/21] async: Add an optional reentrancy guard to the BH API
-
-RH-Author: Jon Maloy <jmaloy@redhat.com>
-RH-MergeRequest: 165: memory: prevent dma-reentracy issues
-RH-Jira: RHEL-516
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [2/13] 009a9a68c1c25b9ad0cd9bc0d73b3e07bee2a19d (jmaloy/jmaloy-qemu-kvm-2)
-
-Jira: https://issues.redhat.com/browse/RHEL-516
-Upstream: Merged
-CVE: CVE-2023-2680
-
-commit 9c86c97f12c060bf7484dd931f38634e166a81f0
-Author: Alexander Bulekov <alxndr@bu.edu>
-Date:   Thu Apr 27 17:10:07 2023 -0400
-
-    async: Add an optional reentrancy guard to the BH API
-
-    Devices can pass their MemoryReentrancyGuard (from their DeviceState),
-    when creating new BHes. Then, the async API will toggle the guard
-    before/after calling the BH call-back. This prevents bh->mmio reentrancy
-    issues.
-
-    Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
-    Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
-    Message-Id: <20230427211013.2994127-3-alxndr@bu.edu>
-    [thuth: Fix "line over 90 characters" checkpatch.pl error]
-    Signed-off-by: Thomas Huth <thuth@redhat.com>
-
-Signed-off-by: Jon Maloy <jmaloy@redhat.com>
----
- docs/devel/multiple-iothreads.txt |  7 +++++++
- include/block/aio.h               | 18 ++++++++++++++++--
- include/qemu/main-loop.h          |  7 +++++--
- tests/unit/ptimer-test-stubs.c    |  3 ++-
- util/async.c                      | 18 +++++++++++++++++-
- util/main-loop.c                  |  6 ++++--
- util/trace-events                 |  1 +
- 7 files changed, 52 insertions(+), 8 deletions(-)
-
-diff --git a/docs/devel/multiple-iothreads.txt b/docs/devel/multiple-iothreads.txt
-index 343120f2ef..a3e949f6b3 100644
---- a/docs/devel/multiple-iothreads.txt
-+++ b/docs/devel/multiple-iothreads.txt
-@@ -61,6 +61,7 @@ There are several old APIs that use the main loop AioContext:
-  * LEGACY qemu_aio_set_event_notifier() - monitor an event notifier
-  * LEGACY timer_new_ms() - create a timer
-  * LEGACY qemu_bh_new() - create a BH
-+ * LEGACY qemu_bh_new_guarded() - create a BH with a device re-entrancy guard
-  * LEGACY qemu_aio_wait() - run an event loop iteration
- 
- Since they implicitly work on the main loop they cannot be used in code that
-@@ -72,8 +73,14 @@ Instead, use the AioContext functions directly (see include/block/aio.h):
-  * aio_set_event_notifier() - monitor an event notifier
-  * aio_timer_new() - create a timer
-  * aio_bh_new() - create a BH
-+ * aio_bh_new_guarded() - create a BH with a device re-entrancy guard
-  * aio_poll() - run an event loop iteration
- 
-+The qemu_bh_new_guarded/aio_bh_new_guarded APIs accept a "MemReentrancyGuard"
-+argument, which is used to check for and prevent re-entrancy problems. For
-+BHs associated with devices, the reentrancy-guard is contained in the
-+corresponding DeviceState and named "mem_reentrancy_guard".
-+
- The AioContext can be obtained from the IOThread using
- iothread_get_aio_context() or for the main loop using qemu_get_aio_context().
- Code that takes an AioContext argument works both in IOThreads or the main
-diff --git a/include/block/aio.h b/include/block/aio.h
-index 543717f294..db6f23c619 100644
---- a/include/block/aio.h
-+++ b/include/block/aio.h
-@@ -23,6 +23,8 @@
- #include "qemu/thread.h"
- #include "qemu/timer.h"
- #include "block/graph-lock.h"
-+#include "hw/qdev-core.h"
-+
- 
- typedef struct BlockAIOCB BlockAIOCB;
- typedef void BlockCompletionFunc(void *opaque, int ret);
-@@ -331,9 +333,11 @@ void aio_bh_schedule_oneshot_full(AioContext *ctx, QEMUBHFunc *cb, void *opaque,
-  * is opaque and must be allocated prior to its use.
-  *
-  * @name: A human-readable identifier for debugging purposes.
-+ * @reentrancy_guard: A guard set when entering a cb to prevent
-+ * device-reentrancy issues
-  */
- QEMUBH *aio_bh_new_full(AioContext *ctx, QEMUBHFunc *cb, void *opaque,
--                        const char *name);
-+                        const char *name, MemReentrancyGuard *reentrancy_guard);
- 
- /**
-  * aio_bh_new: Allocate a new bottom half structure
-@@ -342,7 +346,17 @@ QEMUBH *aio_bh_new_full(AioContext *ctx, QEMUBHFunc *cb, void *opaque,
-  * string.
-  */
- #define aio_bh_new(ctx, cb, opaque) \
--    aio_bh_new_full((ctx), (cb), (opaque), (stringify(cb)))
-+    aio_bh_new_full((ctx), (cb), (opaque), (stringify(cb)), NULL)
-+
-+/**
-+ * aio_bh_new_guarded: Allocate a new bottom half structure with a
-+ * reentrancy_guard
-+ *
-+ * A convenience wrapper for aio_bh_new_full() that uses the cb as the name
-+ * string.
-+ */
-+#define aio_bh_new_guarded(ctx, cb, opaque, guard) \
-+    aio_bh_new_full((ctx), (cb), (opaque), (stringify(cb)), guard)
- 
- /**
-  * aio_notify: Force processing of pending events.
-diff --git a/include/qemu/main-loop.h b/include/qemu/main-loop.h
-index b3e54e00bc..68e70e61aa 100644
---- a/include/qemu/main-loop.h
-+++ b/include/qemu/main-loop.h
-@@ -387,9 +387,12 @@ void qemu_cond_timedwait_iothread(QemuCond *cond, int ms);
- 
- /* internal interfaces */
- 
-+#define qemu_bh_new_guarded(cb, opaque, guard) \
-+    qemu_bh_new_full((cb), (opaque), (stringify(cb)), guard)
- #define qemu_bh_new(cb, opaque) \
--    qemu_bh_new_full((cb), (opaque), (stringify(cb)))
--QEMUBH *qemu_bh_new_full(QEMUBHFunc *cb, void *opaque, const char *name);
-+    qemu_bh_new_full((cb), (opaque), (stringify(cb)), NULL)
-+QEMUBH *qemu_bh_new_full(QEMUBHFunc *cb, void *opaque, const char *name,
-+                         MemReentrancyGuard *reentrancy_guard);
- void qemu_bh_schedule_idle(QEMUBH *bh);
- 
- enum {
-diff --git a/tests/unit/ptimer-test-stubs.c b/tests/unit/ptimer-test-stubs.c
-index f2bfcede93..8c9407c560 100644
---- a/tests/unit/ptimer-test-stubs.c
-+++ b/tests/unit/ptimer-test-stubs.c
-@@ -107,7 +107,8 @@ int64_t qemu_clock_deadline_ns_all(QEMUClockType type, int attr_mask)
-     return deadline;
- }
- 
--QEMUBH *qemu_bh_new_full(QEMUBHFunc *cb, void *opaque, const char *name)
-+QEMUBH *qemu_bh_new_full(QEMUBHFunc *cb, void *opaque, const char *name,
-+                         MemReentrancyGuard *reentrancy_guard)
- {
-     QEMUBH *bh = g_new(QEMUBH, 1);
- 
-diff --git a/util/async.c b/util/async.c
-index 21016a1ac7..a9b528c370 100644
---- a/util/async.c
-+++ b/util/async.c
-@@ -65,6 +65,7 @@ struct QEMUBH {
-     void *opaque;
-     QSLIST_ENTRY(QEMUBH) next;
-     unsigned flags;
-+    MemReentrancyGuard *reentrancy_guard;
- };
- 
- /* Called concurrently from any thread */
-@@ -137,7 +138,7 @@ void aio_bh_schedule_oneshot_full(AioContext *ctx, QEMUBHFunc *cb,
- }
- 
- QEMUBH *aio_bh_new_full(AioContext *ctx, QEMUBHFunc *cb, void *opaque,
--                        const char *name)
-+                        const char *name, MemReentrancyGuard *reentrancy_guard)
- {
-     QEMUBH *bh;
-     bh = g_new(QEMUBH, 1);
-@@ -146,13 +147,28 @@ QEMUBH *aio_bh_new_full(AioContext *ctx, QEMUBHFunc *cb, void *opaque,
-         .cb = cb,
-         .opaque = opaque,
-         .name = name,
-+        .reentrancy_guard = reentrancy_guard,
-     };
-     return bh;
- }
- 
- void aio_bh_call(QEMUBH *bh)
- {
-+    bool last_engaged_in_io = false;
-+
-+    if (bh->reentrancy_guard) {
-+        last_engaged_in_io = bh->reentrancy_guard->engaged_in_io;
-+        if (bh->reentrancy_guard->engaged_in_io) {
-+            trace_reentrant_aio(bh->ctx, bh->name);
-+        }
-+        bh->reentrancy_guard->engaged_in_io = true;
-+    }
-+
-     bh->cb(bh->opaque);
-+
-+    if (bh->reentrancy_guard) {
-+        bh->reentrancy_guard->engaged_in_io = last_engaged_in_io;
-+    }
- }
- 
- /* Multiple occurrences of aio_bh_poll cannot be called concurrently. */
-diff --git a/util/main-loop.c b/util/main-loop.c
-index e180c85145..7022f02ef8 100644
---- a/util/main-loop.c
-+++ b/util/main-loop.c
-@@ -605,9 +605,11 @@ void main_loop_wait(int nonblocking)
- 
- /* Functions to operate on the main QEMU AioContext.  */
- 
--QEMUBH *qemu_bh_new_full(QEMUBHFunc *cb, void *opaque, const char *name)
-+QEMUBH *qemu_bh_new_full(QEMUBHFunc *cb, void *opaque, const char *name,
-+                         MemReentrancyGuard *reentrancy_guard)
- {
--    return aio_bh_new_full(qemu_aio_context, cb, opaque, name);
-+    return aio_bh_new_full(qemu_aio_context, cb, opaque, name,
-+                           reentrancy_guard);
- }
- 
- /*
-diff --git a/util/trace-events b/util/trace-events
-index 16f78d8fe5..3f7e766683 100644
---- a/util/trace-events
-+++ b/util/trace-events
-@@ -11,6 +11,7 @@ poll_remove(void *ctx, void *node, int fd) "ctx %p node %p fd %d"
- # async.c
- aio_co_schedule(void *ctx, void *co) "ctx %p co %p"
- aio_co_schedule_bh_cb(void *ctx, void *co) "ctx %p co %p"
-+reentrant_aio(void *ctx, const char *name) "ctx %p name %s"
- 
- # thread-pool.c
- thread_pool_submit(void *pool, void *req, void *opaque) "pool %p req %p opaque %p"
--- 
-2.39.3
-
diff --git a/kvm-async-avoid-use-after-free-on-re-entrancy-guard.patch b/kvm-async-avoid-use-after-free-on-re-entrancy-guard.patch
deleted file mode 100644
index df71fa2..0000000
--- a/kvm-async-avoid-use-after-free-on-re-entrancy-guard.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 137e84f68da06666ebf7f391766cc6209ce1c39c Mon Sep 17 00:00:00 2001
-From: Jon Maloy <jmaloy@redhat.com>
-Date: Tue, 9 May 2023 10:29:03 -0400
-Subject: [PATCH 13/21] async: avoid use-after-free on re-entrancy guard
-
-RH-Author: Jon Maloy <jmaloy@redhat.com>
-RH-MergeRequest: 165: memory: prevent dma-reentracy issues
-RH-Jira: RHEL-516
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [9/13] d4b957108aaacf4a597122aaeeaa8e56985f1fca (jmaloy/jmaloy-qemu-kvm-2)
-
-Jira: https://issues.redhat.com/browse/RHEL-516
-Upstream: Merged
-CVE: CVE-2023-2680
-
-commit 7915bd06f25e1803778081161bf6fa10c42dc7cd
-Author: Alexander Bulekov <alxndr@bu.edu>
-Date:   Mon May 1 10:19:56 2023 -0400
-
-    async: avoid use-after-free on re-entrancy guard
-
-    A BH callback can free the BH, causing a use-after-free in aio_bh_call.
-    Fix that by keeping a local copy of the re-entrancy guard pointer.
-
-    Buglink: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=58513
-    Fixes: 9c86c97f12 ("async: Add an optional reentrancy guard to the BH API")
-    Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
-    Message-Id: <20230501141956.3444868-1-alxndr@bu.edu>
-    Reviewed-by: Thomas Huth <thuth@redhat.com>
-    Signed-off-by: Thomas Huth <thuth@redhat.com>
-
-Signed-off-by: Jon Maloy <jmaloy@redhat.com>
----
- util/async.c | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/util/async.c b/util/async.c
-index a9b528c370..cd1a1815f9 100644
---- a/util/async.c
-+++ b/util/async.c
-@@ -156,18 +156,20 @@ void aio_bh_call(QEMUBH *bh)
- {
-     bool last_engaged_in_io = false;
- 
--    if (bh->reentrancy_guard) {
--        last_engaged_in_io = bh->reentrancy_guard->engaged_in_io;
--        if (bh->reentrancy_guard->engaged_in_io) {
-+    /* Make a copy of the guard-pointer as cb may free the bh */
-+    MemReentrancyGuard *reentrancy_guard = bh->reentrancy_guard;
-+    if (reentrancy_guard) {
-+        last_engaged_in_io = reentrancy_guard->engaged_in_io;
-+        if (reentrancy_guard->engaged_in_io) {
-             trace_reentrant_aio(bh->ctx, bh->name);
-         }
--        bh->reentrancy_guard->engaged_in_io = true;
-+        reentrancy_guard->engaged_in_io = true;
-     }
- 
-     bh->cb(bh->opaque);
- 
--    if (bh->reentrancy_guard) {
--        bh->reentrancy_guard->engaged_in_io = last_engaged_in_io;
-+    if (reentrancy_guard) {
-+        reentrancy_guard->engaged_in_io = last_engaged_in_io;
-     }
- }
- 
--- 
-2.39.3
-
diff --git a/kvm-bcm2835_property-disable-reentrancy-detection-for-io.patch b/kvm-bcm2835_property-disable-reentrancy-detection-for-io.patch
deleted file mode 100644
index 6d9abb8..0000000
--- a/kvm-bcm2835_property-disable-reentrancy-detection-for-io.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 40866640d15e6a8c9f6af7e437edc1ec1e17ba34 Mon Sep 17 00:00:00 2001
-From: Jon Maloy <jmaloy@redhat.com>
-Date: Tue, 9 May 2023 10:29:03 -0400
-Subject: [PATCH 10/21] bcm2835_property: disable reentrancy detection for
- iomem
-
-RH-Author: Jon Maloy <jmaloy@redhat.com>
-RH-MergeRequest: 165: memory: prevent dma-reentracy issues
-RH-Jira: RHEL-516
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [6/13] 128ebc85e228674af66553af82fba70eb87960e6 (jmaloy/jmaloy-qemu-kvm-2)
-
-Jira: https://issues.redhat.com/browse/RHEL-516
-Upstream: Merged
-CVE: CVE-2023-2680
-
-commit 985c4a4e547afb9573b6bd6843d20eb2c3d1d1cd
-Author: Alexander Bulekov <alxndr@bu.edu>
-Date:   Thu Apr 27 17:10:11 2023 -0400
-
-    bcm2835_property: disable reentrancy detection for iomem
-
-    As the code is designed for re-entrant calls from bcm2835_property to
-    bcm2835_mbox and back into bcm2835_property, mark iomem as
-    reentrancy-safe.
-
-    Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
-    Reviewed-by: Thomas Huth <thuth@redhat.com>
-    Message-Id: <20230427211013.2994127-7-alxndr@bu.edu>
-    Signed-off-by: Thomas Huth <thuth@redhat.com>
-
-Signed-off-by: Jon Maloy <jmaloy@redhat.com>
----
- hw/misc/bcm2835_property.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c
-index 890ae7bae5..de056ea2df 100644
---- a/hw/misc/bcm2835_property.c
-+++ b/hw/misc/bcm2835_property.c
-@@ -382,6 +382,13 @@ static void bcm2835_property_init(Object *obj)
- 
-     memory_region_init_io(&s->iomem, OBJECT(s), &bcm2835_property_ops, s,
-                           TYPE_BCM2835_PROPERTY, 0x10);
-+
-+    /*
-+     * bcm2835_property_ops call into bcm2835_mbox, which in-turn reads from
-+     * iomem. As such, mark iomem as re-entracy safe.
-+     */
-+    s->iomem.disable_reentrancy_guard = true;
-+
-     sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->iomem);
-     sysbus_init_irq(SYS_BUS_DEVICE(s), &s->mbox_irq);
- }
--- 
-2.39.3
-
diff --git a/kvm-block-Collapse-padded-I-O-vecs-exceeding-IOV_MAX.patch b/kvm-block-Collapse-padded-I-O-vecs-exceeding-IOV_MAX.patch
deleted file mode 100644
index 6de5d65..0000000
--- a/kvm-block-Collapse-padded-I-O-vecs-exceeding-IOV_MAX.patch
+++ /dev/null
@@ -1,354 +0,0 @@
-From ff05c0b0d3414c0e5b3903048280accdc6c75ca0 Mon Sep 17 00:00:00 2001
-From: Hanna Czenczek <hreitz@redhat.com>
-Date: Tue, 11 Apr 2023 19:34:16 +0200
-Subject: [PATCH 2/9] block: Collapse padded I/O vecs exceeding IOV_MAX
-
-RH-Author: Hanna Czenczek <hreitz@redhat.com>
-RH-MergeRequest: 189: block: Split padded I/O vectors exceeding IOV_MAX
-RH-Bugzilla: 2174676
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [2/5] 84c56bd16f841a18cf2baa918dfeab3240e3944d (hreitz/qemu-kvm-c-9-s)
-
-When processing vectored guest requests that are not aligned to the
-storage request alignment, we pad them by adding head and/or tail
-buffers for a read-modify-write cycle.
-
-The guest can submit I/O vectors up to IOV_MAX (1024) in length, but
-with this padding, the vector can exceed that limit.  As of
-4c002cef0e9abe7135d7916c51abce47f7fc1ee2 ("util/iov: make
-qemu_iovec_init_extended() honest"), we refuse to pad vectors beyond the
-limit, instead returning an error to the guest.
-
-To the guest, this appears as a random I/O error.  We should not return
-an I/O error to the guest when it issued a perfectly valid request.
-
-Before 4c002cef0e9abe7135d7916c51abce47f7fc1ee2, we just made the vector
-longer than IOV_MAX, which generally seems to work (because the guest
-assumes a smaller alignment than we really have, file-posix's
-raw_co_prw() will generally see bdrv_qiov_is_aligned() return false, and
-so emulate the request, so that the IOV_MAX does not matter).  However,
-that does not seem exactly great.
-
-I see two ways to fix this problem:
-1. We split such long requests into two requests.
-2. We join some elements of the vector into new buffers to make it
-   shorter.
-
-I am wary of (1), because it seems like it may have unintended side
-effects.
-
-(2) on the other hand seems relatively simple to implement, with
-hopefully few side effects, so this patch does that.
-
-To do this, the use of qemu_iovec_init_extended() in bdrv_pad_request()
-is effectively replaced by the new function bdrv_create_padded_qiov(),
-which not only wraps the request IOV with padding head/tail, but also
-ensures that the resulting vector will not have more than IOV_MAX
-elements.  Putting that functionality into qemu_iovec_init_extended() is
-infeasible because it requires allocating a bounce buffer; doing so
-would require many more parameters (buffer alignment, how to initialize
-the buffer, and out parameters like the buffer, its length, and the
-original elements), which is not reasonable.
-
-Conversely, it is not difficult to move qemu_iovec_init_extended()'s
-functionality into bdrv_create_padded_qiov() by using public
-qemu_iovec_* functions, so that is what this patch does.
-
-Because bdrv_pad_request() was the only "serious" user of
-qemu_iovec_init_extended(), the next patch will remove the latter
-function, so the functionality is not implemented twice.
-
-Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=2141964
-Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
-Message-Id: <20230411173418.19549-3-hreitz@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-(cherry picked from commit 18743311b829cafc1737a5f20bc3248d5f91ee2a)
-Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
----
- block/io.c | 166 ++++++++++++++++++++++++++++++++++++++++++++++++-----
- 1 file changed, 151 insertions(+), 15 deletions(-)
-
-diff --git a/block/io.c b/block/io.c
-index 2e267a85ab..4e8e90208b 100644
---- a/block/io.c
-+++ b/block/io.c
-@@ -1439,6 +1439,14 @@ out:
-  * @merge_reads is true for small requests,
-  * if @buf_len == @head + bytes + @tail. In this case it is possible that both
-  * head and tail exist but @buf_len == align and @tail_buf == @buf.
-+ *
-+ * @write is true for write requests, false for read requests.
-+ *
-+ * If padding makes the vector too long (exceeding IOV_MAX), then we need to
-+ * merge existing vector elements into a single one.  @collapse_bounce_buf acts
-+ * as the bounce buffer in such cases.  @pre_collapse_qiov has the pre-collapse
-+ * I/O vector elements so for read requests, the data can be copied back after
-+ * the read is done.
-  */
- typedef struct BdrvRequestPadding {
-     uint8_t *buf;
-@@ -1447,11 +1455,17 @@ typedef struct BdrvRequestPadding {
-     size_t head;
-     size_t tail;
-     bool merge_reads;
-+    bool write;
-     QEMUIOVector local_qiov;
-+
-+    uint8_t *collapse_bounce_buf;
-+    size_t collapse_len;
-+    QEMUIOVector pre_collapse_qiov;
- } BdrvRequestPadding;
- 
- static bool bdrv_init_padding(BlockDriverState *bs,
-                               int64_t offset, int64_t bytes,
-+                              bool write,
-                               BdrvRequestPadding *pad)
- {
-     int64_t align = bs->bl.request_alignment;
-@@ -1483,6 +1497,8 @@ static bool bdrv_init_padding(BlockDriverState *bs,
-         pad->tail_buf = pad->buf + pad->buf_len - align;
-     }
- 
-+    pad->write = write;
-+
-     return true;
- }
- 
-@@ -1547,8 +1563,23 @@ zero_mem:
-     return 0;
- }
- 
--static void bdrv_padding_destroy(BdrvRequestPadding *pad)
-+/**
-+ * Free *pad's associated buffers, and perform any necessary finalization steps.
-+ */
-+static void bdrv_padding_finalize(BdrvRequestPadding *pad)
- {
-+    if (pad->collapse_bounce_buf) {
-+        if (!pad->write) {
-+            /*
-+             * If padding required elements in the vector to be collapsed into a
-+             * bounce buffer, copy the bounce buffer content back
-+             */
-+            qemu_iovec_from_buf(&pad->pre_collapse_qiov, 0,
-+                                pad->collapse_bounce_buf, pad->collapse_len);
-+        }
-+        qemu_vfree(pad->collapse_bounce_buf);
-+        qemu_iovec_destroy(&pad->pre_collapse_qiov);
-+    }
-     if (pad->buf) {
-         qemu_vfree(pad->buf);
-         qemu_iovec_destroy(&pad->local_qiov);
-@@ -1556,6 +1587,101 @@ static void bdrv_padding_destroy(BdrvRequestPadding *pad)
-     memset(pad, 0, sizeof(*pad));
- }
- 
-+/*
-+ * Create pad->local_qiov by wrapping @iov in the padding head and tail, while
-+ * ensuring that the resulting vector will not exceed IOV_MAX elements.
-+ *
-+ * To ensure this, when necessary, the first two or three elements of @iov are
-+ * merged into pad->collapse_bounce_buf and replaced by a reference to that
-+ * bounce buffer in pad->local_qiov.
-+ *
-+ * After performing a read request, the data from the bounce buffer must be
-+ * copied back into pad->pre_collapse_qiov (e.g. by bdrv_padding_finalize()).
-+ */
-+static int bdrv_create_padded_qiov(BlockDriverState *bs,
-+                                   BdrvRequestPadding *pad,
-+                                   struct iovec *iov, int niov,
-+                                   size_t iov_offset, size_t bytes)
-+{
-+    int padded_niov, surplus_count, collapse_count;
-+
-+    /* Assert this invariant */
-+    assert(niov <= IOV_MAX);
-+
-+    /*
-+     * Cannot pad if resulting length would exceed SIZE_MAX.  Returning an error
-+     * to the guest is not ideal, but there is little else we can do.  At least
-+     * this will practically never happen on 64-bit systems.
-+     */
-+    if (SIZE_MAX - pad->head < bytes ||
-+        SIZE_MAX - pad->head - bytes < pad->tail)
-+    {
-+        return -EINVAL;
-+    }
-+
-+    /* Length of the resulting IOV if we just concatenated everything */
-+    padded_niov = !!pad->head + niov + !!pad->tail;
-+
-+    qemu_iovec_init(&pad->local_qiov, MIN(padded_niov, IOV_MAX));
-+
-+    if (pad->head) {
-+        qemu_iovec_add(&pad->local_qiov, pad->buf, pad->head);
-+    }
-+
-+    /*
-+     * If padded_niov > IOV_MAX, we cannot just concatenate everything.
-+     * Instead, merge the first two or three elements of @iov to reduce the
-+     * number of vector elements as necessary.
-+     */
-+    if (padded_niov > IOV_MAX) {
-+        /*
-+         * Only head and tail can have lead to the number of entries exceeding
-+         * IOV_MAX, so we can exceed it by the head and tail at most.  We need
-+         * to reduce the number of elements by `surplus_count`, so we merge that
-+         * many elements plus one into one element.
-+         */
-+        surplus_count = padded_niov - IOV_MAX;
-+        assert(surplus_count <= !!pad->head + !!pad->tail);
-+        collapse_count = surplus_count + 1;
-+
-+        /*
-+         * Move the elements to collapse into `pad->pre_collapse_qiov`, then
-+         * advance `iov` (and associated variables) by those elements.
-+         */
-+        qemu_iovec_init(&pad->pre_collapse_qiov, collapse_count);
-+        qemu_iovec_concat_iov(&pad->pre_collapse_qiov, iov,
-+                              collapse_count, iov_offset, SIZE_MAX);
-+        iov += collapse_count;
-+        iov_offset = 0;
-+        niov -= collapse_count;
-+        bytes -= pad->pre_collapse_qiov.size;
-+
-+        /*
-+         * Construct the bounce buffer to match the length of the to-collapse
-+         * vector elements, and for write requests, initialize it with the data
-+         * from those elements.  Then add it to `pad->local_qiov`.
-+         */
-+        pad->collapse_len = pad->pre_collapse_qiov.size;
-+        pad->collapse_bounce_buf = qemu_blockalign(bs, pad->collapse_len);
-+        if (pad->write) {
-+            qemu_iovec_to_buf(&pad->pre_collapse_qiov, 0,
-+                              pad->collapse_bounce_buf, pad->collapse_len);
-+        }
-+        qemu_iovec_add(&pad->local_qiov,
-+                       pad->collapse_bounce_buf, pad->collapse_len);
-+    }
-+
-+    qemu_iovec_concat_iov(&pad->local_qiov, iov, niov, iov_offset, bytes);
-+
-+    if (pad->tail) {
-+        qemu_iovec_add(&pad->local_qiov,
-+                       pad->buf + pad->buf_len - pad->tail, pad->tail);
-+    }
-+
-+    assert(pad->local_qiov.niov == MIN(padded_niov, IOV_MAX));
-+    return 0;
-+}
-+
- /*
-  * bdrv_pad_request
-  *
-@@ -1563,6 +1689,8 @@ static void bdrv_padding_destroy(BdrvRequestPadding *pad)
-  * read of padding, bdrv_padding_rmw_read() should be called separately if
-  * needed.
-  *
-+ * @write is true for write requests, false for read requests.
-+ *
-  * Request parameters (@qiov, &qiov_offset, &offset, &bytes) are in-out:
-  *  - on function start they represent original request
-  *  - on failure or when padding is not needed they are unchanged
-@@ -1571,26 +1699,34 @@ static void bdrv_padding_destroy(BdrvRequestPadding *pad)
- static int bdrv_pad_request(BlockDriverState *bs,
-                             QEMUIOVector **qiov, size_t *qiov_offset,
-                             int64_t *offset, int64_t *bytes,
-+                            bool write,
-                             BdrvRequestPadding *pad, bool *padded,
-                             BdrvRequestFlags *flags)
- {
-     int ret;
-+    struct iovec *sliced_iov;
-+    int sliced_niov;
-+    size_t sliced_head, sliced_tail;
- 
-     bdrv_check_qiov_request(*offset, *bytes, *qiov, *qiov_offset, &error_abort);
- 
--    if (!bdrv_init_padding(bs, *offset, *bytes, pad)) {
-+    if (!bdrv_init_padding(bs, *offset, *bytes, write, pad)) {
-         if (padded) {
-             *padded = false;
-         }
-         return 0;
-     }
- 
--    ret = qemu_iovec_init_extended(&pad->local_qiov, pad->buf, pad->head,
--                                   *qiov, *qiov_offset, *bytes,
--                                   pad->buf + pad->buf_len - pad->tail,
--                                   pad->tail);
-+    sliced_iov = qemu_iovec_slice(*qiov, *qiov_offset, *bytes,
-+                                  &sliced_head, &sliced_tail,
-+                                  &sliced_niov);
-+
-+    /* Guaranteed by bdrv_check_qiov_request() */
-+    assert(*bytes <= SIZE_MAX);
-+    ret = bdrv_create_padded_qiov(bs, pad, sliced_iov, sliced_niov,
-+                                  sliced_head, *bytes);
-     if (ret < 0) {
--        bdrv_padding_destroy(pad);
-+        bdrv_padding_finalize(pad);
-         return ret;
-     }
-     *bytes += pad->head + pad->tail;
-@@ -1657,8 +1793,8 @@ int coroutine_fn bdrv_co_preadv_part(BdrvChild *child,
-         flags |= BDRV_REQ_COPY_ON_READ;
-     }
- 
--    ret = bdrv_pad_request(bs, &qiov, &qiov_offset, &offset, &bytes, &pad,
--                           NULL, &flags);
-+    ret = bdrv_pad_request(bs, &qiov, &qiov_offset, &offset, &bytes, false,
-+                           &pad, NULL, &flags);
-     if (ret < 0) {
-         goto fail;
-     }
-@@ -1668,7 +1804,7 @@ int coroutine_fn bdrv_co_preadv_part(BdrvChild *child,
-                               bs->bl.request_alignment,
-                               qiov, qiov_offset, flags);
-     tracked_request_end(&req);
--    bdrv_padding_destroy(&pad);
-+    bdrv_padding_finalize(&pad);
- 
- fail:
-     bdrv_dec_in_flight(bs);
-@@ -2000,7 +2136,7 @@ bdrv_co_do_zero_pwritev(BdrvChild *child, int64_t offset, int64_t bytes,
-     /* This flag doesn't make sense for padding or zero writes */
-     flags &= ~BDRV_REQ_REGISTERED_BUF;
- 
--    padding = bdrv_init_padding(bs, offset, bytes, &pad);
-+    padding = bdrv_init_padding(bs, offset, bytes, true, &pad);
-     if (padding) {
-         assert(!(flags & BDRV_REQ_NO_WAIT));
-         bdrv_make_request_serialising(req, align);
-@@ -2048,7 +2184,7 @@ bdrv_co_do_zero_pwritev(BdrvChild *child, int64_t offset, int64_t bytes,
-     }
- 
- out:
--    bdrv_padding_destroy(&pad);
-+    bdrv_padding_finalize(&pad);
- 
-     return ret;
- }
-@@ -2116,8 +2252,8 @@ int coroutine_fn bdrv_co_pwritev_part(BdrvChild *child,
-          * bdrv_co_do_zero_pwritev() does aligning by itself, so, we do
-          * alignment only if there is no ZERO flag.
-          */
--        ret = bdrv_pad_request(bs, &qiov, &qiov_offset, &offset, &bytes, &pad,
--                               &padded, &flags);
-+        ret = bdrv_pad_request(bs, &qiov, &qiov_offset, &offset, &bytes, true,
-+                               &pad, &padded, &flags);
-         if (ret < 0) {
-             return ret;
-         }
-@@ -2147,7 +2283,7 @@ int coroutine_fn bdrv_co_pwritev_part(BdrvChild *child,
-     ret = bdrv_aligned_pwritev(child, &req, offset, bytes, align,
-                                qiov, qiov_offset, flags);
- 
--    bdrv_padding_destroy(&pad);
-+    bdrv_padding_finalize(&pad);
- 
- out:
-     tracked_request_end(&req);
--- 
-2.39.3
-
diff --git a/kvm-block-Don-t-call-no_coroutine_fns-in-qmp_block_resiz.patch b/kvm-block-Don-t-call-no_coroutine_fns-in-qmp_block_resiz.patch
deleted file mode 100644
index fbab82d..0000000
--- a/kvm-block-Don-t-call-no_coroutine_fns-in-qmp_block_resiz.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From dfa2811e88afaf996345552330e97f0513c1803c Mon Sep 17 00:00:00 2001
-From: Kevin Wolf <kwolf@redhat.com>
-Date: Thu, 4 May 2023 13:57:34 +0200
-Subject: [PATCH 53/56] block: Don't call no_coroutine_fns in
- qmp_block_resize()
-
-RH-Author: Kevin Wolf <kwolf@redhat.com>
-RH-MergeRequest: 164: block: Fix hangs in qmp_block_resize()
-RH-Bugzilla: 2185688
-RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-Acked-by: Hanna Czenczek <hreitz@redhat.com>
-RH-Acked-by: Eric Blake <eblake@redhat.com>
-RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
-RH-Commit: [2/4] 7ac7e34821cfc8bd5f0daadd7a1c4a5596bc60a6 (kmwolf/centos-qemu-kvm)
-
-This QMP handler runs in a coroutine, so it must use the corresponding
-no_co_wrappers instead.
-
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2185688
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Message-Id: <20230504115750.54437-5-kwolf@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-(cherry picked from commit 0c7d204f50c382c6baac8c94bd57af4a022b3888)
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- blockdev.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/blockdev.c b/blockdev.c
-index d7b5c18f0a..eb509cf964 100644
---- a/blockdev.c
-+++ b/blockdev.c
-@@ -2430,7 +2430,7 @@ void coroutine_fn qmp_block_resize(const char *device, const char *node_name,
-         return;
-     }
- 
--    blk = blk_new_with_bs(bs, BLK_PERM_RESIZE, BLK_PERM_ALL, errp);
-+    blk = blk_co_new_with_bs(bs, BLK_PERM_RESIZE, BLK_PERM_ALL, errp);
-     if (!blk) {
-         return;
-     }
-@@ -2445,7 +2445,7 @@ void coroutine_fn qmp_block_resize(const char *device, const char *node_name,
- 
-     bdrv_co_lock(bs);
-     bdrv_drained_end(bs);
--    blk_unref(blk);
-+    blk_co_unref(blk);
-     bdrv_co_unlock(bs);
- }
- 
--- 
-2.39.1
-
diff --git a/kvm-block-Fix-pad_request-s-request-restriction.patch b/kvm-block-Fix-pad_request-s-request-restriction.patch
deleted file mode 100644
index c0ab8c2..0000000
--- a/kvm-block-Fix-pad_request-s-request-restriction.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 547f6bf93734f7c13675eebb93273ef2273f7c31 Mon Sep 17 00:00:00 2001
-From: Hanna Czenczek <hreitz@redhat.com>
-Date: Fri, 14 Jul 2023 10:59:38 +0200
-Subject: [PATCH 5/9] block: Fix pad_request's request restriction
-
-RH-Author: Hanna Czenczek <hreitz@redhat.com>
-RH-MergeRequest: 189: block: Split padded I/O vectors exceeding IOV_MAX
-RH-Bugzilla: 2174676
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [5/5] e8abc0485f6e0608a1ec55143ff40a14d273dfc8 (hreitz/qemu-kvm-c-9-s)
-
-bdrv_pad_request() relies on requests' lengths not to exceed SIZE_MAX,
-which bdrv_check_qiov_request() does not guarantee.
-
-bdrv_check_request32() however will guarantee this, and both of
-bdrv_pad_request()'s callers (bdrv_co_preadv_part() and
-bdrv_co_pwritev_part()) already run it before calling
-bdrv_pad_request().  Therefore, bdrv_pad_request() can safely call
-bdrv_check_request32() without expecting error, too.
-
-In effect, this patch will not change guest-visible behavior.  It is a
-clean-up to tighten a condition to match what is guaranteed by our
-callers, and which exists purely to show clearly why the subsequent
-assertion (`assert(*bytes <= SIZE_MAX)`) is always true.
-
-Note there is a difference between the interfaces of
-bdrv_check_qiov_request() and bdrv_check_request32(): The former takes
-an errp, the latter does not, so we can no longer just pass
-&error_abort.  Instead, we need to check the returned value.  While we
-do expect success (because the callers have already run this function),
-an assert(ret == 0) is not much simpler than just to return an error if
-it occurs, so let us handle errors by returning them up the stack now.
-
-Reported-by: Peter Maydell <peter.maydell@linaro.org>
-Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
-Message-id: 20230714085938.202730-1-hreitz@redhat.com
-Fixes: 18743311b829cafc1737a5f20bc3248d5f91ee2a
-       ("block: Collapse padded I/O vecs exceeding IOV_MAX")
-Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- block/io.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/block/io.c b/block/io.c
-index 4e8e90208b..807c9fb720 100644
---- a/block/io.c
-+++ b/block/io.c
-@@ -1708,7 +1708,11 @@ static int bdrv_pad_request(BlockDriverState *bs,
-     int sliced_niov;
-     size_t sliced_head, sliced_tail;
- 
--    bdrv_check_qiov_request(*offset, *bytes, *qiov, *qiov_offset, &error_abort);
-+    /* Should have been checked by the caller already */
-+    ret = bdrv_check_request32(*offset, *bytes, *qiov, *qiov_offset);
-+    if (ret < 0) {
-+        return ret;
-+    }
- 
-     if (!bdrv_init_padding(bs, *offset, *bytes, write, pad)) {
-         if (padded) {
-@@ -1721,7 +1725,7 @@ static int bdrv_pad_request(BlockDriverState *bs,
-                                   &sliced_head, &sliced_tail,
-                                   &sliced_niov);
- 
--    /* Guaranteed by bdrv_check_qiov_request() */
-+    /* Guaranteed by bdrv_check_request32() */
-     assert(*bytes <= SIZE_MAX);
-     ret = bdrv_create_padded_qiov(bs, pad, sliced_iov, sliced_niov,
-                                   sliced_head, *bytes);
--- 
-2.39.3
-
diff --git a/kvm-block-bdrv-blk_co_unref-for-calls-in-coroutine-conte.patch b/kvm-block-bdrv-blk_co_unref-for-calls-in-coroutine-conte.patch
deleted file mode 100644
index 0f0347b..0000000
--- a/kvm-block-bdrv-blk_co_unref-for-calls-in-coroutine-conte.patch
+++ /dev/null
@@ -1,386 +0,0 @@
-From 7baea25be90e184175dd5a919ee5878cbd4970c2 Mon Sep 17 00:00:00 2001
-From: Kevin Wolf <kwolf@redhat.com>
-Date: Thu, 4 May 2023 13:57:33 +0200
-Subject: [PATCH 52/56] block: bdrv/blk_co_unref() for calls in coroutine
- context
-
-RH-Author: Kevin Wolf <kwolf@redhat.com>
-RH-MergeRequest: 164: block: Fix hangs in qmp_block_resize()
-RH-Bugzilla: 2185688
-RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-Acked-by: Hanna Czenczek <hreitz@redhat.com>
-RH-Acked-by: Eric Blake <eblake@redhat.com>
-RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
-RH-Commit: [1/4] 8ebf8486b082c30ca1b39a6ede35e471eaaccfa3 (kmwolf/centos-qemu-kvm)
-
-These functions must not be called in coroutine context, because they
-need write access to the graph.
-
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Message-Id: <20230504115750.54437-4-kwolf@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-(cherry picked from commit b2ab5f545fa1eaaf2955dd617bee19a8b3279786)
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block.c                                     |  2 +-
- block/crypto.c                              |  6 +++---
- block/parallels.c                           |  6 +++---
- block/qcow.c                                |  6 +++---
- block/qcow2.c                               | 14 +++++++-------
- block/qed.c                                 |  6 +++---
- block/vdi.c                                 |  6 +++---
- block/vhdx.c                                |  6 +++---
- block/vmdk.c                                | 18 +++++++++---------
- block/vpc.c                                 |  6 +++---
- include/block/block-global-state.h          |  3 ++-
- include/sysemu/block-backend-global-state.h |  5 ++++-
- 12 files changed, 44 insertions(+), 40 deletions(-)
-
-diff --git a/block.c b/block.c
-index d79a52ca74..a48112f945 100644
---- a/block.c
-+++ b/block.c
-@@ -680,7 +680,7 @@ int coroutine_fn bdrv_co_create_opts_simple(BlockDriver *drv,
- 
-     ret = 0;
- out:
--    blk_unref(blk);
-+    blk_co_unref(blk);
-     return ret;
- }
- 
-diff --git a/block/crypto.c b/block/crypto.c
-index ca67289187..8fd3ad0054 100644
---- a/block/crypto.c
-+++ b/block/crypto.c
-@@ -355,7 +355,7 @@ block_crypto_co_create_generic(BlockDriverState *bs, int64_t size,
-     ret = 0;
-  cleanup:
-     qcrypto_block_free(crypto);
--    blk_unref(blk);
-+    blk_co_unref(blk);
-     return ret;
- }
- 
-@@ -661,7 +661,7 @@ block_crypto_co_create_luks(BlockdevCreateOptions *create_options, Error **errp)
- 
-     ret = 0;
- fail:
--    bdrv_unref(bs);
-+    bdrv_co_unref(bs);
-     return ret;
- }
- 
-@@ -730,7 +730,7 @@ fail:
-         bdrv_co_delete_file_noerr(bs);
-     }
- 
--    bdrv_unref(bs);
-+    bdrv_co_unref(bs);
-     qapi_free_QCryptoBlockCreateOptions(create_opts);
-     qobject_unref(cryptoopts);
-     return ret;
-diff --git a/block/parallels.c b/block/parallels.c
-index 013684801a..b49c35929e 100644
---- a/block/parallels.c
-+++ b/block/parallels.c
-@@ -613,8 +613,8 @@ static int coroutine_fn parallels_co_create(BlockdevCreateOptions* opts,
- 
-     ret = 0;
- out:
--    blk_unref(blk);
--    bdrv_unref(bs);
-+    blk_co_unref(blk);
-+    bdrv_co_unref(bs);
-     return ret;
- 
- exit:
-@@ -691,7 +691,7 @@ parallels_co_create_opts(BlockDriver *drv, const char *filename,
- 
- done:
-     qobject_unref(qdict);
--    bdrv_unref(bs);
-+    bdrv_co_unref(bs);
-     qapi_free_BlockdevCreateOptions(create_options);
-     return ret;
- }
-diff --git a/block/qcow.c b/block/qcow.c
-index 490e4f819e..a0c701f578 100644
---- a/block/qcow.c
-+++ b/block/qcow.c
-@@ -915,8 +915,8 @@ static int coroutine_fn qcow_co_create(BlockdevCreateOptions *opts,
-     g_free(tmp);
-     ret = 0;
- exit:
--    blk_unref(qcow_blk);
--    bdrv_unref(bs);
-+    blk_co_unref(qcow_blk);
-+    bdrv_co_unref(bs);
-     qcrypto_block_free(crypto);
-     return ret;
- }
-@@ -1015,7 +1015,7 @@ qcow_co_create_opts(BlockDriver *drv, const char *filename,
- fail:
-     g_free(backing_fmt);
-     qobject_unref(qdict);
--    bdrv_unref(bs);
-+    bdrv_co_unref(bs);
-     qapi_free_BlockdevCreateOptions(create_options);
-     return ret;
- }
-diff --git a/block/qcow2.c b/block/qcow2.c
-index 22084730f9..0b8beb8b47 100644
---- a/block/qcow2.c
-+++ b/block/qcow2.c
-@@ -3711,7 +3711,7 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)
-         goto out;
-     }
- 
--    blk_unref(blk);
-+    blk_co_unref(blk);
-     blk = NULL;
- 
-     /*
-@@ -3791,7 +3791,7 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)
-         }
-     }
- 
--    blk_unref(blk);
-+    blk_co_unref(blk);
-     blk = NULL;
- 
-     /* Reopen the image without BDRV_O_NO_FLUSH to flush it before returning.
-@@ -3816,9 +3816,9 @@ qcow2_co_create(BlockdevCreateOptions *create_options, Error **errp)
- 
-     ret = 0;
- out:
--    blk_unref(blk);
--    bdrv_unref(bs);
--    bdrv_unref(data_bs);
-+    blk_co_unref(blk);
-+    bdrv_co_unref(bs);
-+    bdrv_co_unref(data_bs);
-     return ret;
- }
- 
-@@ -3949,8 +3949,8 @@ finish:
-     }
- 
-     qobject_unref(qdict);
--    bdrv_unref(bs);
--    bdrv_unref(data_bs);
-+    bdrv_co_unref(bs);
-+    bdrv_co_unref(data_bs);
-     qapi_free_BlockdevCreateOptions(create_options);
-     return ret;
- }
-diff --git a/block/qed.c b/block/qed.c
-index 0705a7b4e2..aff2a2076e 100644
---- a/block/qed.c
-+++ b/block/qed.c
-@@ -748,8 +748,8 @@ static int coroutine_fn bdrv_qed_co_create(BlockdevCreateOptions *opts,
-     ret = 0; /* success */
- out:
-     g_free(l1_table);
--    blk_unref(blk);
--    bdrv_unref(bs);
-+    blk_co_unref(blk);
-+    bdrv_co_unref(bs);
-     return ret;
- }
- 
-@@ -819,7 +819,7 @@ bdrv_qed_co_create_opts(BlockDriver *drv, const char *filename,
- 
- fail:
-     qobject_unref(qdict);
--    bdrv_unref(bs);
-+    bdrv_co_unref(bs);
-     qapi_free_BlockdevCreateOptions(create_options);
-     return ret;
- }
-diff --git a/block/vdi.c b/block/vdi.c
-index f2434d6153..08331d2dd7 100644
---- a/block/vdi.c
-+++ b/block/vdi.c
-@@ -886,8 +886,8 @@ static int coroutine_fn vdi_co_do_create(BlockdevCreateOptions *create_options,
- 
-     ret = 0;
- exit:
--    blk_unref(blk);
--    bdrv_unref(bs_file);
-+    blk_co_unref(blk);
-+    bdrv_co_unref(bs_file);
-     g_free(bmap);
-     return ret;
- }
-@@ -975,7 +975,7 @@ vdi_co_create_opts(BlockDriver *drv, const char *filename,
- done:
-     qobject_unref(qdict);
-     qapi_free_BlockdevCreateOptions(create_options);
--    bdrv_unref(bs_file);
-+    bdrv_co_unref(bs_file);
-     return ret;
- }
- 
-diff --git a/block/vhdx.c b/block/vhdx.c
-index 81420722a1..00777da91a 100644
---- a/block/vhdx.c
-+++ b/block/vhdx.c
-@@ -2053,8 +2053,8 @@ static int coroutine_fn vhdx_co_create(BlockdevCreateOptions *opts,
- 
-     ret = 0;
- delete_and_exit:
--    blk_unref(blk);
--    bdrv_unref(bs);
-+    blk_co_unref(blk);
-+    bdrv_co_unref(bs);
-     g_free(creator);
-     return ret;
- }
-@@ -2144,7 +2144,7 @@ vhdx_co_create_opts(BlockDriver *drv, const char *filename,
- 
- fail:
-     qobject_unref(qdict);
--    bdrv_unref(bs);
-+    bdrv_co_unref(bs);
-     qapi_free_BlockdevCreateOptions(create_options);
-     return ret;
- }
-diff --git a/block/vmdk.c b/block/vmdk.c
-index f5f49018fe..01ca13c82b 100644
---- a/block/vmdk.c
-+++ b/block/vmdk.c
-@@ -2306,7 +2306,7 @@ exit:
-         if (pbb) {
-             *pbb = blk;
-         } else {
--            blk_unref(blk);
-+            blk_co_unref(blk);
-             blk = NULL;
-         }
-     }
-@@ -2516,12 +2516,12 @@ vmdk_co_do_create(int64_t size,
-         if (strcmp(blk_bs(backing)->drv->format_name, "vmdk")) {
-             error_setg(errp, "Invalid backing file format: %s. Must be vmdk",
-                        blk_bs(backing)->drv->format_name);
--            blk_unref(backing);
-+            blk_co_unref(backing);
-             ret = -EINVAL;
-             goto exit;
-         }
-         ret = vmdk_read_cid(blk_bs(backing), 0, &parent_cid);
--        blk_unref(backing);
-+        blk_co_unref(backing);
-         if (ret) {
-             error_setg(errp, "Failed to read parent CID");
-             goto exit;
-@@ -2542,14 +2542,14 @@ vmdk_co_do_create(int64_t size,
-                              blk_bs(extent_blk)->filename);
-         created_size += cur_size;
-         extent_idx++;
--        blk_unref(extent_blk);
-+        blk_co_unref(extent_blk);
-     }
- 
-     /* Check whether we got excess extents */
-     extent_blk = extent_fn(-1, extent_idx, flat, split, compress, zeroed_grain,
-                            opaque, NULL);
-     if (extent_blk) {
--        blk_unref(extent_blk);
-+        blk_co_unref(extent_blk);
-         error_setg(errp, "List of extents contains unused extents");
-         ret = -EINVAL;
-         goto exit;
-@@ -2590,7 +2590,7 @@ vmdk_co_do_create(int64_t size,
-     ret = 0;
- exit:
-     if (blk) {
--        blk_unref(blk);
-+        blk_co_unref(blk);
-     }
-     g_free(desc);
-     g_free(parent_desc_line);
-@@ -2641,7 +2641,7 @@ vmdk_co_create_opts_cb(int64_t size, int idx, bool flat, bool split,
-                            errp)) {
-         goto exit;
-     }
--    bdrv_unref(bs);
-+    bdrv_co_unref(bs);
- exit:
-     g_free(ext_filename);
-     return blk;
-@@ -2797,12 +2797,12 @@ static BlockBackend * coroutine_fn vmdk_co_create_cb(int64_t size, int idx,
-         return NULL;
-     }
-     blk_set_allow_write_beyond_eof(blk, true);
--    bdrv_unref(bs);
-+    bdrv_co_unref(bs);
- 
-     if (size != -1) {
-         ret = vmdk_init_extent(blk, size, flat, compress, zeroed_grain, errp);
-         if (ret) {
--            blk_unref(blk);
-+            blk_co_unref(blk);
-             blk = NULL;
-         }
-     }
-diff --git a/block/vpc.c b/block/vpc.c
-index b89b0ff8e2..07ddda5b99 100644
---- a/block/vpc.c
-+++ b/block/vpc.c
-@@ -1082,8 +1082,8 @@ static int coroutine_fn vpc_co_create(BlockdevCreateOptions *opts,
-     }
- 
- out:
--    blk_unref(blk);
--    bdrv_unref(bs);
-+    blk_co_unref(blk);
-+    bdrv_co_unref(bs);
-     return ret;
- }
- 
-@@ -1162,7 +1162,7 @@ vpc_co_create_opts(BlockDriver *drv, const char *filename,
- 
- fail:
-     qobject_unref(qdict);
--    bdrv_unref(bs);
-+    bdrv_co_unref(bs);
-     qapi_free_BlockdevCreateOptions(create_options);
-     return ret;
- }
-diff --git a/include/block/block-global-state.h b/include/block/block-global-state.h
-index 399200a9a3..cd4ea554bf 100644
---- a/include/block/block-global-state.h
-+++ b/include/block/block-global-state.h
-@@ -214,7 +214,8 @@ void bdrv_img_create(const char *filename, const char *fmt,
-                      bool quiet, Error **errp);
- 
- void bdrv_ref(BlockDriverState *bs);
--void bdrv_unref(BlockDriverState *bs);
-+void no_coroutine_fn bdrv_unref(BlockDriverState *bs);
-+void coroutine_fn no_co_wrapper bdrv_co_unref(BlockDriverState *bs);
- void bdrv_unref_child(BlockDriverState *parent, BdrvChild *child);
- BdrvChild *bdrv_attach_child(BlockDriverState *parent_bs,
-                              BlockDriverState *child_bs,
-diff --git a/include/sysemu/block-backend-global-state.h b/include/sysemu/block-backend-global-state.h
-index 2b6d27db7c..fa83f9389c 100644
---- a/include/sysemu/block-backend-global-state.h
-+++ b/include/sysemu/block-backend-global-state.h
-@@ -42,7 +42,10 @@ blk_co_new_open(const char *filename, const char *reference, QDict *options,
- 
- int blk_get_refcnt(BlockBackend *blk);
- void blk_ref(BlockBackend *blk);
--void blk_unref(BlockBackend *blk);
-+
-+void no_coroutine_fn blk_unref(BlockBackend *blk);
-+void coroutine_fn no_co_wrapper blk_co_unref(BlockBackend *blk);
-+
- void blk_remove_all_bs(void);
- BlockBackend *blk_by_name(const char *name);
- BlockBackend *blk_next(BlockBackend *blk);
--- 
-2.39.1
-
diff --git a/kvm-block-blkio-do-not-use-open-flags-in-qemu_open.patch b/kvm-block-blkio-do-not-use-open-flags-in-qemu_open.patch
deleted file mode 100644
index caf6694..0000000
--- a/kvm-block-blkio-do-not-use-open-flags-in-qemu_open.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From b1f0546548e561856252c2bc610a8f4f8fcdf007 Mon Sep 17 00:00:00 2001
-From: Stefano Garzarella <sgarzare@redhat.com>
-Date: Wed, 26 Jul 2023 09:48:07 +0200
-Subject: [PATCH 02/14] block/blkio: do not use open flags in qemu_open()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Stefano Garzarella <sgarzare@redhat.com>
-RH-MergeRequest: 194: block/blkio: backport latest fixes for virtio-blk-* drivers
-RH-Bugzilla: 2225354 2225439
-RH-Acked-by: Hanna Czenczek <hreitz@redhat.com>
-RH-Acked-by: Alberto Faria <None>
-RH-Commit: [2/6] 1ccd0ef56182bb5e2374c3b5be98ee1ec05066d6 (sgarzarella/qemu-kvm-c-9-s)
-
-qemu_open() in blkio_virtio_blk_common_open() is used to open the
-character device (e.g. /dev/vhost-vdpa-0 or /dev/vfio/vfio) or in
-the future eventually the unix socket.
-
-In all these cases we cannot open the path in read-only mode,
-when the `read-only` option of blockdev is on, because the exchange
-of IOCTL commands for example will fail.
-
-In order to open the device read-only, we have to use the `read-only`
-property of the libblkio driver as we already do in blkio_file_open().
-
-Fixes: cad2ccc395 ("block/blkio: use qemu_open() to support fd passing for virtio-blk")
-Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=2225439
-Reported-by: Qing Wang <qinwang@redhat.com>
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-Message-id: 20230726074807.14041-1-sgarzare@redhat.com
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-(cherry picked from commit a5942c177b7bcc1357e496b7d68668befcfc2bb9)
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
----
- block/blkio.c | 21 ++++++++++++---------
- 1 file changed, 12 insertions(+), 9 deletions(-)
-
-diff --git a/block/blkio.c b/block/blkio.c
-index 3ea9841bd8..5a82c6cb1a 100644
---- a/block/blkio.c
-+++ b/block/blkio.c
-@@ -685,15 +685,18 @@ static int blkio_virtio_blk_common_open(BlockDriverState *bs,
-      * layer through the "/dev/fdset/N" special path.
-      */
-     if (fd_supported) {
--        int open_flags;
--
--        if (flags & BDRV_O_RDWR) {
--            open_flags = O_RDWR;
--        } else {
--            open_flags = O_RDONLY;
--        }
--
--        fd = qemu_open(path, open_flags, errp);
-+        /*
-+         * `path` can contain the path of a character device
-+         * (e.g. /dev/vhost-vdpa-0 or /dev/vfio/vfio) or a unix socket.
-+         *
-+         * So, we should always open it with O_RDWR flag, also if BDRV_O_RDWR
-+         * is not set in the open flags, because the exchange of IOCTL commands
-+         * for example will fail.
-+         *
-+         * In order to open the device read-only, we are using the `read-only`
-+         * property of the libblkio driver in blkio_file_open().
-+         */
-+        fd = qemu_open(path, O_RDWR, errp);
-         if (fd < 0) {
-             return -EINVAL;
-         }
--- 
-2.39.3
-
diff --git a/kvm-block-blkio-enable-the-completion-eventfd.patch b/kvm-block-blkio-enable-the-completion-eventfd.patch
deleted file mode 100644
index 8a6f72b..0000000
--- a/kvm-block-blkio-enable-the-completion-eventfd.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From ef99db21e9469f3fc946b7bf3edc1837d7b24e0b Mon Sep 17 00:00:00 2001
-From: Stefano Garzarella <sgarzare@redhat.com>
-Date: Tue, 25 Jul 2023 12:37:44 +0200
-Subject: [PATCH 01/14] block/blkio: enable the completion eventfd
-
-RH-Author: Stefano Garzarella <sgarzare@redhat.com>
-RH-MergeRequest: 194: block/blkio: backport latest fixes for virtio-blk-* drivers
-RH-Bugzilla: 2225354 2225439
-RH-Acked-by: Hanna Czenczek <hreitz@redhat.com>
-RH-Acked-by: Alberto Faria <None>
-RH-Commit: [1/6] d91b3a465942863550130105ae2f38f47a82a360 (sgarzarella/qemu-kvm-c-9-s)
-
-Until libblkio 1.3.0, virtio-blk drivers had completion eventfd
-notifications enabled from the start, but from the next releases
-this is no longer the case, so we have to explicitly enable them.
-
-In fact, the libblkio documentation says they could be disabled,
-so we should always enable them at the start if we want to be
-sure to get completion eventfd notifications:
-
-    By default, the driver might not generate completion events for
-    requests so it is necessary to explicitly enable the completion
-    file descriptor before use:
-
-    void blkioq_set_completion_fd_enabled(struct blkioq *q, bool enable);
-
-I discovered this while trying a development version of libblkio:
-the guest kernel hangs during boot, while probing the device.
-
-Fixes: fd66dbd424f5 ("blkio: add libblkio block driver")
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
-Message-id: 20230725103744.77343-1-sgarzare@redhat.com
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-(cherry picked from commit 9359c459889fce1804c4e1b2a2ff8f182b4a9ae8)
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
----
- block/blkio.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/block/blkio.c b/block/blkio.c
-index afcec359f2..3ea9841bd8 100644
---- a/block/blkio.c
-+++ b/block/blkio.c
-@@ -844,6 +844,7 @@ static int blkio_file_open(BlockDriverState *bs, QDict *options, int flags,
-     QLIST_INIT(&s->bounce_bufs);
-     s->blkioq = blkio_get_queue(s->blkio, 0);
-     s->completion_fd = blkioq_get_completion_fd(s->blkioq);
-+    blkioq_set_completion_fd_enabled(s->blkioq, true);
- 
-     blkio_attach_aio_context(bs, bdrv_get_aio_context(bs));
-     return 0;
--- 
-2.39.3
-
diff --git a/kvm-block-blkio-fall-back-on-using-path-when-fd-setting-.patch b/kvm-block-blkio-fall-back-on-using-path-when-fd-setting-.patch
deleted file mode 100644
index f4d6e3c..0000000
--- a/kvm-block-blkio-fall-back-on-using-path-when-fd-setting-.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From c1ce3ba81698b9d52ac9dff83c01ee8141ca403d Mon Sep 17 00:00:00 2001
-From: Stefano Garzarella <sgarzare@redhat.com>
-Date: Thu, 27 Jul 2023 18:10:19 +0200
-Subject: [PATCH 05/14] block/blkio: fall back on using `path` when `fd`
- setting fails
-
-RH-Author: Stefano Garzarella <sgarzare@redhat.com>
-RH-MergeRequest: 194: block/blkio: backport latest fixes for virtio-blk-* drivers
-RH-Bugzilla: 2225354 2225439
-RH-Acked-by: Hanna Czenczek <hreitz@redhat.com>
-RH-Acked-by: Alberto Faria <None>
-RH-Commit: [5/6] c03cea95146a59b2830ffe2dd56ef77a6630ce3e (sgarzarella/qemu-kvm-c-9-s)
-
-qemu_open() fails if called with an unix domain socket in this way:
-    -blockdev node-name=drive0,driver=virtio-blk-vhost-user,path=vhost-user-blk.sock,cache.direct=on: Could not open 'vhost-user-blk.sock': No such device or address
-
-Since virtio-blk-vhost-user does not support fd passing, let`s always fall back
-on using `path` if we fail the fd passing.
-
-Fixes: cad2ccc395 ("block/blkio: use qemu_open() to support fd passing for virtio-blk")
-Reported-by: Qing Wang <qinwang@redhat.com>
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
-Message-id: 20230727161020.84213-4-sgarzare@redhat.com
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-(cherry picked from commit 723bea27b127969931fa26bc0de79372a3d9e148)
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
----
- block/blkio.c | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/block/blkio.c b/block/blkio.c
-index 93a8f8fc5c..eef80e9ce5 100644
---- a/block/blkio.c
-+++ b/block/blkio.c
-@@ -710,19 +710,19 @@ static int blkio_virtio_blk_connect(BlockDriverState *bs, QDict *options,
-          * In order to open the device read-only, we are using the `read-only`
-          * property of the libblkio driver in blkio_file_open().
-          */
--        fd = qemu_open(path, O_RDWR, errp);
-+        fd = qemu_open(path, O_RDWR, NULL);
-         if (fd < 0) {
--            return -EINVAL;
-+            fd_supported = false;
-+        } else {
-+            ret = blkio_set_int(s->blkio, "fd", fd);
-+            if (ret < 0) {
-+                fd_supported = false;
-+                qemu_close(fd);
-+            }
-         }
-+    }
- 
--        ret = blkio_set_int(s->blkio, "fd", fd);
--        if (ret < 0) {
--            error_setg_errno(errp, -ret, "failed to set fd: %s",
--                             blkio_get_error_msg());
--            qemu_close(fd);
--            return ret;
--        }
--    } else {
-+    if (!fd_supported) {
-         ret = blkio_set_str(s->blkio, "path", path);
-         if (ret < 0) {
-             error_setg_errno(errp, -ret, "failed to set path: %s",
--- 
-2.39.3
-
diff --git a/kvm-block-blkio-fix-module_block.py-parsing.patch b/kvm-block-blkio-fix-module_block.py-parsing.patch
deleted file mode 100644
index 1c89a0b..0000000
--- a/kvm-block-blkio-fix-module_block.py-parsing.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-From 545482400ea87d54b1b839587f8aaad41e30692f Mon Sep 17 00:00:00 2001
-From: Stefan Hajnoczi <stefanha@redhat.com>
-Date: Tue, 4 Jul 2023 14:34:36 +0200
-Subject: [PATCH 36/37] block/blkio: fix module_block.py parsing
-
-RH-Author: Stefan Hajnoczi <stefanha@redhat.com>
-RH-MergeRequest: 181: block/blkio: fix module_block.py parsing
-RH-Bugzilla: 2213317
-RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
-RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
-RH-Commit: [1/2] c85df95824f4889526a73527771dec9efcb06926 (stefanha/centos-stream-qemu-kvm)
-
-When QEMU is built with --enable-modules, the module_block.py script
-parses block/*.c to find block drivers that are built as modules. The
-script generates a table of block drivers called block_driver_modules[].
-This table is used for block driver module loading.
-
-The blkio.c driver uses macros to define its BlockDriver structs. This
-was done to avoid code duplication but the module_block.py script is
-unable to parse the macro. The result is that libblkio-based block
-drivers can be built as modules but will not be found at runtime.
-
-One fix is to make the module_block.py script or build system fancier so
-it can parse C macros (e.g. by parsing the preprocessed source code). I
-chose not to do this because it raises the complexity of the build,
-making future issues harder to debug.
-
-Keep things simple: use the macro to avoid duplicating BlockDriver
-function pointers but define .format_name and .protocol_name manually
-for each BlockDriver. This way the module_block.py is able to parse the
-code.
-
-Also get rid of the block driver name macros (e.g. DRIVER_IO_URING)
-because module_block.py cannot parse them either.
-
-Fixes: fd66dbd424f5 ("blkio: add libblkio block driver")
-Reported-by: Qing Wang <qinwang@redhat.com>
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
-Message-id: 20230704123436.187761-1-stefanha@redhat.com
-Cc: Stefano Garzarella <sgarzare@redhat.com>
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-(cherry picked from commit c21eae1ccc782440f320accb6f90c66cb8f45ee9)
-
-Conflicts:
-- Downstream lacks commit 28ff7b4dfbb5 ("block/blkio: convert to
-  blk_io_plug_call() API") so keep the .bdrv_co_io_unplug callback.
-
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
----
- block/blkio.c | 118 ++++++++++++++++++++++++++------------------------
- 1 file changed, 61 insertions(+), 57 deletions(-)
-
-diff --git a/block/blkio.c b/block/blkio.c
-index 6a6f20f923..afcec359f2 100644
---- a/block/blkio.c
-+++ b/block/blkio.c
-@@ -21,16 +21,6 @@
- 
- #include "block/block-io.h"
- 
--/*
-- * Keep the QEMU BlockDriver names identical to the libblkio driver names.
-- * Using macros instead of typing out the string literals avoids typos.
-- */
--#define DRIVER_IO_URING "io_uring"
--#define DRIVER_NVME_IO_URING "nvme-io_uring"
--#define DRIVER_VIRTIO_BLK_VFIO_PCI "virtio-blk-vfio-pci"
--#define DRIVER_VIRTIO_BLK_VHOST_USER "virtio-blk-vhost-user"
--#define DRIVER_VIRTIO_BLK_VHOST_VDPA "virtio-blk-vhost-vdpa"
--
- /*
-  * Allocated bounce buffers are kept in a list sorted by buffer address.
-  */
-@@ -743,15 +733,15 @@ static int blkio_file_open(BlockDriverState *bs, QDict *options, int flags,
-         return ret;
-     }
- 
--    if (strcmp(blkio_driver, DRIVER_IO_URING) == 0) {
-+    if (strcmp(blkio_driver, "io_uring") == 0) {
-         ret = blkio_io_uring_open(bs, options, flags, errp);
--    } else if (strcmp(blkio_driver, DRIVER_NVME_IO_URING) == 0) {
-+    } else if (strcmp(blkio_driver, "nvme-io_uring") == 0) {
-         ret = blkio_nvme_io_uring(bs, options, flags, errp);
--    } else if (strcmp(blkio_driver, DRIVER_VIRTIO_BLK_VFIO_PCI) == 0) {
-+    } else if (strcmp(blkio_driver, "virtio-blk-vfio-pci") == 0) {
-         ret = blkio_virtio_blk_common_open(bs, options, flags, errp);
--    } else if (strcmp(blkio_driver, DRIVER_VIRTIO_BLK_VHOST_USER) == 0) {
-+    } else if (strcmp(blkio_driver, "virtio-blk-vhost-user") == 0) {
-         ret = blkio_virtio_blk_common_open(bs, options, flags, errp);
--    } else if (strcmp(blkio_driver, DRIVER_VIRTIO_BLK_VHOST_VDPA) == 0) {
-+    } else if (strcmp(blkio_driver, "virtio-blk-vhost-vdpa") == 0) {
-         ret = blkio_virtio_blk_common_open(bs, options, flags, errp);
-     } else {
-         g_assert_not_reached();
-@@ -1027,50 +1017,64 @@ static void blkio_refresh_limits(BlockDriverState *bs, Error **errp)
-  * - truncate
-  */
- 
--#define BLKIO_DRIVER(name, ...) \
--    { \
--        .format_name             = name, \
--        .protocol_name           = name, \
--        .instance_size           = sizeof(BDRVBlkioState), \
--        .bdrv_file_open          = blkio_file_open, \
--        .bdrv_close              = blkio_close, \
--        .bdrv_co_getlength       = blkio_co_getlength, \
--        .bdrv_co_truncate        = blkio_truncate, \
--        .bdrv_co_get_info        = blkio_co_get_info, \
--        .bdrv_attach_aio_context = blkio_attach_aio_context, \
--        .bdrv_detach_aio_context = blkio_detach_aio_context, \
--        .bdrv_co_pdiscard        = blkio_co_pdiscard, \
--        .bdrv_co_preadv          = blkio_co_preadv, \
--        .bdrv_co_pwritev         = blkio_co_pwritev, \
--        .bdrv_co_flush_to_disk   = blkio_co_flush, \
--        .bdrv_co_pwrite_zeroes   = blkio_co_pwrite_zeroes, \
--        .bdrv_co_io_unplug       = blkio_co_io_unplug, \
--        .bdrv_refresh_limits     = blkio_refresh_limits, \
--        .bdrv_register_buf       = blkio_register_buf, \
--        .bdrv_unregister_buf     = blkio_unregister_buf, \
--        __VA_ARGS__ \
--    }
--
--static BlockDriver bdrv_io_uring = BLKIO_DRIVER(
--    DRIVER_IO_URING,
--    .bdrv_needs_filename = true,
--);
--
--static BlockDriver bdrv_nvme_io_uring = BLKIO_DRIVER(
--    DRIVER_NVME_IO_URING,
--);
--
--static BlockDriver bdrv_virtio_blk_vfio_pci = BLKIO_DRIVER(
--    DRIVER_VIRTIO_BLK_VFIO_PCI
--);
-+/*
-+ * Do not include .format_name and .protocol_name because module_block.py
-+ * does not parse macros in the source code.
-+ */
-+#define BLKIO_DRIVER_COMMON \
-+    .instance_size           = sizeof(BDRVBlkioState), \
-+    .bdrv_file_open          = blkio_file_open, \
-+    .bdrv_close              = blkio_close, \
-+    .bdrv_co_getlength       = blkio_co_getlength, \
-+    .bdrv_co_truncate        = blkio_truncate, \
-+    .bdrv_co_get_info        = blkio_co_get_info, \
-+    .bdrv_attach_aio_context = blkio_attach_aio_context, \
-+    .bdrv_detach_aio_context = blkio_detach_aio_context, \
-+    .bdrv_co_pdiscard        = blkio_co_pdiscard, \
-+    .bdrv_co_preadv          = blkio_co_preadv, \
-+    .bdrv_co_pwritev         = blkio_co_pwritev, \
-+    .bdrv_co_flush_to_disk   = blkio_co_flush, \
-+    .bdrv_co_pwrite_zeroes   = blkio_co_pwrite_zeroes, \
-+    .bdrv_co_io_unplug       = blkio_co_io_unplug, \
-+    .bdrv_refresh_limits     = blkio_refresh_limits, \
-+    .bdrv_register_buf       = blkio_register_buf, \
-+    .bdrv_unregister_buf     = blkio_unregister_buf,
- 
--static BlockDriver bdrv_virtio_blk_vhost_user = BLKIO_DRIVER(
--    DRIVER_VIRTIO_BLK_VHOST_USER
--);
-+/*
-+ * Use the same .format_name and .protocol_name as the libblkio driver name for
-+ * consistency.
-+ */
- 
--static BlockDriver bdrv_virtio_blk_vhost_vdpa = BLKIO_DRIVER(
--    DRIVER_VIRTIO_BLK_VHOST_VDPA
--);
-+static BlockDriver bdrv_io_uring = {
-+    .format_name         = "io_uring",
-+    .protocol_name       = "io_uring",
-+    .bdrv_needs_filename = true,
-+    BLKIO_DRIVER_COMMON
-+};
-+
-+static BlockDriver bdrv_nvme_io_uring = {
-+    .format_name         = "nvme-io_uring",
-+    .protocol_name       = "nvme-io_uring",
-+    BLKIO_DRIVER_COMMON
-+};
-+
-+static BlockDriver bdrv_virtio_blk_vfio_pci = {
-+    .format_name         = "virtio-blk-vfio-pci",
-+    .protocol_name       = "virtio-blk-vfio-pci",
-+    BLKIO_DRIVER_COMMON
-+};
-+
-+static BlockDriver bdrv_virtio_blk_vhost_user = {
-+    .format_name         = "virtio-blk-vhost-user",
-+    .protocol_name       = "virtio-blk-vhost-user",
-+    BLKIO_DRIVER_COMMON
-+};
-+
-+static BlockDriver bdrv_virtio_blk_vhost_vdpa = {
-+    .format_name         = "virtio-blk-vhost-vdpa",
-+    .protocol_name       = "virtio-blk-vhost-vdpa",
-+    BLKIO_DRIVER_COMMON
-+};
- 
- static void bdrv_blkio_init(void)
- {
--- 
-2.39.3
-
diff --git a/kvm-block-blkio-move-blkio_connect-in-the-drivers-functi.patch b/kvm-block-blkio-move-blkio_connect-in-the-drivers-functi.patch
deleted file mode 100644
index e3ec1ee..0000000
--- a/kvm-block-blkio-move-blkio_connect-in-the-drivers-functi.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From 458c33c9f19ed01beeb9b2b494ce6ed10d2ed4ac Mon Sep 17 00:00:00 2001
-From: Stefano Garzarella <sgarzare@redhat.com>
-Date: Thu, 27 Jul 2023 18:10:17 +0200
-Subject: [PATCH 03/14] block/blkio: move blkio_connect() in the drivers
- functions
-
-RH-Author: Stefano Garzarella <sgarzare@redhat.com>
-RH-MergeRequest: 194: block/blkio: backport latest fixes for virtio-blk-* drivers
-RH-Bugzilla: 2225354 2225439
-RH-Acked-by: Hanna Czenczek <hreitz@redhat.com>
-RH-Acked-by: Alberto Faria <None>
-RH-Commit: [3/6] c356108d7dfe1ba2098c094f8d12b6e40853560c (sgarzarella/qemu-kvm-c-9-s)
-
-This is in preparation for the next patch, where for virtio-blk
-drivers we need to handle the failure of blkio_connect().
-
-Let's also rename the *_open() functions to *_connect() to make
-the code reflect the changes applied.
-
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
-Message-id: 20230727161020.84213-2-sgarzare@redhat.com
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-(cherry picked from commit 69785d66ae1ec43f77fc65109a21721992bead9f)
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
----
- block/blkio.c | 67 ++++++++++++++++++++++++++++++---------------------
- 1 file changed, 40 insertions(+), 27 deletions(-)
-
-diff --git a/block/blkio.c b/block/blkio.c
-index 5a82c6cb1a..85d1eed5fb 100644
---- a/block/blkio.c
-+++ b/block/blkio.c
-@@ -602,8 +602,8 @@ static void blkio_unregister_buf(BlockDriverState *bs, void *host, size_t size)
-     }
- }
- 
--static int blkio_io_uring_open(BlockDriverState *bs, QDict *options, int flags,
--                               Error **errp)
-+static int blkio_io_uring_connect(BlockDriverState *bs, QDict *options,
-+                                  int flags, Error **errp)
- {
-     const char *filename = qdict_get_str(options, "filename");
-     BDRVBlkioState *s = bs->opaque;
-@@ -626,11 +626,18 @@ static int blkio_io_uring_open(BlockDriverState *bs, QDict *options, int flags,
-         }
-     }
- 
-+    ret = blkio_connect(s->blkio);
-+    if (ret < 0) {
-+        error_setg_errno(errp, -ret, "blkio_connect failed: %s",
-+                         blkio_get_error_msg());
-+        return ret;
-+    }
-+
-     return 0;
- }
- 
--static int blkio_nvme_io_uring(BlockDriverState *bs, QDict *options, int flags,
--                               Error **errp)
-+static int blkio_nvme_io_uring_connect(BlockDriverState *bs, QDict *options,
-+                                       int flags, Error **errp)
- {
-     const char *path = qdict_get_try_str(options, "path");
-     BDRVBlkioState *s = bs->opaque;
-@@ -654,11 +661,18 @@ static int blkio_nvme_io_uring(BlockDriverState *bs, QDict *options, int flags,
-         return -EINVAL;
-     }
- 
-+    ret = blkio_connect(s->blkio);
-+    if (ret < 0) {
-+        error_setg_errno(errp, -ret, "blkio_connect failed: %s",
-+                         blkio_get_error_msg());
-+        return ret;
-+    }
-+
-     return 0;
- }
- 
--static int blkio_virtio_blk_common_open(BlockDriverState *bs,
--        QDict *options, int flags, Error **errp)
-+static int blkio_virtio_blk_connect(BlockDriverState *bs, QDict *options,
-+                                    int flags, Error **errp)
- {
-     const char *path = qdict_get_try_str(options, "path");
-     BDRVBlkioState *s = bs->opaque;
-@@ -717,6 +731,13 @@ static int blkio_virtio_blk_common_open(BlockDriverState *bs,
-         }
-     }
- 
-+    ret = blkio_connect(s->blkio);
-+    if (ret < 0) {
-+        error_setg_errno(errp, -ret, "blkio_connect failed: %s",
-+                         blkio_get_error_msg());
-+        return ret;
-+    }
-+
-     qdict_del(options, "path");
- 
-     return 0;
-@@ -736,24 +757,6 @@ static int blkio_file_open(BlockDriverState *bs, QDict *options, int flags,
-         return ret;
-     }
- 
--    if (strcmp(blkio_driver, "io_uring") == 0) {
--        ret = blkio_io_uring_open(bs, options, flags, errp);
--    } else if (strcmp(blkio_driver, "nvme-io_uring") == 0) {
--        ret = blkio_nvme_io_uring(bs, options, flags, errp);
--    } else if (strcmp(blkio_driver, "virtio-blk-vfio-pci") == 0) {
--        ret = blkio_virtio_blk_common_open(bs, options, flags, errp);
--    } else if (strcmp(blkio_driver, "virtio-blk-vhost-user") == 0) {
--        ret = blkio_virtio_blk_common_open(bs, options, flags, errp);
--    } else if (strcmp(blkio_driver, "virtio-blk-vhost-vdpa") == 0) {
--        ret = blkio_virtio_blk_common_open(bs, options, flags, errp);
--    } else {
--        g_assert_not_reached();
--    }
--    if (ret < 0) {
--        blkio_destroy(&s->blkio);
--        return ret;
--    }
--
-     if (!(flags & BDRV_O_RDWR)) {
-         ret = blkio_set_bool(s->blkio, "read-only", true);
-         if (ret < 0) {
-@@ -764,10 +767,20 @@ static int blkio_file_open(BlockDriverState *bs, QDict *options, int flags,
-         }
-     }
- 
--    ret = blkio_connect(s->blkio);
-+    if (strcmp(blkio_driver, "io_uring") == 0) {
-+        ret = blkio_io_uring_connect(bs, options, flags, errp);
-+    } else if (strcmp(blkio_driver, "nvme-io_uring") == 0) {
-+        ret = blkio_nvme_io_uring_connect(bs, options, flags, errp);
-+    } else if (strcmp(blkio_driver, "virtio-blk-vfio-pci") == 0) {
-+        ret = blkio_virtio_blk_connect(bs, options, flags, errp);
-+    } else if (strcmp(blkio_driver, "virtio-blk-vhost-user") == 0) {
-+        ret = blkio_virtio_blk_connect(bs, options, flags, errp);
-+    } else if (strcmp(blkio_driver, "virtio-blk-vhost-vdpa") == 0) {
-+        ret = blkio_virtio_blk_connect(bs, options, flags, errp);
-+    } else {
-+        g_assert_not_reached();
-+    }
-     if (ret < 0) {
--        error_setg_errno(errp, -ret, "blkio_connect failed: %s",
--                         blkio_get_error_msg());
-         blkio_destroy(&s->blkio);
-         return ret;
-     }
--- 
-2.39.3
-
diff --git a/kvm-block-blkio-retry-blkio_connect-if-it-fails-using-fd.patch b/kvm-block-blkio-retry-blkio_connect-if-it-fails-using-fd.patch
deleted file mode 100644
index 5ec9e0b..0000000
--- a/kvm-block-blkio-retry-blkio_connect-if-it-fails-using-fd.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From ece855a71d9234c58497f37cb5498f507742167d Mon Sep 17 00:00:00 2001
-From: Stefano Garzarella <sgarzare@redhat.com>
-Date: Thu, 27 Jul 2023 18:10:18 +0200
-Subject: [PATCH 04/14] block/blkio: retry blkio_connect() if it fails using
- `fd`
-
-RH-Author: Stefano Garzarella <sgarzare@redhat.com>
-RH-MergeRequest: 194: block/blkio: backport latest fixes for virtio-blk-* drivers
-RH-Bugzilla: 2225354 2225439
-RH-Acked-by: Hanna Czenczek <hreitz@redhat.com>
-RH-Acked-by: Alberto Faria <None>
-RH-Commit: [4/6] 14ebc1f333617ce22c68693dec1c9a186d4f8a08 (sgarzarella/qemu-kvm-c-9-s)
-
-libblkio 1.3.0 added support of "fd" property for virtio-blk-vhost-vdpa
-driver. In QEMU, starting from commit cad2ccc395 ("block/blkio: use
-qemu_open() to support fd passing for virtio-blk") we are using
-`blkio_get_int(..., "fd")` to check if the "fd" property is supported
-for all the virtio-blk-* driver.
-
-Unfortunately that property is also available for those driver that do
-not support it, such as virtio-blk-vhost-user.
-
-So, `blkio_get_int()` is not enough to check whether the driver supports
-the `fd` property or not. This is because the virito-blk common libblkio
-driver only checks whether or not `fd` is set during `blkio_connect()`
-and fails with -EINVAL for those transports that do not support it
-(all except vhost-vdpa for now).
-
-So let's handle the `blkio_connect()` failure, retrying it using `path`
-directly.
-
-Fixes: cad2ccc395 ("block/blkio: use qemu_open() to support fd passing for virtio-blk")
-Suggested-by: Stefan Hajnoczi <stefanha@redhat.com>
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
-Message-id: 20230727161020.84213-3-sgarzare@redhat.com
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-(cherry picked from commit 809c319f8a089fbc49223dc29e1cc2b978beeada)
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
----
- block/blkio.c | 29 +++++++++++++++++++++++++++++
- 1 file changed, 29 insertions(+)
-
-diff --git a/block/blkio.c b/block/blkio.c
-index 85d1eed5fb..93a8f8fc5c 100644
---- a/block/blkio.c
-+++ b/block/blkio.c
-@@ -732,6 +732,35 @@ static int blkio_virtio_blk_connect(BlockDriverState *bs, QDict *options,
-     }
- 
-     ret = blkio_connect(s->blkio);
-+    /*
-+     * If the libblkio driver doesn't support the `fd` property, blkio_connect()
-+     * will fail with -EINVAL. So let's try calling blkio_connect() again by
-+     * directly setting `path`.
-+     */
-+    if (fd_supported && ret == -EINVAL) {
-+        qemu_close(fd);
-+
-+        /*
-+         * We need to clear the `fd` property we set previously by setting
-+         * it to -1.
-+         */
-+        ret = blkio_set_int(s->blkio, "fd", -1);
-+        if (ret < 0) {
-+            error_setg_errno(errp, -ret, "failed to set fd: %s",
-+                             blkio_get_error_msg());
-+            return ret;
-+        }
-+
-+        ret = blkio_set_str(s->blkio, "path", path);
-+        if (ret < 0) {
-+            error_setg_errno(errp, -ret, "failed to set path: %s",
-+                             blkio_get_error_msg());
-+            return ret;
-+        }
-+
-+        ret = blkio_connect(s->blkio);
-+    }
-+
-     if (ret < 0) {
-         error_setg_errno(errp, -ret, "blkio_connect failed: %s",
-                          blkio_get_error_msg());
--- 
-2.39.3
-
diff --git a/kvm-block-blkio-use-blkio_set_int-fd-to-check-fd-support.patch b/kvm-block-blkio-use-blkio_set_int-fd-to-check-fd-support.patch
deleted file mode 100644
index c6e1cd8..0000000
--- a/kvm-block-blkio-use-blkio_set_int-fd-to-check-fd-support.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 2f4436e7cc2f63d198229dc8ba32783460c0b185 Mon Sep 17 00:00:00 2001
-From: Stefano Garzarella <sgarzare@redhat.com>
-Date: Thu, 27 Jul 2023 18:10:20 +0200
-Subject: [PATCH 06/14] block/blkio: use blkio_set_int("fd") to check fd
- support
-
-RH-Author: Stefano Garzarella <sgarzare@redhat.com>
-RH-MergeRequest: 194: block/blkio: backport latest fixes for virtio-blk-* drivers
-RH-Bugzilla: 2225354 2225439
-RH-Acked-by: Hanna Czenczek <hreitz@redhat.com>
-RH-Acked-by: Alberto Faria <None>
-RH-Commit: [6/6] d57aafb2c3a8ed13aa3c6dcce5525a9cc8f5aa21 (sgarzarella/qemu-kvm-c-9-s)
-
-Setting the `fd` property fails with virtio-blk-* libblkio drivers
-that do not support fd passing since
-https://gitlab.com/libblkio/libblkio/-/merge_requests/208.
-
-Getting the `fd` property, on the other hand, always succeeds for
-virtio-blk-* libblkio drivers even when they don't support fd passing.
-
-This patch switches to setting the `fd` property because it is a
-better mechanism for probing fd passing support than getting the `fd`
-property.
-
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
-Message-id: 20230727161020.84213-5-sgarzare@redhat.com
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-(cherry picked from commit 1c38fe69e2b8a05c1762b122292fa7e3662f06fd)
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
----
- block/blkio.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/block/blkio.c b/block/blkio.c
-index eef80e9ce5..8defbf744f 100644
---- a/block/blkio.c
-+++ b/block/blkio.c
-@@ -689,7 +689,7 @@ static int blkio_virtio_blk_connect(BlockDriverState *bs, QDict *options,
-         return -EINVAL;
-     }
- 
--    if (blkio_get_int(s->blkio, "fd", &fd) == 0) {
-+    if (blkio_set_int(s->blkio, "fd", -1) == 0) {
-         fd_supported = true;
-     }
- 
--- 
-2.39.3
-
diff --git a/kvm-block-blkio-use-qemu_open-to-support-fd-passing-for-.patch b/kvm-block-blkio-use-qemu_open-to-support-fd-passing-for-.patch
deleted file mode 100644
index 3b32299..0000000
--- a/kvm-block-blkio-use-qemu_open-to-support-fd-passing-for-.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From fd57241cf0f8c2906fa56118f8da1e65a5b1e4d8 Mon Sep 17 00:00:00 2001
-From: Stefano Garzarella <sgarzare@redhat.com>
-Date: Tue, 30 May 2023 09:19:40 +0200
-Subject: [PATCH 3/5] block/blkio: use qemu_open() to support fd passing for
- virtio-blk
-
-RH-Author: Stefano Garzarella <sgarzare@redhat.com>
-RH-MergeRequest: 169: block/blkio: support fd passing for virtio-blk-vhost-vdpa driver
-RH-Bugzilla: 2180076
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
-RH-Commit: [1/2] 9ff1a1510500db101648341207a36318a0c41c5a (sgarzarella/qemu-kvm-c-9-s)
-
-Some virtio-blk drivers (e.g. virtio-blk-vhost-vdpa) supports the fd
-passing. Let's expose this to the user, so the management layer
-can pass the file descriptor of an already opened path.
-
-If the libblkio virtio-blk driver supports fd passing, let's always
-use qemu_open() to open the `path`, so we can handle fd passing
-from the management layer through the "/dev/fdset/N" special path.
-
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
-Message-id: 20230530071941.8954-2-sgarzare@redhat.com
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-(cherry picked from commit cad2ccc395c7113fb30bc9390774b67b34f06c68)
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
----
- block/blkio.c | 53 ++++++++++++++++++++++++++++++++++++++++++---------
- 1 file changed, 44 insertions(+), 9 deletions(-)
-
-diff --git a/block/blkio.c b/block/blkio.c
-index 0cdc99a729..6a6f20f923 100644
---- a/block/blkio.c
-+++ b/block/blkio.c
-@@ -672,25 +672,60 @@ static int blkio_virtio_blk_common_open(BlockDriverState *bs,
- {
-     const char *path = qdict_get_try_str(options, "path");
-     BDRVBlkioState *s = bs->opaque;
--    int ret;
-+    bool fd_supported = false;
-+    int fd, ret;
- 
-     if (!path) {
-         error_setg(errp, "missing 'path' option");
-         return -EINVAL;
-     }
- 
--    ret = blkio_set_str(s->blkio, "path", path);
--    qdict_del(options, "path");
--    if (ret < 0) {
--        error_setg_errno(errp, -ret, "failed to set path: %s",
--                         blkio_get_error_msg());
--        return ret;
--    }
--
-     if (!(flags & BDRV_O_NOCACHE)) {
-         error_setg(errp, "cache.direct=off is not supported");
-         return -EINVAL;
-     }
-+
-+    if (blkio_get_int(s->blkio, "fd", &fd) == 0) {
-+        fd_supported = true;
-+    }
-+
-+    /*
-+     * If the libblkio driver supports fd passing, let's always use qemu_open()
-+     * to open the `path`, so we can handle fd passing from the management
-+     * layer through the "/dev/fdset/N" special path.
-+     */
-+    if (fd_supported) {
-+        int open_flags;
-+
-+        if (flags & BDRV_O_RDWR) {
-+            open_flags = O_RDWR;
-+        } else {
-+            open_flags = O_RDONLY;
-+        }
-+
-+        fd = qemu_open(path, open_flags, errp);
-+        if (fd < 0) {
-+            return -EINVAL;
-+        }
-+
-+        ret = blkio_set_int(s->blkio, "fd", fd);
-+        if (ret < 0) {
-+            error_setg_errno(errp, -ret, "failed to set fd: %s",
-+                             blkio_get_error_msg());
-+            qemu_close(fd);
-+            return ret;
-+        }
-+    } else {
-+        ret = blkio_set_str(s->blkio, "path", path);
-+        if (ret < 0) {
-+            error_setg_errno(errp, -ret, "failed to set path: %s",
-+                             blkio_get_error_msg());
-+            return ret;
-+        }
-+    }
-+
-+    qdict_del(options, "path");
-+
-     return 0;
- }
- 
--- 
-2.39.3
-
diff --git a/kvm-block-compile-out-assert_bdrv_graph_readable-by-defa.patch b/kvm-block-compile-out-assert_bdrv_graph_readable-by-defa.patch
deleted file mode 100644
index b6eebf3..0000000
--- a/kvm-block-compile-out-assert_bdrv_graph_readable-by-defa.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From d9190117f3c701380701d6e9b2aa3c2446b9708f Mon Sep 17 00:00:00 2001
-From: Stefan Hajnoczi <stefanha@redhat.com>
-Date: Mon, 1 May 2023 13:34:43 -0400
-Subject: [PATCH 01/21] block: compile out assert_bdrv_graph_readable() by
- default
-
-RH-Author: Kevin Wolf <kwolf@redhat.com>
-RH-MergeRequest: 166: block/graph-lock: Disable locking for now
-RH-Bugzilla: 2186725
-RH-Acked-by: Eric Blake <eblake@redhat.com>
-RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
-RH-Commit: [1/4] d8cb4bb832c85e8216d97e57679a34c7bc6a8f71 (kmwolf/centos-qemu-kvm)
-
-reader_count() is a performance bottleneck because the global
-aio_context_list_lock mutex causes thread contention. Put this debugging
-assertion behind a new ./configure --enable-debug-graph-lock option and
-disable it by default.
-
-The --enable-debug-graph-lock option is also enabled by the more general
---enable-debug option.
-
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-Message-Id: <20230501173443.153062-1-stefanha@redhat.com>
-Reviewed-by: Kevin Wolf <kwolf@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-(cherry picked from commit 58a2e3f5c37be02dac3086b81bdda9414b931edf)
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/graph-lock.c            | 3 +++
- configure                     | 1 +
- meson.build                   | 2 ++
- meson_options.txt             | 2 ++
- scripts/meson-buildoptions.sh | 4 ++++
- 5 files changed, 12 insertions(+)
-
-diff --git a/block/graph-lock.c b/block/graph-lock.c
-index 454c31e691..259a7a0bde 100644
---- a/block/graph-lock.c
-+++ b/block/graph-lock.c
-@@ -265,7 +265,10 @@ void bdrv_graph_rdunlock_main_loop(void)
- 
- void assert_bdrv_graph_readable(void)
- {
-+    /* reader_count() is slow due to aio_context_list_lock lock contention */
-+#ifdef CONFIG_DEBUG_GRAPH_LOCK
-     assert(qemu_in_main_thread() || reader_count());
-+#endif
- }
- 
- void assert_bdrv_graph_writable(void)
-diff --git a/configure b/configure
-index 800b5850f4..a62a3e6be9 100755
---- a/configure
-+++ b/configure
-@@ -806,6 +806,7 @@ for opt do
-   --enable-debug)
-       # Enable debugging options that aren't excessively noisy
-       debug_tcg="yes"
-+      meson_option_parse --enable-debug-graph-lock ""
-       meson_option_parse --enable-debug-mutex ""
-       meson_option_add -Doptimization=0
-       fortify_source="no"
-diff --git a/meson.build b/meson.build
-index c44d05a13f..d964e741e7 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1956,6 +1956,7 @@ if get_option('debug_stack_usage') and have_coroutine_pool
-   have_coroutine_pool = false
- endif
- config_host_data.set10('CONFIG_COROUTINE_POOL', have_coroutine_pool)
-+config_host_data.set('CONFIG_DEBUG_GRAPH_LOCK', get_option('debug_graph_lock'))
- config_host_data.set('CONFIG_DEBUG_MUTEX', get_option('debug_mutex'))
- config_host_data.set('CONFIG_DEBUG_STACK_USAGE', get_option('debug_stack_usage'))
- config_host_data.set('CONFIG_GPROF', get_option('gprof'))
-@@ -3833,6 +3834,7 @@ summary_info += {'PIE':               get_option('b_pie')}
- summary_info += {'static build':      config_host.has_key('CONFIG_STATIC')}
- summary_info += {'malloc trim support': has_malloc_trim}
- summary_info += {'membarrier':        have_membarrier}
-+summary_info += {'debug graph lock':  get_option('debug_graph_lock')}
- summary_info += {'debug stack usage': get_option('debug_stack_usage')}
- summary_info += {'mutex debugging':   get_option('debug_mutex')}
- summary_info += {'memory allocator':  get_option('malloc')}
-diff --git a/meson_options.txt b/meson_options.txt
-index fc9447d267..bc857fe68b 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -311,6 +311,8 @@ option('rng_none', type: 'boolean', value: false,
-        description: 'dummy RNG, avoid using /dev/(u)random and getrandom()')
- option('coroutine_pool', type: 'boolean', value: true,
-        description: 'coroutine freelist (better performance)')
-+option('debug_graph_lock', type: 'boolean', value: false,
-+       description: 'graph lock debugging support')
- option('debug_mutex', type: 'boolean', value: false,
-        description: 'mutex debugging support')
- option('debug_stack_usage', type: 'boolean', value: false,
-diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
-index 009fab1515..30e1f25259 100644
---- a/scripts/meson-buildoptions.sh
-+++ b/scripts/meson-buildoptions.sh
-@@ -21,6 +21,8 @@ meson_options_help() {
-   printf "%s\n" '                           QEMU'
-   printf "%s\n" '  --enable-cfi             Control-Flow Integrity (CFI)'
-   printf "%s\n" '  --enable-cfi-debug       Verbose errors in case of CFI violation'
-+  printf "%s\n" '  --enable-debug-graph-lock'
-+  printf "%s\n" '                           graph lock debugging support'
-   printf "%s\n" '  --enable-debug-mutex     mutex debugging support'
-   printf "%s\n" '  --enable-debug-stack-usage'
-   printf "%s\n" '                           measure coroutine stack usage'
-@@ -249,6 +251,8 @@ _meson_option_parse() {
-     --datadir=*) quote_sh "-Ddatadir=$2" ;;
-     --enable-dbus-display) printf "%s" -Ddbus_display=enabled ;;
-     --disable-dbus-display) printf "%s" -Ddbus_display=disabled ;;
-+    --enable-debug-graph-lock) printf "%s" -Ddebug_graph_lock=true ;;
-+    --disable-debug-graph-lock) printf "%s" -Ddebug_graph_lock=false ;;
-     --enable-debug-mutex) printf "%s" -Ddebug_mutex=true ;;
-     --disable-debug-mutex) printf "%s" -Ddebug_mutex=false ;;
-     --enable-debug-stack-usage) printf "%s" -Ddebug_stack_usage=true ;;
--- 
-2.39.3
-
diff --git a/kvm-checkpatch-add-qemu_bh_new-aio_bh_new-checks.patch b/kvm-checkpatch-add-qemu_bh_new-aio_bh_new-checks.patch
deleted file mode 100644
index 4173648..0000000
--- a/kvm-checkpatch-add-qemu_bh_new-aio_bh_new-checks.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 961bc392ee60743344236ddd247ab646a0eec914 Mon Sep 17 00:00:00 2001
-From: Jon Maloy <jmaloy@redhat.com>
-Date: Tue, 9 May 2023 10:29:03 -0400
-Subject: [PATCH 07/21] checkpatch: add qemu_bh_new/aio_bh_new checks
-
-RH-Author: Jon Maloy <jmaloy@redhat.com>
-RH-MergeRequest: 165: memory: prevent dma-reentracy issues
-RH-Jira: RHEL-516
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [3/13] e0473487f0e3186c42559a5c36a8650f27ab26ae (jmaloy/jmaloy-qemu-kvm-2)
-
-Jira: https://issues.redhat.com/browse/RHEL-516
-Upstream: Merged
-CVE: CVE-2023-2680
-
-commit ef56ffbdd6b0605dc1e305611287b948c970e236
-Author: Alexander Bulekov <alxndr@bu.edu>
-Date:   Thu Apr 27 17:10:08 2023 -0400
-
-    checkpatch: add qemu_bh_new/aio_bh_new checks
-
-    Advise authors to use the _guarded versions of the APIs, instead.
-
-    Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
-    Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
-    Message-Id: <20230427211013.2994127-4-alxndr@bu.edu>
-    Signed-off-by: Thomas Huth <thuth@redhat.com>
-
-Signed-off-by: Jon Maloy <jmaloy@redhat.com>
----
- scripts/checkpatch.pl | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
-index d768171dcf..eeaec436eb 100755
---- a/scripts/checkpatch.pl
-+++ b/scripts/checkpatch.pl
-@@ -2865,6 +2865,14 @@ sub process {
- 		if ($line =~ /\bsignal\s*\(/ && !($line =~ /SIG_(?:IGN|DFL)/)) {
- 			ERROR("use sigaction to establish signal handlers; signal is not portable\n" . $herecurr);
- 		}
-+# recommend qemu_bh_new_guarded instead of qemu_bh_new
-+        if ($realfile =~ /.*\/hw\/.*/ && $line =~ /\bqemu_bh_new\s*\(/) {
-+			ERROR("use qemu_bh_new_guarded() instead of qemu_bh_new() to avoid reentrancy problems\n" . $herecurr);
-+		}
-+# recommend aio_bh_new_guarded instead of aio_bh_new
-+        if ($realfile =~ /.*\/hw\/.*/ && $line =~ /\baio_bh_new\s*\(/) {
-+			ERROR("use aio_bh_new_guarded() instead of aio_bh_new() to avoid reentrancy problems\n" . $herecurr);
-+		}
- # check for module_init(), use category-specific init macros explicitly please
- 		if ($line =~ /^module_init\s*\(/) {
- 			ERROR("please use block_init(), type_init() etc. instead of module_init()\n" . $herecurr);
--- 
-2.39.3
-
diff --git a/kvm-graph-lock-Disable-locking-for-now.patch b/kvm-graph-lock-Disable-locking-for-now.patch
deleted file mode 100644
index 77086e5..0000000
--- a/kvm-graph-lock-Disable-locking-for-now.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From 516bf44de08a13d97c08e210137078e642ce8e88 Mon Sep 17 00:00:00 2001
-From: Kevin Wolf <kwolf@redhat.com>
-Date: Wed, 17 May 2023 17:28:32 +0200
-Subject: [PATCH 02/21] graph-lock: Disable locking for now
-
-RH-Author: Kevin Wolf <kwolf@redhat.com>
-RH-MergeRequest: 166: block/graph-lock: Disable locking for now
-RH-Bugzilla: 2186725
-RH-Acked-by: Eric Blake <eblake@redhat.com>
-RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
-RH-Commit: [2/4] 39d42fb527aad0491a018743289de7b762108317 (kmwolf/centos-qemu-kvm)
-
-In QEMU 8.0, we've been seeing deadlocks in bdrv_graph_wrlock(). They
-come from callers that hold an AioContext lock, which is not allowed
-during polling. In theory, we could temporarily release the lock, but
-callers are inconsistent about whether they hold a lock, and if they do,
-some are also confused about which one they hold. While all of this is
-fixable, it's not trivial, and the best course of action for 8.0.1 is
-probably just disabling the graph locking code temporarily.
-
-We don't currently rely on graph locking yet. It is supposed to replace
-the AioContext lock eventually to enable multiqueue support, but as long
-as we still have the AioContext lock, it is sufficient without the graph
-lock. Once the AioContext lock goes away, the deadlock doesn't exist any
-more either and this commit can be reverted. (Of course, it can also be
-reverted while the AioContext lock still exists if the callers have been
-fixed.)
-
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Message-Id: <20230517152834.277483-2-kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-(cherry picked from commit 80fc5d260002432628710f8b0c7cfc7d9b97bb9d)
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- block/graph-lock.c | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
-diff --git a/block/graph-lock.c b/block/graph-lock.c
-index 259a7a0bde..2490926c90 100644
---- a/block/graph-lock.c
-+++ b/block/graph-lock.c
-@@ -30,8 +30,10 @@ BdrvGraphLock graph_lock;
- /* Protects the list of aiocontext and orphaned_reader_count */
- static QemuMutex aio_context_list_lock;
- 
-+#if 0
- /* Written and read with atomic operations. */
- static int has_writer;
-+#endif
- 
- /*
-  * A reader coroutine could move from an AioContext to another.
-@@ -88,6 +90,7 @@ void unregister_aiocontext(AioContext *ctx)
-     g_free(ctx->bdrv_graph);
- }
- 
-+#if 0
- static uint32_t reader_count(void)
- {
-     BdrvGraphRWlock *brdv_graph;
-@@ -105,10 +108,17 @@ static uint32_t reader_count(void)
-     assert((int32_t)rd >= 0);
-     return rd;
- }
-+#endif
- 
- void bdrv_graph_wrlock(void)
- {
-     GLOBAL_STATE_CODE();
-+    /*
-+     * TODO Some callers hold an AioContext lock when this is called, which
-+     * causes deadlocks. Reenable once the AioContext locking is cleaned up (or
-+     * AioContext locks are gone).
-+     */
-+#if 0
-     assert(!qatomic_read(&has_writer));
- 
-     /* Make sure that constantly arriving new I/O doesn't cause starvation */
-@@ -139,11 +149,13 @@ void bdrv_graph_wrlock(void)
-     } while (reader_count() >= 1);
- 
-     bdrv_drain_all_end();
-+#endif
- }
- 
- void bdrv_graph_wrunlock(void)
- {
-     GLOBAL_STATE_CODE();
-+#if 0
-     QEMU_LOCK_GUARD(&aio_context_list_lock);
-     assert(qatomic_read(&has_writer));
- 
-@@ -155,10 +167,13 @@ void bdrv_graph_wrunlock(void)
- 
-     /* Wake up all coroutine that are waiting to read the graph */
-     qemu_co_enter_all(&reader_queue, &aio_context_list_lock);
-+#endif
- }
- 
- void coroutine_fn bdrv_graph_co_rdlock(void)
- {
-+    /* TODO Reenable when wrlock is reenabled */
-+#if 0
-     BdrvGraphRWlock *bdrv_graph;
-     bdrv_graph = qemu_get_current_aio_context()->bdrv_graph;
- 
-@@ -223,10 +238,12 @@ void coroutine_fn bdrv_graph_co_rdlock(void)
-             qemu_co_queue_wait(&reader_queue, &aio_context_list_lock);
-         }
-     }
-+#endif
- }
- 
- void coroutine_fn bdrv_graph_co_rdunlock(void)
- {
-+#if 0
-     BdrvGraphRWlock *bdrv_graph;
-     bdrv_graph = qemu_get_current_aio_context()->bdrv_graph;
- 
-@@ -249,6 +266,7 @@ void coroutine_fn bdrv_graph_co_rdunlock(void)
-     if (qatomic_read(&has_writer)) {
-         aio_wait_kick();
-     }
-+#endif
- }
- 
- void bdrv_graph_rdlock_main_loop(void)
-@@ -266,13 +284,19 @@ void bdrv_graph_rdunlock_main_loop(void)
- void assert_bdrv_graph_readable(void)
- {
-     /* reader_count() is slow due to aio_context_list_lock lock contention */
-+    /* TODO Reenable when wrlock is reenabled */
-+#if 0
- #ifdef CONFIG_DEBUG_GRAPH_LOCK
-     assert(qemu_in_main_thread() || reader_count());
- #endif
-+#endif
- }
- 
- void assert_bdrv_graph_writable(void)
- {
-     assert(qemu_in_main_thread());
-+    /* TODO Reenable when wrlock is reenabled */
-+#if 0
-     assert(qatomic_read(&has_writer));
-+#endif
- }
--- 
-2.39.3
-
diff --git a/kvm-hw-acpi-Mark-acpi-blobs-as-resizable-on-RHEL-pc-mach.patch b/kvm-hw-acpi-Mark-acpi-blobs-as-resizable-on-RHEL-pc-mach.patch
deleted file mode 100644
index 67e702c..0000000
--- a/kvm-hw-acpi-Mark-acpi-blobs-as-resizable-on-RHEL-pc-mach.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b4645e7682aa1bde6f89df0eff2a9de83720eecc Mon Sep 17 00:00:00 2001
-From: Ani Sinha <anisinha@redhat.com>
-Date: Tue, 2 May 2023 15:51:53 +0530
-Subject: [PATCH 3/3] hw/acpi: Mark acpi blobs as resizable on RHEL pc machines
- version 7.6 and above
-
-RH-Author: Ani Sinha <None>
-RH-MergeRequest: 160: hw/acpi: limit warning on acpi table size to pc machines older than version 2.3
-RH-Bugzilla: 1934134
-RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: MST <mst@redhat.com>
-RH-Commit: [2/2] 95d443af6e75c569d89d04d028012c3c56c0c3a4 (anisinha/centos-qemu-kvm)
-
-Please look at QEMU upstream commit
-1af507756bae7 ("hw/acpi: limit warning on acpi table size to pc machines older than version 2.3")
-This patch adapts the above change so that it applies to RHEL pc machines of
-version 7.6 and newer. These are the machine types that are currently supported
-in RHEL. Q35 machines are not affected.
-
-Signed-off-by: Ani Sinha <anisinha@redhat.com>
----
- hw/i386/pc_piix.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
-index 4d5880e249..6c7be628e1 100644
---- a/hw/i386/pc_piix.c
-+++ b/hw/i386/pc_piix.c
-@@ -914,6 +914,7 @@ static void pc_machine_rhel7_options(MachineClass *m)
-     m->default_machine_opts = "firmware=bios-256k.bin,hpet=off";
-     pcmc->default_nic_model = "e1000";
-     pcmc->pci_root_uid = 0;
-+    pcmc->resizable_acpi_blob = true;
-     m->default_display = "std";
-     m->no_parallel = 1;
-     m->numa_mem_supported = true;
--- 
-2.39.1
-
diff --git a/kvm-hw-acpi-limit-warning-on-acpi-table-size-to-pc-machi.patch b/kvm-hw-acpi-limit-warning-on-acpi-table-size-to-pc-machi.patch
deleted file mode 100644
index e06113a..0000000
--- a/kvm-hw-acpi-limit-warning-on-acpi-table-size-to-pc-machi.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 3f70da88788c398877b8ded0b27689530385302b Mon Sep 17 00:00:00 2001
-From: Ani Sinha <anisinha@redhat.com>
-Date: Wed, 29 Mar 2023 10:27:26 +0530
-Subject: [PATCH 2/3] hw/acpi: limit warning on acpi table size to pc machines
- older than version 2.3
-
-RH-Author: Ani Sinha <None>
-RH-MergeRequest: 160: hw/acpi: limit warning on acpi table size to pc machines older than version 2.3
-RH-Bugzilla: 1934134
-RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: MST <mst@redhat.com>
-RH-Commit: [1/2] 96c3b6d51e16734eb4e8de52635e0ca036964090 (anisinha/centos-qemu-kvm)
-
-i440fx machine versions 2.3 and newer supports dynamic ram
-resizing. See commit a1666142db6233 ("acpi-build: make ROMs RAM blocks resizeable") .
-Currently supported all q35 machine types (versions 2.4 and newer) supports
-resizable RAM/ROM blocks.Therefore the warning generated when the ACPI table
-size exceeds a pre-defined value does not apply to those machine versions.
-Add a check limiting the warning message to only those machines that does not
-support expandable ram blocks (that is, i440fx machines with version 2.2
-and older).
-
-Signed-off-by: Ani Sinha <anisinha@redhat.com>
-Message-Id: <20230329045726.14028-1-anisinha@redhat.com>
-Reviewed-by: Igor Mammedov <imammedo@redhat.com>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-(cherry picked from commit 1af507756bae775028c27d30e602e2b9c72cd074)
----
- hw/i386/acpi-build.c | 6 ++++--
- hw/i386/pc.c         | 1 +
- hw/i386/pc_piix.c    | 1 +
- include/hw/i386/pc.h | 3 +++
- 4 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
-index ec857a117e..9bc4d8a981 100644
---- a/hw/i386/acpi-build.c
-+++ b/hw/i386/acpi-build.c
-@@ -2695,7 +2695,8 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
-         int legacy_table_size =
-             ROUND_UP(tables_blob->len - aml_len + legacy_aml_len,
-                      ACPI_BUILD_ALIGN_SIZE);
--        if (tables_blob->len > legacy_table_size) {
-+        if ((tables_blob->len > legacy_table_size) &&
-+            !pcmc->resizable_acpi_blob) {
-             /* Should happen only with PCI bridges and -M pc-i440fx-2.0.  */
-             warn_report("ACPI table size %u exceeds %d bytes,"
-                         " migration may not work",
-@@ -2706,7 +2707,8 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
-         g_array_set_size(tables_blob, legacy_table_size);
-     } else {
-         /* Make sure we have a buffer in case we need to resize the tables. */
--        if (tables_blob->len > ACPI_BUILD_TABLE_SIZE / 2) {
-+        if ((tables_blob->len > ACPI_BUILD_TABLE_SIZE / 2) &&
-+            !pcmc->resizable_acpi_blob) {
-             /* As of QEMU 2.1, this fires with 160 VCPUs and 255 memory slots.  */
-             warn_report("ACPI table size %u exceeds %d bytes,"
-                         " migration may not work",
-diff --git a/hw/i386/pc.c b/hw/i386/pc.c
-index f216922cee..7db5a2348f 100644
---- a/hw/i386/pc.c
-+++ b/hw/i386/pc.c
-@@ -2092,6 +2092,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
-     pcmc->acpi_data_size = 0x20000 + 0x8000;
-     pcmc->pvh_enabled = true;
-     pcmc->kvmclock_create_always = true;
-+    pcmc->resizable_acpi_blob = true;
-     assert(!mc->get_hotplug_handler);
-     mc->async_pf_vmexit_disable = false;
-     mc->get_hotplug_handler = pc_get_hotplug_handler;
-diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
-index fc704d783f..4d5880e249 100644
---- a/hw/i386/pc_piix.c
-+++ b/hw/i386/pc_piix.c
-@@ -750,6 +750,7 @@ static void pc_i440fx_2_2_machine_options(MachineClass *m)
-     compat_props_add(m->compat_props, hw_compat_2_2, hw_compat_2_2_len);
-     compat_props_add(m->compat_props, pc_compat_2_2, pc_compat_2_2_len);
-     pcmc->rsdp_in_ram = false;
-+    pcmc->resizable_acpi_blob = false;
- }
- 
- DEFINE_I440FX_MACHINE(v2_2, "pc-i440fx-2.2", pc_compat_2_2_fn,
-diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
-index d218ad1628..2f514d13d8 100644
---- a/include/hw/i386/pc.h
-+++ b/include/hw/i386/pc.h
-@@ -130,6 +130,9 @@ struct PCMachineClass {
- 
-     /* create kvmclock device even when KVM PV features are not exposed */
-     bool kvmclock_create_always;
-+
-+    /* resizable acpi blob compat */
-+    bool resizable_acpi_blob;
- };
- 
- #define TYPE_PC_MACHINE "generic-pc-machine"
--- 
-2.39.1
-
diff --git a/kvm-hw-arm-Validate-cluster-and-NUMA-node-boundary.patch b/kvm-hw-arm-Validate-cluster-and-NUMA-node-boundary.patch
deleted file mode 100644
index e96bb10..0000000
--- a/kvm-hw-arm-Validate-cluster-and-NUMA-node-boundary.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 7b57aec372fc238cbaafe86557f9fb4b560895b1 Mon Sep 17 00:00:00 2001
-From: Gavin Shan <gshan@redhat.com>
-Date: Tue, 27 Jun 2023 20:20:09 +1000
-Subject: [PATCH 2/6] hw/arm: Validate cluster and NUMA node boundary
-
-RH-Author: Gavin Shan <gshan@redhat.com>
-RH-MergeRequest: 175: hw/arm: Validate CPU cluster and NUMA node boundary for RHEL machines
-RH-Bugzilla: 2171363
-RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Commit: [2/3] fcac7ea85d9f73613989903c642fc1bf6c51946b
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2171363
-
-There are two ARM machines where NUMA is aware: 'virt' and 'sbsa-ref'.
-Both of them are required to follow cluster-NUMA-node boundary. To
-enable the validation to warn about the irregular configuration where
-multiple CPUs in one cluster have been associated with different NUMA
-nodes.
-
-Signed-off-by: Gavin Shan <gshan@redhat.com>
-Acked-by: Igor Mammedov <imammedo@redhat.com>
-Message-Id: <20230509002739.18388-3-gshan@redhat.com>
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-(cherry picked from commit fecff672351ace5e39adf7dbcf7a8ee748b201cb)
-Signed-off-by: Gavin Shan <gshan@redhat.com>
----
- hw/arm/sbsa-ref.c | 2 ++
- hw/arm/virt.c     | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c
-index 0b93558dde..efb380e7c8 100644
---- a/hw/arm/sbsa-ref.c
-+++ b/hw/arm/sbsa-ref.c
-@@ -864,6 +864,8 @@ static void sbsa_ref_class_init(ObjectClass *oc, void *data)
-     mc->possible_cpu_arch_ids = sbsa_ref_possible_cpu_arch_ids;
-     mc->cpu_index_to_instance_props = sbsa_ref_cpu_index_to_props;
-     mc->get_default_cpu_node_id = sbsa_ref_get_default_cpu_node_id;
-+    /* platform instead of architectural choice */
-+    mc->cpu_cluster_has_numa_boundary = true;
- }
- 
- static const TypeInfo sbsa_ref_info = {
-diff --git a/hw/arm/virt.c b/hw/arm/virt.c
-index 9be53e9355..df6a0231bc 100644
---- a/hw/arm/virt.c
-+++ b/hw/arm/virt.c
-@@ -3083,6 +3083,8 @@ static void virt_machine_class_init(ObjectClass *oc, void *data)
-     mc->smp_props.clusters_supported = true;
-     mc->auto_enable_numa_with_memhp = true;
-     mc->auto_enable_numa_with_memdev = true;
-+    /* platform instead of architectural choice */
-+    mc->cpu_cluster_has_numa_boundary = true;
-     mc->default_ram_id = "mach-virt.ram";
- 
-     object_class_property_add(oc, "acpi", "OnOffAuto",
--- 
-2.39.3
-
diff --git a/kvm-hw-arm-smmu-Handle-big-endian-hosts-correctly.patch b/kvm-hw-arm-smmu-Handle-big-endian-hosts-correctly.patch
deleted file mode 100644
index 3bbe93f..0000000
--- a/kvm-hw-arm-smmu-Handle-big-endian-hosts-correctly.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From a3412036477e8c91e0b71fcd91de4e24a9904077 Mon Sep 17 00:00:00 2001
-From: Peter Maydell <peter.maydell@linaro.org>
-Date: Tue, 25 Jul 2023 10:56:51 +0100
-Subject: [PATCH 09/14] hw/arm/smmu: Handle big-endian hosts correctly
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Eric Auger <eric.auger@redhat.com>
-RH-MergeRequest: 197: virtio-iommu/smmu: backport some late fixes
-RH-Bugzilla: 2229133
-RH-Acked-by: Thomas Huth <thuth@redhat.com>
-RH-Acked-by: Peter Xu <peterx@redhat.com>
-RH-Commit: [3/3] df9c8d228b25273e0c4927a10b21e66fb4bef5f0 (eauger1/centos-qemu-kvm)
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2229133
-
-The implementation of the SMMUv3 has multiple places where it reads a
-data structure from the guest and directly operates on it without
-doing a guest-to-host endianness conversion.  Since all SMMU data
-structures are little-endian, this means that the SMMU doesn't work
-on a big-endian host.  In particular, this causes the Avocado test
-  machine_aarch64_virt.py:Aarch64VirtMachine.test_alpine_virt_tcg_gic_max
-to fail on an s390x host.
-
-Add appropriate byte-swapping on reads and writes of guest in-memory
-data structures so that the device works correctly on big-endian
-hosts.
-
-As part of this we constrain queue_read() to operate only on Cmd
-structs and queue_write() on Evt structs, because in practice these
-are the only data structures the two functions are used with, and we
-need to know what the data structure is to be able to byte-swap its
-parts correctly.
-
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Tested-by: Thomas Huth <thuth@redhat.com>
-Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-Reviewed-by: Eric Auger <eric.auger@redhat.com>
-Message-id: 20230717132641.764660-1-peter.maydell@linaro.org
-Cc: qemu-stable@nongnu.org
-(cherry picked from commit c6445544d4cea2628fbad3bad09f3d3a03c749d3)
-Signed-off-by: Eric Auger <eric.auger@redhat.com>
----
- hw/arm/smmu-common.c |  3 +--
- hw/arm/smmuv3.c      | 39 +++++++++++++++++++++++++++++++--------
- 2 files changed, 32 insertions(+), 10 deletions(-)
-
-diff --git a/hw/arm/smmu-common.c b/hw/arm/smmu-common.c
-index e7f1c1f219..daa02ce798 100644
---- a/hw/arm/smmu-common.c
-+++ b/hw/arm/smmu-common.c
-@@ -192,8 +192,7 @@ static int get_pte(dma_addr_t baseaddr, uint32_t index, uint64_t *pte,
-     dma_addr_t addr = baseaddr + index * sizeof(*pte);
- 
-     /* TODO: guarantee 64-bit single-copy atomicity */
--    ret = dma_memory_read(&address_space_memory, addr, pte, sizeof(*pte),
--                          MEMTXATTRS_UNSPECIFIED);
-+    ret = ldq_le_dma(&address_space_memory, addr, pte, MEMTXATTRS_UNSPECIFIED);
- 
-     if (ret != MEMTX_OK) {
-         info->type = SMMU_PTW_ERR_WALK_EABT;
-diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c
-index 270c80b665..cfb56725a6 100644
---- a/hw/arm/smmuv3.c
-+++ b/hw/arm/smmuv3.c
-@@ -98,20 +98,34 @@ static void smmuv3_write_gerrorn(SMMUv3State *s, uint32_t new_gerrorn)
-     trace_smmuv3_write_gerrorn(toggled & pending, s->gerrorn);
- }
- 
--static inline MemTxResult queue_read(SMMUQueue *q, void *data)
-+static inline MemTxResult queue_read(SMMUQueue *q, Cmd *cmd)
- {
-     dma_addr_t addr = Q_CONS_ENTRY(q);
-+    MemTxResult ret;
-+    int i;
- 
--    return dma_memory_read(&address_space_memory, addr, data, q->entry_size,
--                           MEMTXATTRS_UNSPECIFIED);
-+    ret = dma_memory_read(&address_space_memory, addr, cmd, sizeof(Cmd),
-+                          MEMTXATTRS_UNSPECIFIED);
-+    if (ret != MEMTX_OK) {
-+        return ret;
-+    }
-+    for (i = 0; i < ARRAY_SIZE(cmd->word); i++) {
-+        le32_to_cpus(&cmd->word[i]);
-+    }
-+    return ret;
- }
- 
--static MemTxResult queue_write(SMMUQueue *q, void *data)
-+static MemTxResult queue_write(SMMUQueue *q, Evt *evt_in)
- {
-     dma_addr_t addr = Q_PROD_ENTRY(q);
-     MemTxResult ret;
-+    Evt evt = *evt_in;
-+    int i;
- 
--    ret = dma_memory_write(&address_space_memory, addr, data, q->entry_size,
-+    for (i = 0; i < ARRAY_SIZE(evt.word); i++) {
-+        cpu_to_le32s(&evt.word[i]);
-+    }
-+    ret = dma_memory_write(&address_space_memory, addr, &evt, sizeof(Evt),
-                            MEMTXATTRS_UNSPECIFIED);
-     if (ret != MEMTX_OK) {
-         return ret;
-@@ -291,7 +305,7 @@ static void smmuv3_init_regs(SMMUv3State *s)
- static int smmu_get_ste(SMMUv3State *s, dma_addr_t addr, STE *buf,
-                         SMMUEventInfo *event)
- {
--    int ret;
-+    int ret, i;
- 
-     trace_smmuv3_get_ste(addr);
-     /* TODO: guarantee 64-bit single-copy atomicity */
-@@ -304,6 +318,9 @@ static int smmu_get_ste(SMMUv3State *s, dma_addr_t addr, STE *buf,
-         event->u.f_ste_fetch.addr = addr;
-         return -EINVAL;
-     }
-+    for (i = 0; i < ARRAY_SIZE(buf->word); i++) {
-+        le32_to_cpus(&buf->word[i]);
-+    }
-     return 0;
- 
- }
-@@ -313,7 +330,7 @@ static int smmu_get_cd(SMMUv3State *s, STE *ste, uint32_t ssid,
-                        CD *buf, SMMUEventInfo *event)
- {
-     dma_addr_t addr = STE_CTXPTR(ste);
--    int ret;
-+    int ret, i;
- 
-     trace_smmuv3_get_cd(addr);
-     /* TODO: guarantee 64-bit single-copy atomicity */
-@@ -326,6 +343,9 @@ static int smmu_get_cd(SMMUv3State *s, STE *ste, uint32_t ssid,
-         event->u.f_ste_fetch.addr = addr;
-         return -EINVAL;
-     }
-+    for (i = 0; i < ARRAY_SIZE(buf->word); i++) {
-+        le32_to_cpus(&buf->word[i]);
-+    }
-     return 0;
- }
- 
-@@ -407,7 +427,7 @@ static int smmu_find_ste(SMMUv3State *s, uint32_t sid, STE *ste,
-         return -EINVAL;
-     }
-     if (s->features & SMMU_FEATURE_2LVL_STE) {
--        int l1_ste_offset, l2_ste_offset, max_l2_ste, span;
-+        int l1_ste_offset, l2_ste_offset, max_l2_ste, span, i;
-         dma_addr_t l1ptr, l2ptr;
-         STEDesc l1std;
- 
-@@ -431,6 +451,9 @@ static int smmu_find_ste(SMMUv3State *s, uint32_t sid, STE *ste,
-             event->u.f_ste_fetch.addr = l1ptr;
-             return -EINVAL;
-         }
-+        for (i = 0; i < ARRAY_SIZE(l1std.word); i++) {
-+            le32_to_cpus(&l1std.word[i]);
-+        }
- 
-         span = L1STD_SPAN(&l1std);
- 
--- 
-2.39.3
-
diff --git a/kvm-hw-arm-virt-Validate-cluster-and-NUMA-node-boundary-.patch b/kvm-hw-arm-virt-Validate-cluster-and-NUMA-node-boundary-.patch
deleted file mode 100644
index 42ec705..0000000
--- a/kvm-hw-arm-virt-Validate-cluster-and-NUMA-node-boundary-.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 022529f6d0ee306da857825c72a98bf7ddf5de22 Mon Sep 17 00:00:00 2001
-From: Gavin Shan <gshan@redhat.com>
-Date: Tue, 27 Jun 2023 20:20:09 +1000
-Subject: [PATCH 3/6] hw/arm/virt: Validate cluster and NUMA node boundary for
- RHEL machines
-
-RH-Author: Gavin Shan <gshan@redhat.com>
-RH-MergeRequest: 175: hw/arm: Validate CPU cluster and NUMA node boundary for RHEL machines
-RH-Bugzilla: 2171363
-RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Commit: [3/3] a396c499259b566861ca007b01f8539bf6113711
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2171363
-Upstream Status: RHEL only
-
-Set mc->cpu_cluster_has_numa_boundary to true so that the boundary of
-CPU cluster and NUMA node will be validated for 'virt-rhel*' machines.
-A warning message will be printed if the boundary is broken.
-
-Signed-off-by: Gavin Shan <gshan@redhat.com>
----
- hw/arm/virt.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/hw/arm/virt.c b/hw/arm/virt.c
-index df6a0231bc..faf68488d5 100644
---- a/hw/arm/virt.c
-+++ b/hw/arm/virt.c
-@@ -3530,6 +3530,8 @@ static void rhel_machine_class_init(ObjectClass *oc, void *data)
-     mc->smp_props.clusters_supported = true;
-     mc->auto_enable_numa_with_memhp = true;
-     mc->auto_enable_numa_with_memdev = true;
-+    /* platform instead of architectural choice */
-+    mc->cpu_cluster_has_numa_boundary = true;
-     mc->default_ram_id = "mach-virt.ram";
- 
-     object_class_property_add(oc, "acpi", "OnOffAuto",
--- 
-2.39.3
-
diff --git a/kvm-hw-pci-Disable-PCI_ERR_UNCOR_MASK-reg-for-machine-ty.patch b/kvm-hw-pci-Disable-PCI_ERR_UNCOR_MASK-reg-for-machine-ty.patch
deleted file mode 100644
index fe9cd8c..0000000
--- a/kvm-hw-pci-Disable-PCI_ERR_UNCOR_MASK-reg-for-machine-ty.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 491cf9e251026d135f315b7fe0d8771841f06e9f Mon Sep 17 00:00:00 2001
-From: Leonardo Bras <leobras@redhat.com>
-Date: Tue, 25 Jul 2023 15:34:45 -0300
-Subject: [PATCH 8/9] hw/pci: Disable PCI_ERR_UNCOR_MASK reg for machine type
- <= pc-q35-rhel9.2.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Leonardo Brás <leobras@redhat.com>
-RH-MergeRequest: 192: hw/pci: Disable PCI_ERR_UNCOR_MASK reg for machine type <= pc-q35-rhel9.2.0
-RH-Bugzilla: 2223691
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [1/1] e57816f8ad15a9ce5f342b061c103ae011ec1223 (LeoBras/centos-qemu-kvm)
-
-This is a downstream-only patch to that sets off the property
-x-pcie-err-unc-mask for machine types <= pc-q35-rhel9.2.0, allowing
-live migrations to RHEL9.2 happen successfully.
-
-Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=2223691
-Fixes: 293a34b4be ("hw/pci: Disable PCI_ERR_UNCOR_MASK register for machine
-type < 8.0")
-Signed-off-by: Leonardo Bras <leobras@redhat.com>
----
- hw/core/machine.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/hw/core/machine.c b/hw/core/machine.c
-index 5ea52317b9..6f5117669d 100644
---- a/hw/core/machine.c
-+++ b/hw/core/machine.c
-@@ -62,6 +62,8 @@ GlobalProperty hw_compat_rhel_9_2[] = {
-   { "virtio-mem", "x-early-migration", "false" },
-   /* hw_compat_rhel_9_2 from hw_compat_7_2 */
-   { "migration", "x-preempt-pre-7-2", "true" },
-+  /* hw_compat_rhel_9_2 from hw_compat_7_2 */
-+  { TYPE_PCI_DEVICE, "x-pcie-err-unc-mask", "off" },
- };
- const size_t hw_compat_rhel_9_2_len = G_N_ELEMENTS(hw_compat_rhel_9_2);
- 
--- 
-2.39.3
-
diff --git a/kvm-hw-pci-Disable-PCI_ERR_UNCOR_MASK-register-for-machi.patch b/kvm-hw-pci-Disable-PCI_ERR_UNCOR_MASK-register-for-machi.patch
deleted file mode 100644
index 164bea7..0000000
--- a/kvm-hw-pci-Disable-PCI_ERR_UNCOR_MASK-register-for-machi.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 3ac01bb90da12538898f95b2fb4e7f6bc1557eb3 Mon Sep 17 00:00:00 2001
-From: Leonardo Bras <leobras@redhat.com>
-Date: Tue, 2 May 2023 21:27:02 -0300
-Subject: [PATCH 18/21] hw/pci: Disable PCI_ERR_UNCOR_MASK register for machine
- type < 8.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Leonardo Brás <leobras@redhat.com>
-RH-MergeRequest: 170: hw/pci: Disable PCI_ERR_UNCOR_MASK register for machine type < 8.0
-RH-Bugzilla: 2189423
-RH-Acked-by: Peter Xu <peterx@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [1/1] ad62dd5a8567f386770577513c00a0bf36bd3df1 (LeoBras/centos-qemu-kvm)
-
-Since it's implementation on v8.0.0-rc0, having the PCI_ERR_UNCOR_MASK
-set for machine types < 8.0 will cause migration to fail if the target
-QEMU version is < 8.0.0 :
-
-qemu-system-x86_64: get_pci_config_device: Bad config data: i=0x10a read: 40 device: 0 cmask: ff wmask: 0 w1cmask:0
-qemu-system-x86_64: Failed to load PCIDevice:config
-qemu-system-x86_64: Failed to load e1000e:parent_obj
-qemu-system-x86_64: error while loading state for instance 0x0 of device '0000:00:02.0/e1000e'
-qemu-system-x86_64: load of migration failed: Invalid argument
-
-The above test migrated a 7.2 machine type from QEMU master to QEMU 7.2.0,
-with this cmdline:
-
-./qemu-system-x86_64 -M pc-q35-7.2 [-incoming XXX]
-
-In order to fix this, property x-pcie-err-unc-mask was introduced to
-control when PCI_ERR_UNCOR_MASK is enabled. This property is enabled by
-default, but is disabled if machine type <= 7.2.
-
-Fixes: 010746ae1d ("hw/pci/aer: Implement PCI_ERR_UNCOR_MASK register")
-Suggested-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Leonardo Bras <leobras@redhat.com>
-Message-Id: <20230503002701.854329-1-leobras@redhat.com>
-Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
-Reviewed-by: Peter Xu <peterx@redhat.com>
-Reviewed-by: Juan Quintela <quintela@redhat.com>
-Fixes: https://gitlab.com/qemu-project/qemu/-/issues/1576
-Tested-by: Fiona Ebner <f.ebner@proxmox.com>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-(cherry picked from commit 5ed3dabe57dd9f4c007404345e5f5bf0e347317f)
-Signed-off-by: Leonardo Bras <leobras@redhat.com>
----
- hw/core/machine.c    |  1 +
- hw/pci/pci.c         |  2 ++
- hw/pci/pcie_aer.c    | 11 +++++++----
- include/hw/pci/pci.h |  2 ++
- 4 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/hw/core/machine.c b/hw/core/machine.c
-index 0e0120b7f2..c28702b690 100644
---- a/hw/core/machine.c
-+++ b/hw/core/machine.c
-@@ -43,6 +43,7 @@ GlobalProperty hw_compat_7_2[] = {
-     { "e1000e", "migrate-timadj", "off" },
-     { "virtio-mem", "x-early-migration", "false" },
-     { "migration", "x-preempt-pre-7-2", "true" },
-+    { TYPE_PCI_DEVICE, "x-pcie-err-unc-mask", "off" },
- };
- const size_t hw_compat_7_2_len = G_N_ELEMENTS(hw_compat_7_2);
- 
-diff --git a/hw/pci/pci.c b/hw/pci/pci.c
-index def5000e7b..8ad4349e96 100644
---- a/hw/pci/pci.c
-+++ b/hw/pci/pci.c
-@@ -79,6 +79,8 @@ static Property pci_props[] = {
-     DEFINE_PROP_STRING("failover_pair_id", PCIDevice,
-                        failover_pair_id),
-     DEFINE_PROP_UINT32("acpi-index",  PCIDevice, acpi_index, 0),
-+    DEFINE_PROP_BIT("x-pcie-err-unc-mask", PCIDevice, cap_present,
-+                    QEMU_PCIE_ERR_UNC_MASK_BITNR, true),
-     DEFINE_PROP_END_OF_LIST()
- };
- 
-diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c
-index 103667c368..374d593ead 100644
---- a/hw/pci/pcie_aer.c
-+++ b/hw/pci/pcie_aer.c
-@@ -112,10 +112,13 @@ int pcie_aer_init(PCIDevice *dev, uint8_t cap_ver, uint16_t offset,
- 
-     pci_set_long(dev->w1cmask + offset + PCI_ERR_UNCOR_STATUS,
-                  PCI_ERR_UNC_SUPPORTED);
--    pci_set_long(dev->config + offset + PCI_ERR_UNCOR_MASK,
--                 PCI_ERR_UNC_MASK_DEFAULT);
--    pci_set_long(dev->wmask + offset + PCI_ERR_UNCOR_MASK,
--                 PCI_ERR_UNC_SUPPORTED);
-+
-+    if (dev->cap_present & QEMU_PCIE_ERR_UNC_MASK) {
-+        pci_set_long(dev->config + offset + PCI_ERR_UNCOR_MASK,
-+                     PCI_ERR_UNC_MASK_DEFAULT);
-+        pci_set_long(dev->wmask + offset + PCI_ERR_UNCOR_MASK,
-+                     PCI_ERR_UNC_SUPPORTED);
-+    }
- 
-     pci_set_long(dev->config + offset + PCI_ERR_UNCOR_SEVER,
-                  PCI_ERR_UNC_SEVERITY_DEFAULT);
-diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
-index d5a40cd058..6dc6742fc4 100644
---- a/include/hw/pci/pci.h
-+++ b/include/hw/pci/pci.h
-@@ -207,6 +207,8 @@ enum {
-     QEMU_PCIE_EXTCAP_INIT = (1 << QEMU_PCIE_EXTCAP_INIT_BITNR),
- #define QEMU_PCIE_CXL_BITNR 10
-     QEMU_PCIE_CAP_CXL = (1 << QEMU_PCIE_CXL_BITNR),
-+#define QEMU_PCIE_ERR_UNC_MASK_BITNR 11
-+    QEMU_PCIE_ERR_UNC_MASK = (1 << QEMU_PCIE_ERR_UNC_MASK_BITNR),
- };
- 
- typedef struct PCIINTxRoute {
--- 
-2.39.3
-
diff --git a/kvm-hw-replace-most-qemu_bh_new-calls-with-qemu_bh_new_g.patch b/kvm-hw-replace-most-qemu_bh_new-calls-with-qemu_bh_new_g.patch
deleted file mode 100644
index 08ee94f..0000000
--- a/kvm-hw-replace-most-qemu_bh_new-calls-with-qemu_bh_new_g.patch
+++ /dev/null
@@ -1,470 +0,0 @@
-From d1b7a9b25c0df9016cd8e93d40837314b1a81d70 Mon Sep 17 00:00:00 2001
-From: Jon Maloy <jmaloy@redhat.com>
-Date: Tue, 9 May 2023 10:29:03 -0400
-Subject: [PATCH 08/21] hw: replace most qemu_bh_new calls with
- qemu_bh_new_guarded
-
-RH-Author: Jon Maloy <jmaloy@redhat.com>
-RH-MergeRequest: 165: memory: prevent dma-reentracy issues
-RH-Jira: RHEL-516
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [4/13] bcbc67dd0023aee2b3a342665237daa83b183c7b (jmaloy/jmaloy-qemu-kvm-2)
-
-Jira: https://issues.redhat.com/browse/RHEL-516
-Upstream: Merged
-CVE: CVE-2023-2680
-
-commit f63192b0544af5d3e4d5edfd85ab520fcf671377
-Author: Alexander Bulekov <alxndr@bu.edu>
-Date:   Thu Apr 27 17:10:09 2023 -0400
-
-    hw: replace most qemu_bh_new calls with qemu_bh_new_guarded
-
-    This protects devices from bh->mmio reentrancy issues.
-
-    Thanks: Thomas Huth <thuth@redhat.com> for diagnosing OS X test failure.
-    Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
-    Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
-    Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-    Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-    Reviewed-by: Paul Durrant <paul@xen.org>
-    Reviewed-by: Thomas Huth <thuth@redhat.com>
-    Message-Id: <20230427211013.2994127-5-alxndr@bu.edu>
-    Signed-off-by: Thomas Huth <thuth@redhat.com>
-
-Signed-off-by: Jon Maloy <jmaloy@redhat.com>
----
- hw/9pfs/xen-9p-backend.c        | 5 ++++-
- hw/block/dataplane/virtio-blk.c | 3 ++-
- hw/block/dataplane/xen-block.c  | 5 +++--
- hw/char/virtio-serial-bus.c     | 3 ++-
- hw/display/qxl.c                | 9 ++++++---
- hw/display/virtio-gpu.c         | 6 ++++--
- hw/ide/ahci.c                   | 3 ++-
- hw/ide/ahci_internal.h          | 1 +
- hw/ide/core.c                   | 4 +++-
- hw/misc/imx_rngc.c              | 6 ++++--
- hw/misc/macio/mac_dbdma.c       | 2 +-
- hw/net/virtio-net.c             | 3 ++-
- hw/nvme/ctrl.c                  | 6 ++++--
- hw/scsi/mptsas.c                | 3 ++-
- hw/scsi/scsi-bus.c              | 3 ++-
- hw/scsi/vmw_pvscsi.c            | 3 ++-
- hw/usb/dev-uas.c                | 3 ++-
- hw/usb/hcd-dwc2.c               | 3 ++-
- hw/usb/hcd-ehci.c               | 3 ++-
- hw/usb/hcd-uhci.c               | 2 +-
- hw/usb/host-libusb.c            | 6 ++++--
- hw/usb/redirect.c               | 6 ++++--
- hw/usb/xen-usb.c                | 3 ++-
- hw/virtio/virtio-balloon.c      | 5 +++--
- hw/virtio/virtio-crypto.c       | 3 ++-
- 25 files changed, 66 insertions(+), 33 deletions(-)
-
-diff --git a/hw/9pfs/xen-9p-backend.c b/hw/9pfs/xen-9p-backend.c
-index 74f3a05f88..0e266c552b 100644
---- a/hw/9pfs/xen-9p-backend.c
-+++ b/hw/9pfs/xen-9p-backend.c
-@@ -61,6 +61,7 @@ typedef struct Xen9pfsDev {
- 
-     int num_rings;
-     Xen9pfsRing *rings;
-+    MemReentrancyGuard mem_reentrancy_guard;
- } Xen9pfsDev;
- 
- static void xen_9pfs_disconnect(struct XenLegacyDevice *xendev);
-@@ -443,7 +444,9 @@ static int xen_9pfs_connect(struct XenLegacyDevice *xendev)
-         xen_9pdev->rings[i].ring.out = xen_9pdev->rings[i].data +
-                                        XEN_FLEX_RING_SIZE(ring_order);
- 
--        xen_9pdev->rings[i].bh = qemu_bh_new(xen_9pfs_bh, &xen_9pdev->rings[i]);
-+        xen_9pdev->rings[i].bh = qemu_bh_new_guarded(xen_9pfs_bh,
-+                                                     &xen_9pdev->rings[i],
-+                                                     &xen_9pdev->mem_reentrancy_guard);
-         xen_9pdev->rings[i].out_cons = 0;
-         xen_9pdev->rings[i].out_size = 0;
-         xen_9pdev->rings[i].inprogress = false;
-diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c
-index b28d81737e..a6202997ee 100644
---- a/hw/block/dataplane/virtio-blk.c
-+++ b/hw/block/dataplane/virtio-blk.c
-@@ -127,7 +127,8 @@ bool virtio_blk_data_plane_create(VirtIODevice *vdev, VirtIOBlkConf *conf,
-     } else {
-         s->ctx = qemu_get_aio_context();
-     }
--    s->bh = aio_bh_new(s->ctx, notify_guest_bh, s);
-+    s->bh = aio_bh_new_guarded(s->ctx, notify_guest_bh, s,
-+                               &DEVICE(vdev)->mem_reentrancy_guard);
-     s->batch_notify_vqs = bitmap_new(conf->num_queues);
- 
-     *dataplane = s;
-diff --git a/hw/block/dataplane/xen-block.c b/hw/block/dataplane/xen-block.c
-index 734da42ea7..d8bc39d359 100644
---- a/hw/block/dataplane/xen-block.c
-+++ b/hw/block/dataplane/xen-block.c
-@@ -633,8 +633,9 @@ XenBlockDataPlane *xen_block_dataplane_create(XenDevice *xendev,
-     } else {
-         dataplane->ctx = qemu_get_aio_context();
-     }
--    dataplane->bh = aio_bh_new(dataplane->ctx, xen_block_dataplane_bh,
--                               dataplane);
-+    dataplane->bh = aio_bh_new_guarded(dataplane->ctx, xen_block_dataplane_bh,
-+                                       dataplane,
-+                                       &DEVICE(xendev)->mem_reentrancy_guard);
- 
-     return dataplane;
- }
-diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
-index 7d4601cb5d..dd619f0731 100644
---- a/hw/char/virtio-serial-bus.c
-+++ b/hw/char/virtio-serial-bus.c
-@@ -985,7 +985,8 @@ static void virtser_port_device_realize(DeviceState *dev, Error **errp)
-         return;
-     }
- 
--    port->bh = qemu_bh_new(flush_queued_data_bh, port);
-+    port->bh = qemu_bh_new_guarded(flush_queued_data_bh, port,
-+                                   &dev->mem_reentrancy_guard);
-     port->elem = NULL;
- }
- 
-diff --git a/hw/display/qxl.c b/hw/display/qxl.c
-index 80ce1e9a93..f1c0eb7dfc 100644
---- a/hw/display/qxl.c
-+++ b/hw/display/qxl.c
-@@ -2201,11 +2201,14 @@ static void qxl_realize_common(PCIQXLDevice *qxl, Error **errp)
- 
-     qemu_add_vm_change_state_handler(qxl_vm_change_state_handler, qxl);
- 
--    qxl->update_irq = qemu_bh_new(qxl_update_irq_bh, qxl);
-+    qxl->update_irq = qemu_bh_new_guarded(qxl_update_irq_bh, qxl,
-+                                          &DEVICE(qxl)->mem_reentrancy_guard);
-     qxl_reset_state(qxl);
- 
--    qxl->update_area_bh = qemu_bh_new(qxl_render_update_area_bh, qxl);
--    qxl->ssd.cursor_bh = qemu_bh_new(qemu_spice_cursor_refresh_bh, &qxl->ssd);
-+    qxl->update_area_bh = qemu_bh_new_guarded(qxl_render_update_area_bh, qxl,
-+                                              &DEVICE(qxl)->mem_reentrancy_guard);
-+    qxl->ssd.cursor_bh = qemu_bh_new_guarded(qemu_spice_cursor_refresh_bh, &qxl->ssd,
-+                                             &DEVICE(qxl)->mem_reentrancy_guard);
- }
- 
- static void qxl_realize_primary(PCIDevice *dev, Error **errp)
-diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
-index 5e15c79b94..66ac9b6cc5 100644
---- a/hw/display/virtio-gpu.c
-+++ b/hw/display/virtio-gpu.c
-@@ -1339,8 +1339,10 @@ void virtio_gpu_device_realize(DeviceState *qdev, Error **errp)
- 
-     g->ctrl_vq = virtio_get_queue(vdev, 0);
-     g->cursor_vq = virtio_get_queue(vdev, 1);
--    g->ctrl_bh = qemu_bh_new(virtio_gpu_ctrl_bh, g);
--    g->cursor_bh = qemu_bh_new(virtio_gpu_cursor_bh, g);
-+    g->ctrl_bh = qemu_bh_new_guarded(virtio_gpu_ctrl_bh, g,
-+                                     &qdev->mem_reentrancy_guard);
-+    g->cursor_bh = qemu_bh_new_guarded(virtio_gpu_cursor_bh, g,
-+                                       &qdev->mem_reentrancy_guard);
-     QTAILQ_INIT(&g->reslist);
-     QTAILQ_INIT(&g->cmdq);
-     QTAILQ_INIT(&g->fenceq);
-diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
-index 55902e1df7..4e76d6b191 100644
---- a/hw/ide/ahci.c
-+++ b/hw/ide/ahci.c
-@@ -1509,7 +1509,8 @@ static void ahci_cmd_done(const IDEDMA *dma)
-     ahci_write_fis_d2h(ad);
- 
-     if (ad->port_regs.cmd_issue && !ad->check_bh) {
--        ad->check_bh = qemu_bh_new(ahci_check_cmd_bh, ad);
-+        ad->check_bh = qemu_bh_new_guarded(ahci_check_cmd_bh, ad,
-+                                           &ad->mem_reentrancy_guard);
-         qemu_bh_schedule(ad->check_bh);
-     }
- }
-diff --git a/hw/ide/ahci_internal.h b/hw/ide/ahci_internal.h
-index 303fcd7235..2480455372 100644
---- a/hw/ide/ahci_internal.h
-+++ b/hw/ide/ahci_internal.h
-@@ -321,6 +321,7 @@ struct AHCIDevice {
-     bool init_d2h_sent;
-     AHCICmdHdr *cur_cmd;
-     NCQTransferState ncq_tfs[AHCI_MAX_CMDS];
-+    MemReentrancyGuard mem_reentrancy_guard;
- };
- 
- struct AHCIPCIState {
-diff --git a/hw/ide/core.c b/hw/ide/core.c
-index 45d14a25e9..de48ff9f86 100644
---- a/hw/ide/core.c
-+++ b/hw/ide/core.c
-@@ -513,6 +513,7 @@ BlockAIOCB *ide_issue_trim(
-         BlockCompletionFunc *cb, void *cb_opaque, void *opaque)
- {
-     IDEState *s = opaque;
-+    IDEDevice *dev = s->unit ? s->bus->slave : s->bus->master;
-     TrimAIOCB *iocb;
- 
-     /* Paired with a decrement in ide_trim_bh_cb() */
-@@ -520,7 +521,8 @@ BlockAIOCB *ide_issue_trim(
- 
-     iocb = blk_aio_get(&trim_aiocb_info, s->blk, cb, cb_opaque);
-     iocb->s = s;
--    iocb->bh = qemu_bh_new(ide_trim_bh_cb, iocb);
-+    iocb->bh = qemu_bh_new_guarded(ide_trim_bh_cb, iocb,
-+                                   &DEVICE(dev)->mem_reentrancy_guard);
-     iocb->ret = 0;
-     iocb->qiov = qiov;
-     iocb->i = -1;
-diff --git a/hw/misc/imx_rngc.c b/hw/misc/imx_rngc.c
-index 632c03779c..082c6980ad 100644
---- a/hw/misc/imx_rngc.c
-+++ b/hw/misc/imx_rngc.c
-@@ -228,8 +228,10 @@ static void imx_rngc_realize(DeviceState *dev, Error **errp)
-     sysbus_init_mmio(sbd, &s->iomem);
- 
-     sysbus_init_irq(sbd, &s->irq);
--    s->self_test_bh = qemu_bh_new(imx_rngc_self_test, s);
--    s->seed_bh = qemu_bh_new(imx_rngc_seed, s);
-+    s->self_test_bh = qemu_bh_new_guarded(imx_rngc_self_test, s,
-+                                          &dev->mem_reentrancy_guard);
-+    s->seed_bh = qemu_bh_new_guarded(imx_rngc_seed, s,
-+                                     &dev->mem_reentrancy_guard);
- }
- 
- static void imx_rngc_reset(DeviceState *dev)
-diff --git a/hw/misc/macio/mac_dbdma.c b/hw/misc/macio/mac_dbdma.c
-index 43bb1f56ba..80a789f32b 100644
---- a/hw/misc/macio/mac_dbdma.c
-+++ b/hw/misc/macio/mac_dbdma.c
-@@ -914,7 +914,7 @@ static void mac_dbdma_realize(DeviceState *dev, Error **errp)
- {
-     DBDMAState *s = MAC_DBDMA(dev);
- 
--    s->bh = qemu_bh_new(DBDMA_run_bh, s);
-+    s->bh = qemu_bh_new_guarded(DBDMA_run_bh, s, &dev->mem_reentrancy_guard);
- }
- 
- static void mac_dbdma_class_init(ObjectClass *oc, void *data)
-diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
-index 53e1c32643..447f669921 100644
---- a/hw/net/virtio-net.c
-+++ b/hw/net/virtio-net.c
-@@ -2917,7 +2917,8 @@ static void virtio_net_add_queue(VirtIONet *n, int index)
-         n->vqs[index].tx_vq =
-             virtio_add_queue(vdev, n->net_conf.tx_queue_size,
-                              virtio_net_handle_tx_bh);
--        n->vqs[index].tx_bh = qemu_bh_new(virtio_net_tx_bh, &n->vqs[index]);
-+        n->vqs[index].tx_bh = qemu_bh_new_guarded(virtio_net_tx_bh, &n->vqs[index],
-+                                                  &DEVICE(vdev)->mem_reentrancy_guard);
-     }
- 
-     n->vqs[index].tx_waiting = 0;
-diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c
-index ac24eeb5ed..e5a468975e 100644
---- a/hw/nvme/ctrl.c
-+++ b/hw/nvme/ctrl.c
-@@ -4607,7 +4607,8 @@ static void nvme_init_sq(NvmeSQueue *sq, NvmeCtrl *n, uint64_t dma_addr,
-         QTAILQ_INSERT_TAIL(&(sq->req_list), &sq->io_req[i], entry);
-     }
- 
--    sq->bh = qemu_bh_new(nvme_process_sq, sq);
-+    sq->bh = qemu_bh_new_guarded(nvme_process_sq, sq,
-+                                 &DEVICE(sq->ctrl)->mem_reentrancy_guard);
- 
-     if (n->dbbuf_enabled) {
-         sq->db_addr = n->dbbuf_dbs + (sqid << 3);
-@@ -5253,7 +5254,8 @@ static void nvme_init_cq(NvmeCQueue *cq, NvmeCtrl *n, uint64_t dma_addr,
-         }
-     }
-     n->cq[cqid] = cq;
--    cq->bh = qemu_bh_new(nvme_post_cqes, cq);
-+    cq->bh = qemu_bh_new_guarded(nvme_post_cqes, cq,
-+                                 &DEVICE(cq->ctrl)->mem_reentrancy_guard);
- }
- 
- static uint16_t nvme_create_cq(NvmeCtrl *n, NvmeRequest *req)
-diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c
-index c485da792c..3de288b454 100644
---- a/hw/scsi/mptsas.c
-+++ b/hw/scsi/mptsas.c
-@@ -1322,7 +1322,8 @@ static void mptsas_scsi_realize(PCIDevice *dev, Error **errp)
-     }
-     s->max_devices = MPTSAS_NUM_PORTS;
- 
--    s->request_bh = qemu_bh_new(mptsas_fetch_requests, s);
-+    s->request_bh = qemu_bh_new_guarded(mptsas_fetch_requests, s,
-+                                        &DEVICE(dev)->mem_reentrancy_guard);
- 
-     scsi_bus_init(&s->bus, sizeof(s->bus), &dev->qdev, &mptsas_scsi_info);
- }
-diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
-index c97176110c..3c20b47ad0 100644
---- a/hw/scsi/scsi-bus.c
-+++ b/hw/scsi/scsi-bus.c
-@@ -193,7 +193,8 @@ static void scsi_dma_restart_cb(void *opaque, bool running, RunState state)
-         AioContext *ctx = blk_get_aio_context(s->conf.blk);
-         /* The reference is dropped in scsi_dma_restart_bh.*/
-         object_ref(OBJECT(s));
--        s->bh = aio_bh_new(ctx, scsi_dma_restart_bh, s);
-+        s->bh = aio_bh_new_guarded(ctx, scsi_dma_restart_bh, s,
-+                                   &DEVICE(s)->mem_reentrancy_guard);
-         qemu_bh_schedule(s->bh);
-     }
- }
-diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c
-index fa76696855..4de34536e9 100644
---- a/hw/scsi/vmw_pvscsi.c
-+++ b/hw/scsi/vmw_pvscsi.c
-@@ -1184,7 +1184,8 @@ pvscsi_realizefn(PCIDevice *pci_dev, Error **errp)
-         pcie_endpoint_cap_init(pci_dev, PVSCSI_EXP_EP_OFFSET);
-     }
- 
--    s->completion_worker = qemu_bh_new(pvscsi_process_completion_queue, s);
-+    s->completion_worker = qemu_bh_new_guarded(pvscsi_process_completion_queue, s,
-+                                               &DEVICE(pci_dev)->mem_reentrancy_guard);
- 
-     scsi_bus_init(&s->bus, sizeof(s->bus), DEVICE(pci_dev), &pvscsi_scsi_info);
-     /* override default SCSI bus hotplug-handler, with pvscsi's one */
-diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c
-index 88f99c05d5..f013ded91e 100644
---- a/hw/usb/dev-uas.c
-+++ b/hw/usb/dev-uas.c
-@@ -937,7 +937,8 @@ static void usb_uas_realize(USBDevice *dev, Error **errp)
- 
-     QTAILQ_INIT(&uas->results);
-     QTAILQ_INIT(&uas->requests);
--    uas->status_bh = qemu_bh_new(usb_uas_send_status_bh, uas);
-+    uas->status_bh = qemu_bh_new_guarded(usb_uas_send_status_bh, uas,
-+                                         &d->mem_reentrancy_guard);
- 
-     dev->flags |= (1 << USB_DEV_FLAG_IS_SCSI_STORAGE);
-     scsi_bus_init(&uas->bus, sizeof(uas->bus), DEVICE(dev), &usb_uas_scsi_info);
-diff --git a/hw/usb/hcd-dwc2.c b/hw/usb/hcd-dwc2.c
-index 8755e9cbb0..a0c4e782b2 100644
---- a/hw/usb/hcd-dwc2.c
-+++ b/hw/usb/hcd-dwc2.c
-@@ -1364,7 +1364,8 @@ static void dwc2_realize(DeviceState *dev, Error **errp)
-     s->fi = USB_FRMINTVL - 1;
-     s->eof_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, dwc2_frame_boundary, s);
-     s->frame_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, dwc2_work_timer, s);
--    s->async_bh = qemu_bh_new(dwc2_work_bh, s);
-+    s->async_bh = qemu_bh_new_guarded(dwc2_work_bh, s,
-+                                      &dev->mem_reentrancy_guard);
- 
-     sysbus_init_irq(sbd, &s->irq);
- }
-diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
-index d4da8dcb8d..c930c60921 100644
---- a/hw/usb/hcd-ehci.c
-+++ b/hw/usb/hcd-ehci.c
-@@ -2533,7 +2533,8 @@ void usb_ehci_realize(EHCIState *s, DeviceState *dev, Error **errp)
-     }
- 
-     s->frame_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, ehci_work_timer, s);
--    s->async_bh = qemu_bh_new(ehci_work_bh, s);
-+    s->async_bh = qemu_bh_new_guarded(ehci_work_bh, s,
-+                                      &dev->mem_reentrancy_guard);
-     s->device = dev;
- 
-     s->vmstate = qemu_add_vm_change_state_handler(usb_ehci_vm_state_change, s);
-diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
-index 8ac1175ad2..77baaa7a6b 100644
---- a/hw/usb/hcd-uhci.c
-+++ b/hw/usb/hcd-uhci.c
-@@ -1190,7 +1190,7 @@ void usb_uhci_common_realize(PCIDevice *dev, Error **errp)
-                               USB_SPEED_MASK_LOW | USB_SPEED_MASK_FULL);
-         }
-     }
--    s->bh = qemu_bh_new(uhci_bh, s);
-+    s->bh = qemu_bh_new_guarded(uhci_bh, s, &DEVICE(dev)->mem_reentrancy_guard);
-     s->frame_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, uhci_frame_timer, s);
-     s->num_ports_vmstate = NB_PORTS;
-     QTAILQ_INIT(&s->queues);
-diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
-index 176868d345..f500db85ab 100644
---- a/hw/usb/host-libusb.c
-+++ b/hw/usb/host-libusb.c
-@@ -1141,7 +1141,8 @@ static void usb_host_nodev_bh(void *opaque)
- static void usb_host_nodev(USBHostDevice *s)
- {
-     if (!s->bh_nodev) {
--        s->bh_nodev = qemu_bh_new(usb_host_nodev_bh, s);
-+        s->bh_nodev = qemu_bh_new_guarded(usb_host_nodev_bh, s,
-+                                          &DEVICE(s)->mem_reentrancy_guard);
-     }
-     qemu_bh_schedule(s->bh_nodev);
- }
-@@ -1739,7 +1740,8 @@ static int usb_host_post_load(void *opaque, int version_id)
-     USBHostDevice *dev = opaque;
- 
-     if (!dev->bh_postld) {
--        dev->bh_postld = qemu_bh_new(usb_host_post_load_bh, dev);
-+        dev->bh_postld = qemu_bh_new_guarded(usb_host_post_load_bh, dev,
-+                                             &DEVICE(dev)->mem_reentrancy_guard);
-     }
-     qemu_bh_schedule(dev->bh_postld);
-     dev->bh_postld_pending = true;
-diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
-index fd7df599bc..39fbaaab16 100644
---- a/hw/usb/redirect.c
-+++ b/hw/usb/redirect.c
-@@ -1441,8 +1441,10 @@ static void usbredir_realize(USBDevice *udev, Error **errp)
-         }
-     }
- 
--    dev->chardev_close_bh = qemu_bh_new(usbredir_chardev_close_bh, dev);
--    dev->device_reject_bh = qemu_bh_new(usbredir_device_reject_bh, dev);
-+    dev->chardev_close_bh = qemu_bh_new_guarded(usbredir_chardev_close_bh, dev,
-+                                                &DEVICE(dev)->mem_reentrancy_guard);
-+    dev->device_reject_bh = qemu_bh_new_guarded(usbredir_device_reject_bh, dev,
-+                                                &DEVICE(dev)->mem_reentrancy_guard);
-     dev->attach_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL, usbredir_do_attach, dev);
- 
-     packet_id_queue_init(&dev->cancelled, dev, "cancelled");
-diff --git a/hw/usb/xen-usb.c b/hw/usb/xen-usb.c
-index 66cb3f7c24..38ee660a30 100644
---- a/hw/usb/xen-usb.c
-+++ b/hw/usb/xen-usb.c
-@@ -1032,7 +1032,8 @@ static void usbback_alloc(struct XenLegacyDevice *xendev)
- 
-     QTAILQ_INIT(&usbif->req_free_q);
-     QSIMPLEQ_INIT(&usbif->hotplug_q);
--    usbif->bh = qemu_bh_new(usbback_bh, usbif);
-+    usbif->bh = qemu_bh_new_guarded(usbback_bh, usbif,
-+                                    &DEVICE(xendev)->mem_reentrancy_guard);
- }
- 
- static int usbback_free(struct XenLegacyDevice *xendev)
-diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
-index 43092aa634..5186e831dd 100644
---- a/hw/virtio/virtio-balloon.c
-+++ b/hw/virtio/virtio-balloon.c
-@@ -909,8 +909,9 @@ static void virtio_balloon_device_realize(DeviceState *dev, Error **errp)
-         precopy_add_notifier(&s->free_page_hint_notify);
- 
-         object_ref(OBJECT(s->iothread));
--        s->free_page_bh = aio_bh_new(iothread_get_aio_context(s->iothread),
--                                     virtio_ballloon_get_free_page_hints, s);
-+        s->free_page_bh = aio_bh_new_guarded(iothread_get_aio_context(s->iothread),
-+                                             virtio_ballloon_get_free_page_hints, s,
-+                                             &dev->mem_reentrancy_guard);
-     }
- 
-     if (virtio_has_feature(s->host_features, VIRTIO_BALLOON_F_REPORTING)) {
-diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c
-index 802e1b9659..2fe804510f 100644
---- a/hw/virtio/virtio-crypto.c
-+++ b/hw/virtio/virtio-crypto.c
-@@ -1074,7 +1074,8 @@ static void virtio_crypto_device_realize(DeviceState *dev, Error **errp)
-         vcrypto->vqs[i].dataq =
-                  virtio_add_queue(vdev, 1024, virtio_crypto_handle_dataq_bh);
-         vcrypto->vqs[i].dataq_bh =
--                 qemu_bh_new(virtio_crypto_dataq_bh, &vcrypto->vqs[i]);
-+                 qemu_bh_new_guarded(virtio_crypto_dataq_bh, &vcrypto->vqs[i],
-+                                     &dev->mem_reentrancy_guard);
-         vcrypto->vqs[i].vcrypto = vcrypto;
-     }
- 
--- 
-2.39.3
-
diff --git a/kvm-hw-scsi-lsi53c895a-Fix-reentrancy-issues-in-the-LSI-.patch b/kvm-hw-scsi-lsi53c895a-Fix-reentrancy-issues-in-the-LSI-.patch
deleted file mode 100644
index efa966e..0000000
--- a/kvm-hw-scsi-lsi53c895a-Fix-reentrancy-issues-in-the-LSI-.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From 8075a9e05699ef0c4e078017eefc20db3186328f Mon Sep 17 00:00:00 2001
-From: Jon Maloy <jmaloy@redhat.com>
-Date: Mon, 29 May 2023 14:21:08 -0400
-Subject: [PATCH 17/21] hw/scsi/lsi53c895a: Fix reentrancy issues in the LSI
- controller (CVE-2023-0330)
-
-RH-Author: Jon Maloy <jmaloy@redhat.com>
-RH-MergeRequest: 165: memory: prevent dma-reentracy issues
-RH-Jira: RHEL-516
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [13/13] 0b6fa742075ef2db3a354ee672dccca3747051cc (jmaloy/jmaloy-qemu-kvm-2)
-
-Jira: https://issues.redhat.com/browse/RHEL-516
-Upstream: Merged
-CVE: CVE-2023-2680
-
-commit b987718bbb1d0eabf95499b976212dd5f0120d75
-Author: Thomas Huth <thuth@redhat.com>
-Date:   Mon May 22 11:10:11 2023 +0200
-
-    hw/scsi/lsi53c895a: Fix reentrancy issues in the LSI controller (CVE-2023-0330)
-
-    We cannot use the generic reentrancy guard in the LSI code, so
-    we have to manually prevent endless reentrancy here. The problematic
-    lsi_execute_script() function has already a way to detect whether
-    too many instructions have been executed - we just have to slightly
-    change the logic here that it also takes into account if the function
-    has been called too often in a reentrant way.
-
-    The code in fuzz-lsi53c895a-test.c has been taken from an earlier
-    patch by Mauro Matteo Cascella.
-
-    Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1563
-    Message-Id: <20230522091011.1082574-1-thuth@redhat.com>
-    Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-    Reviewed-by: Alexander Bulekov <alxndr@bu.edu>
-    Signed-off-by: Thomas Huth <thuth@redhat.com>
-
-Signed-off-by: Jon Maloy <jmaloy@redhat.com>
----
- hw/scsi/lsi53c895a.c               | 23 +++++++++++++++------
- tests/qtest/fuzz-lsi53c895a-test.c | 33 ++++++++++++++++++++++++++++++
- 2 files changed, 50 insertions(+), 6 deletions(-)
-
-diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c
-index 048436352b..f7d45b0b20 100644
---- a/hw/scsi/lsi53c895a.c
-+++ b/hw/scsi/lsi53c895a.c
-@@ -1134,15 +1134,24 @@ static void lsi_execute_script(LSIState *s)
-     uint32_t addr, addr_high;
-     int opcode;
-     int insn_processed = 0;
-+    static int reentrancy_level;
-+
-+    reentrancy_level++;
- 
-     s->istat1 |= LSI_ISTAT1_SRUN;
- again:
--    if (++insn_processed > LSI_MAX_INSN) {
--        /* Some windows drivers make the device spin waiting for a memory
--           location to change.  If we have been executed a lot of code then
--           assume this is the case and force an unexpected device disconnect.
--           This is apparently sufficient to beat the drivers into submission.
--         */
-+    /*
-+     * Some windows drivers make the device spin waiting for a memory location
-+     * to change. If we have executed more than LSI_MAX_INSN instructions then
-+     * assume this is the case and force an unexpected device disconnect. This
-+     * is apparently sufficient to beat the drivers into submission.
-+     *
-+     * Another issue (CVE-2023-0330) can occur if the script is programmed to
-+     * trigger itself again and again. Avoid this problem by stopping after
-+     * being called multiple times in a reentrant way (8 is an arbitrary value
-+     * which should be enough for all valid use cases).
-+     */
-+    if (++insn_processed > LSI_MAX_INSN || reentrancy_level > 8) {
-         if (!(s->sien0 & LSI_SIST0_UDC)) {
-             qemu_log_mask(LOG_GUEST_ERROR,
-                           "lsi_scsi: inf. loop with UDC masked");
-@@ -1596,6 +1605,8 @@ again:
-         }
-     }
-     trace_lsi_execute_script_stop();
-+
-+    reentrancy_level--;
- }
- 
- static uint8_t lsi_reg_readb(LSIState *s, int offset)
-diff --git a/tests/qtest/fuzz-lsi53c895a-test.c b/tests/qtest/fuzz-lsi53c895a-test.c
-index 2012bd54b7..1b55928b9f 100644
---- a/tests/qtest/fuzz-lsi53c895a-test.c
-+++ b/tests/qtest/fuzz-lsi53c895a-test.c
-@@ -8,6 +8,36 @@
- #include "qemu/osdep.h"
- #include "libqtest.h"
- 
-+/*
-+ * This used to trigger a DMA reentrancy issue
-+ * leading to memory corruption bugs like stack
-+ * overflow or use-after-free
-+ * https://gitlab.com/qemu-project/qemu/-/issues/1563
-+ */
-+static void test_lsi_dma_reentrancy(void)
-+{
-+    QTestState *s;
-+
-+    s = qtest_init("-M q35 -m 512M -nodefaults "
-+                   "-blockdev driver=null-co,node-name=null0 "
-+                   "-device lsi53c810 -device scsi-cd,drive=null0");
-+
-+    qtest_outl(s, 0xcf8, 0x80000804); /* PCI Command Register */
-+    qtest_outw(s, 0xcfc, 0x7);        /* Enables accesses */
-+    qtest_outl(s, 0xcf8, 0x80000814); /* Memory Bar 1 */
-+    qtest_outl(s, 0xcfc, 0xff100000); /* Set MMIO Address*/
-+    qtest_outl(s, 0xcf8, 0x80000818); /* Memory Bar 2 */
-+    qtest_outl(s, 0xcfc, 0xff000000); /* Set RAM Address*/
-+    qtest_writel(s, 0xff000000, 0xc0000024);
-+    qtest_writel(s, 0xff000114, 0x00000080);
-+    qtest_writel(s, 0xff00012c, 0xff000000);
-+    qtest_writel(s, 0xff000004, 0xff000114);
-+    qtest_writel(s, 0xff000008, 0xff100014);
-+    qtest_writel(s, 0xff10002f, 0x000000ff);
-+
-+    qtest_quit(s);
-+}
-+
- /*
-  * This used to trigger a UAF in lsi_do_msgout()
-  * https://gitlab.com/qemu-project/qemu/-/issues/972
-@@ -124,5 +154,8 @@ int main(int argc, char **argv)
-     qtest_add_func("fuzz/lsi53c895a/lsi_do_msgout_cancel_req",
-                    test_lsi_do_msgout_cancel_req);
- 
-+    qtest_add_func("fuzz/lsi53c895a/lsi_dma_reentrancy",
-+                   test_lsi_dma_reentrancy);
-+
-     return g_test_run();
- }
--- 
-2.39.3
-
diff --git a/kvm-hw-vfio-pci-quirks-Sanitize-capability-pointer.patch b/kvm-hw-vfio-pci-quirks-Sanitize-capability-pointer.patch
deleted file mode 100644
index ffabd75..0000000
--- a/kvm-hw-vfio-pci-quirks-Sanitize-capability-pointer.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From fcd6219a95851d17fd8bde69d87e78c6533be990 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:57 +0200
-Subject: [PATCH 24/37] hw/vfio/pci-quirks: Sanitize capability pointer
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [22/28] cb080409c1912f4365f8e31cd23c914b48f91575 (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit 0ddcb39c9357
-Author: Alex Williamson <alex.williamson@redhat.com>
-Date:   Fri Jun 30 16:36:08 2023 -0600
-
-    hw/vfio/pci-quirks: Sanitize capability pointer
-
-    Coverity reports a tained scalar when traversing the capabilities
-    chain (CID 1516589).  In practice I've never seen a device with a
-    chain so broken as to cause an issue, but it's also pretty easy to
-    sanitize.
-
-    Fixes: f6b30c1984f7 ("hw/vfio/pci-quirks: Support alternate offset for GPUDirect Cliques")
-    Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
-    Reviewed-by: Cédric Le Goater <clg@redhat.com>
-    Signed-off-by: Cédric Le Goater <clg@redhat.com>
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- hw/vfio/pci-quirks.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
-index 0ed2fcd531..f4ff836805 100644
---- a/hw/vfio/pci-quirks.c
-+++ b/hw/vfio/pci-quirks.c
-@@ -1530,6 +1530,12 @@ const PropertyInfo qdev_prop_nv_gpudirect_clique = {
-     .set = set_nv_gpudirect_clique_id,
- };
- 
-+static bool is_valid_std_cap_offset(uint8_t pos)
-+{
-+    return (pos >= PCI_STD_HEADER_SIZEOF &&
-+            pos <= (PCI_CFG_SPACE_SIZE - PCI_CAP_SIZEOF));
-+}
-+
- static int vfio_add_nv_gpudirect_cap(VFIOPCIDevice *vdev, Error **errp)
- {
-     PCIDevice *pdev = &vdev->pdev;
-@@ -1563,7 +1569,7 @@ static int vfio_add_nv_gpudirect_cap(VFIOPCIDevice *vdev, Error **errp)
-      */
-     ret = pread(vdev->vbasedev.fd, &tmp, 1,
-                 vdev->config_offset + PCI_CAPABILITY_LIST);
--    if (ret != 1 || !tmp) {
-+    if (ret != 1 || !is_valid_std_cap_offset(tmp)) {
-         error_setg(errp, "NVIDIA GPUDirect Clique ID: error getting cap list");
-         return -EINVAL;
-     }
-@@ -1575,7 +1581,7 @@ static int vfio_add_nv_gpudirect_cap(VFIOPCIDevice *vdev, Error **errp)
-             d4_conflict = true;
-         }
-         tmp = pdev->config[tmp + PCI_CAP_LIST_NEXT];
--    } while (tmp);
-+    } while (is_valid_std_cap_offset(tmp));
- 
-     if (!c8_conflict) {
-         pos = 0xC8;
--- 
-2.39.3
-
diff --git a/kvm-hw-vfio-pci-quirks-Support-alternate-offset-for-GPUD.patch b/kvm-hw-vfio-pci-quirks-Support-alternate-offset-for-GPUD.patch
deleted file mode 100644
index 99f5c75..0000000
--- a/kvm-hw-vfio-pci-quirks-Support-alternate-offset-for-GPUD.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From dd38230a0a375fb8427fa106ff79562e56c51b6c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:57 +0200
-Subject: [PATCH 18/37] hw/vfio/pci-quirks: Support alternate offset for
- GPUDirect Cliques
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [16/28] 9befb7c9adaeb58e9d0b49686cf54b751c742832 (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit f6b30c1984f7
-Author: Alex Williamson <alex.williamson@redhat.com>
-Date:   Thu Jun 8 12:05:07 2023 -0600
-
-    hw/vfio/pci-quirks: Support alternate offset for GPUDirect Cliques
-
-    NVIDIA Turing and newer GPUs implement the MSI-X capability at the offset
-    previously reserved for use by hypervisors to implement the GPUDirect
-    Cliques capability.  A revised specification provides an alternate
-    location.  Add a config space walk to the quirk to check for conflicts,
-    allowing us to fall back to the new location or generate an error at the
-    quirk setup rather than when the real conflicting capability is added
-    should there be no available location.
-
-    Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
-    Reviewed-by: Cédric Le Goater <clg@redhat.com>
-    Signed-off-by: Cédric Le Goater <clg@redhat.com>
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- hw/vfio/pci-quirks.c | 41 ++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 40 insertions(+), 1 deletion(-)
-
-diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
-index f0147a050a..0ed2fcd531 100644
---- a/hw/vfio/pci-quirks.c
-+++ b/hw/vfio/pci-quirks.c
-@@ -1490,6 +1490,9 @@ void vfio_setup_resetfn_quirk(VFIOPCIDevice *vdev)
-  * +---------------------------------+---------------------------------+
-  *
-  * https://lists.gnu.org/archive/html/qemu-devel/2017-08/pdfUda5iEpgOS.pdf
-+ *
-+ * Specification for Turning and later GPU architectures:
-+ * https://lists.gnu.org/archive/html/qemu-devel/2023-06/pdf142OR4O4c2.pdf
-  */
- static void get_nv_gpudirect_clique_id(Object *obj, Visitor *v,
-                                        const char *name, void *opaque,
-@@ -1530,7 +1533,9 @@ const PropertyInfo qdev_prop_nv_gpudirect_clique = {
- static int vfio_add_nv_gpudirect_cap(VFIOPCIDevice *vdev, Error **errp)
- {
-     PCIDevice *pdev = &vdev->pdev;
--    int ret, pos = 0xC8;
-+    int ret, pos;
-+    bool c8_conflict = false, d4_conflict = false;
-+    uint8_t tmp;
- 
-     if (vdev->nv_gpudirect_clique == 0xFF) {
-         return 0;
-@@ -1547,6 +1552,40 @@ static int vfio_add_nv_gpudirect_cap(VFIOPCIDevice *vdev, Error **errp)
-         return -EINVAL;
-     }
- 
-+    /*
-+     * Per the updated specification above, it's recommended to use offset
-+     * D4h for Turing and later GPU architectures due to a conflict of the
-+     * MSI-X capability at C8h.  We don't know how to determine the GPU
-+     * architecture, instead we walk the capability chain to mark conflicts
-+     * and choose one or error based on the result.
-+     *
-+     * NB. Cap list head in pdev->config is already cleared, read from device.
-+     */
-+    ret = pread(vdev->vbasedev.fd, &tmp, 1,
-+                vdev->config_offset + PCI_CAPABILITY_LIST);
-+    if (ret != 1 || !tmp) {
-+        error_setg(errp, "NVIDIA GPUDirect Clique ID: error getting cap list");
-+        return -EINVAL;
-+    }
-+
-+    do {
-+        if (tmp == 0xC8) {
-+            c8_conflict = true;
-+        } else if (tmp == 0xD4) {
-+            d4_conflict = true;
-+        }
-+        tmp = pdev->config[tmp + PCI_CAP_LIST_NEXT];
-+    } while (tmp);
-+
-+    if (!c8_conflict) {
-+        pos = 0xC8;
-+    } else if (!d4_conflict) {
-+        pos = 0xD4;
-+    } else {
-+        error_setg(errp, "NVIDIA GPUDirect Clique ID: invalid config space");
-+        return -EINVAL;
-+    }
-+
-     ret = pci_add_capability(pdev, PCI_CAP_ID_VNDR, pos, 8, errp);
-     if (ret < 0) {
-         error_prepend(errp, "Failed to add NVIDIA GPUDirect cap: ");
--- 
-2.39.3
-
diff --git a/kvm-hw-virtio-iommu-Fix-potential-OOB-access-in-virtio_i.patch b/kvm-hw-virtio-iommu-Fix-potential-OOB-access-in-virtio_i.patch
deleted file mode 100644
index 7a5963c..0000000
--- a/kvm-hw-virtio-iommu-Fix-potential-OOB-access-in-virtio_i.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 0a731ac1191182546e80af5f39d178a5a2f3688f Mon Sep 17 00:00:00 2001
-From: Eric Auger <eric.auger@redhat.com>
-Date: Mon, 17 Jul 2023 18:21:26 +0200
-Subject: [PATCH 07/14] hw/virtio-iommu: Fix potential OOB access in
- virtio_iommu_handle_command()
-
-RH-Author: Eric Auger <eric.auger@redhat.com>
-RH-MergeRequest: 197: virtio-iommu/smmu: backport some late fixes
-RH-Bugzilla: 2229133
-RH-Acked-by: Thomas Huth <thuth@redhat.com>
-RH-Acked-by: Peter Xu <peterx@redhat.com>
-RH-Commit: [1/3] ecdb1e1aa6b93761dc87ea79bc0a1093ad649a74 (eauger1/centos-qemu-kvm)
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2229133
-
-In the virtio_iommu_handle_command() when a PROBE request is handled,
-output_size takes a value greater than the tail size and on a subsequent
-iteration we can get a stack out-of-band access. Initialize the
-output_size on each iteration.
-
-The issue was found with ASAN. Credits to:
-Yiming Tao(Zhejiang University)
-Gaoning Pan(Zhejiang University)
-
-Fixes: 1733eebb9e7 ("virtio-iommu: Implement RESV_MEM probe request")
-Signed-off-by: Eric Auger <eric.auger@redhat.com>
-Reported-by: Mauro Matteo Cascella <mcascell@redhat.com>
-Cc: qemu-stable@nongnu.org
-
-Message-Id: <20230717162126.11693-1-eric.auger@redhat.com>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-(cherry picked from commit cf2f89edf36a59183166ae8721a8d7ab5cd286bd)
-Signed-off-by: Eric Auger <eric.auger@redhat.com>
----
- hw/virtio/virtio-iommu.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
-index 421e2a944f..17ce630200 100644
---- a/hw/virtio/virtio-iommu.c
-+++ b/hw/virtio/virtio-iommu.c
-@@ -728,13 +728,15 @@ static void virtio_iommu_handle_command(VirtIODevice *vdev, VirtQueue *vq)
-     VirtIOIOMMU *s = VIRTIO_IOMMU(vdev);
-     struct virtio_iommu_req_head head;
-     struct virtio_iommu_req_tail tail = {};
--    size_t output_size = sizeof(tail), sz;
-     VirtQueueElement *elem;
-     unsigned int iov_cnt;
-     struct iovec *iov;
-     void *buf = NULL;
-+    size_t sz;
- 
-     for (;;) {
-+        size_t output_size = sizeof(tail);
-+
-         elem = virtqueue_pop(vq, sizeof(VirtQueueElement));
-         if (!elem) {
-             return;
--- 
-2.39.3
-
diff --git a/kvm-i386-cpu-Update-how-the-EBX-register-of-CPUID-0x8000.patch b/kvm-i386-cpu-Update-how-the-EBX-register-of-CPUID-0x8000.patch
deleted file mode 100644
index 3ee6b29..0000000
--- a/kvm-i386-cpu-Update-how-the-EBX-register-of-CPUID-0x8000.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From f9d982fae156aa9db0506e1e098c1e8a7f7eec94 Mon Sep 17 00:00:00 2001
-From: Bandan Das <bsd@redhat.com>
-Date: Thu, 3 Aug 2023 14:29:15 -0400
-Subject: [PATCH 13/14] i386/cpu: Update how the EBX register of CPUID
- 0x8000001F is set
-
-RH-Author: Bandan Das <None>
-RH-MergeRequest: 196: Updates to SEV reduced-phys-bits parameter
-RH-Bugzilla: 2214839
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [4/4] efc368b2c844fd4fbc3c755a5e2da288329e7a2c (bdas1/qemu-kvm)
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2214839
-
-commit fb6bbafc0f19385fb257ee073ed13dcaf613f2f8
-Author: Tom Lendacky <thomas.lendacky@amd.com>
-Date:   Fri Sep 30 10:14:30 2022 -0500
-
-    i386/cpu: Update how the EBX register of CPUID 0x8000001F is set
-
-    Update the setting of CPUID 0x8000001F EBX to clearly document the ranges
-    associated with fields being set.
-
-    Fixes: 6cb8f2a663 ("cpu/i386: populate CPUID 0x8000_001F when SEV is active")
-    Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
-    Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
-    Message-Id: <5822fd7d02b575121380e1f493a8f6d9eba2b11a.1664550870.git.thomas.lendacky@amd.com>
-    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-
-Signed-off-by: Bandan Das <bsd@redhat.com>
----
- target/i386/cpu.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/target/i386/cpu.c b/target/i386/cpu.c
-index 839706b430..4ac3046313 100644
---- a/target/i386/cpu.c
-+++ b/target/i386/cpu.c
-@@ -6008,8 +6008,8 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
-         if (sev_enabled()) {
-             *eax = 0x2;
-             *eax |= sev_es_enabled() ? 0x8 : 0;
--            *ebx = sev_get_cbit_position();
--            *ebx |= sev_get_reduced_phys_bits() << 6;
-+            *ebx = sev_get_cbit_position() & 0x3f; /* EBX[5:0] */
-+            *ebx |= (sev_get_reduced_phys_bits() & 0x3f) << 6; /* EBX[11:6] */
-         }
-         break;
-     default:
--- 
-2.39.3
-
diff --git a/kvm-i386-sev-Update-checks-and-information-related-to-re.patch b/kvm-i386-sev-Update-checks-and-information-related-to-re.patch
deleted file mode 100644
index e9d28d3..0000000
--- a/kvm-i386-sev-Update-checks-and-information-related-to-re.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 5c0d254762caaffd574bd95dbfc1df416e6e2509 Mon Sep 17 00:00:00 2001
-From: Bandan Das <bsd@redhat.com>
-Date: Thu, 3 Aug 2023 14:22:55 -0400
-Subject: [PATCH 12/14] i386/sev: Update checks and information related to
- reduced-phys-bits
-
-RH-Author: Bandan Das <None>
-RH-MergeRequest: 196: Updates to SEV reduced-phys-bits parameter
-RH-Bugzilla: 2214839
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [3/4] 7c5e7ea9f6cd39e84e5b60417c849430296399fd (bdas1/qemu-kvm)
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2214839
-
-commit 8168fed9f84e3128f7628969ae78af49433d5ce7
-Author: Tom Lendacky <thomas.lendacky@amd.com>
-Date:   Fri Sep 30 10:14:29 2022 -0500
-
-    i386/sev: Update checks and information related to reduced-phys-bits
-
-    The value of the reduced-phys-bits parameter is propogated to the CPUID
-    information exposed to the guest. Update the current validation check to
-    account for the size of the CPUID field (6-bits), ensuring the value is
-    in the range of 1 to 63.
-
-    Maintain backward compatibility, to an extent, by allowing a value greater
-    than 1 (so that the previously documented value of 5 still works), but not
-    allowing anything over 63.
-
-    Fixes: d8575c6c02 ("sev/i386: add command to initialize the memory encryption context")
-    Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
-    Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
-    Message-Id: <cca5341a95ac73f904e6300f10b04f9c62e4e8ff.1664550870.git.thomas.lendacky@amd.com>
-    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-
-Signed-off-by: Bandan Das <bsd@redhat.com>
----
- target/i386/sev.c | 17 ++++++++++++++---
- 1 file changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/target/i386/sev.c b/target/i386/sev.c
-index 859e06f6ad..fe2144c038 100644
---- a/target/i386/sev.c
-+++ b/target/i386/sev.c
-@@ -932,15 +932,26 @@ int sev_kvm_init(ConfidentialGuestSupport *cgs, Error **errp)
-     host_cpuid(0x8000001F, 0, NULL, &ebx, NULL, NULL);
-     host_cbitpos = ebx & 0x3f;
- 
-+    /*
-+     * The cbitpos value will be placed in bit positions 5:0 of the EBX
-+     * register of CPUID 0x8000001F. No need to verify the range as the
-+     * comparison against the host value accomplishes that.
-+     */
-     if (host_cbitpos != sev->cbitpos) {
-         error_setg(errp, "%s: cbitpos check failed, host '%d' requested '%d'",
-                    __func__, host_cbitpos, sev->cbitpos);
-         goto err;
-     }
- 
--    if (sev->reduced_phys_bits < 1) {
--        error_setg(errp, "%s: reduced_phys_bits check failed, it should be >=1,"
--                   " requested '%d'", __func__, sev->reduced_phys_bits);
-+    /*
-+     * The reduced-phys-bits value will be placed in bit positions 11:6 of
-+     * the EBX register of CPUID 0x8000001F, so verify the supplied value
-+     * is in the range of 1 to 63.
-+     */
-+    if (sev->reduced_phys_bits < 1 || sev->reduced_phys_bits > 63) {
-+        error_setg(errp, "%s: reduced_phys_bits check failed,"
-+                   " it should be in the range of 1 to 63, requested '%d'",
-+                   __func__, sev->reduced_phys_bits);
-         goto err;
-     }
- 
--- 
-2.39.3
-
diff --git a/kvm-iotests-Test-commit-with-iothreads-and-ongoing-I-O.patch b/kvm-iotests-Test-commit-with-iothreads-and-ongoing-I-O.patch
deleted file mode 100644
index 1fc5697..0000000
--- a/kvm-iotests-Test-commit-with-iothreads-and-ongoing-I-O.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From 399bfc04fb8352af6d2f4c984e68c334d2043368 Mon Sep 17 00:00:00 2001
-From: Kevin Wolf <kwolf@redhat.com>
-Date: Wed, 17 May 2023 17:28:34 +0200
-Subject: [PATCH 04/21] iotests: Test commit with iothreads and ongoing I/O
-
-RH-Author: Kevin Wolf <kwolf@redhat.com>
-RH-MergeRequest: 166: block/graph-lock: Disable locking for now
-RH-Bugzilla: 2186725
-RH-Acked-by: Eric Blake <eblake@redhat.com>
-RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
-RH-Commit: [4/4] 1e42fde5951ae12bddc4eea2320f066f7079878f (kmwolf/centos-qemu-kvm)
-
-This tests exercises graph locking, draining, and graph modifications
-with AioContext switches a lot. Amongst others, it serves as a
-regression test for bdrv_graph_wrlock() deadlocking because it is called
-with a locked AioContext and for AioContext handling in the NBD server.
-
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Message-Id: <20230517152834.277483-4-kwolf@redhat.com>
-Tested-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-(cherry picked from commit 95fdd8db61848d31fde1d9b32da7f3f76babfa25)
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- tests/qemu-iotests/iotests.py                 |  4 ++
- .../qemu-iotests/tests/graph-changes-while-io | 56 +++++++++++++++++--
- .../tests/graph-changes-while-io.out          |  4 +-
- 3 files changed, 58 insertions(+), 6 deletions(-)
-
-diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
-index 3e82c634cf..7073579a7d 100644
---- a/tests/qemu-iotests/iotests.py
-+++ b/tests/qemu-iotests/iotests.py
-@@ -462,6 +462,10 @@ def qmp(self, cmd: str, args: Optional[Dict[str, object]] = None) \
-         assert self._qmp is not None
-         return self._qmp.cmd(cmd, args)
- 
-+    def get_qmp(self) -> QEMUMonitorProtocol:
-+        assert self._qmp is not None
-+        return self._qmp
-+
-     def stop(self, kill_signal=15):
-         self._p.send_signal(kill_signal)
-         self._p.wait()
-diff --git a/tests/qemu-iotests/tests/graph-changes-while-io b/tests/qemu-iotests/tests/graph-changes-while-io
-index 7664f33689..750e7d4d38 100755
---- a/tests/qemu-iotests/tests/graph-changes-while-io
-+++ b/tests/qemu-iotests/tests/graph-changes-while-io
-@@ -22,19 +22,19 @@
- import os
- from threading import Thread
- import iotests
--from iotests import imgfmt, qemu_img, qemu_img_create, QMPTestCase, \
--        QemuStorageDaemon
-+from iotests import imgfmt, qemu_img, qemu_img_create, qemu_io, \
-+        QMPTestCase, QemuStorageDaemon
- 
- 
- top = os.path.join(iotests.test_dir, 'top.img')
- nbd_sock = os.path.join(iotests.sock_dir, 'nbd.sock')
- 
- 
--def do_qemu_img_bench() -> None:
-+def do_qemu_img_bench(count: int = 2000000) -> None:
-     """
-     Do some I/O requests on `nbd_sock`.
-     """
--    qemu_img('bench', '-f', 'raw', '-c', '2000000',
-+    qemu_img('bench', '-f', 'raw', '-c', str(count),
-              f'nbd+unix:///node0?socket={nbd_sock}')
- 
- 
-@@ -84,6 +84,54 @@ class TestGraphChangesWhileIO(QMPTestCase):
- 
-         bench_thr.join()
- 
-+    def test_commit_while_io(self) -> None:
-+        # Run qemu-img bench in the background
-+        bench_thr = Thread(target=do_qemu_img_bench, args=(200000, ))
-+        bench_thr.start()
-+
-+        qemu_io('-c', 'write 0 64k', top)
-+        qemu_io('-c', 'write 128k 64k', top)
-+
-+        result = self.qsd.qmp('blockdev-add', {
-+            'driver': imgfmt,
-+            'node-name': 'overlay',
-+            'backing': None,
-+            'file': {
-+                'driver': 'file',
-+                'filename': top
-+            }
-+        })
-+        self.assert_qmp(result, 'return', {})
-+
-+        result = self.qsd.qmp('blockdev-snapshot', {
-+            'node': 'node0',
-+            'overlay': 'overlay',
-+        })
-+        self.assert_qmp(result, 'return', {})
-+
-+        # While qemu-img bench is running, repeatedly commit overlay to node0
-+        while bench_thr.is_alive():
-+            result = self.qsd.qmp('block-commit', {
-+                'job-id': 'job0',
-+                'device': 'overlay',
-+            })
-+            self.assert_qmp(result, 'return', {})
-+
-+            result = self.qsd.qmp('block-job-cancel', {
-+                'device': 'job0',
-+            })
-+            self.assert_qmp(result, 'return', {})
-+
-+            cancelled = False
-+            while not cancelled:
-+                for event in self.qsd.get_qmp().get_events(wait=10.0):
-+                    if event['event'] != 'JOB_STATUS_CHANGE':
-+                        continue
-+                    if event['data']['status'] == 'null':
-+                        cancelled = True
-+
-+        bench_thr.join()
-+
- if __name__ == '__main__':
-     # Format must support raw backing files
-     iotests.main(supported_fmts=['qcow', 'qcow2', 'qed'],
-diff --git a/tests/qemu-iotests/tests/graph-changes-while-io.out b/tests/qemu-iotests/tests/graph-changes-while-io.out
-index ae1213e6f8..fbc63e62f8 100644
---- a/tests/qemu-iotests/tests/graph-changes-while-io.out
-+++ b/tests/qemu-iotests/tests/graph-changes-while-io.out
-@@ -1,5 +1,5 @@
--.
-+..
- ----------------------------------------------------------------------
--Ran 1 tests
-+Ran 2 tests
- 
- OK
--- 
-2.39.3
-
diff --git a/kvm-iotests-Test-resizing-image-attached-to-an-iothread.patch b/kvm-iotests-Test-resizing-image-attached-to-an-iothread.patch
deleted file mode 100644
index 4e91505..0000000
--- a/kvm-iotests-Test-resizing-image-attached-to-an-iothread.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 2c9e6892369ff99decd4030642b8dcf3875e9ebf Mon Sep 17 00:00:00 2001
-From: Kevin Wolf <kwolf@redhat.com>
-Date: Tue, 9 May 2023 15:41:33 +0200
-Subject: [PATCH 55/56] iotests: Test resizing image attached to an iothread
-
-RH-Author: Kevin Wolf <kwolf@redhat.com>
-RH-MergeRequest: 164: block: Fix hangs in qmp_block_resize()
-RH-Bugzilla: 2185688
-RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-Acked-by: Hanna Czenczek <hreitz@redhat.com>
-RH-Acked-by: Eric Blake <eblake@redhat.com>
-RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
-RH-Commit: [4/4] 8d31752d1e6e8c6a422d68d9cb2251fbc34b7aef (kmwolf/centos-qemu-kvm)
-
-This tests that trying to resize an image with QMP block_resize doesn't
-hang or otherwise fail when the image is attached to a device running in
-an iothread.
-
-This is a regression test for the recent fix that changed
-qmp_block_resize, which is a coroutine based QMP handler, to avoid
-calling no_coroutine_fns directly.
-
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Message-Id: <20230509134133.373408-1-kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-(cherry picked from commit e113362e4cdfdcfe1d497e569527f70a0021333a)
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- tests/qemu-iotests/tests/iothreads-resize     | 71 +++++++++++++++++++
- tests/qemu-iotests/tests/iothreads-resize.out | 11 +++
- 2 files changed, 82 insertions(+)
- create mode 100755 tests/qemu-iotests/tests/iothreads-resize
- create mode 100644 tests/qemu-iotests/tests/iothreads-resize.out
-
-diff --git a/tests/qemu-iotests/tests/iothreads-resize b/tests/qemu-iotests/tests/iothreads-resize
-new file mode 100755
-index 0000000000..36e4598c62
---- /dev/null
-+++ b/tests/qemu-iotests/tests/iothreads-resize
-@@ -0,0 +1,71 @@
-+#!/usr/bin/env bash
-+# group: rw auto quick
-+#
-+# Test resizing an image that is attached to a separate iothread
-+#
-+# Copyright (C) 2023 Red Hat, Inc.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+#
-+
-+# creator
-+owner=kwolf@redhat.com
-+
-+seq=`basename $0`
-+echo "QA output created by $seq"
-+
-+status=1 # failure is the default!
-+
-+_cleanup()
-+{
-+    _cleanup_test_img
-+}
-+trap "_cleanup; exit \$status" 0 1 2 3 15
-+
-+# get standard environment, filters and checks
-+cd ..
-+. ./common.rc
-+. ./common.filter
-+
-+# Resizing images is only supported by a few block drivers
-+_supported_fmt raw qcow2 qed
-+_supported_proto file
-+_require_devices virtio-scsi-pci
-+
-+size=64M
-+_make_test_img $size
-+
-+qmp() {
-+cat <<EOF
-+{"execute":"qmp_capabilities"}
-+{'execute': 'block_resize',
-+ 'arguments': {'node-name': 'img', 'size': 134217728}}
-+{"execute":"quit"}
-+EOF
-+}
-+
-+qmp | $QEMU -S -display none \
-+    -drive if=none,format=$IMGFMT,file="$TEST_IMG",node-name=img \
-+    -object iothread,id=t0 \
-+    -device virtio-scsi-pci,iothread=t0 \
-+    -device scsi-hd,drive=none0 \
-+    -qmp stdio \
-+    | _filter_qmp
-+
-+_img_info | _filter_img_info
-+
-+# success, all done
-+echo "*** done"
-+rm -f $seq.full
-+status=0
-diff --git a/tests/qemu-iotests/tests/iothreads-resize.out b/tests/qemu-iotests/tests/iothreads-resize.out
-new file mode 100644
-index 0000000000..2ca5a9d964
---- /dev/null
-+++ b/tests/qemu-iotests/tests/iothreads-resize.out
-@@ -0,0 +1,11 @@
-+QA output created by iothreads-resize
-+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-+QMP_VERSION
-+{"return": {}}
-+{"return": {}}
-+{"return": {}}
-+{"timestamp": {"seconds":  TIMESTAMP, "microseconds":  TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
-+image: TEST_DIR/t.IMGFMT
-+file format: IMGFMT
-+virtual size: 128 MiB (134217728 bytes)
-+*** done
--- 
-2.39.1
-
diff --git a/kvm-iotests-Use-alternative-CPU-type-that-is-not-depreca.patch b/kvm-iotests-Use-alternative-CPU-type-that-is-not-depreca.patch
deleted file mode 100644
index d1857af..0000000
--- a/kvm-iotests-Use-alternative-CPU-type-that-is-not-depreca.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 21d1d93abd48f613c18df7dacd986693da774175 Mon Sep 17 00:00:00 2001
-From: Kevin Wolf <kwolf@redhat.com>
-Date: Thu, 11 May 2023 13:03:22 +0200
-Subject: [PATCH 54/56] iotests: Use alternative CPU type that is not
- deprecated in RHEL
-
-RH-Author: Kevin Wolf <kwolf@redhat.com>
-RH-MergeRequest: 164: block: Fix hangs in qmp_block_resize()
-RH-Bugzilla: 2185688
-RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-Acked-by: Hanna Czenczek <hreitz@redhat.com>
-RH-Acked-by: Eric Blake <eblake@redhat.com>
-RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
-RH-Commit: [3/4] 038d4718c0ee7a17ff5e6f4af8fc04d07e452f8d (kmwolf/centos-qemu-kvm)
-
-This is a downstream-only patch that is necessary because the default
-CPU in RHEL is marked as deprecated. This makes test cases fail due to
-the warning in the output:
-
-qemu-system-x86_64: warning: CPU model qemu64-x86_64-cpu is deprecated -- use at least 'Nehalem' / 'Opteron_G4', or 'host' / 'max'
-
-Fixes: 318178778db60b6475d1484509bee136317156d3
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- tests/qemu-iotests/testenv.py | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/tests/qemu-iotests/testenv.py b/tests/qemu-iotests/testenv.py
-index 9a37ad9152..963514aab3 100644
---- a/tests/qemu-iotests/testenv.py
-+++ b/tests/qemu-iotests/testenv.py
-@@ -244,6 +244,9 @@ def __init__(self, source_dir: str, build_dir: str,
-             if self.qemu_prog.endswith(f'qemu-system-{suffix}'):
-                 self.qemu_options += f' -machine {machine}'
- 
-+        if self.qemu_prog.endswith('qemu-system-x86_64'):
-+            self.qemu_options += ' -cpu Nehalem'
-+
-         # QEMU_DEFAULT_MACHINE
-         self.qemu_default_machine = get_default_machine(self.qemu_prog)
- 
--- 
-2.39.1
-
diff --git a/kvm-iotests-iov-padding-New-test.patch b/kvm-iotests-iov-padding-New-test.patch
deleted file mode 100644
index 9ef37a2..0000000
--- a/kvm-iotests-iov-padding-New-test.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-From add833b5de202d6765dda56c8773985fbe7f40a6 Mon Sep 17 00:00:00 2001
-From: Hanna Czenczek <hreitz@redhat.com>
-Date: Tue, 11 Apr 2023 19:34:18 +0200
-Subject: [PATCH 4/9] iotests/iov-padding: New test
-
-RH-Author: Hanna Czenczek <hreitz@redhat.com>
-RH-MergeRequest: 189: block: Split padded I/O vectors exceeding IOV_MAX
-RH-Bugzilla: 2174676
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [4/5] b32715b5c2a3e2add39c5ed6e8f71df56e0b91a0 (hreitz/qemu-kvm-c-9-s)
-
-Test that even vectored IO requests with 1024 vector elements that are
-not aligned to the device's request alignment will succeed.
-
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
-Message-Id: <20230411173418.19549-5-hreitz@redhat.com>
-(cherry picked from commit d7e1905e3f54ff9512db4c7a946a8603b62b108d)
-Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
----
- tests/qemu-iotests/tests/iov-padding     | 85 ++++++++++++++++++++++++
- tests/qemu-iotests/tests/iov-padding.out | 59 ++++++++++++++++
- 2 files changed, 144 insertions(+)
- create mode 100755 tests/qemu-iotests/tests/iov-padding
- create mode 100644 tests/qemu-iotests/tests/iov-padding.out
-
-diff --git a/tests/qemu-iotests/tests/iov-padding b/tests/qemu-iotests/tests/iov-padding
-new file mode 100755
-index 0000000000..b9604900c7
---- /dev/null
-+++ b/tests/qemu-iotests/tests/iov-padding
-@@ -0,0 +1,85 @@
-+#!/usr/bin/env bash
-+# group: rw quick
-+#
-+# Check the interaction of request padding (to fit alignment restrictions) with
-+# vectored I/O from the guest
-+#
-+# Copyright Red Hat
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+#
-+
-+seq=$(basename $0)
-+echo "QA output created by $seq"
-+
-+status=1	# failure is the default!
-+
-+_cleanup()
-+{
-+    _cleanup_test_img
-+}
-+trap "_cleanup; exit \$status" 0 1 2 3 15
-+
-+# get standard environment, filters and checks
-+cd ..
-+. ./common.rc
-+. ./common.filter
-+
-+_supported_fmt raw
-+_supported_proto file
-+
-+_make_test_img 1M
-+
-+IMGSPEC="driver=blkdebug,align=4096,image.driver=file,image.filename=$TEST_IMG"
-+
-+# Four combinations:
-+# - Offset 4096, length 1023 * 512 + 512: Fully aligned to 4k
-+# - Offset 4096, length 1023 * 512 + 4096: Head is aligned, tail is not
-+# - Offset 512, length 1023 * 512 + 512: Neither head nor tail are aligned
-+# - Offset 512, length 1023 * 512 + 4096: Tail is aligned, head is not
-+for start_offset in 4096 512; do
-+    for last_element_length in 512 4096; do
-+        length=$((1023 * 512 + $last_element_length))
-+
-+        echo
-+        echo "== performing 1024-element vectored requests to image (offset: $start_offset; length: $length) =="
-+
-+        # Fill with data for testing
-+        $QEMU_IO -c 'write -P 1 0 1M' "$TEST_IMG" | _filter_qemu_io
-+
-+        # 1023 512-byte buffers, and then one with length $last_element_length
-+        cmd_params="-P 2 $start_offset $(yes 512 | head -n 1023 | tr '\n' ' ') $last_element_length"
-+        QEMU_IO_OPTIONS="$QEMU_IO_OPTIONS_NO_FMT" $QEMU_IO \
-+            -c "writev $cmd_params" \
-+            --image-opts \
-+            "$IMGSPEC" \
-+            | _filter_qemu_io
-+
-+        # Read all patterns -- read the part we just wrote with writev twice,
-+        # once "normally", and once with a readv, so we see that that works, too
-+        QEMU_IO_OPTIONS="$QEMU_IO_OPTIONS_NO_FMT" $QEMU_IO \
-+            -c "read -P 1 0 $start_offset" \
-+            -c "read -P 2 $start_offset $length" \
-+            -c "readv $cmd_params" \
-+            -c "read -P 1 $((start_offset + length)) $((1024 * 1024 - length - start_offset))" \
-+            --image-opts \
-+            "$IMGSPEC" \
-+            | _filter_qemu_io
-+    done
-+done
-+
-+# success, all done
-+echo "*** done"
-+rm -f $seq.full
-+status=0
-diff --git a/tests/qemu-iotests/tests/iov-padding.out b/tests/qemu-iotests/tests/iov-padding.out
-new file mode 100644
-index 0000000000..e07a91fac7
---- /dev/null
-+++ b/tests/qemu-iotests/tests/iov-padding.out
-@@ -0,0 +1,59 @@
-+QA output created by iov-padding
-+Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
-+
-+== performing 1024-element vectored requests to image (offset: 4096; length: 524288) ==
-+wrote 1048576/1048576 bytes at offset 0
-+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+wrote 524288/524288 bytes at offset 4096
-+512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+read 4096/4096 bytes at offset 0
-+4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+read 524288/524288 bytes at offset 4096
-+512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+read 524288/524288 bytes at offset 4096
-+512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+read 520192/520192 bytes at offset 528384
-+508 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+
-+== performing 1024-element vectored requests to image (offset: 4096; length: 527872) ==
-+wrote 1048576/1048576 bytes at offset 0
-+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+wrote 527872/527872 bytes at offset 4096
-+515.500 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+read 4096/4096 bytes at offset 0
-+4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+read 527872/527872 bytes at offset 4096
-+515.500 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+read 527872/527872 bytes at offset 4096
-+515.500 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+read 516608/516608 bytes at offset 531968
-+504.500 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+
-+== performing 1024-element vectored requests to image (offset: 512; length: 524288) ==
-+wrote 1048576/1048576 bytes at offset 0
-+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+wrote 524288/524288 bytes at offset 512
-+512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+read 512/512 bytes at offset 0
-+512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+read 524288/524288 bytes at offset 512
-+512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+read 524288/524288 bytes at offset 512
-+512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+read 523776/523776 bytes at offset 524800
-+511.500 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+
-+== performing 1024-element vectored requests to image (offset: 512; length: 527872) ==
-+wrote 1048576/1048576 bytes at offset 0
-+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+wrote 527872/527872 bytes at offset 512
-+515.500 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+read 512/512 bytes at offset 0
-+512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+read 527872/527872 bytes at offset 512
-+515.500 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+read 527872/527872 bytes at offset 512
-+515.500 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+read 520192/520192 bytes at offset 528384
-+508 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-+*** done
--- 
-2.39.3
-
diff --git a/kvm-kvm-reuse-per-vcpu-stats-fd-to-avoid-vcpu-interrupti.patch b/kvm-kvm-reuse-per-vcpu-stats-fd-to-avoid-vcpu-interrupti.patch
deleted file mode 100644
index d6a6d73..0000000
--- a/kvm-kvm-reuse-per-vcpu-stats-fd-to-avoid-vcpu-interrupti.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From a5857fb12fcad46e27c415fe82ce13c0cb5d09c7 Mon Sep 17 00:00:00 2001
-From: Marcelo Tosatti <mtosatti@redhat.com>
-Date: Thu, 29 Jun 2023 14:48:32 -0300
-Subject: [PATCH 5/6] kvm: reuse per-vcpu stats fd to avoid vcpu interruption
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Marcelo Tosatti <None>
-RH-MergeRequest: 177: kvm: reuse per-vcpu stats fd to avoid vcpu interruption
-RH-Bugzilla: 2218644
-RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
-RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Commit: [1/1] 4ec72385a9047888121485f49bacb1aff84f7018 (mtosatti/qemu-kvm)
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2218644
-Commit: 3b6f485275ae95a81eec589d2773b86ca9ddec4d
-
-A regression has been detected in latency testing of KVM guests.
-More specifically, it was observed that the cyclictest
-numbers inside of an isolated vcpu (running on isolated pcpu) are:
-
-Where a maximum of 50us is acceptable.
-
-The implementation of KVM_GET_STATS_FD uses run_on_cpu to query
-per vcpu statistics, which interrupts the vcpu (and is unnecessary).
-
-To fix this, open the per vcpu stats fd on vcpu initialization,
-and read from that fd from QEMU's main thread.
-
-Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
----
- accel/kvm/kvm-all.c   | 30 +++++++++++++++---------------
- include/hw/core/cpu.h |  1 +
- 2 files changed, 16 insertions(+), 15 deletions(-)
-
-diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
-index cf3a88d90e..fa7ca46c66 100644
---- a/accel/kvm/kvm-all.c
-+++ b/accel/kvm/kvm-all.c
-@@ -450,6 +450,8 @@ int kvm_init_vcpu(CPUState *cpu, Error **errp)
-                          "kvm_init_vcpu: kvm_arch_init_vcpu failed (%lu)",
-                          kvm_arch_vcpu_id(cpu));
-     }
-+    cpu->kvm_vcpu_stats_fd = kvm_vcpu_ioctl(cpu, KVM_GET_STATS_FD, NULL);
-+
- err:
-     return ret;
- }
-@@ -3959,7 +3961,7 @@ static StatsDescriptors *find_stats_descriptors(StatsTarget target, int stats_fd
- 
-     /* Read stats header */
-     kvm_stats_header = &descriptors->kvm_stats_header;
--    ret = read(stats_fd, kvm_stats_header, sizeof(*kvm_stats_header));
-+    ret = pread(stats_fd, kvm_stats_header, sizeof(*kvm_stats_header), 0);
-     if (ret != sizeof(*kvm_stats_header)) {
-         error_setg(errp, "KVM stats: failed to read stats header: "
-                    "expected %zu actual %zu",
-@@ -3990,7 +3992,8 @@ static StatsDescriptors *find_stats_descriptors(StatsTarget target, int stats_fd
- }
- 
- static void query_stats(StatsResultList **result, StatsTarget target,
--                        strList *names, int stats_fd, Error **errp)
-+                        strList *names, int stats_fd, CPUState *cpu,
-+                        Error **errp)
- {
-     struct kvm_stats_desc *kvm_stats_desc;
-     struct kvm_stats_header *kvm_stats_header;
-@@ -4048,7 +4051,7 @@ static void query_stats(StatsResultList **result, StatsTarget target,
-         break;
-     case STATS_TARGET_VCPU:
-         add_stats_entry(result, STATS_PROVIDER_KVM,
--                        current_cpu->parent_obj.canonical_path,
-+                        cpu->parent_obj.canonical_path,
-                         stats_list);
-         break;
-     default:
-@@ -4085,10 +4088,9 @@ static void query_stats_schema(StatsSchemaList **result, StatsTarget target,
-     add_stats_schema(result, STATS_PROVIDER_KVM, target, stats_list);
- }
- 
--static void query_stats_vcpu(CPUState *cpu, run_on_cpu_data data)
-+static void query_stats_vcpu(CPUState *cpu, StatsArgs *kvm_stats_args)
- {
--    StatsArgs *kvm_stats_args = (StatsArgs *) data.host_ptr;
--    int stats_fd = kvm_vcpu_ioctl(cpu, KVM_GET_STATS_FD, NULL);
-+    int stats_fd = cpu->kvm_vcpu_stats_fd;
-     Error *local_err = NULL;
- 
-     if (stats_fd == -1) {
-@@ -4097,14 +4099,13 @@ static void query_stats_vcpu(CPUState *cpu, run_on_cpu_data data)
-         return;
-     }
-     query_stats(kvm_stats_args->result.stats, STATS_TARGET_VCPU,
--                kvm_stats_args->names, stats_fd, kvm_stats_args->errp);
--    close(stats_fd);
-+                kvm_stats_args->names, stats_fd, cpu,
-+                kvm_stats_args->errp);
- }
- 
--static void query_stats_schema_vcpu(CPUState *cpu, run_on_cpu_data data)
-+static void query_stats_schema_vcpu(CPUState *cpu, StatsArgs *kvm_stats_args)
- {
--    StatsArgs *kvm_stats_args = (StatsArgs *) data.host_ptr;
--    int stats_fd = kvm_vcpu_ioctl(cpu, KVM_GET_STATS_FD, NULL);
-+    int stats_fd = cpu->kvm_vcpu_stats_fd;
-     Error *local_err = NULL;
- 
-     if (stats_fd == -1) {
-@@ -4114,7 +4115,6 @@ static void query_stats_schema_vcpu(CPUState *cpu, run_on_cpu_data data)
-     }
-     query_stats_schema(kvm_stats_args->result.schema, STATS_TARGET_VCPU, stats_fd,
-                        kvm_stats_args->errp);
--    close(stats_fd);
- }
- 
- static void query_stats_cb(StatsResultList **result, StatsTarget target,
-@@ -4132,7 +4132,7 @@ static void query_stats_cb(StatsResultList **result, StatsTarget target,
-             error_setg_errno(errp, errno, "KVM stats: ioctl failed");
-             return;
-         }
--        query_stats(result, target, names, stats_fd, errp);
-+        query_stats(result, target, names, stats_fd, NULL, errp);
-         close(stats_fd);
-         break;
-     }
-@@ -4146,7 +4146,7 @@ static void query_stats_cb(StatsResultList **result, StatsTarget target,
-             if (!apply_str_list_filter(cpu->parent_obj.canonical_path, targets)) {
-                 continue;
-             }
--            run_on_cpu(cpu, query_stats_vcpu, RUN_ON_CPU_HOST_PTR(&stats_args));
-+            query_stats_vcpu(cpu, &stats_args);
-         }
-         break;
-     }
-@@ -4172,6 +4172,6 @@ void query_stats_schemas_cb(StatsSchemaList **result, Error **errp)
-     if (first_cpu) {
-         stats_args.result.schema = result;
-         stats_args.errp = errp;
--        run_on_cpu(first_cpu, query_stats_schema_vcpu, RUN_ON_CPU_HOST_PTR(&stats_args));
-+        query_stats_schema_vcpu(first_cpu, &stats_args);
-     }
- }
-diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
-index 397fd3ac68..ae96be07e7 100644
---- a/include/hw/core/cpu.h
-+++ b/include/hw/core/cpu.h
-@@ -399,6 +399,7 @@ struct CPUState {
-     struct kvm_dirty_gfn *kvm_dirty_gfns;
-     uint32_t kvm_fetch_index;
-     uint64_t dirty_pages;
-+    int kvm_vcpu_stats_fd;
- 
-     /* Use by accel-block: CPU is executing an ioctl() */
-     QemuLockCnt in_ioctl_lock;
--- 
-2.39.3
-
diff --git a/kvm-loongarch-mark-loongarch_ipi_iocsr-re-entrnacy-safe.patch b/kvm-loongarch-mark-loongarch_ipi_iocsr-re-entrnacy-safe.patch
deleted file mode 100644
index c1100a5..0000000
--- a/kvm-loongarch-mark-loongarch_ipi_iocsr-re-entrnacy-safe.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 6de2f37d9a5db6578554929227377e4fd6d2feb3 Mon Sep 17 00:00:00 2001
-From: Jon Maloy <jmaloy@redhat.com>
-Date: Tue, 9 May 2023 10:29:03 -0400
-Subject: [PATCH 14/21] loongarch: mark loongarch_ipi_iocsr re-entrnacy safe
-
-RH-Author: Jon Maloy <jmaloy@redhat.com>
-RH-MergeRequest: 165: memory: prevent dma-reentracy issues
-RH-Jira: RHEL-516
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [10/13] 02435b9148b906960137de32eb5a3c4961e44a57 (jmaloy/jmaloy-qemu-kvm-2)
-
-Jira: https://issues.redhat.com/browse/RHEL-516
-Upstream: Merged
-CVE: CVE-2023-2680
-
-commit 6d0589e0e6c64b888864a2bf980537be20389264
-Author: Alexander Bulekov <alxndr@bu.edu>
-Date:   Sat May 6 07:21:45 2023 -0400
-
-    loongarch: mark loongarch_ipi_iocsr re-entrnacy safe
-
-    loongarch_ipi_iocsr MRs rely on re-entrant IO through the ipi_send
-    function. As such, mark these MRs re-entrancy-safe.
-
-    Fixes: a2e1753b80 ("memory: prevent dma-reentracy issues")
-    Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
-    Reviewed-by: Song Gao <gaosong@loongson.cn>
-    Message-Id: <20230506112145.3563708-1-alxndr@bu.edu>
-    Signed-off-by: Song Gao <gaosong@loongson.cn>
-
-Signed-off-by: Jon Maloy <jmaloy@redhat.com>
----
- hw/intc/loongarch_ipi.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/hw/intc/loongarch_ipi.c b/hw/intc/loongarch_ipi.c
-index aa4bf9eb74..40e98af2ce 100644
---- a/hw/intc/loongarch_ipi.c
-+++ b/hw/intc/loongarch_ipi.c
-@@ -215,6 +215,10 @@ static void loongarch_ipi_init(Object *obj)
-     for (cpu = 0; cpu < MAX_IPI_CORE_NUM; cpu++) {
-         memory_region_init_io(&s->ipi_iocsr_mem[cpu], obj, &loongarch_ipi_ops,
-                             &lams->ipi_core[cpu], "loongarch_ipi_iocsr", 0x48);
-+
-+        /* loongarch_ipi_iocsr performs re-entrant IO through ipi_send */
-+        s->ipi_iocsr_mem[cpu].disable_reentrancy_guard = true;
-+
-         sysbus_init_mmio(sbd, &s->ipi_iocsr_mem[cpu]);
- 
-         memory_region_init_io(&s->ipi64_iocsr_mem[cpu], obj, &loongarch_ipi64_ops,
--- 
-2.39.3
-
diff --git a/kvm-lsi53c895a-disable-reentrancy-detection-for-MMIO-reg.patch b/kvm-lsi53c895a-disable-reentrancy-detection-for-MMIO-reg.patch
deleted file mode 100644
index 359d53f..0000000
--- a/kvm-lsi53c895a-disable-reentrancy-detection-for-MMIO-reg.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 0660a7a6994db0db9f6d0b84f6345aa06dc61761 Mon Sep 17 00:00:00 2001
-From: Jon Maloy <jmaloy@redhat.com>
-Date: Mon, 29 May 2023 14:21:08 -0400
-Subject: [PATCH 16/21] lsi53c895a: disable reentrancy detection for MMIO
- region, too
-
-RH-Author: Jon Maloy <jmaloy@redhat.com>
-RH-MergeRequest: 165: memory: prevent dma-reentracy issues
-RH-Jira: RHEL-516
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [12/13] fb9da8b68cdf0dc0b0bd8fb8540849c944d0bf20 (jmaloy/jmaloy-qemu-kvm-2)
-
-Jira: https://issues.redhat.com/browse/RHEL-516
-Upstream: Merged
-CVE: CVE-2023-2680
-
-commit d139fe9ad8a27bcc50b4ead77d2f97d191a0e95e
-Author: Thomas Huth <thuth@redhat.com>
-Date:   Tue May 16 11:05:56 2023 +0200
-
-    lsi53c895a: disable reentrancy detection for MMIO region, too
-
-    While trying to use a SCSI disk on the LSI controller with an
-    older version of Fedora (25), I'm getting:
-
-     qemu: warning: Blocked re-entrant IO on MemoryRegion: lsi-mmio at addr: 0x34
-
-    and the SCSI controller is not usable. Seems like we have to
-    disable the reentrancy checker for the MMIO region, too, to
-    get this working again.
-
-    The problem could be reproduced it like this:
-
-    ./qemu-system-x86_64 -accel kvm -m 2G -machine q35 \
-     -device lsi53c810,id=lsi1 -device scsi-hd,drive=d0 \
-     -drive if=none,id=d0,file=.../somedisk.qcow2 \
-     -cdrom Fedora-Everything-netinst-i386-25-1.3.iso
-
-    Where somedisk.qcow2 is an image that contains already some partitions
-    and file systems.
-
-    In the boot menu of Fedora, go to
-    "Troubleshooting" -> "Rescue a Fedora system" -> "3) Skip to shell"
-
-    Then check "dmesg | grep -i 53c" for failure messages, and try to mount
-    a partition from somedisk.qcow2.
-
-    Message-Id: <20230516090556.553813-1-thuth@redhat.com>
-    Signed-off-by: Thomas Huth <thuth@redhat.com>
-
-Signed-off-by: Jon Maloy <jmaloy@redhat.com>
----
- hw/scsi/lsi53c895a.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c
-index db27872963..048436352b 100644
---- a/hw/scsi/lsi53c895a.c
-+++ b/hw/scsi/lsi53c895a.c
-@@ -2307,6 +2307,7 @@ static void lsi_scsi_realize(PCIDevice *dev, Error **errp)
-      * re-entrancy guard.
-      */
-     s->ram_io.disable_reentrancy_guard = true;
-+    s->mmio_io.disable_reentrancy_guard = true;
- 
-     address_space_init(&s->pci_io_as, pci_address_space_io(dev), "lsi-pci-io");
-     qdev_init_gpio_out(d, &s->ext_irq, 1);
--- 
-2.39.3
-
diff --git a/kvm-lsi53c895a-disable-reentrancy-detection-for-script-R.patch b/kvm-lsi53c895a-disable-reentrancy-detection-for-script-R.patch
deleted file mode 100644
index e671c92..0000000
--- a/kvm-lsi53c895a-disable-reentrancy-detection-for-script-R.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 621808c6c4da3adcc073231493d487d6360386c9 Mon Sep 17 00:00:00 2001
-From: Jon Maloy <jmaloy@redhat.com>
-Date: Tue, 9 May 2023 10:29:03 -0400
-Subject: [PATCH 09/21] lsi53c895a: disable reentrancy detection for script RAM
-
-RH-Author: Jon Maloy <jmaloy@redhat.com>
-RH-MergeRequest: 165: memory: prevent dma-reentracy issues
-RH-Jira: RHEL-516
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [5/13] 765d65fc3fb735eb4b52a408ccff91b538ad32b6 (jmaloy/jmaloy-qemu-kvm-2)
-
-Jira: https://issues.redhat.com/browse/RHEL-516
-Upstream: Merged
-CVE: CVE-2023-2680
-
-commit bfd6e7ae6a72b84e2eb9574f56e6ec037f05182c
-Author: Alexander Bulekov <alxndr@bu.edu>
-Date:   Thu Apr 27 17:10:10 2023 -0400
-
-    lsi53c895a: disable reentrancy detection for script RAM
-
-    As the code is designed to use the memory APIs to access the script ram,
-    disable reentrancy checks for the pseudo-RAM ram_io MemoryRegion.
-
-    In the future, ram_io may be converted from an IO to a proper RAM MemoryRegion.
-
-    Reported-by: Fiona Ebner <f.ebner@proxmox.com>
-    Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
-    Reviewed-by: Thomas Huth <thuth@redhat.com>
-    Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
-    Message-Id: <20230427211013.2994127-6-alxndr@bu.edu>
-    Signed-off-by: Thomas Huth <thuth@redhat.com>
-
-Signed-off-by: Jon Maloy <jmaloy@redhat.com>
----
- hw/scsi/lsi53c895a.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c
-index af93557a9a..db27872963 100644
---- a/hw/scsi/lsi53c895a.c
-+++ b/hw/scsi/lsi53c895a.c
-@@ -2302,6 +2302,12 @@ static void lsi_scsi_realize(PCIDevice *dev, Error **errp)
-     memory_region_init_io(&s->io_io, OBJECT(s), &lsi_io_ops, s,
-                           "lsi-io", 256);
- 
-+    /*
-+     * Since we use the address-space API to interact with ram_io, disable the
-+     * re-entrancy guard.
-+     */
-+    s->ram_io.disable_reentrancy_guard = true;
-+
-     address_space_init(&s->pci_io_as, pci_address_space_io(dev), "lsi-pci-io");
-     qdev_init_gpio_out(d, &s->ext_irq, 1);
- 
--- 
-2.39.3
-
diff --git a/kvm-memory-prevent-dma-reentracy-issues.patch b/kvm-memory-prevent-dma-reentracy-issues.patch
deleted file mode 100644
index d3697dc..0000000
--- a/kvm-memory-prevent-dma-reentracy-issues.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 0bc9295be331781491e993b6f1b0dca959194f13 Mon Sep 17 00:00:00 2001
-From: Jon Maloy <jmaloy@redhat.com>
-Date: Tue, 9 May 2023 10:29:03 -0400
-Subject: [PATCH 05/21] memory: prevent dma-reentracy issues
-
-RH-Author: Jon Maloy <jmaloy@redhat.com>
-RH-MergeRequest: 165: memory: prevent dma-reentracy issues
-RH-Jira: RHEL-516
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [1/13] d4a762d3b156200a65d09cde58cd6d77b229071e (jmaloy/jmaloy-qemu-kvm-2)
-
-Jira: https://issues.redhat.com/browse/RHEL-516
-Upstream: Merged
-CVE: CVE-2023-2680
-CVE: CVE-2023-0330
-
-commit a2e1753b8054344f32cf94f31c6399a58794a380
-Author: Alexander Bulekov <alxndr@bu.edu>
-Date:   Thu Apr 27 17:10:06 2023 -0400
-
-    memory: prevent dma-reentracy issues
-
-    Add a flag to the DeviceState, when a device is engaged in PIO/MMIO/DMA.
-    This flag is set/checked prior to calling a device's MemoryRegion
-    handlers, and set when device code initiates DMA.  The purpose of this
-    flag is to prevent two types of DMA-based reentrancy issues:
-
-    1.) mmio -> dma -> mmio case
-    2.) bh -> dma write -> mmio case
-
-    These issues have led to problems such as stack-exhaustion and
-    use-after-frees.
-
-    Summary of the problem from Peter Maydell:
-    https://lore.kernel.org/qemu-devel/CAFEAcA_23vc7hE3iaM-JVA6W38LK4hJoWae5KcknhPRD5fPBZA@mail.gmail.com
-
-    Resolves: https://gitlab.com/qemu-project/qemu/-/issues/62
-    Resolves: https://gitlab.com/qemu-project/qemu/-/issues/540
-    Resolves: https://gitlab.com/qemu-project/qemu/-/issues/541
-    Resolves: https://gitlab.com/qemu-project/qemu/-/issues/556
-    Resolves: https://gitlab.com/qemu-project/qemu/-/issues/557
-    Resolves: https://gitlab.com/qemu-project/qemu/-/issues/827
-    Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1282
-    Resolves: CVE-2023-0330
-
-    Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
-    Reviewed-by: Thomas Huth <thuth@redhat.com>
-    Message-Id: <20230427211013.2994127-2-alxndr@bu.edu>
-    [thuth: Replace warn_report() with warn_report_once()]
-    Signed-off-by: Thomas Huth <thuth@redhat.com>
-
-Signed-off-by: Jon Maloy <jmaloy@redhat.com>
----
- include/exec/memory.h  |  5 +++++
- include/hw/qdev-core.h |  7 +++++++
- softmmu/memory.c       | 16 ++++++++++++++++
- 3 files changed, 28 insertions(+)
-
-diff --git a/include/exec/memory.h b/include/exec/memory.h
-index 15ade918ba..e45ce6061f 100644
---- a/include/exec/memory.h
-+++ b/include/exec/memory.h
-@@ -767,6 +767,8 @@ struct MemoryRegion {
-     bool is_iommu;
-     RAMBlock *ram_block;
-     Object *owner;
-+    /* owner as TYPE_DEVICE. Used for re-entrancy checks in MR access hotpath */
-+    DeviceState *dev;
- 
-     const MemoryRegionOps *ops;
-     void *opaque;
-@@ -791,6 +793,9 @@ struct MemoryRegion {
-     unsigned ioeventfd_nb;
-     MemoryRegionIoeventfd *ioeventfds;
-     RamDiscardManager *rdm; /* Only for RAM */
-+
-+    /* For devices designed to perform re-entrant IO into their own IO MRs */
-+    bool disable_reentrancy_guard;
- };
- 
- struct IOMMUMemoryRegion {
-diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
-index bd50ad5ee1..7623703943 100644
---- a/include/hw/qdev-core.h
-+++ b/include/hw/qdev-core.h
-@@ -162,6 +162,10 @@ struct NamedClockList {
-     QLIST_ENTRY(NamedClockList) node;
- };
- 
-+typedef struct {
-+    bool engaged_in_io;
-+} MemReentrancyGuard;
-+
- /**
-  * DeviceState:
-  * @realized: Indicates whether the device has been fully constructed.
-@@ -194,6 +198,9 @@ struct DeviceState {
-     int alias_required_for_version;
-     ResettableState reset;
-     GSList *unplug_blockers;
-+
-+    /* Is the device currently in mmio/pio/dma? Used to prevent re-entrancy */
-+    MemReentrancyGuard mem_reentrancy_guard;
- };
- 
- struct DeviceListener {
-diff --git a/softmmu/memory.c b/softmmu/memory.c
-index b1a6cae6f5..b7b3386e9d 100644
---- a/softmmu/memory.c
-+++ b/softmmu/memory.c
-@@ -542,6 +542,18 @@ static MemTxResult access_with_adjusted_size(hwaddr addr,
-         access_size_max = 4;
-     }
- 
-+    /* Do not allow more than one simultaneous access to a device's IO Regions */
-+    if (mr->dev && !mr->disable_reentrancy_guard &&
-+        !mr->ram_device && !mr->ram && !mr->rom_device && !mr->readonly) {
-+        if (mr->dev->mem_reentrancy_guard.engaged_in_io) {
-+            warn_report_once("Blocked re-entrant IO on MemoryRegion: "
-+                             "%s at addr: 0x%" HWADDR_PRIX,
-+                             memory_region_name(mr), addr);
-+            return MEMTX_ACCESS_ERROR;
-+        }
-+        mr->dev->mem_reentrancy_guard.engaged_in_io = true;
-+    }
-+
-     /* FIXME: support unaligned access? */
-     access_size = MAX(MIN(size, access_size_max), access_size_min);
-     access_mask = MAKE_64BIT_MASK(0, access_size * 8);
-@@ -556,6 +568,9 @@ static MemTxResult access_with_adjusted_size(hwaddr addr,
-                         access_mask, attrs);
-         }
-     }
-+    if (mr->dev) {
-+        mr->dev->mem_reentrancy_guard.engaged_in_io = false;
-+    }
-     return r;
- }
- 
-@@ -1170,6 +1185,7 @@ static void memory_region_do_init(MemoryRegion *mr,
-     }
-     mr->name = g_strdup(name);
-     mr->owner = owner;
-+    mr->dev = (DeviceState *) object_dynamic_cast(mr->owner, TYPE_DEVICE);
-     mr->ram_block = NULL;
- 
-     if (name) {
--- 
-2.39.3
-
diff --git a/kvm-memory-stricter-checks-prior-to-unsetting-engaged_in.patch b/kvm-memory-stricter-checks-prior-to-unsetting-engaged_in.patch
deleted file mode 100644
index f45abea..0000000
--- a/kvm-memory-stricter-checks-prior-to-unsetting-engaged_in.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 3f2042e33acb6db91594e12ebd63b9abd9e753cc Mon Sep 17 00:00:00 2001
-From: Jon Maloy <jmaloy@redhat.com>
-Date: Wed, 7 Jun 2023 11:45:09 -0400
-Subject: [PATCH 15/21] memory: stricter checks prior to unsetting
- engaged_in_io
-
-RH-Author: Jon Maloy <jmaloy@redhat.com>
-RH-MergeRequest: 165: memory: prevent dma-reentracy issues
-RH-Jira: RHEL-516
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [11/13] b8e1a4b49dd7fa3b7948d32f46dfe1d7f7a4c1cf (jmaloy/jmaloy-qemu-kvm-2)
-
-Jira: https://issues.redhat.com/browse/RHEL-516
-Upstream: Merged
-CVE: CVE-2023-2680
-
-commit 3884bf6468ac6bbb58c2b3feaa74e87f821b52f3
-Author: Alexander Bulekov <alxndr@bu.edu>
-Date:   Tue May 16 04:40:02 2023 -0400
-
-    memory: stricter checks prior to unsetting engaged_in_io
-
-    engaged_in_io could be unset by an MR with re-entrancy checks disabled.
-    Ensure that only MRs that can set the engaged_in_io flag can unset it.
-
-    Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
-    Message-Id: <20230516084002.3813836-1-alxndr@bu.edu>
-    Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
-    Signed-off-by: Thomas Huth <thuth@redhat.com>
-
-Signed-off-by: Jon Maloy <jmaloy@redhat.com>
----
- softmmu/memory.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/softmmu/memory.c b/softmmu/memory.c
-index b7b3386e9d..26424f1d78 100644
---- a/softmmu/memory.c
-+++ b/softmmu/memory.c
-@@ -534,6 +534,7 @@ static MemTxResult access_with_adjusted_size(hwaddr addr,
-     unsigned access_size;
-     unsigned i;
-     MemTxResult r = MEMTX_OK;
-+    bool reentrancy_guard_applied = false;
- 
-     if (!access_size_min) {
-         access_size_min = 1;
-@@ -552,6 +553,7 @@ static MemTxResult access_with_adjusted_size(hwaddr addr,
-             return MEMTX_ACCESS_ERROR;
-         }
-         mr->dev->mem_reentrancy_guard.engaged_in_io = true;
-+        reentrancy_guard_applied = true;
-     }
- 
-     /* FIXME: support unaligned access? */
-@@ -568,7 +570,7 @@ static MemTxResult access_with_adjusted_size(hwaddr addr,
-                         access_mask, attrs);
-         }
-     }
--    if (mr->dev) {
-+    if (mr->dev && reentrancy_guard_applied) {
-         mr->dev->mem_reentrancy_guard.engaged_in_io = false;
-     }
-     return r;
--- 
-2.39.3
-
diff --git a/kvm-migration-Add-switchover-ack-capability.patch b/kvm-migration-Add-switchover-ack-capability.patch
deleted file mode 100644
index 399c9ed..0000000
--- a/kvm-migration-Add-switchover-ack-capability.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From 8f89d3bc8f226cd038bf88b9fb3ef43b0fb33034 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:57 +0200
-Subject: [PATCH 10/37] migration: Add switchover ack capability
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [8/28] 2f4ca020783bd617eca13b18289fce764279833b (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit 6574232fff6a
-Author: Avihai Horon <avihaih@nvidia.com>
-Date:   Wed Jun 21 14:11:54 2023 +0300
-
-    migration: Add switchover ack capability
-
-    Migration downtime estimation is calculated based on bandwidth and
-    remaining migration data. This assumes that loading of migration data in
-    the destination takes a negligible amount of time and that downtime
-    depends only on network speed.
-
-    While this may be true for RAM, it's not necessarily true for other
-    migrated devices. For example, loading the data of a VFIO device in the
-    destination might require from the device to allocate resources, prepare
-    internal data structures and so on. These operations can take a
-    significant amount of time which can increase migration downtime.
-
-    This patch adds a new capability "switchover ack" that prevents the
-    source from stopping the VM and completing the migration until an ACK
-    is received from the destination that it's OK to do so.
-
-    This can be used by migrated devices in various ways to reduce downtime.
-    For example, a device can send initial precopy metadata to pre-allocate
-    resources in the destination and use this capability to make sure that
-    the pre-allocation is completed before the source VM is stopped, so it
-    will have full effect.
-
-    This new capability relies on the return path capability to communicate
-    from the destination back to the source.
-
-    The actual implementation of the capability will be added in the
-    following patches.
-
-    Signed-off-by: Avihai Horon <avihaih@nvidia.com>
-    Reviewed-by: Peter Xu <peterx@redhat.com>
-    Acked-by: Markus Armbruster <armbru@redhat.com>
-    Tested-by: YangHang Liu <yanghliu@redhat.com>
-    Acked-by: Alex Williamson <alex.williamson@redhat.com>
-    Signed-off-by: Cédric Le Goater <clg@redhat.com>
-
-Conflicts:
-    - qapi/migration.json
-      re-indent of @switchover-ack to avoid ../qapi/migration.json:482:1:
-      unexpected de-indent (expected at least 17 spaces)
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- migration/options.c | 21 +++++++++++++++++++++
- migration/options.h |  1 +
- qapi/migration.json | 14 +++++++++++++-
- 3 files changed, 35 insertions(+), 1 deletion(-)
-
-diff --git a/migration/options.c b/migration/options.c
-index a76984276d..c3df6c6dde 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -182,6 +182,8 @@ Property migration_properties[] = {
-     DEFINE_PROP_MIG_CAP("x-zero-copy-send",
-             MIGRATION_CAPABILITY_ZERO_COPY_SEND),
- #endif
-+    DEFINE_PROP_MIG_CAP("x-switchover-ack",
-+                        MIGRATION_CAPABILITY_SWITCHOVER_ACK),
- 
-     DEFINE_PROP_END_OF_LIST(),
- };
-@@ -305,6 +307,13 @@ bool migrate_return_path(void)
-     return s->capabilities[MIGRATION_CAPABILITY_RETURN_PATH];
- }
- 
-+bool migrate_switchover_ack(void)
-+{
-+    MigrationState *s = migrate_get_current();
-+
-+    return s->capabilities[MIGRATION_CAPABILITY_SWITCHOVER_ACK];
-+}
-+
- bool migrate_validate_uuid(void)
- {
-     MigrationState *s = migrate_get_current();
-@@ -532,6 +541,18 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp)
-         }
-     }
- 
-+    if (new_caps[MIGRATION_CAPABILITY_SWITCHOVER_ACK]) {
-+        if (!new_caps[MIGRATION_CAPABILITY_RETURN_PATH]) {
-+            error_setg(errp, "Capability 'switchover-ack' requires capability "
-+                             "'return-path'");
-+            return false;
-+        }
-+
-+        /* Disable this capability until it's implemented */
-+        error_setg(errp, "'switchover-ack' is not implemented yet");
-+        return false;
-+    }
-+
-     return true;
- }
- 
-diff --git a/migration/options.h b/migration/options.h
-index 7b0f7245ad..0fc7be6869 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -47,6 +47,7 @@ bool migrate_postcopy_ram(void);
- bool migrate_rdma_pin_all(void);
- bool migrate_release_ram(void);
- bool migrate_return_path(void);
-+bool migrate_switchover_ack(void);
- bool migrate_validate_uuid(void);
- bool migrate_xbzrle(void);
- bool migrate_zero_blocks(void);
-diff --git a/qapi/migration.json b/qapi/migration.json
-index 2c35b7b9cf..b6a58347cc 100644
---- a/qapi/migration.json
-+++ b/qapi/migration.json
-@@ -478,6 +478,18 @@
- #                    should not affect the correctness of postcopy migration.
- #                    (since 7.1)
- #
-+# @switchover-ack: If enabled, migration will not stop the source VM
-+#                  and complete the migration until an ACK is received
-+#                  from the destination that it's OK to do so.
-+#                  Exactly when this ACK is sent depends on the
-+#                  migrated devices that use this feature.  For
-+#                  example, a device can use it to make sure some of
-+#                  its data is sent and loaded in the destination
-+#                  before doing switchover.  This can reduce downtime
-+#                  if devices that support this capability are
-+#                  present.  'return-path' capability must be enabled
-+#                  to use it.  (since 8.1)
-+#
- # Features:
- # @unstable: Members @x-colo and @x-ignore-shared are experimental.
- #
-@@ -492,7 +504,7 @@
-            'dirty-bitmaps', 'postcopy-blocktime', 'late-block-activate',
-            { 'name': 'x-ignore-shared', 'features': [ 'unstable' ] },
-            'validate-uuid', 'background-snapshot',
--           'zero-copy-send', 'postcopy-preempt'] }
-+           'zero-copy-send', 'postcopy-preempt', 'switchover-ack'] }
- 
- ##
- # @MigrationCapabilityStatus:
--- 
-2.39.3
-
diff --git a/kvm-migration-Allow-postcopy_ram_supported_by_host-to-re.patch b/kvm-migration-Allow-postcopy_ram_supported_by_host-to-re.patch
deleted file mode 100644
index 7c9748b..0000000
--- a/kvm-migration-Allow-postcopy_ram_supported_by_host-to-re.patch
+++ /dev/null
@@ -1,308 +0,0 @@
-From e2c2910edf90186ca0d7d13c9943caa284e95ea9 Mon Sep 17 00:00:00 2001
-From: Peter Xu <peterx@redhat.com>
-Date: Tue, 25 Apr 2023 21:15:14 -0400
-Subject: [PATCH 51/56] migration: Allow postcopy_ram_supported_by_host() to
- report err
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [50/50] 08c44affc11c27ddf1aa7ce0dfacbaf5effb80cb (peterx/qemu-kvm)
-
-Instead of print it to STDERR, bring the error upwards so that it can be
-reported via QMP responses.
-
-E.g.:
-
-{ "execute": "migrate-set-capabilities" ,
-  "arguments": { "capabilities":
-  [ { "capability": "postcopy-ram", "state": true } ] } }
-
-{ "error":
-  { "class": "GenericError",
-    "desc": "Postcopy is not supported: Host backend files need to be TMPFS
-    or HUGETLBFS only" } }
-
-Signed-off-by: Peter Xu <peterx@redhat.com>
-Reviewed-by: Juan Quintela <quintela@redhat.com>
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-(cherry picked from commit 74c38cf7fd24c60e4f0a90585d17250478260877)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/options.c      |  8 ++----
- migration/postcopy-ram.c | 60 +++++++++++++++++++++-------------------
- migration/postcopy-ram.h |  3 +-
- migration/savevm.c       |  3 +-
- 4 files changed, 39 insertions(+), 35 deletions(-)
-
-diff --git a/migration/options.c b/migration/options.c
-index 4701c75a4d..e51d667e14 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -302,6 +302,7 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp)
- {
-     MigrationIncomingState *mis = migration_incoming_get_current();
- 
-+    ERRP_GUARD();
- #ifndef CONFIG_LIVE_BLOCK_MIGRATION
-     if (new_caps[MIGRATION_CAPABILITY_BLOCK]) {
-         error_setg(errp, "QEMU compiled without old-style (blk/-b, inc/-i) "
-@@ -327,11 +328,8 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp)
-          */
-         if (!old_caps[MIGRATION_CAPABILITY_POSTCOPY_RAM] &&
-             runstate_check(RUN_STATE_INMIGRATE) &&
--            !postcopy_ram_supported_by_host(mis)) {
--            /* postcopy_ram_supported_by_host will have emitted a more
--             * detailed message
--             */
--            error_setg(errp, "Postcopy is not supported");
-+            !postcopy_ram_supported_by_host(mis, errp)) {
-+            error_prepend(errp, "Postcopy is not supported: ");
-             return false;
-         }
- 
-diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
-index 0711500036..75aa276bb1 100644
---- a/migration/postcopy-ram.c
-+++ b/migration/postcopy-ram.c
-@@ -283,11 +283,13 @@ static bool request_ufd_features(int ufd, uint64_t features)
-     return true;
- }
- 
--static bool ufd_check_and_apply(int ufd, MigrationIncomingState *mis)
-+static bool ufd_check_and_apply(int ufd, MigrationIncomingState *mis,
-+                                Error **errp)
- {
-     uint64_t asked_features = 0;
-     static uint64_t supported_features;
- 
-+    ERRP_GUARD();
-     /*
-      * it's not possible to
-      * request UFFD_API twice per one fd
-@@ -295,7 +297,7 @@ static bool ufd_check_and_apply(int ufd, MigrationIncomingState *mis)
-      */
-     if (!supported_features) {
-         if (!receive_ufd_features(&supported_features)) {
--            error_report("%s failed", __func__);
-+            error_setg(errp, "Userfault feature detection failed");
-             return false;
-         }
-     }
-@@ -317,8 +319,7 @@ static bool ufd_check_and_apply(int ufd, MigrationIncomingState *mis)
-      * userfault file descriptor
-      */
-     if (!request_ufd_features(ufd, asked_features)) {
--        error_report("%s failed: features %" PRIu64, __func__,
--                     asked_features);
-+        error_setg(errp, "Failed features %" PRIu64, asked_features);
-         return false;
-     }
- 
-@@ -329,7 +330,8 @@ static bool ufd_check_and_apply(int ufd, MigrationIncomingState *mis)
-         have_hp = supported_features & UFFD_FEATURE_MISSING_HUGETLBFS;
- #endif
-         if (!have_hp) {
--            error_report("Userfault on this host does not support huge pages");
-+            error_setg(errp,
-+                       "Userfault on this host does not support huge pages");
-             return false;
-         }
-     }
-@@ -338,7 +340,7 @@ static bool ufd_check_and_apply(int ufd, MigrationIncomingState *mis)
- 
- /* Callback from postcopy_ram_supported_by_host block iterator.
-  */
--static int test_ramblock_postcopiable(RAMBlock *rb)
-+static int test_ramblock_postcopiable(RAMBlock *rb, Error **errp)
- {
-     const char *block_name = qemu_ram_get_idstr(rb);
-     ram_addr_t length = qemu_ram_get_used_length(rb);
-@@ -346,16 +348,18 @@ static int test_ramblock_postcopiable(RAMBlock *rb)
-     QemuFsType fs;
- 
-     if (length % pagesize) {
--        error_report("Postcopy requires RAM blocks to be a page size multiple,"
--                     " block %s is 0x" RAM_ADDR_FMT " bytes with a "
--                     "page size of 0x%zx", block_name, length, pagesize);
-+        error_setg(errp,
-+                   "Postcopy requires RAM blocks to be a page size multiple,"
-+                   " block %s is 0x" RAM_ADDR_FMT " bytes with a "
-+                   "page size of 0x%zx", block_name, length, pagesize);
-         return 1;
-     }
- 
-     if (rb->fd >= 0) {
-         fs = qemu_fd_getfs(rb->fd);
-         if (fs != QEMU_FS_TYPE_TMPFS && fs != QEMU_FS_TYPE_HUGETLBFS) {
--            error_report("Host backend files need to be TMPFS or HUGETLBFS only");
-+            error_setg(errp,
-+                       "Host backend files need to be TMPFS or HUGETLBFS only");
-             return 1;
-         }
-     }
-@@ -368,7 +372,7 @@ static int test_ramblock_postcopiable(RAMBlock *rb)
-  * normally fine since if the postcopy succeeds it gets turned back on at the
-  * end.
-  */
--bool postcopy_ram_supported_by_host(MigrationIncomingState *mis)
-+bool postcopy_ram_supported_by_host(MigrationIncomingState *mis, Error **errp)
- {
-     long pagesize = qemu_real_host_page_size();
-     int ufd = -1;
-@@ -377,29 +381,27 @@ bool postcopy_ram_supported_by_host(MigrationIncomingState *mis)
-     struct uffdio_register reg_struct;
-     struct uffdio_range range_struct;
-     uint64_t feature_mask;
--    Error *local_err = NULL;
-     RAMBlock *block;
- 
-+    ERRP_GUARD();
-     if (qemu_target_page_size() > pagesize) {
--        error_report("Target page size bigger than host page size");
-+        error_setg(errp, "Target page size bigger than host page size");
-         goto out;
-     }
- 
-     ufd = uffd_open(O_CLOEXEC);
-     if (ufd == -1) {
--        error_report("%s: userfaultfd not available: %s", __func__,
--                     strerror(errno));
-+        error_setg(errp, "Userfaultfd not available: %s", strerror(errno));
-         goto out;
-     }
- 
-     /* Give devices a chance to object */
--    if (postcopy_notify(POSTCOPY_NOTIFY_PROBE, &local_err)) {
--        error_report_err(local_err);
-+    if (postcopy_notify(POSTCOPY_NOTIFY_PROBE, errp)) {
-         goto out;
-     }
- 
-     /* Version and features check */
--    if (!ufd_check_and_apply(ufd, mis)) {
-+    if (!ufd_check_and_apply(ufd, mis, errp)) {
-         goto out;
-     }
- 
-@@ -417,7 +419,7 @@ bool postcopy_ram_supported_by_host(MigrationIncomingState *mis)
-      * affect in reality, or we can revisit.
-      */
-     RAMBLOCK_FOREACH(block) {
--        if (test_ramblock_postcopiable(block)) {
-+        if (test_ramblock_postcopiable(block, errp)) {
-             goto out;
-         }
-     }
-@@ -427,7 +429,7 @@ bool postcopy_ram_supported_by_host(MigrationIncomingState *mis)
-      * it was enabled.
-      */
-     if (munlockall()) {
--        error_report("%s: munlockall: %s", __func__,  strerror(errno));
-+        error_setg(errp, "munlockall() failed: %s", strerror(errno));
-         goto out;
-     }
- 
-@@ -439,8 +441,7 @@ bool postcopy_ram_supported_by_host(MigrationIncomingState *mis)
-     testarea = mmap(NULL, pagesize, PROT_READ | PROT_WRITE, MAP_PRIVATE |
-                                     MAP_ANONYMOUS, -1, 0);
-     if (testarea == MAP_FAILED) {
--        error_report("%s: Failed to map test area: %s", __func__,
--                     strerror(errno));
-+        error_setg(errp, "Failed to map test area: %s", strerror(errno));
-         goto out;
-     }
-     g_assert(QEMU_PTR_IS_ALIGNED(testarea, pagesize));
-@@ -450,14 +451,14 @@ bool postcopy_ram_supported_by_host(MigrationIncomingState *mis)
-     reg_struct.mode = UFFDIO_REGISTER_MODE_MISSING;
- 
-     if (ioctl(ufd, UFFDIO_REGISTER, &reg_struct)) {
--        error_report("%s userfault register: %s", __func__, strerror(errno));
-+        error_setg(errp, "UFFDIO_REGISTER failed: %s", strerror(errno));
-         goto out;
-     }
- 
-     range_struct.start = (uintptr_t)testarea;
-     range_struct.len = pagesize;
-     if (ioctl(ufd, UFFDIO_UNREGISTER, &range_struct)) {
--        error_report("%s userfault unregister: %s", __func__, strerror(errno));
-+        error_setg(errp, "UFFDIO_UNREGISTER failed: %s", strerror(errno));
-         goto out;
-     }
- 
-@@ -465,8 +466,8 @@ bool postcopy_ram_supported_by_host(MigrationIncomingState *mis)
-                    (__u64)1 << _UFFDIO_COPY |
-                    (__u64)1 << _UFFDIO_ZEROPAGE;
-     if ((reg_struct.ioctls & feature_mask) != feature_mask) {
--        error_report("Missing userfault map features: %" PRIx64,
--                     (uint64_t)(~reg_struct.ioctls & feature_mask));
-+        error_setg(errp, "Missing userfault map features: %" PRIx64,
-+                   (uint64_t)(~reg_struct.ioctls & feature_mask));
-         goto out;
-     }
- 
-@@ -1188,6 +1189,8 @@ static int postcopy_temp_pages_setup(MigrationIncomingState *mis)
- 
- int postcopy_ram_incoming_setup(MigrationIncomingState *mis)
- {
-+    Error *local_err = NULL;
-+
-     /* Open the fd for the kernel to give us userfaults */
-     mis->userfault_fd = uffd_open(O_CLOEXEC | O_NONBLOCK);
-     if (mis->userfault_fd == -1) {
-@@ -1200,7 +1203,8 @@ int postcopy_ram_incoming_setup(MigrationIncomingState *mis)
-      * Although the host check already tested the API, we need to
-      * do the check again as an ABI handshake on the new fd.
-      */
--    if (!ufd_check_and_apply(mis->userfault_fd, mis)) {
-+    if (!ufd_check_and_apply(mis->userfault_fd, mis, &local_err)) {
-+        error_report_err(local_err);
-         return -1;
-     }
- 
-@@ -1360,7 +1364,7 @@ void fill_destination_postcopy_migration_info(MigrationInfo *info)
- {
- }
- 
--bool postcopy_ram_supported_by_host(MigrationIncomingState *mis)
-+bool postcopy_ram_supported_by_host(MigrationIncomingState *mis, Error **errp)
- {
-     error_report("%s: No OS support", __func__);
-     return false;
-diff --git a/migration/postcopy-ram.h b/migration/postcopy-ram.h
-index b4867a32d5..442ab89752 100644
---- a/migration/postcopy-ram.h
-+++ b/migration/postcopy-ram.h
-@@ -14,7 +14,8 @@
- #define QEMU_POSTCOPY_RAM_H
- 
- /* Return true if the host supports everything we need to do postcopy-ram */
--bool postcopy_ram_supported_by_host(MigrationIncomingState *mis);
-+bool postcopy_ram_supported_by_host(MigrationIncomingState *mis,
-+                                    Error **errp);
- 
- /*
-  * Make all of RAM sensitive to accesses to areas that haven't yet been written
-diff --git a/migration/savevm.c b/migration/savevm.c
-index 9671211339..211eff3a8b 100644
---- a/migration/savevm.c
-+++ b/migration/savevm.c
-@@ -1753,7 +1753,8 @@ static int loadvm_postcopy_handle_advise(MigrationIncomingState *mis,
-         return -EINVAL;
-     }
- 
--    if (!postcopy_ram_supported_by_host(mis)) {
-+    if (!postcopy_ram_supported_by_host(mis, &local_err)) {
-+        error_report_err(local_err);
-         postcopy_state_set(POSTCOPY_INCOMING_NONE);
-         return -1;
-     }
--- 
-2.39.1
-
diff --git a/kvm-migration-Attempt-disk-reactivation-in-more-failure-.patch b/kvm-migration-Attempt-disk-reactivation-in-more-failure-.patch
deleted file mode 100644
index d1620f0..0000000
--- a/kvm-migration-Attempt-disk-reactivation-in-more-failure-.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 3691bb5f956e3c60dbf6de183011b31dbc7a7801 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Tue, 2 May 2023 15:52:12 -0500
-Subject: [PATCH 01/56] migration: Attempt disk reactivation in more failure
- scenarios
-
-RH-Author: Eric Blake <eblake@redhat.com>
-RH-MergeRequest: 161: Avoid migration assertion from failed NFS server.
-RH-Bugzilla: 2058982
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
-RH-Commit: [1/1] 5999b747b314641259d3b8809033b057805eed3f (ebblake/centos-qemu-kvm)
-
-Commit fe904ea824 added a fail_inactivate label, which tries to
-reactivate disks on the source after a failure while s->state ==
-MIGRATION_STATUS_ACTIVE, but didn't actually use the label if
-qemu_savevm_state_complete_precopy() failed.  This failure to
-reactivate is also present in commit 6039dd5b1c (also covering the new
-s->state == MIGRATION_STATUS_DEVICE state) and 403d18ae (ensuring
-s->block_inactive is set more reliably).
-
-Consolidate the two labels back into one - no matter HOW migration is
-failed, if there is any chance we can reach vm_start() after having
-attempted inactivation, it is essential that we have tried to restart
-disks before then.  This also makes the cleanup more like
-migrate_fd_cancel().
-
-Suggested-by: Kevin Wolf <kwolf@redhat.com>
-Signed-off-by: Eric Blake <eblake@redhat.com>
-Message-Id: <20230502205212.134680-1-eblake@redhat.com>
-Acked-by: Peter Xu <peterx@redhat.com>
-Reviewed-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Kevin Wolf <kwolf@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-(cherry picked from commit 6dab4c93ecfae48e2e67b984d1032c1e988d3005)
-[eblake: downstream migrate_colo() => migrate_colo_enabled()]
-Signed-off-by: Eric Blake <eblake@redhat.com>
----
- migration/migration.c | 24 ++++++++++++++----------
- 1 file changed, 14 insertions(+), 10 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index 08007cef4e..99f86bd6c2 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -3443,6 +3443,11 @@ static void migration_completion(MigrationState *s)
-                                             MIGRATION_STATUS_DEVICE);
-             }
-             if (ret >= 0) {
-+                /*
-+                 * Inactivate disks except in COLO, and track that we
-+                 * have done so in order to remember to reactivate
-+                 * them if migration fails or is cancelled.
-+                 */
-                 s->block_inactive = !migrate_colo_enabled();
-                 qemu_file_set_rate_limit(s->to_dst_file, INT64_MAX);
-                 ret = qemu_savevm_state_complete_precopy(s->to_dst_file, false,
-@@ -3487,13 +3492,13 @@ static void migration_completion(MigrationState *s)
-         rp_error = await_return_path_close_on_source(s);
-         trace_migration_return_path_end_after(rp_error);
-         if (rp_error) {
--            goto fail_invalidate;
-+            goto fail;
-         }
-     }
- 
-     if (qemu_file_get_error(s->to_dst_file)) {
-         trace_migration_completion_file_err();
--        goto fail_invalidate;
-+        goto fail;
-     }
- 
-     if (migrate_colo_enabled() && s->state == MIGRATION_STATUS_ACTIVE) {
-@@ -3507,26 +3512,25 @@ static void migration_completion(MigrationState *s)
- 
-     return;
- 
--fail_invalidate:
--    /* If not doing postcopy, vm_start() will be called: let's regain
--     * control on images.
--     */
--    if (s->state == MIGRATION_STATUS_ACTIVE ||
--        s->state == MIGRATION_STATUS_DEVICE) {
-+fail:
-+    if (s->block_inactive && (s->state == MIGRATION_STATUS_ACTIVE ||
-+                              s->state == MIGRATION_STATUS_DEVICE)) {
-+        /*
-+         * If not doing postcopy, vm_start() will be called: let's
-+         * regain control on images.
-+         */
-         Error *local_err = NULL;
- 
-         qemu_mutex_lock_iothread();
-         bdrv_activate_all(&local_err);
-         if (local_err) {
-             error_report_err(local_err);
--            s->block_inactive = true;
-         } else {
-             s->block_inactive = false;
-         }
-         qemu_mutex_unlock_iothread();
-     }
- 
--fail:
-     migrate_set_state(&s->state, current_active_state,
-                       MIGRATION_STATUS_FAILED);
- }
--- 
-2.39.1
-
diff --git a/kvm-migration-Create-migrate_cap_set.patch b/kvm-migration-Create-migrate_cap_set.patch
deleted file mode 100644
index 33268bb..0000000
--- a/kvm-migration-Create-migrate_cap_set.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From d772464e9a51a085e10864b2dc7ffd49991fc23b Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Wed, 1 Mar 2023 21:02:42 +0100
-Subject: [PATCH 22/56] migration: Create migrate_cap_set()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [21/50] 5b12f04013cf2d374a869134bb67c938c789e24d (peterx/qemu-kvm)
-
-And remove the convoluted use of qmp_migrate_set_capabilities() to
-enable disable MIGRATION_CAPABILITY_BLOCK.
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Fabiano Rosas <farosas@suse.de>
-(cherry picked from commit 9eb1109cfba5415dd0b0cb82e80fc5e42fe861b7)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c | 34 ++++++++++++++++------------------
- 1 file changed, 16 insertions(+), 18 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index b745d829a4..18058fb597 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -1912,25 +1912,24 @@ void migrate_set_state(int *state, int old_state, int new_state)
-     }
- }
- 
--static MigrationCapabilityStatus *migrate_cap_add(MigrationCapability index,
--                                                  bool state)
-+static bool migrate_cap_set(int cap, bool value, Error **errp)
- {
--    MigrationCapabilityStatus *cap;
--
--    cap = g_new0(MigrationCapabilityStatus, 1);
--    cap->capability = index;
--    cap->state = state;
-+    MigrationState *s = migrate_get_current();
-+    bool new_caps[MIGRATION_CAPABILITY__MAX];
- 
--    return cap;
--}
-+    if (migration_is_running(s->state)) {
-+        error_setg(errp, QERR_MIGRATION_ACTIVE);
-+        return false;
-+    }
- 
--void migrate_set_block_enabled(bool value, Error **errp)
--{
--    MigrationCapabilityStatusList *cap = NULL;
-+    memcpy(new_caps, s->capabilities, sizeof(new_caps));
-+    new_caps[cap] = value;
- 
--    QAPI_LIST_PREPEND(cap, migrate_cap_add(MIGRATION_CAPABILITY_BLOCK, value));
--    qmp_migrate_set_capabilities(cap, errp);
--    qapi_free_MigrationCapabilityStatusList(cap);
-+    if (!migrate_caps_check(s->capabilities, new_caps, errp)) {
-+        return false;
-+    }
-+    s->capabilities[cap] = value;
-+    return true;
- }
- 
- static void migrate_set_block_incremental(MigrationState *s, bool value)
-@@ -1942,7 +1941,7 @@ static void block_cleanup_parameters(MigrationState *s)
- {
-     if (s->must_remove_block_options) {
-         /* setting to false can never fail */
--        migrate_set_block_enabled(false, &error_abort);
-+        migrate_cap_set(MIGRATION_CAPABILITY_BLOCK, false, &error_abort);
-         migrate_set_block_incremental(s, false);
-         s->must_remove_block_options = false;
-     }
-@@ -2429,8 +2428,7 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc,
-                        "current migration capabilities");
-             return false;
-         }
--        migrate_set_block_enabled(true, &local_err);
--        if (local_err) {
-+        if (!migrate_cap_set(MIGRATION_CAPABILITY_BLOCK, true, &local_err)) {
-             error_propagate(errp, local_err);
-             return false;
-         }
--- 
-2.39.1
-
diff --git a/kvm-migration-Create-migrate_checkpoint_delay.patch b/kvm-migration-Create-migrate_checkpoint_delay.patch
deleted file mode 100644
index 408d258..0000000
--- a/kvm-migration-Create-migrate_checkpoint_delay.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From a17bee3c8ab48daa471ec53bed0e2cb0bb41fc76 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Thu, 2 Mar 2023 01:04:55 +0100
-Subject: [PATCH 41/56] migration: Create migrate_checkpoint_delay()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [40/50] b972d3f12e49dc27aa78eb723ca6d0fac4d174d8 (peterx/qemu-kvm)
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Fabiano Rosas <farosas@suse.de>
-(cherry picked from commit f94a858fa3e72ba954a338c01ae9fecc15fcce5c)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/colo.c    | 5 ++---
- migration/options.c | 9 +++++++++
- migration/options.h | 1 +
- 3 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/migration/colo.c b/migration/colo.c
-index 93b78c9270..07bfa21fea 100644
---- a/migration/colo.c
-+++ b/migration/colo.c
-@@ -576,7 +576,7 @@ static void colo_process_checkpoint(MigrationState *s)
-     trace_colo_vm_state_change("stop", "run");
- 
-     timer_mod(s->colo_delay_timer, qemu_clock_get_ms(QEMU_CLOCK_HOST) +
--              s->parameters.x_checkpoint_delay);
-+              migrate_checkpoint_delay());
- 
-     while (s->state == MIGRATION_STATUS_COLO) {
-         if (failover_get_state() != FAILOVER_STATUS_NONE) {
-@@ -651,8 +651,7 @@ void colo_checkpoint_notify(void *opaque)
- 
-     qemu_event_set(&s->colo_checkpoint_event);
-     s->colo_checkpoint_time = qemu_clock_get_ms(QEMU_CLOCK_HOST);
--    next_notify_time = s->colo_checkpoint_time +
--                    s->parameters.x_checkpoint_delay;
-+    next_notify_time = s->colo_checkpoint_time + migrate_checkpoint_delay();
-     timer_mod(s->colo_delay_timer, next_notify_time);
- }
- 
-diff --git a/migration/options.c b/migration/options.c
-index b9f3815f7e..0e102e5700 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -472,6 +472,15 @@ bool migrate_block_incremental(void)
-     return s->parameters.block_incremental;
- }
- 
-+uint32_t migrate_checkpoint_delay(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->parameters.x_checkpoint_delay;
-+}
-+
- int migrate_compress_level(void)
- {
-     MigrationState *s;
-diff --git a/migration/options.h b/migration/options.h
-index aa54443353..adc2879bbb 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -46,6 +46,7 @@ bool migrate_cap_set(int cap, bool value, Error **errp);
- /* parameters */
- 
- bool migrate_block_incremental(void);
-+uint32_t migrate_checkpoint_delay(void);
- int migrate_compress_level(void);
- int migrate_compress_threads(void);
- int migrate_compress_wait_thread(void);
--- 
-2.39.1
-
diff --git a/kvm-migration-Create-migrate_cpu_throttle_increment-func.patch b/kvm-migration-Create-migrate_cpu_throttle_increment-func.patch
deleted file mode 100644
index 65bad3c..0000000
--- a/kvm-migration-Create-migrate_cpu_throttle_increment-func.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 7ff430e011780dad00e5ebaad0318c5fa3aec102 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Thu, 2 Mar 2023 10:20:49 +0100
-Subject: [PATCH 45/56] migration: Create migrate_cpu_throttle_increment()
- function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [44/50] aec990a106a0347b265f5c056a516e0b91e8183c (peterx/qemu-kvm)
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Fabiano Rosas <farosas@suse.de>
-(cherry picked from commit 9605c2ac282c565bb00b5f344217161bef29eff8)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/options.c | 9 +++++++++
- migration/options.h | 1 +
- migration/ram.c     | 2 +-
- 3 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/migration/options.c b/migration/options.c
-index f7fb6999f7..31435d2b45 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -509,6 +509,15 @@ int migrate_compress_wait_thread(void)
-     return s->parameters.compress_wait_thread;
- }
- 
-+uint8_t migrate_cpu_throttle_increment(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->parameters.cpu_throttle_increment;
-+}
-+
- uint8_t migrate_cpu_throttle_initial(void)
- {
-     MigrationState *s;
-diff --git a/migration/options.h b/migration/options.h
-index fd8b91d767..49b29bdafd 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -50,6 +50,7 @@ uint32_t migrate_checkpoint_delay(void);
- int migrate_compress_level(void);
- int migrate_compress_threads(void);
- int migrate_compress_wait_thread(void);
-+uint8_t migrate_cpu_throttle_increment(void);
- uint8_t migrate_cpu_throttle_initial(void);
- int migrate_decompress_threads(void);
- uint8_t migrate_max_cpu_throttle(void);
-diff --git a/migration/ram.c b/migration/ram.c
-index 5e855d5c22..5645745a42 100644
---- a/migration/ram.c
-+++ b/migration/ram.c
-@@ -713,7 +713,7 @@ static void mig_throttle_guest_down(uint64_t bytes_dirty_period,
- {
-     MigrationState *s = migrate_get_current();
-     uint64_t pct_initial = migrate_cpu_throttle_initial();
--    uint64_t pct_increment = s->parameters.cpu_throttle_increment;
-+    uint64_t pct_increment = migrate_cpu_throttle_increment();
-     bool pct_tailslow = s->parameters.cpu_throttle_tailslow;
-     int pct_max = migrate_max_cpu_throttle();
- 
--- 
-2.39.1
-
diff --git a/kvm-migration-Create-migrate_cpu_throttle_initial-to-opt.patch b/kvm-migration-Create-migrate_cpu_throttle_initial-to-opt.patch
deleted file mode 100644
index aab2013..0000000
--- a/kvm-migration-Create-migrate_cpu_throttle_initial-to-opt.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From fdc2f14bfb3ef8897310a7db63287a9bab1fb858 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Thu, 2 Mar 2023 01:22:44 +0100
-Subject: [PATCH 44/56] migration: Create  migrate_cpu_throttle_initial() to
- option.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [43/50] e0e0db7218f28aefd4bd022edbaec236e2030cb1 (peterx/qemu-kvm)
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Fabiano Rosas <farosas@suse.de>
-(cherry picked from commit 2a8ec38082f8098f2693bb3632175453c0c84a51)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/options.c | 9 +++++++++
- migration/options.h | 1 +
- migration/ram.c     | 2 +-
- 3 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/migration/options.c b/migration/options.c
-index 418aafac64..f7fb6999f7 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -509,6 +509,15 @@ int migrate_compress_wait_thread(void)
-     return s->parameters.compress_wait_thread;
- }
- 
-+uint8_t migrate_cpu_throttle_initial(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->parameters.cpu_throttle_initial;
-+}
-+
- int migrate_decompress_threads(void)
- {
-     MigrationState *s;
-diff --git a/migration/options.h b/migration/options.h
-index 72b1a320b7..fd8b91d767 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -50,6 +50,7 @@ uint32_t migrate_checkpoint_delay(void);
- int migrate_compress_level(void);
- int migrate_compress_threads(void);
- int migrate_compress_wait_thread(void);
-+uint8_t migrate_cpu_throttle_initial(void);
- int migrate_decompress_threads(void);
- uint8_t migrate_max_cpu_throttle(void);
- int64_t migrate_max_postcopy_bandwidth(void);
-diff --git a/migration/ram.c b/migration/ram.c
-index 5c786513ef..5e855d5c22 100644
---- a/migration/ram.c
-+++ b/migration/ram.c
-@@ -712,7 +712,7 @@ static void mig_throttle_guest_down(uint64_t bytes_dirty_period,
-                                     uint64_t bytes_dirty_threshold)
- {
-     MigrationState *s = migrate_get_current();
--    uint64_t pct_initial = s->parameters.cpu_throttle_initial;
-+    uint64_t pct_initial = migrate_cpu_throttle_initial();
-     uint64_t pct_increment = s->parameters.cpu_throttle_increment;
-     bool pct_tailslow = s->parameters.cpu_throttle_tailslow;
-     int pct_max = migrate_max_cpu_throttle();
--- 
-2.39.1
-
diff --git a/kvm-migration-Create-migrate_cpu_throttle_tailslow-funct.patch b/kvm-migration-Create-migrate_cpu_throttle_tailslow-funct.patch
deleted file mode 100644
index e36f003..0000000
--- a/kvm-migration-Create-migrate_cpu_throttle_tailslow-funct.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From b88c51c4b02639e28da73143b1da7bd3d6706ce5 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Thu, 2 Mar 2023 10:29:51 +0100
-Subject: [PATCH 46/56] migration: Create migrate_cpu_throttle_tailslow()
- function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [45/50] e93e96392405c60f75abbf288e4fddb191bbc996 (peterx/qemu-kvm)
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Fabiano Rosas <farosas@suse.de>
-(cherry picked from commit 873f674c559e3162a6e6e92994301d400c5cc873)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/options.c | 9 +++++++++
- migration/options.h | 1 +
- migration/ram.c     | 3 +--
- 3 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/migration/options.c b/migration/options.c
-index 31435d2b45..615534c151 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -527,6 +527,15 @@ uint8_t migrate_cpu_throttle_initial(void)
-     return s->parameters.cpu_throttle_initial;
- }
- 
-+bool migrate_cpu_throttle_tailslow(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->parameters.cpu_throttle_tailslow;
-+}
-+
- int migrate_decompress_threads(void)
- {
-     MigrationState *s;
-diff --git a/migration/options.h b/migration/options.h
-index 49b29bdafd..99f6bbd7a1 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -52,6 +52,7 @@ int migrate_compress_threads(void);
- int migrate_compress_wait_thread(void);
- uint8_t migrate_cpu_throttle_increment(void);
- uint8_t migrate_cpu_throttle_initial(void);
-+bool migrate_cpu_throttle_tailslow(void);
- int migrate_decompress_threads(void);
- uint8_t migrate_max_cpu_throttle(void);
- int64_t migrate_max_postcopy_bandwidth(void);
-diff --git a/migration/ram.c b/migration/ram.c
-index 5645745a42..01356f60a4 100644
---- a/migration/ram.c
-+++ b/migration/ram.c
-@@ -711,10 +711,9 @@ static size_t save_page_header(PageSearchStatus *pss, QEMUFile *f,
- static void mig_throttle_guest_down(uint64_t bytes_dirty_period,
-                                     uint64_t bytes_dirty_threshold)
- {
--    MigrationState *s = migrate_get_current();
-     uint64_t pct_initial = migrate_cpu_throttle_initial();
-     uint64_t pct_increment = migrate_cpu_throttle_increment();
--    bool pct_tailslow = s->parameters.cpu_throttle_tailslow;
-+    bool pct_tailslow = migrate_cpu_throttle_tailslow();
-     int pct_max = migrate_max_cpu_throttle();
- 
-     uint64_t throttle_now = cpu_throttle_get_percentage();
--- 
-2.39.1
-
diff --git a/kvm-migration-Create-migrate_max_bandwidth-function.patch b/kvm-migration-Create-migrate_max_bandwidth-function.patch
deleted file mode 100644
index ba1d34c..0000000
--- a/kvm-migration-Create-migrate_max_bandwidth-function.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-From b6228b3122f5c1f220f92042277ab1bfbb5ba086 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Thu, 2 Mar 2023 11:00:12 +0100
-Subject: [PATCH 48/56] migration: Create migrate_max_bandwidth() function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [47/50] 3874656f70cb9c2a30f4d63e146539480d422326 (peterx/qemu-kvm)
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Fabiano Rosas <farosas@suse.de>
-(cherry picked from commit 9c894df3a37d675652390f7dbbe2f65b7bad7efa)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c | 70 +-------------------------------------
- migration/options.c   | 79 +++++++++++++++++++++++++++++++++++++++++++
- migration/options.h   |  1 +
- 3 files changed, 81 insertions(+), 69 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index 46a5ea4d42..c2e109329d 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -886,74 +886,6 @@ void migrate_send_rp_resume_ack(MigrationIncomingState *mis, uint32_t value)
-     migrate_send_rp_message(mis, MIG_RP_MSG_RESUME_ACK, sizeof(buf), &buf);
- }
- 
--MigrationParameters *qmp_query_migrate_parameters(Error **errp)
--{
--    MigrationParameters *params;
--    MigrationState *s = migrate_get_current();
--
--    /* TODO use QAPI_CLONE() instead of duplicating it inline */
--    params = g_malloc0(sizeof(*params));
--    params->has_compress_level = true;
--    params->compress_level = s->parameters.compress_level;
--    params->has_compress_threads = true;
--    params->compress_threads = s->parameters.compress_threads;
--    params->has_compress_wait_thread = true;
--    params->compress_wait_thread = s->parameters.compress_wait_thread;
--    params->has_decompress_threads = true;
--    params->decompress_threads = s->parameters.decompress_threads;
--    params->has_throttle_trigger_threshold = true;
--    params->throttle_trigger_threshold = s->parameters.throttle_trigger_threshold;
--    params->has_cpu_throttle_initial = true;
--    params->cpu_throttle_initial = s->parameters.cpu_throttle_initial;
--    params->has_cpu_throttle_increment = true;
--    params->cpu_throttle_increment = s->parameters.cpu_throttle_increment;
--    params->has_cpu_throttle_tailslow = true;
--    params->cpu_throttle_tailslow = s->parameters.cpu_throttle_tailslow;
--    params->tls_creds = g_strdup(s->parameters.tls_creds);
--    params->tls_hostname = g_strdup(s->parameters.tls_hostname);
--    params->tls_authz = g_strdup(s->parameters.tls_authz ?
--                                 s->parameters.tls_authz : "");
--    params->has_max_bandwidth = true;
--    params->max_bandwidth = s->parameters.max_bandwidth;
--    params->has_downtime_limit = true;
--    params->downtime_limit = s->parameters.downtime_limit;
--    params->has_x_checkpoint_delay = true;
--    params->x_checkpoint_delay = s->parameters.x_checkpoint_delay;
--    params->has_block_incremental = true;
--    params->block_incremental = s->parameters.block_incremental;
--    params->has_multifd_channels = true;
--    params->multifd_channels = s->parameters.multifd_channels;
--    params->has_multifd_compression = true;
--    params->multifd_compression = s->parameters.multifd_compression;
--    params->has_multifd_zlib_level = true;
--    params->multifd_zlib_level = s->parameters.multifd_zlib_level;
--    params->has_multifd_zstd_level = true;
--    params->multifd_zstd_level = s->parameters.multifd_zstd_level;
--    params->has_xbzrle_cache_size = true;
--    params->xbzrle_cache_size = s->parameters.xbzrle_cache_size;
--    params->has_max_postcopy_bandwidth = true;
--    params->max_postcopy_bandwidth = s->parameters.max_postcopy_bandwidth;
--    params->has_max_cpu_throttle = true;
--    params->max_cpu_throttle = s->parameters.max_cpu_throttle;
--    params->has_announce_initial = true;
--    params->announce_initial = s->parameters.announce_initial;
--    params->has_announce_max = true;
--    params->announce_max = s->parameters.announce_max;
--    params->has_announce_rounds = true;
--    params->announce_rounds = s->parameters.announce_rounds;
--    params->has_announce_step = true;
--    params->announce_step = s->parameters.announce_step;
--
--    if (s->parameters.has_block_bitmap_mapping) {
--        params->has_block_bitmap_mapping = true;
--        params->block_bitmap_mapping =
--            QAPI_CLONE(BitmapMigrationNodeAliasList,
--                       s->parameters.block_bitmap_mapping);
--    }
--
--    return params;
--}
--
- /*
-  * Return true if we're already in the middle of a migration
-  * (i.e. any of the active or setup states)
-@@ -3775,7 +3707,7 @@ void migrate_fd_connect(MigrationState *s, Error *error_in)
-             XFER_LIMIT_RATIO;
-     } else {
-         /* This is a fresh new migration */
--        rate_limit = s->parameters.max_bandwidth / XFER_LIMIT_RATIO;
-+        rate_limit = migrate_max_bandwidth() / XFER_LIMIT_RATIO;
- 
-         /* Notify before starting migration thread */
-         notifier_list_notify(&migration_state_notifiers, s);
-diff --git a/migration/options.c b/migration/options.c
-index 8bd2d949ae..8e8753d9be 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -12,8 +12,10 @@
-  */
- 
- #include "qemu/osdep.h"
-+#include "qapi/clone-visitor.h"
- #include "qapi/error.h"
- #include "qapi/qapi-commands-migration.h"
-+#include "qapi/qapi-visit-migration.h"
- #include "qapi/qmp/qerror.h"
- #include "sysemu/runstate.h"
- #include "migration/misc.h"
-@@ -562,6 +564,15 @@ uint8_t migrate_max_cpu_throttle(void)
-     return s->parameters.max_cpu_throttle;
- }
- 
-+uint64_t migrate_max_bandwidth(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->parameters.max_bandwidth;
-+}
-+
- int64_t migrate_max_postcopy_bandwidth(void)
- {
-     MigrationState *s;
-@@ -641,3 +652,71 @@ AnnounceParameters *migrate_announce_params(void)
- 
-     return &ap;
- }
-+
-+MigrationParameters *qmp_query_migrate_parameters(Error **errp)
-+{
-+    MigrationParameters *params;
-+    MigrationState *s = migrate_get_current();
-+
-+    /* TODO use QAPI_CLONE() instead of duplicating it inline */
-+    params = g_malloc0(sizeof(*params));
-+    params->has_compress_level = true;
-+    params->compress_level = s->parameters.compress_level;
-+    params->has_compress_threads = true;
-+    params->compress_threads = s->parameters.compress_threads;
-+    params->has_compress_wait_thread = true;
-+    params->compress_wait_thread = s->parameters.compress_wait_thread;
-+    params->has_decompress_threads = true;
-+    params->decompress_threads = s->parameters.decompress_threads;
-+    params->has_throttle_trigger_threshold = true;
-+    params->throttle_trigger_threshold = s->parameters.throttle_trigger_threshold;
-+    params->has_cpu_throttle_initial = true;
-+    params->cpu_throttle_initial = s->parameters.cpu_throttle_initial;
-+    params->has_cpu_throttle_increment = true;
-+    params->cpu_throttle_increment = s->parameters.cpu_throttle_increment;
-+    params->has_cpu_throttle_tailslow = true;
-+    params->cpu_throttle_tailslow = s->parameters.cpu_throttle_tailslow;
-+    params->tls_creds = g_strdup(s->parameters.tls_creds);
-+    params->tls_hostname = g_strdup(s->parameters.tls_hostname);
-+    params->tls_authz = g_strdup(s->parameters.tls_authz ?
-+                                 s->parameters.tls_authz : "");
-+    params->has_max_bandwidth = true;
-+    params->max_bandwidth = s->parameters.max_bandwidth;
-+    params->has_downtime_limit = true;
-+    params->downtime_limit = s->parameters.downtime_limit;
-+    params->has_x_checkpoint_delay = true;
-+    params->x_checkpoint_delay = s->parameters.x_checkpoint_delay;
-+    params->has_block_incremental = true;
-+    params->block_incremental = s->parameters.block_incremental;
-+    params->has_multifd_channels = true;
-+    params->multifd_channels = s->parameters.multifd_channels;
-+    params->has_multifd_compression = true;
-+    params->multifd_compression = s->parameters.multifd_compression;
-+    params->has_multifd_zlib_level = true;
-+    params->multifd_zlib_level = s->parameters.multifd_zlib_level;
-+    params->has_multifd_zstd_level = true;
-+    params->multifd_zstd_level = s->parameters.multifd_zstd_level;
-+    params->has_xbzrle_cache_size = true;
-+    params->xbzrle_cache_size = s->parameters.xbzrle_cache_size;
-+    params->has_max_postcopy_bandwidth = true;
-+    params->max_postcopy_bandwidth = s->parameters.max_postcopy_bandwidth;
-+    params->has_max_cpu_throttle = true;
-+    params->max_cpu_throttle = s->parameters.max_cpu_throttle;
-+    params->has_announce_initial = true;
-+    params->announce_initial = s->parameters.announce_initial;
-+    params->has_announce_max = true;
-+    params->announce_max = s->parameters.announce_max;
-+    params->has_announce_rounds = true;
-+    params->announce_rounds = s->parameters.announce_rounds;
-+    params->has_announce_step = true;
-+    params->announce_step = s->parameters.announce_step;
-+
-+    if (s->parameters.has_block_bitmap_mapping) {
-+        params->has_block_bitmap_mapping = true;
-+        params->block_bitmap_mapping =
-+            QAPI_CLONE(BitmapMigrationNodeAliasList,
-+                       s->parameters.block_bitmap_mapping);
-+    }
-+
-+    return params;
-+}
-diff --git a/migration/options.h b/migration/options.h
-index 093bc907a1..1b78fa9f3d 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -64,6 +64,7 @@ uint8_t migrate_cpu_throttle_initial(void);
- bool migrate_cpu_throttle_tailslow(void);
- int migrate_decompress_threads(void);
- uint8_t migrate_max_cpu_throttle(void);
-+uint64_t migrate_max_bandwidth(void);
- int64_t migrate_max_postcopy_bandwidth(void);
- int migrate_multifd_channels(void);
- MultiFDCompression migrate_multifd_compression(void);
--- 
-2.39.1
-
diff --git a/kvm-migration-Create-migrate_max_cpu_throttle.patch b/kvm-migration-Create-migrate_max_cpu_throttle.patch
deleted file mode 100644
index 6628b80..0000000
--- a/kvm-migration-Create-migrate_max_cpu_throttle.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From f0d4e34b00f66d2336b755a34a1ba226571641c4 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Thu, 2 Mar 2023 01:13:01 +0100
-Subject: [PATCH 42/56] migration: Create migrate_max_cpu_throttle()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [41/50] fc7537c06d8e1f53d7bb552661f6ddb0133a978d (peterx/qemu-kvm)
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Fabiano Rosas <farosas@suse.de>
-(cherry picked from commit 24155bd0520035d5148c0af5b925932c4d8064a8)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.h | 2 --
- migration/options.c   | 9 +++++++++
- migration/options.h   | 1 +
- migration/ram.c       | 2 +-
- 4 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/migration/migration.h b/migration/migration.h
-index 86051af132..3ae938b19c 100644
---- a/migration/migration.h
-+++ b/migration/migration.h
-@@ -451,8 +451,6 @@ bool migrate_postcopy(void);
- 
- int migrate_use_tls(void);
- 
--int migrate_max_cpu_throttle(void);
--
- uint64_t ram_get_total_transferred_pages(void);
- 
- /* Sending on the return path - generic and then for each message type */
-diff --git a/migration/options.c b/migration/options.c
-index 0e102e5700..2cb04fbbd1 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -517,6 +517,15 @@ int migrate_decompress_threads(void)
-     return s->parameters.decompress_threads;
- }
- 
-+uint8_t migrate_max_cpu_throttle(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->parameters.max_cpu_throttle;
-+}
-+
- int64_t migrate_max_postcopy_bandwidth(void)
- {
-     MigrationState *s;
-diff --git a/migration/options.h b/migration/options.h
-index adc2879bbb..72b1a320b7 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -51,6 +51,7 @@ int migrate_compress_level(void);
- int migrate_compress_threads(void);
- int migrate_compress_wait_thread(void);
- int migrate_decompress_threads(void);
-+uint8_t migrate_max_cpu_throttle(void);
- int64_t migrate_max_postcopy_bandwidth(void);
- int migrate_multifd_channels(void);
- MultiFDCompression migrate_multifd_compression(void);
-diff --git a/migration/ram.c b/migration/ram.c
-index e82cee97c3..5c786513ef 100644
---- a/migration/ram.c
-+++ b/migration/ram.c
-@@ -715,7 +715,7 @@ static void mig_throttle_guest_down(uint64_t bytes_dirty_period,
-     uint64_t pct_initial = s->parameters.cpu_throttle_initial;
-     uint64_t pct_increment = s->parameters.cpu_throttle_increment;
-     bool pct_tailslow = s->parameters.cpu_throttle_tailslow;
--    int pct_max = s->parameters.max_cpu_throttle;
-+    int pct_max = migrate_max_cpu_throttle();
- 
-     uint64_t throttle_now = cpu_throttle_get_percentage();
-     uint64_t cpu_now, cpu_ideal, throttle_inc;
--- 
-2.39.1
-
diff --git a/kvm-migration-Create-migrate_rdma_pin_all-function.patch b/kvm-migration-Create-migrate_rdma_pin_all-function.patch
deleted file mode 100644
index c7799f1..0000000
--- a/kvm-migration-Create-migrate_rdma_pin_all-function.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From e4ef0f2cee6cdf2cf4bd225ac9e610f41d66dfcb Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Wed, 1 Mar 2023 22:41:55 +0100
-Subject: [PATCH 32/56] migration: Create migrate_rdma_pin_all() function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [31/50] 206d96d47d9ee73ddc89dd01186560bf62ea5295 (peterx/qemu-kvm)
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-
----
-
-Fixed missing space after comma (fabiano)
-
-(cherry picked from commit 17cba690cdd42108369fafe6b07bff09872fbea6)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/options.c | 7 +++++++
- migration/options.h | 1 +
- migration/rdma.c    | 6 +++---
- 3 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/migration/options.c b/migration/options.c
-index 2003e413da..9c9b8e5863 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -138,6 +138,13 @@ bool migrate_postcopy_ram(void)
-     return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_RAM];
- }
- 
-+bool migrate_rdma_pin_all(void)
-+{
-+    MigrationState *s = migrate_get_current();
-+
-+    return s->capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL];
-+}
-+
- bool migrate_release_ram(void)
- {
-     MigrationState *s;
-diff --git a/migration/options.h b/migration/options.h
-index 316efd1063..25c002b37a 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -30,6 +30,7 @@ bool migrate_pause_before_switchover(void);
- bool migrate_postcopy_blocktime(void);
- bool migrate_postcopy_preempt(void);
- bool migrate_postcopy_ram(void);
-+bool migrate_rdma_pin_all(void);
- bool migrate_release_ram(void);
- bool migrate_return_path(void);
- bool migrate_validate_uuid(void);
-diff --git a/migration/rdma.c b/migration/rdma.c
-index bf55e2f163..0af5e944f0 100644
---- a/migration/rdma.c
-+++ b/migration/rdma.c
-@@ -35,6 +35,7 @@
- #include <rdma/rdma_cma.h>
- #include "trace.h"
- #include "qom/object.h"
-+#include "options.h"
- #include <poll.h>
- 
- /*
-@@ -4178,8 +4179,7 @@ void rdma_start_outgoing_migration(void *opaque,
-         goto err;
-     }
- 
--    ret = qemu_rdma_source_init(rdma,
--        s->capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL], errp);
-+    ret = qemu_rdma_source_init(rdma, migrate_rdma_pin_all(), errp);
- 
-     if (ret) {
-         goto err;
-@@ -4201,7 +4201,7 @@ void rdma_start_outgoing_migration(void *opaque,
-         }
- 
-         ret = qemu_rdma_source_init(rdma_return_path,
--            s->capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL], errp);
-+                                    migrate_rdma_pin_all(), errp);
- 
-         if (ret) {
-             goto return_path_err;
--- 
-2.39.1
-
diff --git a/kvm-migration-Create-migrate_throttle_trigger_threshold.patch b/kvm-migration-Create-migrate_throttle_trigger_threshold.patch
deleted file mode 100644
index 5fc1072..0000000
--- a/kvm-migration-Create-migrate_throttle_trigger_threshold.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 27862b9d31da6447b60f185cdad95764018c6bc6 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Thu, 2 Mar 2023 00:59:13 +0100
-Subject: [PATCH 40/56] migration: Create migrate_throttle_trigger_threshold()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [39/50] b8af9080c49be3d38bd2784d61289be89c03db3e (peterx/qemu-kvm)
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Fabiano Rosas <farosas@suse.de>
-(cherry picked from commit 6499efdb16e5c1288b4c8390d3bf68b313329b8b)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/options.c | 9 +++++++++
- migration/options.h | 1 +
- migration/ram.c     | 3 +--
- 3 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/migration/options.c b/migration/options.c
-index 2b6d88b4b9..b9f3815f7e 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -554,6 +554,15 @@ int migrate_multifd_zstd_level(void)
-     return s->parameters.multifd_zstd_level;
- }
- 
-+uint8_t migrate_throttle_trigger_threshold(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->parameters.throttle_trigger_threshold;
-+}
-+
- uint64_t migrate_xbzrle_cache_size(void)
- {
-     MigrationState *s;
-diff --git a/migration/options.h b/migration/options.h
-index 96d5a8e6e4..aa54443353 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -55,6 +55,7 @@ int migrate_multifd_channels(void);
- MultiFDCompression migrate_multifd_compression(void);
- int migrate_multifd_zlib_level(void);
- int migrate_multifd_zstd_level(void);
-+uint8_t migrate_throttle_trigger_threshold(void);
- uint64_t migrate_xbzrle_cache_size(void);
- 
- #endif
-diff --git a/migration/ram.c b/migration/ram.c
-index 4576d0d849..e82cee97c3 100644
---- a/migration/ram.c
-+++ b/migration/ram.c
-@@ -1178,8 +1178,7 @@ static void migration_update_rates(RAMState *rs, int64_t end_time)
- 
- static void migration_trigger_throttle(RAMState *rs)
- {
--    MigrationState *s = migrate_get_current();
--    uint64_t threshold = s->parameters.throttle_trigger_threshold;
-+    uint64_t threshold = migrate_throttle_trigger_threshold();
-     uint64_t bytes_xfer_period =
-         stat64_get(&ram_counters.transferred) - rs->bytes_xfer_prev;
-     uint64_t bytes_dirty_period = rs->num_dirty_pages_period * TARGET_PAGE_SIZE;
--- 
-2.39.1
-
diff --git a/kvm-migration-Create-options.c.patch b/kvm-migration-Create-options.c.patch
deleted file mode 100644
index ea60202..0000000
--- a/kvm-migration-Create-options.c.patch
+++ /dev/null
@@ -1,524 +0,0 @@
-From 282634a835f4711c8b501dd76c344058bc399fbd Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Wed, 1 Mar 2023 21:18:45 +0100
-Subject: [PATCH 23/56] migration: Create options.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [22/50] 10c9be528b9fcfae93f1a12fcd09db1a69e58f64 (peterx/qemu-kvm)
-
-We move there all capabilities helpers from migration.c.
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
-
----
-
-Following David advise:
-- looked through the history, capabilities are newer than 2012, so we
-  can remove that bit of the header.
-- This part is posterior to Anthony.
-  Original Author is Orit. Once there,
-  I put myself.  Peter Xu also did quite a bit of work here.
-  Anyone else wants/needs to be there?  I didn't search too hard
-  because nobody asked before to be added.
-
-What do you think?
-
-(cherry picked from commit 1f0776f1c03312aad5d6a5f98871240bc3af01e5)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- hw/virtio/virtio-balloon.c     |   1 +
- migration/block-dirty-bitmap.c |   1 +
- migration/block.c              |   1 +
- migration/colo.c               |   1 +
- migration/meson.build          |   1 +
- migration/migration.c          | 109 +----------------------------
- migration/migration.h          |  12 ----
- migration/options.c            | 124 +++++++++++++++++++++++++++++++++
- migration/options.h            |  32 +++++++++
- migration/postcopy-ram.c       |   1 +
- migration/ram.c                |   1 +
- migration/savevm.c             |   1 +
- migration/socket.c             |   1 +
- 13 files changed, 166 insertions(+), 120 deletions(-)
- create mode 100644 migration/options.c
- create mode 100644 migration/options.h
-
-diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
-index 746f07c4d2..43092aa634 100644
---- a/hw/virtio/virtio-balloon.c
-+++ b/hw/virtio/virtio-balloon.c
-@@ -32,6 +32,7 @@
- #include "qemu/error-report.h"
- #include "migration/misc.h"
- #include "migration/migration.h"
-+#include "migration/options.h"
- 
- #include "hw/virtio/virtio-bus.h"
- #include "hw/virtio/virtio-access.h"
-diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
-index fe73aa94b1..a6ffae0002 100644
---- a/migration/block-dirty-bitmap.c
-+++ b/migration/block-dirty-bitmap.c
-@@ -79,6 +79,7 @@
- #include "qapi/qapi-visit-migration.h"
- #include "qapi/clone-visitor.h"
- #include "trace.h"
-+#include "options.h"
- 
- #define CHUNK_SIZE     (1 << 10)
- 
-diff --git a/migration/block.c b/migration/block.c
-index b2497bbd32..4b167fa5cf 100644
---- a/migration/block.c
-+++ b/migration/block.c
-@@ -28,6 +28,7 @@
- #include "migration/vmstate.h"
- #include "sysemu/block-backend.h"
- #include "trace.h"
-+#include "options.h"
- 
- #define BLK_MIG_BLOCK_SIZE           (1ULL << 20)
- #define BDRV_SECTORS_PER_DIRTY_CHUNK (BLK_MIG_BLOCK_SIZE >> BDRV_SECTOR_BITS)
-diff --git a/migration/colo.c b/migration/colo.c
-index 0716e64689..93b78c9270 100644
---- a/migration/colo.c
-+++ b/migration/colo.c
-@@ -36,6 +36,7 @@
- #include "sysemu/cpus.h"
- #include "sysemu/runstate.h"
- #include "net/filter.h"
-+#include "options.h"
- 
- static bool vmstate_loading;
- static Notifier packets_compare_notifier;
-diff --git a/migration/meson.build b/migration/meson.build
-index 0d1bb9f96e..480ff6854a 100644
---- a/migration/meson.build
-+++ b/migration/meson.build
-@@ -22,6 +22,7 @@ softmmu_ss.add(files(
-   'migration.c',
-   'multifd.c',
-   'multifd-zlib.c',
-+  'options.c',
-   'postcopy-ram.c',
-   'savevm.c',
-   'socket.c',
-diff --git a/migration/migration.c b/migration/migration.c
-index 18058fb597..66ea55be06 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -63,6 +63,7 @@
- #include "sysemu/cpus.h"
- #include "yank_functions.h"
- #include "sysemu/qtest.h"
-+#include "options.h"
- 
- #define MAX_THROTTLE  (128 << 20)      /* Migration transfer speed throttling */
- 
-@@ -357,15 +358,6 @@ static void migrate_generate_event(int new_state)
-     }
- }
- 
--static bool migrate_late_block_activate(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->capabilities[MIGRATION_CAPABILITY_LATE_BLOCK_ACTIVATE];
--}
--
- /*
-  * Send a message on the return channel back to the source
-  * of the migration.
-@@ -2525,56 +2517,11 @@ void qmp_migrate_continue(MigrationStatus state, Error **errp)
-     qemu_sem_post(&s->pause_sem);
- }
- 
--bool migrate_release_ram(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->capabilities[MIGRATION_CAPABILITY_RELEASE_RAM];
--}
--
--bool migrate_postcopy_ram(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_RAM];
--}
--
- bool migrate_postcopy(void)
- {
-     return migrate_postcopy_ram() || migrate_dirty_bitmaps();
- }
- 
--bool migrate_auto_converge(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->capabilities[MIGRATION_CAPABILITY_AUTO_CONVERGE];
--}
--
--bool migrate_zero_blocks(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->capabilities[MIGRATION_CAPABILITY_ZERO_BLOCKS];
--}
--
--bool migrate_postcopy_blocktime(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_BLOCKTIME];
--}
--
- bool migrate_use_compression(void)
- {
-     MigrationState *s;
-@@ -2620,33 +2567,6 @@ int migrate_decompress_threads(void)
-     return s->parameters.decompress_threads;
- }
- 
--bool migrate_dirty_bitmaps(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->capabilities[MIGRATION_CAPABILITY_DIRTY_BITMAPS];
--}
--
--bool migrate_ignore_shared(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->capabilities[MIGRATION_CAPABILITY_X_IGNORE_SHARED];
--}
--
--bool migrate_validate_uuid(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->capabilities[MIGRATION_CAPABILITY_VALIDATE_UUID];
--}
--
- bool migrate_use_events(void)
- {
-     MigrationState *s;
-@@ -2665,15 +2585,6 @@ bool migrate_use_multifd(void)
-     return s->capabilities[MIGRATION_CAPABILITY_MULTIFD];
- }
- 
--bool migrate_pause_before_switchover(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->capabilities[MIGRATION_CAPABILITY_PAUSE_BEFORE_SWITCHOVER];
--}
--
- int migrate_multifd_channels(void)
- {
-     MigrationState *s;
-@@ -2785,24 +2696,6 @@ bool migrate_use_block_incremental(void)
-     return s->parameters.block_incremental;
- }
- 
--bool migrate_background_snapshot(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->capabilities[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT];
--}
--
--bool migrate_postcopy_preempt(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_PREEMPT];
--}
--
- /* migration thread support */
- /*
-  * Something bad happened to the RP stream, mark an error
-diff --git a/migration/migration.h b/migration/migration.h
-index 04e0860b4e..a25fed6ef0 100644
---- a/migration/migration.h
-+++ b/migration/migration.h
-@@ -449,16 +449,7 @@ MigrationState *migrate_get_current(void);
- 
- bool migrate_postcopy(void);
- 
--bool migrate_release_ram(void);
--bool migrate_postcopy_ram(void);
--bool migrate_zero_blocks(void);
--bool migrate_dirty_bitmaps(void);
--bool migrate_ignore_shared(void);
--bool migrate_validate_uuid(void);
--
--bool migrate_auto_converge(void);
- bool migrate_use_multifd(void);
--bool migrate_pause_before_switchover(void);
- int migrate_multifd_channels(void);
- MultiFDCompression migrate_multifd_compression(void);
- int migrate_multifd_zlib_level(void);
-@@ -487,9 +478,6 @@ int migrate_compress_threads(void);
- int migrate_compress_wait_thread(void);
- int migrate_decompress_threads(void);
- bool migrate_use_events(void);
--bool migrate_postcopy_blocktime(void);
--bool migrate_background_snapshot(void);
--bool migrate_postcopy_preempt(void);
- 
- /* Sending on the return path - generic and then for each message type */
- void migrate_send_rp_shut(MigrationIncomingState *mis,
-diff --git a/migration/options.c b/migration/options.c
-new file mode 100644
-index 0000000000..88a9a45913
---- /dev/null
-+++ b/migration/options.c
-@@ -0,0 +1,124 @@
-+/*
-+ * QEMU migration capabilities
-+ *
-+ * Copyright (c) 2012-2023 Red Hat Inc
-+ *
-+ * Authors:
-+ *   Orit Wasserman <owasserm@redhat.com>
-+ *   Juan Quintela <quintela@redhat.com>
-+ *
-+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
-+ * See the COPYING file in the top-level directory.
-+ */
-+
-+#include "qemu/osdep.h"
-+#include "migration.h"
-+#include "options.h"
-+
-+bool migrate_auto_converge(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->capabilities[MIGRATION_CAPABILITY_AUTO_CONVERGE];
-+}
-+
-+bool migrate_background_snapshot(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->capabilities[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT];
-+}
-+
-+bool migrate_dirty_bitmaps(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->capabilities[MIGRATION_CAPABILITY_DIRTY_BITMAPS];
-+}
-+
-+bool migrate_ignore_shared(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->capabilities[MIGRATION_CAPABILITY_X_IGNORE_SHARED];
-+}
-+
-+bool migrate_late_block_activate(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->capabilities[MIGRATION_CAPABILITY_LATE_BLOCK_ACTIVATE];
-+}
-+
-+bool migrate_pause_before_switchover(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->capabilities[MIGRATION_CAPABILITY_PAUSE_BEFORE_SWITCHOVER];
-+}
-+
-+bool migrate_postcopy_blocktime(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_BLOCKTIME];
-+}
-+
-+bool migrate_postcopy_preempt(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_PREEMPT];
-+}
-+
-+bool migrate_postcopy_ram(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_RAM];
-+}
-+
-+bool migrate_release_ram(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->capabilities[MIGRATION_CAPABILITY_RELEASE_RAM];
-+}
-+
-+bool migrate_validate_uuid(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->capabilities[MIGRATION_CAPABILITY_VALIDATE_UUID];
-+}
-+
-+bool migrate_zero_blocks(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->capabilities[MIGRATION_CAPABILITY_ZERO_BLOCKS];
-+}
-diff --git a/migration/options.h b/migration/options.h
-new file mode 100644
-index 0000000000..0dfa0af245
---- /dev/null
-+++ b/migration/options.h
-@@ -0,0 +1,32 @@
-+/*
-+ * QEMU migration capabilities
-+ *
-+ * Copyright (c) 2012-2023 Red Hat Inc
-+ *
-+ * Authors:
-+ *   Orit Wasserman <owasserm@redhat.com>
-+ *   Juan Quintela <quintela@redhat.com>
-+ *
-+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
-+ * See the COPYING file in the top-level directory.
-+ */
-+
-+#ifndef QEMU_MIGRATION_OPTIONS_H
-+#define QEMU_MIGRATION_OPTIONS_H
-+
-+/* capabilities */
-+
-+bool migrate_auto_converge(void);
-+bool migrate_background_snapshot(void);
-+bool migrate_dirty_bitmaps(void);
-+bool migrate_ignore_shared(void);
-+bool migrate_late_block_activate(void);
-+bool migrate_pause_before_switchover(void);
-+bool migrate_postcopy_blocktime(void);
-+bool migrate_postcopy_preempt(void);
-+bool migrate_postcopy_ram(void);
-+bool migrate_release_ram(void);
-+bool migrate_validate_uuid(void);
-+bool migrate_zero_blocks(void);
-+
-+#endif
-diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
-index d7b48dd920..0711500036 100644
---- a/migration/postcopy-ram.c
-+++ b/migration/postcopy-ram.c
-@@ -37,6 +37,7 @@
- #include "tls.h"
- #include "qemu/userfaultfd.h"
- #include "qemu/mmap-alloc.h"
-+#include "options.h"
- 
- /* Arbitrary limit on size of each discard command,
-  * keeps them around ~200 bytes
-diff --git a/migration/ram.c b/migration/ram.c
-index 229714045a..912ccd89fa 100644
---- a/migration/ram.c
-+++ b/migration/ram.c
-@@ -57,6 +57,7 @@
- #include "qemu/iov.h"
- #include "multifd.h"
- #include "sysemu/runstate.h"
-+#include "options.h"
- 
- #include "hw/boards.h" /* for machine_dump_guest_core() */
- 
-diff --git a/migration/savevm.c b/migration/savevm.c
-index 589ef926ab..ebcf571e37 100644
---- a/migration/savevm.c
-+++ b/migration/savevm.c
-@@ -67,6 +67,7 @@
- #include "qemu/yank.h"
- #include "yank_functions.h"
- #include "sysemu/qtest.h"
-+#include "options.h"
- 
- const unsigned int postcopy_ram_discard_version;
- 
-diff --git a/migration/socket.c b/migration/socket.c
-index e6fdf3c5e1..ebf9ac41af 100644
---- a/migration/socket.c
-+++ b/migration/socket.c
-@@ -27,6 +27,7 @@
- #include "io/net-listener.h"
- #include "trace.h"
- #include "postcopy-ram.h"
-+#include "options.h"
- 
- struct SocketOutgoingArgs {
-     SocketAddress *saddr;
--- 
-2.39.1
-
diff --git a/kvm-migration-Enable-switchover-ack-capability.patch b/kvm-migration-Enable-switchover-ack-capability.patch
deleted file mode 100644
index e08e5df..0000000
--- a/kvm-migration-Enable-switchover-ack-capability.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From bbe565f7d3b7fe46971e020e9bd8e79dc9ffa69c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:57 +0200
-Subject: [PATCH 12/37] migration: Enable switchover ack capability
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [10/28] c4a7d7d26a97181c9516d133a6610bfa5dcb1d16 (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit 538ef4fe2f72
-Author: Avihai Horon <avihaih@nvidia.com>
-Date:   Wed Jun 21 14:11:56 2023 +0300
-
-    migration: Enable switchover ack capability
-
-    Now that switchover ack logic has been implemented, enable the
-    capability.
-
-    Signed-off-by: Avihai Horon <avihaih@nvidia.com>
-    Reviewed-by: Juan Quintela <quintela@redhat.com>
-    Reviewed-by: Peter Xu <peterx@redhat.com>
-    Tested-by: YangHang Liu <yanghliu@redhat.com>
-    Acked-by: Alex Williamson <alex.williamson@redhat.com>
-    Signed-off-by: Cédric Le Goater <clg@redhat.com>
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- migration/options.c | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/migration/options.c b/migration/options.c
-index c3df6c6dde..ccd7ef3907 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -547,10 +547,6 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp)
-                              "'return-path'");
-             return false;
-         }
--
--        /* Disable this capability until it's implemented */
--        error_setg(errp, "'switchover-ack' is not implemented yet");
--        return false;
-     }
- 
-     return true;
--- 
-2.39.3
-
diff --git a/kvm-migration-Handle-block-device-inactivation-failures-.patch b/kvm-migration-Handle-block-device-inactivation-failures-.patch
deleted file mode 100644
index 26c8437..0000000
--- a/kvm-migration-Handle-block-device-inactivation-failures-.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 2aac64623d8d2d06d248c1bcc71aa13572fc843c Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Fri, 14 Apr 2023 10:33:58 -0500
-Subject: [PATCH 1/2] migration: Handle block device inactivation failures
- better
-
-RH-Author: Eric Blake <eblake@redhat.com>
-RH-MergeRequest: 161: Avoid migration assertion from failed NFS server.
-RH-Bugzilla: 2058982
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [1/2] 5ae143c9234f6eee9fc5154944172bcd56975b36 (ebblake/centos-qemu-kvm)
-
-Consider what happens when performing a migration between two host
-machines connected to an NFS server serving multiple block devices to
-the guest, when the NFS server becomes unavailable.  The migration
-attempts to inactivate all block devices on the source (a necessary
-step before the destination can take over); but if the NFS server is
-non-responsive, the attempt to inactivate can itself fail.  When that
-happens, the destination fails to get the migrated guest (good,
-because the source wasn't able to flush everything properly):
-
-  (qemu) qemu-kvm: load of migration failed: Input/output error
-
-at which point, our only hope for the guest is for the source to take
-back control.  With the current code base, the host outputs a message, but then appears to resume:
-
-  (qemu) qemu-kvm: qemu_savevm_state_complete_precopy_non_iterable: bdrv_inactivate_all() failed (-1)
-
-  (src qemu)info status
-   VM status: running
-
-but a second migration attempt now asserts:
-
-  (src qemu) qemu-kvm: ../block.c:6738: int bdrv_inactivate_recurse(BlockDriverState *): Assertion `!(bs->open_flags & BDRV_O_INACTIVE)' failed.
-
-Whether the guest is recoverable on the source after the first failure
-is debatable, but what we do not want is to have qemu itself fail due
-to an assertion.  It looks like the problem is as follows:
-
-In migration.c:migration_completion(), the source sets 'inactivate' to
-true (since COLO is not enabled), then tries
-savevm.c:qemu_savevm_state_complete_precopy() with a request to
-inactivate block devices.  In turn, this calls
-block.c:bdrv_inactivate_all(), which fails when flushing runs up
-against the non-responsive NFS server.  With savevm failing, we are
-now left in a state where some, but not all, of the block devices have
-been inactivated; but migration_completion() then jumps to 'fail'
-rather than 'fail_invalidate' and skips an attempt to reclaim those
-those disks by calling bdrv_activate_all().  Even if we do attempt to
-reclaim disks, we aren't taking note of failure there, either.
-
-Thus, we have reached a state where the migration engine has forgotten
-all state about whether a block device is inactive, because we did not
-set s->block_inactive in enough places; so migration allows the source
-to reach vm_start() and resume execution, violating the block layer
-invariant that the guest CPUs should not be restarted while a device
-is inactive.  Note that the code in migration.c:migrate_fd_cancel()
-will also try to reactivate all block devices if s->block_inactive was
-set, but because we failed to set that flag after the first failure,
-the source assumes it has reclaimed all devices, even though it still
-has remaining inactivated devices and does not try again.  Normally,
-qmp_cont() will also try to reactivate all disks (or correctly fail if
-the disks are not reclaimable because NFS is not yet back up), but the
-auto-resumption of the source after a migration failure does not go
-through qmp_cont().  And because we have left the block layer in an
-inconsistent state with devices still inactivated, the later migration
-attempt is hitting the assertion failure.
-
-Since it is important to not resume the source with inactive disks,
-this patch marks s->block_inactive before attempting inactivation,
-rather than after succeeding, in order to prevent any vm_start() until
-it has successfully reactivated all devices.
-
-See also https://bugzilla.redhat.com/show_bug.cgi?id=2058982
-
-Signed-off-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Juan Quintela <quintela@redhat.com>
-Acked-by: Lukas Straub <lukasstraub2@web.de>
-Tested-by: Lukas Straub <lukasstraub2@web.de>
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-(cherry picked from commit 403d18ae384239876764bbfa111d6cc5dcb673d1)
----
- migration/migration.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index bda4789193..cb0d42c061 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -3444,13 +3444,11 @@ static void migration_completion(MigrationState *s)
-                                             MIGRATION_STATUS_DEVICE);
-             }
-             if (ret >= 0) {
-+                s->block_inactive = inactivate;
-                 qemu_file_set_rate_limit(s->to_dst_file, INT64_MAX);
-                 ret = qemu_savevm_state_complete_precopy(s->to_dst_file, false,
-                                                          inactivate);
-             }
--            if (inactivate && ret >= 0) {
--                s->block_inactive = true;
--            }
-         }
-         qemu_mutex_unlock_iothread();
- 
-@@ -3522,6 +3520,7 @@ fail_invalidate:
-         bdrv_activate_all(&local_err);
-         if (local_err) {
-             error_report_err(local_err);
-+            s->block_inactive = true;
-         } else {
-             s->block_inactive = false;
-         }
--- 
-2.39.1
-
diff --git a/kvm-migration-Implement-switchover-ack-logic.patch b/kvm-migration-Implement-switchover-ack-logic.patch
deleted file mode 100644
index 49b9f12..0000000
--- a/kvm-migration-Implement-switchover-ack-logic.patch
+++ /dev/null
@@ -1,339 +0,0 @@
-From 387c39f198d94f600be525e363edc7ca916dc261 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:57 +0200
-Subject: [PATCH 11/37] migration: Implement switchover ack logic
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [9/28] 853e1978f3b9f87942863bba894a0ed908bde6b1 (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit 1b4adb10f898
-Author: Avihai Horon <avihaih@nvidia.com>
-Date:   Wed Jun 21 14:11:55 2023 +0300
-
-    migration: Implement switchover ack logic
-
-    Implement switchover ack logic. This prevents the source from stopping
-    the VM and completing the migration until an ACK is received from the
-    destination that it's OK to do so.
-
-    To achieve this, a new SaveVMHandlers handler switchover_ack_needed()
-    and a new return path message MIG_RP_MSG_SWITCHOVER_ACK are added.
-
-    The switchover_ack_needed() handler is called during migration setup in
-    the destination to check if switchover ack is used by the migrated
-    device.
-
-    When switchover is approved by all migrated devices in the destination
-    that support this capability, the MIG_RP_MSG_SWITCHOVER_ACK return path
-    message is sent to the source to notify it that it's OK to do
-    switchover.
-
-    Signed-off-by: Avihai Horon <avihaih@nvidia.com>
-    Reviewed-by: Peter Xu <peterx@redhat.com>
-    Tested-by: YangHang Liu <yanghliu@redhat.com>
-    Acked-by: Alex Williamson <alex.williamson@redhat.com>
-    Signed-off-by: Cédric Le Goater <clg@redhat.com>
-
-Conflicts:
-    - migration/migration.c
-      context changes due to commit f4584076fc31 ("migration: switch
-      from .vm_was_running to .vm_old_state")
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- include/migration/register.h |  2 ++
- migration/migration.c        | 32 +++++++++++++++++++--
- migration/migration.h        | 14 ++++++++++
- migration/savevm.c           | 54 ++++++++++++++++++++++++++++++++++++
- migration/savevm.h           |  1 +
- migration/trace-events       |  3 ++
- 6 files changed, 104 insertions(+), 2 deletions(-)
-
-diff --git a/include/migration/register.h b/include/migration/register.h
-index a8dfd8fefd..90914f32f5 100644
---- a/include/migration/register.h
-+++ b/include/migration/register.h
-@@ -71,6 +71,8 @@ typedef struct SaveVMHandlers {
-     int (*load_cleanup)(void *opaque);
-     /* Called when postcopy migration wants to resume from failure */
-     int (*resume_prepare)(MigrationState *s, void *opaque);
-+    /* Checks if switchover ack should be used. Called only in dest */
-+    bool (*switchover_ack_needed)(void *opaque);
- } SaveVMHandlers;
- 
- int register_savevm_live(const char *idstr,
-diff --git a/migration/migration.c b/migration/migration.c
-index 1ac5f19bc2..9bf1caee6c 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -76,6 +76,7 @@ enum mig_rp_message_type {
-     MIG_RP_MSG_REQ_PAGES,    /* data (start: be64, len: be32) */
-     MIG_RP_MSG_RECV_BITMAP,  /* send recved_bitmap back to source */
-     MIG_RP_MSG_RESUME_ACK,   /* tell source that we are ready to resume */
-+    MIG_RP_MSG_SWITCHOVER_ACK, /* Tell source it's OK to do switchover */
- 
-     MIG_RP_MSG_MAX
- };
-@@ -756,6 +757,11 @@ bool migration_has_all_channels(void)
-     return true;
- }
- 
-+int migrate_send_rp_switchover_ack(MigrationIncomingState *mis)
-+{
-+    return migrate_send_rp_message(mis, MIG_RP_MSG_SWITCHOVER_ACK, 0, NULL);
-+}
-+
- /*
-  * Send a 'SHUT' message on the return channel with the given value
-  * to indicate that we've finished with the RP.  Non-0 value indicates
-@@ -1415,6 +1421,7 @@ void migrate_init(MigrationState *s)
-     s->vm_was_running = false;
-     s->iteration_initial_bytes = 0;
-     s->threshold_size = 0;
-+    s->switchover_acked = false;
- }
- 
- int migrate_add_blocker_internal(Error *reason, Error **errp)
-@@ -1731,6 +1738,7 @@ static struct rp_cmd_args {
-     [MIG_RP_MSG_REQ_PAGES_ID]   = { .len = -1, .name = "REQ_PAGES_ID" },
-     [MIG_RP_MSG_RECV_BITMAP]    = { .len = -1, .name = "RECV_BITMAP" },
-     [MIG_RP_MSG_RESUME_ACK]     = { .len =  4, .name = "RESUME_ACK" },
-+    [MIG_RP_MSG_SWITCHOVER_ACK] = { .len =  0, .name = "SWITCHOVER_ACK" },
-     [MIG_RP_MSG_MAX]            = { .len = -1, .name = "MAX" },
- };
- 
-@@ -1969,6 +1977,11 @@ retry:
-             }
-             break;
- 
-+        case MIG_RP_MSG_SWITCHOVER_ACK:
-+            ms->switchover_acked = true;
-+            trace_source_return_path_thread_switchover_acked();
-+            break;
-+
-         default:
-             break;
-         }
-@@ -2720,6 +2733,20 @@ static void migration_update_counters(MigrationState *s,
-                               bandwidth, s->threshold_size);
- }
- 
-+static bool migration_can_switchover(MigrationState *s)
-+{
-+    if (!migrate_switchover_ack()) {
-+        return true;
-+    }
-+
-+    /* No reason to wait for switchover ACK if VM is stopped */
-+    if (!runstate_is_running()) {
-+        return true;
-+    }
-+
-+    return s->switchover_acked;
-+}
-+
- /* Migration thread iteration status */
- typedef enum {
-     MIG_ITERATE_RESUME,         /* Resume current iteration */
-@@ -2735,6 +2762,7 @@ static MigIterateState migration_iteration_run(MigrationState *s)
- {
-     uint64_t must_precopy, can_postcopy;
-     bool in_postcopy = s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE;
-+    bool can_switchover = migration_can_switchover(s);
- 
-     qemu_savevm_state_pending_estimate(&must_precopy, &can_postcopy);
-     uint64_t pending_size = must_precopy + can_postcopy;
-@@ -2747,14 +2775,14 @@ static MigIterateState migration_iteration_run(MigrationState *s)
-         trace_migrate_pending_exact(pending_size, must_precopy, can_postcopy);
-     }
- 
--    if (!pending_size || pending_size < s->threshold_size) {
-+    if ((!pending_size || pending_size < s->threshold_size) && can_switchover) {
-         trace_migration_thread_low_pending(pending_size);
-         migration_completion(s);
-         return MIG_ITERATE_BREAK;
-     }
- 
-     /* Still a significant amount to transfer */
--    if (!in_postcopy && must_precopy <= s->threshold_size &&
-+    if (!in_postcopy && must_precopy <= s->threshold_size && can_switchover &&
-         qatomic_read(&s->start_postcopy)) {
-         if (postcopy_start(s)) {
-             error_report("%s: postcopy failed to start", __func__);
-diff --git a/migration/migration.h b/migration/migration.h
-index 2b71df8617..e9679f8029 100644
---- a/migration/migration.h
-+++ b/migration/migration.h
-@@ -204,6 +204,13 @@ struct MigrationIncomingState {
-      * contains valid information.
-      */
-     QemuMutex page_request_mutex;
-+
-+    /*
-+     * Number of devices that have yet to approve switchover. When this reaches
-+     * zero an ACK that it's OK to do switchover is sent to the source. No lock
-+     * is needed as this field is updated serially.
-+     */
-+    unsigned int switchover_ack_pending_num;
- };
- 
- MigrationIncomingState *migration_incoming_get_current(void);
-@@ -421,6 +428,12 @@ struct MigrationState {
- 
-     /* QEMU_VM_VMDESCRIPTION content filled for all non-iterable devices. */
-     JSONWriter *vmdesc;
-+
-+    /*
-+     * Indicates whether an ACK from the destination that it's OK to do
-+     * switchover has been received.
-+     */
-+    bool switchover_acked;
- };
- 
- void migrate_set_state(int *state, int old_state, int new_state);
-@@ -461,6 +474,7 @@ int migrate_send_rp_message_req_pages(MigrationIncomingState *mis,
- void migrate_send_rp_recv_bitmap(MigrationIncomingState *mis,
-                                  char *block_name);
- void migrate_send_rp_resume_ack(MigrationIncomingState *mis, uint32_t value);
-+int migrate_send_rp_switchover_ack(MigrationIncomingState *mis);
- 
- void dirty_bitmap_mig_before_vm_start(void);
- void dirty_bitmap_mig_cancel_outgoing(void);
-diff --git a/migration/savevm.c b/migration/savevm.c
-index 211eff3a8b..aff70e6263 100644
---- a/migration/savevm.c
-+++ b/migration/savevm.c
-@@ -2358,6 +2358,21 @@ static int loadvm_process_command(QEMUFile *f)
-             error_report("CMD_OPEN_RETURN_PATH failed");
-             return -1;
-         }
-+
-+        /*
-+         * Switchover ack is enabled but no device uses it, so send an ACK to
-+         * source that it's OK to switchover. Do it here, after return path has
-+         * been created.
-+         */
-+        if (migrate_switchover_ack() && !mis->switchover_ack_pending_num) {
-+            int ret = migrate_send_rp_switchover_ack(mis);
-+            if (ret) {
-+                error_report(
-+                    "Could not send switchover ack RP MSG, err %d (%s)", ret,
-+                    strerror(-ret));
-+                return ret;
-+            }
-+        }
-         break;
- 
-     case MIG_CMD_PING:
-@@ -2584,6 +2599,23 @@ static int qemu_loadvm_state_header(QEMUFile *f)
-     return 0;
- }
- 
-+static void qemu_loadvm_state_switchover_ack_needed(MigrationIncomingState *mis)
-+{
-+    SaveStateEntry *se;
-+
-+    QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
-+        if (!se->ops || !se->ops->switchover_ack_needed) {
-+            continue;
-+        }
-+
-+        if (se->ops->switchover_ack_needed(se->opaque)) {
-+            mis->switchover_ack_pending_num++;
-+        }
-+    }
-+
-+    trace_loadvm_state_switchover_ack_needed(mis->switchover_ack_pending_num);
-+}
-+
- static int qemu_loadvm_state_setup(QEMUFile *f)
- {
-     SaveStateEntry *se;
-@@ -2787,6 +2819,10 @@ int qemu_loadvm_state(QEMUFile *f)
-         return -EINVAL;
-     }
- 
-+    if (migrate_switchover_ack()) {
-+        qemu_loadvm_state_switchover_ack_needed(mis);
-+    }
-+
-     cpu_synchronize_all_pre_loadvm();
- 
-     ret = qemu_loadvm_state_main(f, mis);
-@@ -2860,6 +2896,24 @@ int qemu_load_device_state(QEMUFile *f)
-     return 0;
- }
- 
-+int qemu_loadvm_approve_switchover(void)
-+{
-+    MigrationIncomingState *mis = migration_incoming_get_current();
-+
-+    if (!mis->switchover_ack_pending_num) {
-+        return -EINVAL;
-+    }
-+
-+    mis->switchover_ack_pending_num--;
-+    trace_loadvm_approve_switchover(mis->switchover_ack_pending_num);
-+
-+    if (mis->switchover_ack_pending_num) {
-+        return 0;
-+    }
-+
-+    return migrate_send_rp_switchover_ack(mis);
-+}
-+
- bool save_snapshot(const char *name, bool overwrite, const char *vmstate,
-                   bool has_devices, strList *devices, Error **errp)
- {
-diff --git a/migration/savevm.h b/migration/savevm.h
-index fb636735f0..e894bbc143 100644
---- a/migration/savevm.h
-+++ b/migration/savevm.h
-@@ -65,6 +65,7 @@ int qemu_loadvm_state(QEMUFile *f);
- void qemu_loadvm_state_cleanup(void);
- int qemu_loadvm_state_main(QEMUFile *f, MigrationIncomingState *mis);
- int qemu_load_device_state(QEMUFile *f);
-+int qemu_loadvm_approve_switchover(void);
- int qemu_savevm_state_complete_precopy_non_iterable(QEMUFile *f,
-         bool in_postcopy, bool inactivate_disks);
- 
-diff --git a/migration/trace-events b/migration/trace-events
-index 92161eeac5..cda807d271 100644
---- a/migration/trace-events
-+++ b/migration/trace-events
-@@ -7,6 +7,7 @@ qemu_loadvm_state_section_partend(uint32_t section_id) "%u"
- qemu_loadvm_state_post_main(int ret) "%d"
- qemu_loadvm_state_section_startfull(uint32_t section_id, const char *idstr, uint32_t instance_id, uint32_t version_id) "%u(%s) %u %u"
- qemu_savevm_send_packaged(void) ""
-+loadvm_state_switchover_ack_needed(unsigned int switchover_ack_pending_num) "Switchover ack pending num=%u"
- loadvm_state_setup(void) ""
- loadvm_state_cleanup(void) ""
- loadvm_handle_cmd_packaged(unsigned int length) "%u"
-@@ -23,6 +24,7 @@ loadvm_postcopy_ram_handle_discard_end(void) ""
- loadvm_postcopy_ram_handle_discard_header(const char *ramid, uint16_t len) "%s: %ud"
- loadvm_process_command(const char *s, uint16_t len) "com=%s len=%d"
- loadvm_process_command_ping(uint32_t val) "0x%x"
-+loadvm_approve_switchover(unsigned int switchover_ack_pending_num) "Switchover ack pending num=%u"
- postcopy_ram_listen_thread_exit(void) ""
- postcopy_ram_listen_thread_start(void) ""
- qemu_savevm_send_postcopy_advise(void) ""
-@@ -180,6 +182,7 @@ source_return_path_thread_loop_top(void) ""
- source_return_path_thread_pong(uint32_t val) "0x%x"
- source_return_path_thread_shut(uint32_t val) "0x%x"
- source_return_path_thread_resume_ack(uint32_t v) "%"PRIu32
-+source_return_path_thread_switchover_acked(void) ""
- migration_thread_low_pending(uint64_t pending) "%" PRIu64
- migrate_transferred(uint64_t tranferred, uint64_t time_spent, uint64_t bandwidth, uint64_t size) "transferred %" PRIu64 " time_spent %" PRIu64 " bandwidth %" PRIu64 " max_size %" PRId64
- process_incoming_migration_co_end(int ret, int ps) "ret=%d postcopy-state=%d"
--- 
-2.39.3
-
diff --git a/kvm-migration-Make-all-functions-check-have-the-same-for.patch b/kvm-migration-Make-all-functions-check-have-the-same-for.patch
deleted file mode 100644
index f873f3f..0000000
--- a/kvm-migration-Make-all-functions-check-have-the-same-for.patch
+++ /dev/null
@@ -1,431 +0,0 @@
-From eaccfc91b34f93dcaf597e6b39f78741da618ff3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:57 +0200
-Subject: [PATCH 08/37] migration: Make all functions check have the same
- format
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [6/28] 774df2a81502d3eab5d5b8f64fa9b69f8be43669 (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit 8f9c532756c5
-Author: Juan Quintela <quintela@redhat.com>
-Date:   Wed Mar 1 23:11:08 2023 +0100
-
-    migration: Make all functions check have the same format
-
-    Signed-off-by: Juan Quintela <quintela@redhat.com>
-    Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- migration/options.c | 153 +++++++++++---------------------------------
- 1 file changed, 39 insertions(+), 114 deletions(-)
-
-diff --git a/migration/options.c b/migration/options.c
-index e51d667e14..bcfe244fa9 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -33,27 +33,21 @@
- 
- bool migrate_auto_converge(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->capabilities[MIGRATION_CAPABILITY_AUTO_CONVERGE];
- }
- 
- bool migrate_background_snapshot(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->capabilities[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT];
- }
- 
- bool migrate_block(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->capabilities[MIGRATION_CAPABILITY_BLOCK];
- }
-@@ -61,95 +55,76 @@ bool migrate_block(void)
- bool migrate_colo(void)
- {
-     MigrationState *s = migrate_get_current();
-+
-     return s->capabilities[MIGRATION_CAPABILITY_X_COLO];
- }
- 
- bool migrate_compress(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->capabilities[MIGRATION_CAPABILITY_COMPRESS];
- }
- 
- bool migrate_dirty_bitmaps(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->capabilities[MIGRATION_CAPABILITY_DIRTY_BITMAPS];
- }
- 
- bool migrate_events(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->capabilities[MIGRATION_CAPABILITY_EVENTS];
- }
- 
- bool migrate_ignore_shared(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->capabilities[MIGRATION_CAPABILITY_X_IGNORE_SHARED];
- }
- 
- bool migrate_late_block_activate(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->capabilities[MIGRATION_CAPABILITY_LATE_BLOCK_ACTIVATE];
- }
- 
- bool migrate_multifd(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->capabilities[MIGRATION_CAPABILITY_MULTIFD];
- }
- 
- bool migrate_pause_before_switchover(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->capabilities[MIGRATION_CAPABILITY_PAUSE_BEFORE_SWITCHOVER];
- }
- 
- bool migrate_postcopy_blocktime(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_BLOCKTIME];
- }
- 
- bool migrate_postcopy_preempt(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_PREEMPT];
- }
- 
- bool migrate_postcopy_ram(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_RAM];
- }
-@@ -163,54 +138,42 @@ bool migrate_rdma_pin_all(void)
- 
- bool migrate_release_ram(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->capabilities[MIGRATION_CAPABILITY_RELEASE_RAM];
- }
- 
- bool migrate_return_path(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->capabilities[MIGRATION_CAPABILITY_RETURN_PATH];
- }
- 
- bool migrate_validate_uuid(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->capabilities[MIGRATION_CAPABILITY_VALIDATE_UUID];
- }
- 
- bool migrate_xbzrle(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->capabilities[MIGRATION_CAPABILITY_XBZRLE];
- }
- 
- bool migrate_zero_blocks(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->capabilities[MIGRATION_CAPABILITY_ZERO_BLOCKS];
- }
- 
- bool migrate_zero_copy_send(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->capabilities[MIGRATION_CAPABILITY_ZERO_COPY_SEND];
- }
-@@ -224,9 +187,7 @@ bool migrate_postcopy(void)
- 
- bool migrate_tls(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->parameters.tls_creds && *s->parameters.tls_creds;
- }
-@@ -491,126 +452,98 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,
- 
- bool migrate_block_incremental(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->parameters.block_incremental;
- }
- 
- uint32_t migrate_checkpoint_delay(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->parameters.x_checkpoint_delay;
- }
- 
- int migrate_compress_level(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->parameters.compress_level;
- }
- 
- int migrate_compress_threads(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->parameters.compress_threads;
- }
- 
- int migrate_compress_wait_thread(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->parameters.compress_wait_thread;
- }
- 
- uint8_t migrate_cpu_throttle_increment(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->parameters.cpu_throttle_increment;
- }
- 
- uint8_t migrate_cpu_throttle_initial(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->parameters.cpu_throttle_initial;
- }
- 
- bool migrate_cpu_throttle_tailslow(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->parameters.cpu_throttle_tailslow;
- }
- 
- int migrate_decompress_threads(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->parameters.decompress_threads;
- }
- 
- uint8_t migrate_max_cpu_throttle(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->parameters.max_cpu_throttle;
- }
- 
- uint64_t migrate_max_bandwidth(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->parameters.max_bandwidth;
- }
- 
- int64_t migrate_max_postcopy_bandwidth(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->parameters.max_postcopy_bandwidth;
- }
- 
- int migrate_multifd_channels(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->parameters.multifd_channels;
- }
- 
- MultiFDCompression migrate_multifd_compression(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     assert(s->parameters.multifd_compression < MULTIFD_COMPRESSION__MAX);
-     return s->parameters.multifd_compression;
-@@ -618,36 +551,28 @@ MultiFDCompression migrate_multifd_compression(void)
- 
- int migrate_multifd_zlib_level(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->parameters.multifd_zlib_level;
- }
- 
- int migrate_multifd_zstd_level(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->parameters.multifd_zstd_level;
- }
- 
- uint8_t migrate_throttle_trigger_threshold(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->parameters.throttle_trigger_threshold;
- }
- 
- uint64_t migrate_xbzrle_cache_size(void)
- {
--    MigrationState *s;
--
--    s = migrate_get_current();
-+    MigrationState *s = migrate_get_current();
- 
-     return s->parameters.xbzrle_cache_size;
- }
--- 
-2.39.3
-
diff --git a/kvm-migration-Make-dirty_sync_count-atomic.patch b/kvm-migration-Make-dirty_sync_count-atomic.patch
deleted file mode 100644
index ad1de7b..0000000
--- a/kvm-migration-Make-dirty_sync_count-atomic.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 886b511e0a225b1c4428c646534d7bcc65bd9e2a Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Tue, 11 Apr 2023 18:02:34 +0200
-Subject: [PATCH 14/56] migration: Make dirty_sync_count atomic
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [13/50] ef3ae8cdd960e944ba9e73a53d54c9a5a55bb1ce (peterx/qemu-kvm)
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Peter Xu <peterx@redhat.com>
-(cherry picked from commit 536b5a4e56ec67c958f46e7d46cbd5ac34e5a239)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c |  3 ++-
- migration/ram.c       | 13 +++++++------
- migration/ram.h       |  2 +-
- 3 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index 8f2847d298..8fca751050 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -1148,7 +1148,8 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)
-     info->ram->normal = stat64_get(&ram_counters.normal);
-     info->ram->normal_bytes = info->ram->normal * page_size;
-     info->ram->mbps = s->mbps;
--    info->ram->dirty_sync_count = ram_counters.dirty_sync_count;
-+    info->ram->dirty_sync_count =
-+        stat64_get(&ram_counters.dirty_sync_count);
-     info->ram->dirty_sync_missed_zero_copy =
-         stat64_get(&ram_counters.dirty_sync_missed_zero_copy);
-     info->ram->postcopy_requests = ram_counters.postcopy_requests;
-diff --git a/migration/ram.c b/migration/ram.c
-index b1722b6071..3c13136559 100644
---- a/migration/ram.c
-+++ b/migration/ram.c
-@@ -764,7 +764,7 @@ static void xbzrle_cache_zero_page(RAMState *rs, ram_addr_t current_addr)
-     /* We don't care if this fails to allocate a new cache page
-      * as long as it updated an old one */
-     cache_insert(XBZRLE.cache, current_addr, XBZRLE.zero_target_page,
--                 ram_counters.dirty_sync_count);
-+                 stat64_get(&ram_counters.dirty_sync_count));
- }
- 
- #define ENCODING_FLAG_XBZRLE 0x1
-@@ -790,13 +790,13 @@ static int save_xbzrle_page(RAMState *rs, PageSearchStatus *pss,
-     int encoded_len = 0, bytes_xbzrle;
-     uint8_t *prev_cached_page;
-     QEMUFile *file = pss->pss_channel;
-+    uint64_t generation = stat64_get(&ram_counters.dirty_sync_count);
- 
--    if (!cache_is_cached(XBZRLE.cache, current_addr,
--                         ram_counters.dirty_sync_count)) {
-+    if (!cache_is_cached(XBZRLE.cache, current_addr, generation)) {
-         xbzrle_counters.cache_miss++;
-         if (!rs->last_stage) {
-             if (cache_insert(XBZRLE.cache, current_addr, *current_data,
--                             ram_counters.dirty_sync_count) == -1) {
-+                             generation) == -1) {
-                 return -1;
-             } else {
-                 /* update *current_data when the page has been
-@@ -1209,7 +1209,7 @@ static void migration_bitmap_sync(RAMState *rs)
-     RAMBlock *block;
-     int64_t end_time;
- 
--    ram_counters.dirty_sync_count++;
-+    stat64_add(&ram_counters.dirty_sync_count, 1);
- 
-     if (!rs->time_last_bitmap_sync) {
-         rs->time_last_bitmap_sync = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
-@@ -1246,7 +1246,8 @@ static void migration_bitmap_sync(RAMState *rs)
-         rs->bytes_xfer_prev = stat64_get(&ram_counters.transferred);
-     }
-     if (migrate_use_events()) {
--        qapi_event_send_migration_pass(ram_counters.dirty_sync_count);
-+        uint64_t generation = stat64_get(&ram_counters.dirty_sync_count);
-+        qapi_event_send_migration_pass(generation);
-     }
- }
- 
-diff --git a/migration/ram.h b/migration/ram.h
-index bb52632424..8c0d07c43a 100644
---- a/migration/ram.h
-+++ b/migration/ram.h
-@@ -42,7 +42,7 @@
-  */
- typedef struct {
-     int64_t dirty_pages_rate;
--    int64_t dirty_sync_count;
-+    Stat64 dirty_sync_count;
-     Stat64 dirty_sync_missed_zero_copy;
-     Stat64 downtime_bytes;
-     Stat64 duplicate;
--- 
-2.39.1
-
diff --git a/kvm-migration-Make-dirty_sync_missed_zero_copy-atomic.patch b/kvm-migration-Make-dirty_sync_missed_zero_copy-atomic.patch
deleted file mode 100644
index b7b0f60..0000000
--- a/kvm-migration-Make-dirty_sync_missed_zero_copy-atomic.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From e9ff20d7f7e6c2354f3696e8bca265e535eeb801 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Tue, 11 Apr 2023 17:33:56 +0200
-Subject: [PATCH 11/56] migration: Make dirty_sync_missed_zero_copy atomic
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [10/50] 041230abb087db0e7ffae02b4f85772490b805a0 (peterx/qemu-kvm)
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Peter Xu <peterx@redhat.com>
-(cherry picked from commit 4291823694fd8507831d26e2558d9cd0030841f7)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c | 2 +-
- migration/multifd.c   | 2 +-
- migration/ram.c       | 5 -----
- migration/ram.h       | 4 +---
- 4 files changed, 3 insertions(+), 10 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index ca68808b5c..645fb4b3c5 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -1150,7 +1150,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)
-     info->ram->mbps = s->mbps;
-     info->ram->dirty_sync_count = ram_counters.dirty_sync_count;
-     info->ram->dirty_sync_missed_zero_copy =
--            ram_counters.dirty_sync_missed_zero_copy;
-+        stat64_get(&ram_counters.dirty_sync_missed_zero_copy);
-     info->ram->postcopy_requests = ram_counters.postcopy_requests;
-     info->ram->page_size = page_size;
-     info->ram->multifd_bytes = stat64_get(&ram_counters.multifd_bytes);
-diff --git a/migration/multifd.c b/migration/multifd.c
-index 1c992abf53..903df2117b 100644
---- a/migration/multifd.c
-+++ b/migration/multifd.c
-@@ -576,7 +576,7 @@ static int multifd_zero_copy_flush(QIOChannel *c)
-         return -1;
-     }
-     if (ret == 1) {
--        dirty_sync_missed_zero_copy();
-+        stat64_add(&ram_counters.dirty_sync_missed_zero_copy, 1);
-     }
- 
-     return ret;
-diff --git a/migration/ram.c b/migration/ram.c
-index 71320ed27a..93e0a48af4 100644
---- a/migration/ram.c
-+++ b/migration/ram.c
-@@ -472,11 +472,6 @@ void ram_transferred_add(uint64_t bytes)
-     stat64_add(&ram_counters.transferred, bytes);
- }
- 
--void dirty_sync_missed_zero_copy(void)
--{
--    ram_counters.dirty_sync_missed_zero_copy++;
--}
--
- struct MigrationOps {
-     int (*ram_save_target_page)(RAMState *rs, PageSearchStatus *pss);
- };
-diff --git a/migration/ram.h b/migration/ram.h
-index ed70391317..2170c55e67 100644
---- a/migration/ram.h
-+++ b/migration/ram.h
-@@ -43,7 +43,7 @@
- typedef struct {
-     int64_t dirty_pages_rate;
-     int64_t dirty_sync_count;
--    uint64_t dirty_sync_missed_zero_copy;
-+    Stat64 dirty_sync_missed_zero_copy;
-     uint64_t downtime_bytes;
-     Stat64 duplicate;
-     Stat64 multifd_bytes;
-@@ -114,6 +114,4 @@ void ram_write_tracking_prepare(void);
- int ram_write_tracking_start(void);
- void ram_write_tracking_stop(void);
- 
--void dirty_sync_missed_zero_copy(void);
--
- #endif
--- 
-2.39.1
-
diff --git a/kvm-migration-Make-downtime_bytes-atomic.patch b/kvm-migration-Make-downtime_bytes-atomic.patch
deleted file mode 100644
index 9b206bc..0000000
--- a/kvm-migration-Make-downtime_bytes-atomic.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 4c6af064277b5445b31db4a598e1c4402ba56452 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Tue, 11 Apr 2023 17:38:11 +0200
-Subject: [PATCH 13/56] migration: Make downtime_bytes atomic
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [12/50] ebfc16aae8bc4a8c1fec431780a062950e6f50c4 (peterx/qemu-kvm)
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Peter Xu <peterx@redhat.com>
-(cherry picked from commit 296a4ac2aa63038b6b702f2ee8f0f93ae26727ae)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c | 2 +-
- migration/ram.c       | 2 +-
- migration/ram.h       | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index 3a68d93d69..8f2847d298 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -1156,7 +1156,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)
-     info->ram->multifd_bytes = stat64_get(&ram_counters.multifd_bytes);
-     info->ram->pages_per_second = s->pages_per_second;
-     info->ram->precopy_bytes = stat64_get(&ram_counters.precopy_bytes);
--    info->ram->downtime_bytes = ram_counters.downtime_bytes;
-+    info->ram->downtime_bytes = stat64_get(&ram_counters.downtime_bytes);
-     info->ram->postcopy_bytes = stat64_get(&ram_counters.postcopy_bytes);
- 
-     if (migrate_use_xbzrle()) {
-diff --git a/migration/ram.c b/migration/ram.c
-index 0b4693215e..b1722b6071 100644
---- a/migration/ram.c
-+++ b/migration/ram.c
-@@ -467,7 +467,7 @@ void ram_transferred_add(uint64_t bytes)
-     } else if (migration_in_postcopy()) {
-         stat64_add(&ram_counters.postcopy_bytes, bytes);
-     } else {
--        ram_counters.downtime_bytes += bytes;
-+        stat64_add(&ram_counters.downtime_bytes, bytes);
-     }
-     stat64_add(&ram_counters.transferred, bytes);
- }
-diff --git a/migration/ram.h b/migration/ram.h
-index a766b895fa..bb52632424 100644
---- a/migration/ram.h
-+++ b/migration/ram.h
-@@ -44,7 +44,7 @@ typedef struct {
-     int64_t dirty_pages_rate;
-     int64_t dirty_sync_count;
-     Stat64 dirty_sync_missed_zero_copy;
--    uint64_t downtime_bytes;
-+    Stat64 downtime_bytes;
-     Stat64 duplicate;
-     Stat64 multifd_bytes;
-     Stat64 normal;
--- 
-2.39.1
-
diff --git a/kvm-migration-Make-multifd_bytes-atomic.patch b/kvm-migration-Make-multifd_bytes-atomic.patch
deleted file mode 100644
index b315fdc..0000000
--- a/kvm-migration-Make-multifd_bytes-atomic.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From bfcc4bc8f60b541d545f1ea27b1ff156d8092d33 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Wed, 23 Nov 2022 20:36:56 +0100
-Subject: [PATCH 10/56] migration: Make multifd_bytes atomic
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [9/50] c2bc6b173770a0ea81c3f9d850c583c651647070 (peterx/qemu-kvm)
-
-In the spirit of:
-
-commit 394d323bc3451e4d07f13341cb8817fac8dfbadd
-Author: Peter Xu <peterx@redhat.com>
-Date:   Tue Oct 11 17:55:51 2022 -0400
-
-    migration: Use atomic ops properly for page accountings
-
-Reviewed-by: David Edmondson <david.edmondson@oracle.com>
-Reviewed-by: Peter Xu <peterx@redhat.com>
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-(cherry picked from commit cf671116facf4e29d91fce9c9ffb535385ffac81)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c | 4 ++--
- migration/multifd.c   | 4 ++--
- migration/ram.h       | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index a91704d35c..ca68808b5c 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -1153,7 +1153,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)
-             ram_counters.dirty_sync_missed_zero_copy;
-     info->ram->postcopy_requests = ram_counters.postcopy_requests;
-     info->ram->page_size = page_size;
--    info->ram->multifd_bytes = ram_counters.multifd_bytes;
-+    info->ram->multifd_bytes = stat64_get(&ram_counters.multifd_bytes);
-     info->ram->pages_per_second = s->pages_per_second;
-     info->ram->precopy_bytes = ram_counters.precopy_bytes;
-     info->ram->downtime_bytes = ram_counters.downtime_bytes;
-@@ -3780,7 +3780,7 @@ static MigThrError migration_detect_error(MigrationState *s)
- static uint64_t migration_total_bytes(MigrationState *s)
- {
-     return qemu_file_total_transferred(s->to_dst_file) +
--        ram_counters.multifd_bytes;
-+        stat64_get(&ram_counters.multifd_bytes);
- }
- 
- static void migration_calculate_complete(MigrationState *s)
-diff --git a/migration/multifd.c b/migration/multifd.c
-index 6ef3a27938..1c992abf53 100644
---- a/migration/multifd.c
-+++ b/migration/multifd.c
-@@ -432,9 +432,9 @@ static int multifd_send_pages(QEMUFile *f)
-     p->pages = pages;
-     transferred = ((uint64_t) pages->num) * p->page_size + p->packet_len;
-     qemu_file_acct_rate_limit(f, transferred);
--    ram_counters.multifd_bytes += transferred;
-     qemu_mutex_unlock(&p->mutex);
-     stat64_add(&ram_counters.transferred, transferred);
-+    stat64_add(&ram_counters.multifd_bytes, transferred);
-     qemu_sem_post(&p->sem);
- 
-     return 1;
-@@ -627,9 +627,9 @@ int multifd_send_sync_main(QEMUFile *f)
-         p->flags |= MULTIFD_FLAG_SYNC;
-         p->pending_job++;
-         qemu_file_acct_rate_limit(f, p->packet_len);
--        ram_counters.multifd_bytes += p->packet_len;
-         qemu_mutex_unlock(&p->mutex);
-         stat64_add(&ram_counters.transferred, p->packet_len);
-+        stat64_add(&ram_counters.multifd_bytes, p->packet_len);
-         qemu_sem_post(&p->sem);
-     }
-     for (i = 0; i < migrate_multifd_channels(); i++) {
-diff --git a/migration/ram.h b/migration/ram.h
-index 7c026b5242..ed70391317 100644
---- a/migration/ram.h
-+++ b/migration/ram.h
-@@ -46,7 +46,7 @@ typedef struct {
-     uint64_t dirty_sync_missed_zero_copy;
-     uint64_t downtime_bytes;
-     Stat64 duplicate;
--    uint64_t multifd_bytes;
-+    Stat64 multifd_bytes;
-     Stat64 normal;
-     Stat64 postcopy_bytes;
-     int64_t postcopy_requests;
--- 
-2.39.1
-
diff --git a/kvm-migration-Make-postcopy_requests-atomic.patch b/kvm-migration-Make-postcopy_requests-atomic.patch
deleted file mode 100644
index 894419a..0000000
--- a/kvm-migration-Make-postcopy_requests-atomic.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From e6ff4536a5e5f5bbfda370ecb525d0e066c3ab1c Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Tue, 11 Apr 2023 18:04:59 +0200
-Subject: [PATCH 15/56] migration: Make postcopy_requests atomic
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [14/50] d15c6052b77e7ded7bf34c66caa11bf86b75f2e8 (peterx/qemu-kvm)
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Peter Xu <peterx@redhat.com>
-(cherry picked from commit 3c764f9b2bc3e5eb5ed93ab45c2de6d599fef00f)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c | 3 ++-
- migration/ram.c       | 2 +-
- migration/ram.h       | 2 +-
- 3 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index 8fca751050..39501a0ed8 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -1152,7 +1152,8 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)
-         stat64_get(&ram_counters.dirty_sync_count);
-     info->ram->dirty_sync_missed_zero_copy =
-         stat64_get(&ram_counters.dirty_sync_missed_zero_copy);
--    info->ram->postcopy_requests = ram_counters.postcopy_requests;
-+    info->ram->postcopy_requests =
-+        stat64_get(&ram_counters.postcopy_requests);
-     info->ram->page_size = page_size;
-     info->ram->multifd_bytes = stat64_get(&ram_counters.multifd_bytes);
-     info->ram->pages_per_second = s->pages_per_second;
-diff --git a/migration/ram.c b/migration/ram.c
-index 3c13136559..fe69ecaef4 100644
---- a/migration/ram.c
-+++ b/migration/ram.c
-@@ -2169,7 +2169,7 @@ int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len)
-     RAMBlock *ramblock;
-     RAMState *rs = ram_state;
- 
--    ram_counters.postcopy_requests++;
-+    stat64_add(&ram_counters.postcopy_requests, 1);
-     RCU_READ_LOCK_GUARD();
- 
-     if (!rbname) {
-diff --git a/migration/ram.h b/migration/ram.h
-index 8c0d07c43a..afa68521d7 100644
---- a/migration/ram.h
-+++ b/migration/ram.h
-@@ -49,7 +49,7 @@ typedef struct {
-     Stat64 multifd_bytes;
-     Stat64 normal;
-     Stat64 postcopy_bytes;
--    int64_t postcopy_requests;
-+    Stat64 postcopy_requests;
-     Stat64 precopy_bytes;
-     int64_t remaining;
-     Stat64 transferred;
--- 
-2.39.1
-
diff --git a/kvm-migration-Make-precopy_bytes-atomic.patch b/kvm-migration-Make-precopy_bytes-atomic.patch
deleted file mode 100644
index 8e6c177..0000000
--- a/kvm-migration-Make-precopy_bytes-atomic.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 7e4d4316855f7f6556364eb16828f925b61c80d4 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Tue, 11 Apr 2023 17:36:48 +0200
-Subject: [PATCH 12/56] migration: Make precopy_bytes atomic
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [11/50] 23bec49b4b8f4d23c2192b401416139e3ca13626 (peterx/qemu-kvm)
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Peter Xu <peterx@redhat.com>
-(cherry picked from commit b013b5d1f32ef88457e66c7ce576f6475238f97f)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c | 2 +-
- migration/ram.c       | 2 +-
- migration/ram.h       | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index 645fb4b3c5..3a68d93d69 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -1155,7 +1155,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)
-     info->ram->page_size = page_size;
-     info->ram->multifd_bytes = stat64_get(&ram_counters.multifd_bytes);
-     info->ram->pages_per_second = s->pages_per_second;
--    info->ram->precopy_bytes = ram_counters.precopy_bytes;
-+    info->ram->precopy_bytes = stat64_get(&ram_counters.precopy_bytes);
-     info->ram->downtime_bytes = ram_counters.downtime_bytes;
-     info->ram->postcopy_bytes = stat64_get(&ram_counters.postcopy_bytes);
- 
-diff --git a/migration/ram.c b/migration/ram.c
-index 93e0a48af4..0b4693215e 100644
---- a/migration/ram.c
-+++ b/migration/ram.c
-@@ -463,7 +463,7 @@ RAMStats ram_counters;
- void ram_transferred_add(uint64_t bytes)
- {
-     if (runstate_is_running()) {
--        ram_counters.precopy_bytes += bytes;
-+        stat64_add(&ram_counters.precopy_bytes, bytes);
-     } else if (migration_in_postcopy()) {
-         stat64_add(&ram_counters.postcopy_bytes, bytes);
-     } else {
-diff --git a/migration/ram.h b/migration/ram.h
-index 2170c55e67..a766b895fa 100644
---- a/migration/ram.h
-+++ b/migration/ram.h
-@@ -50,7 +50,7 @@ typedef struct {
-     Stat64 normal;
-     Stat64 postcopy_bytes;
-     int64_t postcopy_requests;
--    uint64_t precopy_bytes;
-+    Stat64 precopy_bytes;
-     int64_t remaining;
-     Stat64 transferred;
- } RAMStats;
--- 
-2.39.1
-
diff --git a/kvm-migration-Merge-ram_counters-and-ram_atomic_counters.patch b/kvm-migration-Merge-ram_counters-and-ram_atomic_counters.patch
deleted file mode 100644
index 0679e89..0000000
--- a/kvm-migration-Merge-ram_counters-and-ram_atomic_counters.patch
+++ /dev/null
@@ -1,270 +0,0 @@
-From 5a87058eea6ee56f37fb454486c35baaf693d691 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Wed, 22 Feb 2023 15:56:45 +0100
-Subject: [PATCH 08/56] migration: Merge ram_counters and ram_atomic_counters
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [7/50] 90e395de66aa32b886cf151f7996a680190471f5 (peterx/qemu-kvm)
-
-Using MgrationStats as type for ram_counters mean that we didn't have
-to re-declare each value in another struct. The need of atomic
-counters have make us to create MigrationAtomicStats for this atomic
-counters.
-
-Create RAMStats type which is a merge of MigrationStats and
-MigrationAtomicStats removing unused members.
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Peter Xu <peterx@redhat.com>
-
----
-
-Fix typos found by David Edmondson
-
-(cherry picked from commit abce5fa16d126ed085ccf8a5b3fe61a1efa20994)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c |  8 ++++----
- migration/multifd.c   |  4 ++--
- migration/ram.c       | 39 ++++++++++++++++-----------------------
- migration/ram.h       | 28 +++++++++++++++-------------
- 4 files changed, 37 insertions(+), 42 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index 99f86bd6c2..a91704d35c 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -1140,12 +1140,12 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)
-     size_t page_size = qemu_target_page_size();
- 
-     info->ram = g_malloc0(sizeof(*info->ram));
--    info->ram->transferred = stat64_get(&ram_atomic_counters.transferred);
-+    info->ram->transferred = stat64_get(&ram_counters.transferred);
-     info->ram->total = ram_bytes_total();
--    info->ram->duplicate = stat64_get(&ram_atomic_counters.duplicate);
-+    info->ram->duplicate = stat64_get(&ram_counters.duplicate);
-     /* legacy value.  It is not used anymore */
-     info->ram->skipped = 0;
--    info->ram->normal = stat64_get(&ram_atomic_counters.normal);
-+    info->ram->normal = stat64_get(&ram_counters.normal);
-     info->ram->normal_bytes = info->ram->normal * page_size;
-     info->ram->mbps = s->mbps;
-     info->ram->dirty_sync_count = ram_counters.dirty_sync_count;
-@@ -1157,7 +1157,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)
-     info->ram->pages_per_second = s->pages_per_second;
-     info->ram->precopy_bytes = ram_counters.precopy_bytes;
-     info->ram->downtime_bytes = ram_counters.downtime_bytes;
--    info->ram->postcopy_bytes = stat64_get(&ram_atomic_counters.postcopy_bytes);
-+    info->ram->postcopy_bytes = stat64_get(&ram_counters.postcopy_bytes);
- 
-     if (migrate_use_xbzrle()) {
-         info->xbzrle_cache = g_malloc0(sizeof(*info->xbzrle_cache));
-diff --git a/migration/multifd.c b/migration/multifd.c
-index cbc0dfe39b..01fab01a92 100644
---- a/migration/multifd.c
-+++ b/migration/multifd.c
-@@ -433,7 +433,7 @@ static int multifd_send_pages(QEMUFile *f)
-     transferred = ((uint64_t) pages->num) * p->page_size + p->packet_len;
-     qemu_file_acct_rate_limit(f, transferred);
-     ram_counters.multifd_bytes += transferred;
--    stat64_add(&ram_atomic_counters.transferred, transferred);
-+    stat64_add(&ram_counters.transferred, transferred);
-     qemu_mutex_unlock(&p->mutex);
-     qemu_sem_post(&p->sem);
- 
-@@ -628,7 +628,7 @@ int multifd_send_sync_main(QEMUFile *f)
-         p->pending_job++;
-         qemu_file_acct_rate_limit(f, p->packet_len);
-         ram_counters.multifd_bytes += p->packet_len;
--        stat64_add(&ram_atomic_counters.transferred, p->packet_len);
-+        stat64_add(&ram_counters.transferred, p->packet_len);
-         qemu_mutex_unlock(&p->mutex);
-         qemu_sem_post(&p->sem);
-     }
-diff --git a/migration/ram.c b/migration/ram.c
-index 0e68099bf9..71320ed27a 100644
---- a/migration/ram.c
-+++ b/migration/ram.c
-@@ -458,25 +458,18 @@ uint64_t ram_bytes_remaining(void)
-                        0;
- }
- 
--/*
-- * NOTE: not all stats in ram_counters are used in reality.  See comments
-- * for struct MigrationAtomicStats.  The ultimate result of ram migration
-- * counters will be a merged version with both ram_counters and the atomic
-- * fields in ram_atomic_counters.
-- */
--MigrationStats ram_counters;
--MigrationAtomicStats ram_atomic_counters;
-+RAMStats ram_counters;
- 
- void ram_transferred_add(uint64_t bytes)
- {
-     if (runstate_is_running()) {
-         ram_counters.precopy_bytes += bytes;
-     } else if (migration_in_postcopy()) {
--        stat64_add(&ram_atomic_counters.postcopy_bytes, bytes);
-+        stat64_add(&ram_counters.postcopy_bytes, bytes);
-     } else {
-         ram_counters.downtime_bytes += bytes;
-     }
--    stat64_add(&ram_atomic_counters.transferred, bytes);
-+    stat64_add(&ram_counters.transferred, bytes);
- }
- 
- void dirty_sync_missed_zero_copy(void)
-@@ -756,7 +749,7 @@ void mig_throttle_counter_reset(void)
- 
-     rs->time_last_bitmap_sync = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
-     rs->num_dirty_pages_period = 0;
--    rs->bytes_xfer_prev = stat64_get(&ram_atomic_counters.transferred);
-+    rs->bytes_xfer_prev = stat64_get(&ram_counters.transferred);
- }
- 
- /**
-@@ -1130,8 +1123,8 @@ uint64_t ram_pagesize_summary(void)
- 
- uint64_t ram_get_total_transferred_pages(void)
- {
--    return  stat64_get(&ram_atomic_counters.normal) +
--        stat64_get(&ram_atomic_counters.duplicate) +
-+    return stat64_get(&ram_counters.normal) +
-+        stat64_get(&ram_counters.duplicate) +
-         compression_counters.pages + xbzrle_counters.pages;
- }
- 
-@@ -1192,7 +1185,7 @@ static void migration_trigger_throttle(RAMState *rs)
-     MigrationState *s = migrate_get_current();
-     uint64_t threshold = s->parameters.throttle_trigger_threshold;
-     uint64_t bytes_xfer_period =
--        stat64_get(&ram_atomic_counters.transferred) - rs->bytes_xfer_prev;
-+        stat64_get(&ram_counters.transferred) - rs->bytes_xfer_prev;
-     uint64_t bytes_dirty_period = rs->num_dirty_pages_period * TARGET_PAGE_SIZE;
-     uint64_t bytes_dirty_threshold = bytes_xfer_period * threshold / 100;
- 
-@@ -1255,7 +1248,7 @@ static void migration_bitmap_sync(RAMState *rs)
-         /* reset period counters */
-         rs->time_last_bitmap_sync = end_time;
-         rs->num_dirty_pages_period = 0;
--        rs->bytes_xfer_prev = stat64_get(&ram_atomic_counters.transferred);
-+        rs->bytes_xfer_prev = stat64_get(&ram_counters.transferred);
-     }
-     if (migrate_use_events()) {
-         qapi_event_send_migration_pass(ram_counters.dirty_sync_count);
-@@ -1331,7 +1324,7 @@ static int save_zero_page(PageSearchStatus *pss, QEMUFile *f, RAMBlock *block,
-     int len = save_zero_page_to_file(pss, f, block, offset);
- 
-     if (len) {
--        stat64_add(&ram_atomic_counters.duplicate, 1);
-+        stat64_add(&ram_counters.duplicate, 1);
-         ram_transferred_add(len);
-         return 1;
-     }
-@@ -1368,9 +1361,9 @@ static bool control_save_page(PageSearchStatus *pss, RAMBlock *block,
-     }
- 
-     if (bytes_xmit > 0) {
--        stat64_add(&ram_atomic_counters.normal, 1);
-+        stat64_add(&ram_counters.normal, 1);
-     } else if (bytes_xmit == 0) {
--        stat64_add(&ram_atomic_counters.duplicate, 1);
-+        stat64_add(&ram_counters.duplicate, 1);
-     }
- 
-     return true;
-@@ -1402,7 +1395,7 @@ static int save_normal_page(PageSearchStatus *pss, RAMBlock *block,
-         qemu_put_buffer(file, buf, TARGET_PAGE_SIZE);
-     }
-     ram_transferred_add(TARGET_PAGE_SIZE);
--    stat64_add(&ram_atomic_counters.normal, 1);
-+    stat64_add(&ram_counters.normal, 1);
-     return 1;
- }
- 
-@@ -1458,7 +1451,7 @@ static int ram_save_multifd_page(QEMUFile *file, RAMBlock *block,
-     if (multifd_queue_page(file, block, offset) < 0) {
-         return -1;
-     }
--    stat64_add(&ram_atomic_counters.normal, 1);
-+    stat64_add(&ram_counters.normal, 1);
- 
-     return 1;
- }
-@@ -1497,7 +1490,7 @@ update_compress_thread_counts(const CompressParam *param, int bytes_xmit)
-     ram_transferred_add(bytes_xmit);
- 
-     if (param->zero_page) {
--        stat64_add(&ram_atomic_counters.duplicate, 1);
-+        stat64_add(&ram_counters.duplicate, 1);
-         return;
-     }
- 
-@@ -2632,9 +2625,9 @@ void acct_update_position(QEMUFile *f, size_t size, bool zero)
-     uint64_t pages = size / TARGET_PAGE_SIZE;
- 
-     if (zero) {
--        stat64_add(&ram_atomic_counters.duplicate, pages);
-+        stat64_add(&ram_counters.duplicate, pages);
-     } else {
--        stat64_add(&ram_atomic_counters.normal, pages);
-+        stat64_add(&ram_counters.normal, pages);
-         ram_transferred_add(size);
-         qemu_file_credit_transfer(f, size);
-     }
-diff --git a/migration/ram.h b/migration/ram.h
-index 81cbb0947c..7c026b5242 100644
---- a/migration/ram.h
-+++ b/migration/ram.h
-@@ -35,25 +35,27 @@
- #include "qemu/stats64.h"
- 
- /*
-- * These are the migration statistic counters that need to be updated using
-- * atomic ops (can be accessed by more than one thread).  Here since we
-- * cannot modify MigrationStats directly to use Stat64 as it was defined in
-- * the QAPI scheme, we define an internal structure to hold them, and we
-- * propagate the real values when QMP queries happen.
-- *
-- * IOW, the corresponding fields within ram_counters on these specific
-- * fields will be always zero and not being used at all; they're just
-- * placeholders to make it QAPI-compatible.
-+ * These are the ram migration statistic counters.  It is loosely
-+ * based on MigrationStats.  We change to Stat64 any counter that
-+ * needs to be updated using atomic ops (can be accessed by more than
-+ * one thread).
-  */
- typedef struct {
--    Stat64 transferred;
-+    int64_t dirty_pages_rate;
-+    int64_t dirty_sync_count;
-+    uint64_t dirty_sync_missed_zero_copy;
-+    uint64_t downtime_bytes;
-     Stat64 duplicate;
-+    uint64_t multifd_bytes;
-     Stat64 normal;
-     Stat64 postcopy_bytes;
--} MigrationAtomicStats;
-+    int64_t postcopy_requests;
-+    uint64_t precopy_bytes;
-+    int64_t remaining;
-+    Stat64 transferred;
-+} RAMStats;
- 
--extern MigrationAtomicStats ram_atomic_counters;
--extern MigrationStats ram_counters;
-+extern RAMStats ram_counters;
- extern XBZRLECacheStats xbzrle_counters;
- extern CompressionStats compression_counters;
- 
--- 
-2.39.1
-
diff --git a/kvm-migration-Minor-control-flow-simplification.patch b/kvm-migration-Minor-control-flow-simplification.patch
deleted file mode 100644
index a0dbdd9..0000000
--- a/kvm-migration-Minor-control-flow-simplification.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From c3bc974ea4b5186a76daa433209c1209d94dd0b7 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Thu, 20 Apr 2023 09:35:51 -0500
-Subject: [PATCH 2/2] migration: Minor control flow simplification
-
-RH-Author: Eric Blake <eblake@redhat.com>
-RH-MergeRequest: 161: Avoid migration assertion from failed NFS server.
-RH-Bugzilla: 2058982
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [2/2] 5afd8c25d6f14bdb2a380ecc77bc6c2f2a26df87 (ebblake/centos-qemu-kvm)
-
-No need to declare a temporary variable.
-
-Suggested-by: Juan Quintela <quintela@redhat.com>
-Fixes: 1df36e8c6289 ("migration: Handle block device inactivation failures better")
-Signed-off-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Juan Quintela <quintela@redhat.com>
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-(cherry picked from commit 5d39f44d7ac5c63f53d4d0900ceba9521bc27e49)
----
- migration/migration.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index cb0d42c061..08007cef4e 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -3436,7 +3436,6 @@ static void migration_completion(MigrationState *s)
-         ret = global_state_store();
- 
-         if (!ret) {
--            bool inactivate = !migrate_colo_enabled();
-             ret = vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
-             trace_migration_completion_vm_stop(ret);
-             if (ret >= 0) {
-@@ -3444,10 +3443,10 @@ static void migration_completion(MigrationState *s)
-                                             MIGRATION_STATUS_DEVICE);
-             }
-             if (ret >= 0) {
--                s->block_inactive = inactivate;
-+                s->block_inactive = !migrate_colo_enabled();
-                 qemu_file_set_rate_limit(s->to_dst_file, INT64_MAX);
-                 ret = qemu_savevm_state_complete_precopy(s->to_dst_file, false,
--                                                         inactivate);
-+                                                         s->block_inactive);
-             }
-         }
-         qemu_mutex_unlock_iothread();
--- 
-2.39.1
-
diff --git a/kvm-migration-Move-migrate_announce_params-to-option.c.patch b/kvm-migration-Move-migrate_announce_params-to-option.c.patch
deleted file mode 100644
index 24dcb16..0000000
--- a/kvm-migration-Move-migrate_announce_params-to-option.c.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 1f5232d611ecaaf61bcac151e7d90b8b452ac161 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Thu, 2 Mar 2023 01:17:23 +0100
-Subject: [PATCH 43/56] migration: Move migrate_announce_params() to option.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [42/50] 541be7adc7f81c269058485aef5b14e787b2efe6 (peterx/qemu-kvm)
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Fabiano Rosas <farosas@suse.de>
-
----
-
-Fix extra whitespace (fabiano)
-
-(cherry picked from commit 2682c4eea72c621dfd0fb0151cbd758e81d1bdff)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c | 14 --------------
- migration/options.c   | 17 +++++++++++++++++
- 2 files changed, 17 insertions(+), 14 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index 724e841eb9..f27ce30be2 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -954,20 +954,6 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp)
-     return params;
- }
- 
--AnnounceParameters *migrate_announce_params(void)
--{
--    static AnnounceParameters ap;
--
--    MigrationState *s = migrate_get_current();
--
--    ap.initial = s->parameters.announce_initial;
--    ap.max = s->parameters.announce_max;
--    ap.rounds = s->parameters.announce_rounds;
--    ap.step = s->parameters.announce_step;
--
--    return &ap;
--}
--
- /*
-  * Return true if we're already in the middle of a migration
-  * (i.e. any of the active or setup states)
-diff --git a/migration/options.c b/migration/options.c
-index 2cb04fbbd1..418aafac64 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -16,6 +16,7 @@
- #include "qapi/qapi-commands-migration.h"
- #include "qapi/qmp/qerror.h"
- #include "sysemu/runstate.h"
-+#include "migration/misc.h"
- #include "migration.h"
- #include "ram.h"
- #include "options.h"
-@@ -589,3 +590,19 @@ uint64_t migrate_xbzrle_cache_size(void)
- 
-     return s->parameters.xbzrle_cache_size;
- }
-+
-+/* parameters helpers */
-+
-+AnnounceParameters *migrate_announce_params(void)
-+{
-+    static AnnounceParameters ap;
-+
-+    MigrationState *s = migrate_get_current();
-+
-+    ap.initial = s->parameters.announce_initial;
-+    ap.max = s->parameters.announce_max;
-+    ap.rounds = s->parameters.announce_rounds;
-+    ap.step = s->parameters.announce_step;
-+
-+    return &ap;
-+}
--- 
-2.39.1
-
diff --git a/kvm-migration-Move-migrate_cap_set-to-options.c.patch b/kvm-migration-Move-migrate_cap_set-to-options.c.patch
deleted file mode 100644
index 0e33c4c..0000000
--- a/kvm-migration-Move-migrate_cap_set-to-options.c.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 9c4f8d869f5bbdd07381f6baad2ed755b07d03f4 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Wed, 1 Mar 2023 23:25:44 +0100
-Subject: [PATCH 36/56] migration: Move migrate_cap_set() to options.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [35/50] d0cd6b8e9cf0534a56795d94c3da18622fa10ad7 (peterx/qemu-kvm)
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-(cherry picked from commit f80196b772ddeeb07d3d80d5c8382cb5d1063fa2)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c | 20 --------------------
- migration/options.c   | 21 +++++++++++++++++++++
- migration/options.h   |  1 +
- 3 files changed, 22 insertions(+), 20 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index 369cd91796..880a51210e 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -1666,26 +1666,6 @@ void migrate_set_state(int *state, int old_state, int new_state)
-     }
- }
- 
--static bool migrate_cap_set(int cap, bool value, Error **errp)
--{
--    MigrationState *s = migrate_get_current();
--    bool new_caps[MIGRATION_CAPABILITY__MAX];
--
--    if (migration_is_running(s->state)) {
--        error_setg(errp, QERR_MIGRATION_ACTIVE);
--        return false;
--    }
--
--    memcpy(new_caps, s->capabilities, sizeof(new_caps));
--    new_caps[cap] = value;
--
--    if (!migrate_caps_check(s->capabilities, new_caps, errp)) {
--        return false;
--    }
--    s->capabilities[cap] = value;
--    return true;
--}
--
- static void migrate_set_block_incremental(MigrationState *s, bool value)
- {
-     s->parameters.block_incremental = value;
-diff --git a/migration/options.c b/migration/options.c
-index 4cbe77e35a..f3b2d6e482 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -14,6 +14,7 @@
- #include "qemu/osdep.h"
- #include "qapi/error.h"
- #include "qapi/qapi-commands-migration.h"
-+#include "qapi/qmp/qerror.h"
- #include "sysemu/runstate.h"
- #include "migration.h"
- #include "ram.h"
-@@ -392,6 +393,26 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp)
-     return true;
- }
- 
-+bool migrate_cap_set(int cap, bool value, Error **errp)
-+{
-+    MigrationState *s = migrate_get_current();
-+    bool new_caps[MIGRATION_CAPABILITY__MAX];
-+
-+    if (migration_is_running(s->state)) {
-+        error_setg(errp, QERR_MIGRATION_ACTIVE);
-+        return false;
-+    }
-+
-+    memcpy(new_caps, s->capabilities, sizeof(new_caps));
-+    new_caps[cap] = value;
-+
-+    if (!migrate_caps_check(s->capabilities, new_caps, errp)) {
-+        return false;
-+    }
-+    s->capabilities[cap] = value;
-+    return true;
-+}
-+
- MigrationCapabilityStatusList *qmp_query_migrate_capabilities(Error **errp)
- {
-     MigrationCapabilityStatusList *head = NULL, **tail = &head;
-diff --git a/migration/options.h b/migration/options.h
-index e779f14161..5979e4ff90 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -41,5 +41,6 @@ bool migrate_zero_copy_send(void);
- /* capabilities helpers */
- 
- bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp);
-+bool migrate_cap_set(int cap, bool value, Error **errp);
- 
- #endif
--- 
-2.39.1
-
diff --git a/kvm-migration-Move-migrate_caps_check-to-options.c.patch b/kvm-migration-Move-migrate_caps_check-to-options.c.patch
deleted file mode 100644
index 0d6fa08..0000000
--- a/kvm-migration-Move-migrate_caps_check-to-options.c.patch
+++ /dev/null
@@ -1,458 +0,0 @@
-From 3af7c7aaf7407ec14c19e54d52a2229ce4dbb7c5 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Wed, 1 Mar 2023 23:05:53 +0100
-Subject: [PATCH 33/56] migration: Move migrate_caps_check() to options.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [32/50] 12999471063d97fffb2b04c6dcb80083b902f963 (peterx/qemu-kvm)
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-(cherry picked from commit 77608706459bd197e25ac1ef54591b9f8a0b46f8)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c | 190 -----------------------------------------
- migration/options.c   | 192 ++++++++++++++++++++++++++++++++++++++++++
- migration/options.h   |   4 +
- 3 files changed, 196 insertions(+), 190 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index f7facecd66..d9e30ca918 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -136,39 +136,6 @@ enum mig_rp_message_type {
-     MIG_RP_MSG_MAX
- };
- 
--/* Migration capabilities set */
--struct MigrateCapsSet {
--    int size;                       /* Capability set size */
--    MigrationCapability caps[];     /* Variadic array of capabilities */
--};
--typedef struct MigrateCapsSet MigrateCapsSet;
--
--/* Define and initialize MigrateCapsSet */
--#define INITIALIZE_MIGRATE_CAPS_SET(_name, ...)   \
--    MigrateCapsSet _name = {    \
--        .size = sizeof((int []) { __VA_ARGS__ }) / sizeof(int), \
--        .caps = { __VA_ARGS__ } \
--    }
--
--/* Background-snapshot compatibility check list */
--static const
--INITIALIZE_MIGRATE_CAPS_SET(check_caps_background_snapshot,
--    MIGRATION_CAPABILITY_POSTCOPY_RAM,
--    MIGRATION_CAPABILITY_DIRTY_BITMAPS,
--    MIGRATION_CAPABILITY_POSTCOPY_BLOCKTIME,
--    MIGRATION_CAPABILITY_LATE_BLOCK_ACTIVATE,
--    MIGRATION_CAPABILITY_RETURN_PATH,
--    MIGRATION_CAPABILITY_MULTIFD,
--    MIGRATION_CAPABILITY_PAUSE_BEFORE_SWITCHOVER,
--    MIGRATION_CAPABILITY_AUTO_CONVERGE,
--    MIGRATION_CAPABILITY_RELEASE_RAM,
--    MIGRATION_CAPABILITY_RDMA_PIN_ALL,
--    MIGRATION_CAPABILITY_COMPRESS,
--    MIGRATION_CAPABILITY_XBZRLE,
--    MIGRATION_CAPABILITY_X_COLO,
--    MIGRATION_CAPABILITY_VALIDATE_UUID,
--    MIGRATION_CAPABILITY_ZERO_COPY_SEND);
--
- /* When we add fault tolerance, we could have several
-    migrations at once.  For now we don't need to add
-    dynamic creation of migration */
-@@ -1235,163 +1202,6 @@ static void fill_source_migration_info(MigrationInfo *info)
-     info->status = state;
- }
- 
--typedef enum WriteTrackingSupport {
--    WT_SUPPORT_UNKNOWN = 0,
--    WT_SUPPORT_ABSENT,
--    WT_SUPPORT_AVAILABLE,
--    WT_SUPPORT_COMPATIBLE
--} WriteTrackingSupport;
--
--static
--WriteTrackingSupport migrate_query_write_tracking(void)
--{
--    /* Check if kernel supports required UFFD features */
--    if (!ram_write_tracking_available()) {
--        return WT_SUPPORT_ABSENT;
--    }
--    /*
--     * Check if current memory configuration is
--     * compatible with required UFFD features.
--     */
--    if (!ram_write_tracking_compatible()) {
--        return WT_SUPPORT_AVAILABLE;
--    }
--
--    return WT_SUPPORT_COMPATIBLE;
--}
--
--/**
-- * @migration_caps_check - check capability compatibility
-- *
-- * @old_caps: old capability list
-- * @new_caps: new capability list
-- * @errp: set *errp if the check failed, with reason
-- *
-- * Returns true if check passed, otherwise false.
-- */
--static bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp)
--{
--    MigrationIncomingState *mis = migration_incoming_get_current();
--
--#ifndef CONFIG_LIVE_BLOCK_MIGRATION
--    if (new_caps[MIGRATION_CAPABILITY_BLOCK]) {
--        error_setg(errp, "QEMU compiled without old-style (blk/-b, inc/-i) "
--                   "block migration");
--        error_append_hint(errp, "Use drive_mirror+NBD instead.\n");
--        return false;
--    }
--#endif
--
--#ifndef CONFIG_REPLICATION
--    if (new_caps[MIGRATION_CAPABILITY_X_COLO]) {
--        error_setg(errp, "QEMU compiled without replication module"
--                   " can't enable COLO");
--        error_append_hint(errp, "Please enable replication before COLO.\n");
--        return false;
--    }
--#endif
--
--    if (new_caps[MIGRATION_CAPABILITY_POSTCOPY_RAM]) {
--        /* This check is reasonably expensive, so only when it's being
--         * set the first time, also it's only the destination that needs
--         * special support.
--         */
--        if (!old_caps[MIGRATION_CAPABILITY_POSTCOPY_RAM] &&
--            runstate_check(RUN_STATE_INMIGRATE) &&
--            !postcopy_ram_supported_by_host(mis)) {
--            /* postcopy_ram_supported_by_host will have emitted a more
--             * detailed message
--             */
--            error_setg(errp, "Postcopy is not supported");
--            return false;
--        }
--
--        if (new_caps[MIGRATION_CAPABILITY_X_IGNORE_SHARED]) {
--            error_setg(errp, "Postcopy is not compatible with ignore-shared");
--            return false;
--        }
--    }
--
--    if (new_caps[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT]) {
--        WriteTrackingSupport wt_support;
--        int idx;
--        /*
--         * Check if 'background-snapshot' capability is supported by
--         * host kernel and compatible with guest memory configuration.
--         */
--        wt_support = migrate_query_write_tracking();
--        if (wt_support < WT_SUPPORT_AVAILABLE) {
--            error_setg(errp, "Background-snapshot is not supported by host kernel");
--            return false;
--        }
--        if (wt_support < WT_SUPPORT_COMPATIBLE) {
--            error_setg(errp, "Background-snapshot is not compatible "
--                    "with guest memory configuration");
--            return false;
--        }
--
--        /*
--         * Check if there are any migration capabilities
--         * incompatible with 'background-snapshot'.
--         */
--        for (idx = 0; idx < check_caps_background_snapshot.size; idx++) {
--            int incomp_cap = check_caps_background_snapshot.caps[idx];
--            if (new_caps[incomp_cap]) {
--                error_setg(errp,
--                        "Background-snapshot is not compatible with %s",
--                        MigrationCapability_str(incomp_cap));
--                return false;
--            }
--        }
--    }
--
--#ifdef CONFIG_LINUX
--    if (new_caps[MIGRATION_CAPABILITY_ZERO_COPY_SEND] &&
--        (!new_caps[MIGRATION_CAPABILITY_MULTIFD] ||
--         new_caps[MIGRATION_CAPABILITY_COMPRESS] ||
--         new_caps[MIGRATION_CAPABILITY_XBZRLE] ||
--         migrate_multifd_compression() ||
--         migrate_use_tls())) {
--        error_setg(errp,
--                   "Zero copy only available for non-compressed non-TLS multifd migration");
--        return false;
--    }
--#else
--    if (new_caps[MIGRATION_CAPABILITY_ZERO_COPY_SEND]) {
--        error_setg(errp,
--                   "Zero copy currently only available on Linux");
--        return false;
--    }
--#endif
--
--    if (new_caps[MIGRATION_CAPABILITY_POSTCOPY_PREEMPT]) {
--        if (!new_caps[MIGRATION_CAPABILITY_POSTCOPY_RAM]) {
--            error_setg(errp, "Postcopy preempt requires postcopy-ram");
--            return false;
--        }
--
--        /*
--         * Preempt mode requires urgent pages to be sent in separate
--         * channel, OTOH compression logic will disorder all pages into
--         * different compression channels, which is not compatible with the
--         * preempt assumptions on channel assignments.
--         */
--        if (new_caps[MIGRATION_CAPABILITY_COMPRESS]) {
--            error_setg(errp, "Postcopy preempt not compatible with compress");
--            return false;
--        }
--    }
--
--    if (new_caps[MIGRATION_CAPABILITY_MULTIFD]) {
--        if (new_caps[MIGRATION_CAPABILITY_COMPRESS]) {
--            error_setg(errp, "Multifd is not compatible with compress");
--            return false;
--        }
--    }
--
--    return true;
--}
--
- static void fill_destination_migration_info(MigrationInfo *info)
- {
-     MigrationIncomingState *mis = migration_incoming_get_current();
-diff --git a/migration/options.c b/migration/options.c
-index 9c9b8e5863..367c930f46 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -12,7 +12,10 @@
-  */
- 
- #include "qemu/osdep.h"
-+#include "qapi/error.h"
-+#include "sysemu/runstate.h"
- #include "migration.h"
-+#include "ram.h"
- #include "options.h"
- 
- bool migrate_auto_converge(void)
-@@ -198,3 +201,192 @@ bool migrate_zero_copy_send(void)
- 
-     return s->capabilities[MIGRATION_CAPABILITY_ZERO_COPY_SEND];
- }
-+typedef enum WriteTrackingSupport {
-+    WT_SUPPORT_UNKNOWN = 0,
-+    WT_SUPPORT_ABSENT,
-+    WT_SUPPORT_AVAILABLE,
-+    WT_SUPPORT_COMPATIBLE
-+} WriteTrackingSupport;
-+
-+static
-+WriteTrackingSupport migrate_query_write_tracking(void)
-+{
-+    /* Check if kernel supports required UFFD features */
-+    if (!ram_write_tracking_available()) {
-+        return WT_SUPPORT_ABSENT;
-+    }
-+    /*
-+     * Check if current memory configuration is
-+     * compatible with required UFFD features.
-+     */
-+    if (!ram_write_tracking_compatible()) {
-+        return WT_SUPPORT_AVAILABLE;
-+    }
-+
-+    return WT_SUPPORT_COMPATIBLE;
-+}
-+
-+/* Migration capabilities set */
-+struct MigrateCapsSet {
-+    int size;                       /* Capability set size */
-+    MigrationCapability caps[];     /* Variadic array of capabilities */
-+};
-+typedef struct MigrateCapsSet MigrateCapsSet;
-+
-+/* Define and initialize MigrateCapsSet */
-+#define INITIALIZE_MIGRATE_CAPS_SET(_name, ...)   \
-+    MigrateCapsSet _name = {    \
-+        .size = sizeof((int []) { __VA_ARGS__ }) / sizeof(int), \
-+        .caps = { __VA_ARGS__ } \
-+    }
-+
-+/* Background-snapshot compatibility check list */
-+static const
-+INITIALIZE_MIGRATE_CAPS_SET(check_caps_background_snapshot,
-+    MIGRATION_CAPABILITY_POSTCOPY_RAM,
-+    MIGRATION_CAPABILITY_DIRTY_BITMAPS,
-+    MIGRATION_CAPABILITY_POSTCOPY_BLOCKTIME,
-+    MIGRATION_CAPABILITY_LATE_BLOCK_ACTIVATE,
-+    MIGRATION_CAPABILITY_RETURN_PATH,
-+    MIGRATION_CAPABILITY_MULTIFD,
-+    MIGRATION_CAPABILITY_PAUSE_BEFORE_SWITCHOVER,
-+    MIGRATION_CAPABILITY_AUTO_CONVERGE,
-+    MIGRATION_CAPABILITY_RELEASE_RAM,
-+    MIGRATION_CAPABILITY_RDMA_PIN_ALL,
-+    MIGRATION_CAPABILITY_COMPRESS,
-+    MIGRATION_CAPABILITY_XBZRLE,
-+    MIGRATION_CAPABILITY_X_COLO,
-+    MIGRATION_CAPABILITY_VALIDATE_UUID,
-+    MIGRATION_CAPABILITY_ZERO_COPY_SEND);
-+
-+/**
-+ * @migration_caps_check - check capability compatibility
-+ *
-+ * @old_caps: old capability list
-+ * @new_caps: new capability list
-+ * @errp: set *errp if the check failed, with reason
-+ *
-+ * Returns true if check passed, otherwise false.
-+ */
-+bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp)
-+{
-+    MigrationIncomingState *mis = migration_incoming_get_current();
-+
-+#ifndef CONFIG_LIVE_BLOCK_MIGRATION
-+    if (new_caps[MIGRATION_CAPABILITY_BLOCK]) {
-+        error_setg(errp, "QEMU compiled without old-style (blk/-b, inc/-i) "
-+                   "block migration");
-+        error_append_hint(errp, "Use drive_mirror+NBD instead.\n");
-+        return false;
-+    }
-+#endif
-+
-+#ifndef CONFIG_REPLICATION
-+    if (new_caps[MIGRATION_CAPABILITY_X_COLO]) {
-+        error_setg(errp, "QEMU compiled without replication module"
-+                   " can't enable COLO");
-+        error_append_hint(errp, "Please enable replication before COLO.\n");
-+        return false;
-+    }
-+#endif
-+
-+    if (new_caps[MIGRATION_CAPABILITY_POSTCOPY_RAM]) {
-+        /* This check is reasonably expensive, so only when it's being
-+         * set the first time, also it's only the destination that needs
-+         * special support.
-+         */
-+        if (!old_caps[MIGRATION_CAPABILITY_POSTCOPY_RAM] &&
-+            runstate_check(RUN_STATE_INMIGRATE) &&
-+            !postcopy_ram_supported_by_host(mis)) {
-+            /* postcopy_ram_supported_by_host will have emitted a more
-+             * detailed message
-+             */
-+            error_setg(errp, "Postcopy is not supported");
-+            return false;
-+        }
-+
-+        if (new_caps[MIGRATION_CAPABILITY_X_IGNORE_SHARED]) {
-+            error_setg(errp, "Postcopy is not compatible with ignore-shared");
-+            return false;
-+        }
-+    }
-+
-+    if (new_caps[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT]) {
-+        WriteTrackingSupport wt_support;
-+        int idx;
-+        /*
-+         * Check if 'background-snapshot' capability is supported by
-+         * host kernel and compatible with guest memory configuration.
-+         */
-+        wt_support = migrate_query_write_tracking();
-+        if (wt_support < WT_SUPPORT_AVAILABLE) {
-+            error_setg(errp, "Background-snapshot is not supported by host kernel");
-+            return false;
-+        }
-+        if (wt_support < WT_SUPPORT_COMPATIBLE) {
-+            error_setg(errp, "Background-snapshot is not compatible "
-+                    "with guest memory configuration");
-+            return false;
-+        }
-+
-+        /*
-+         * Check if there are any migration capabilities
-+         * incompatible with 'background-snapshot'.
-+         */
-+        for (idx = 0; idx < check_caps_background_snapshot.size; idx++) {
-+            int incomp_cap = check_caps_background_snapshot.caps[idx];
-+            if (new_caps[incomp_cap]) {
-+                error_setg(errp,
-+                        "Background-snapshot is not compatible with %s",
-+                        MigrationCapability_str(incomp_cap));
-+                return false;
-+            }
-+        }
-+    }
-+
-+#ifdef CONFIG_LINUX
-+    if (new_caps[MIGRATION_CAPABILITY_ZERO_COPY_SEND] &&
-+        (!new_caps[MIGRATION_CAPABILITY_MULTIFD] ||
-+         new_caps[MIGRATION_CAPABILITY_COMPRESS] ||
-+         new_caps[MIGRATION_CAPABILITY_XBZRLE] ||
-+         migrate_multifd_compression() ||
-+         migrate_use_tls())) {
-+        error_setg(errp,
-+                   "Zero copy only available for non-compressed non-TLS multifd migration");
-+        return false;
-+    }
-+#else
-+    if (new_caps[MIGRATION_CAPABILITY_ZERO_COPY_SEND]) {
-+        error_setg(errp,
-+                   "Zero copy currently only available on Linux");
-+        return false;
-+    }
-+#endif
-+
-+    if (new_caps[MIGRATION_CAPABILITY_POSTCOPY_PREEMPT]) {
-+        if (!new_caps[MIGRATION_CAPABILITY_POSTCOPY_RAM]) {
-+            error_setg(errp, "Postcopy preempt requires postcopy-ram");
-+            return false;
-+        }
-+
-+        /*
-+         * Preempt mode requires urgent pages to be sent in separate
-+         * channel, OTOH compression logic will disorder all pages into
-+         * different compression channels, which is not compatible with the
-+         * preempt assumptions on channel assignments.
-+         */
-+        if (new_caps[MIGRATION_CAPABILITY_COMPRESS]) {
-+            error_setg(errp, "Postcopy preempt not compatible with compress");
-+            return false;
-+        }
-+    }
-+
-+    if (new_caps[MIGRATION_CAPABILITY_MULTIFD]) {
-+        if (new_caps[MIGRATION_CAPABILITY_COMPRESS]) {
-+            error_setg(errp, "Multifd is not compatible with compress");
-+            return false;
-+        }
-+    }
-+
-+    return true;
-+}
-diff --git a/migration/options.h b/migration/options.h
-index 25c002b37a..e779f14161 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -38,4 +38,8 @@ bool migrate_xbzrle(void);
- bool migrate_zero_blocks(void);
- bool migrate_zero_copy_send(void);
- 
-+/* capabilities helpers */
-+
-+bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp);
-+
- #endif
--- 
-2.39.1
-
diff --git a/kvm-migration-Move-migrate_colo_enabled-to-options.c.patch b/kvm-migration-Move-migrate_colo_enabled-to-options.c.patch
deleted file mode 100644
index 47c6f83..0000000
--- a/kvm-migration-Move-migrate_colo_enabled-to-options.c.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From 13da9060fa2dfc666cd6f4b9bc85b7cee0fef45e Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Wed, 1 Mar 2023 22:00:16 +0100
-Subject: [PATCH 24/56] migration: Move migrate_colo_enabled() to options.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [23/50] 4809b1091edee38bd222af41b6313133705785c7 (peterx/qemu-kvm)
-
-Once that we are there, we rename the function to migrate_colo() to be
-consistent with all other capabilities.
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-(cherry picked from commit 5e8046445575dc5879e63c5d07af893d174813d0)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c | 16 +++++-----------
- migration/migration.h |  1 -
- migration/options.c   |  6 ++++++
- migration/options.h   |  1 +
- 4 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index 66ea55be06..59ee0ef82b 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -2411,7 +2411,7 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc,
-     }
- 
-     if (blk || blk_inc) {
--        if (migrate_colo_enabled()) {
-+        if (migrate_colo()) {
-             error_setg(errp, "No disk migration is required in COLO mode");
-             return false;
-         }
-@@ -3304,7 +3304,7 @@ static void migration_completion(MigrationState *s)
-                  * have done so in order to remember to reactivate
-                  * them if migration fails or is cancelled.
-                  */
--                s->block_inactive = !migrate_colo_enabled();
-+                s->block_inactive = !migrate_colo();
-                 qemu_file_set_rate_limit(s->to_dst_file, INT64_MAX);
-                 ret = qemu_savevm_state_complete_precopy(s->to_dst_file, false,
-                                                          s->block_inactive);
-@@ -3357,7 +3357,7 @@ static void migration_completion(MigrationState *s)
-         goto fail;
-     }
- 
--    if (migrate_colo_enabled() && s->state == MIGRATION_STATUS_ACTIVE) {
-+    if (migrate_colo() && s->state == MIGRATION_STATUS_ACTIVE) {
-         /* COLO does not support postcopy */
-         migrate_set_state(&s->state, MIGRATION_STATUS_ACTIVE,
-                           MIGRATION_STATUS_COLO);
-@@ -3435,12 +3435,6 @@ fail:
-                       MIGRATION_STATUS_FAILED);
- }
- 
--bool migrate_colo_enabled(void)
--{
--    MigrationState *s = migrate_get_current();
--    return s->capabilities[MIGRATION_CAPABILITY_X_COLO];
--}
--
- typedef enum MigThrError {
-     /* No error detected */
-     MIG_THR_ERR_NONE = 0,
-@@ -3771,7 +3765,7 @@ static void migration_iteration_finish(MigrationState *s)
-         runstate_set(RUN_STATE_POSTMIGRATE);
-         break;
-     case MIGRATION_STATUS_COLO:
--        if (!migrate_colo_enabled()) {
-+        if (!migrate_colo()) {
-             error_report("%s: critical error: calling COLO code without "
-                          "COLO enabled", __func__);
-         }
-@@ -3967,7 +3961,7 @@ static void *migration_thread(void *opaque)
-         qemu_savevm_send_postcopy_advise(s->to_dst_file);
-     }
- 
--    if (migrate_colo_enabled()) {
-+    if (migrate_colo()) {
-         /* Notify migration destination that we enable COLO */
-         qemu_savevm_send_colo_enable(s->to_dst_file);
-     }
-diff --git a/migration/migration.h b/migration/migration.h
-index a25fed6ef0..42f0c68b6f 100644
---- a/migration/migration.h
-+++ b/migration/migration.h
-@@ -463,7 +463,6 @@ bool migrate_use_zero_copy_send(void);
- int migrate_use_tls(void);
- int migrate_use_xbzrle(void);
- uint64_t migrate_xbzrle_cache_size(void);
--bool migrate_colo_enabled(void);
- 
- bool migrate_use_block(void);
- bool migrate_use_block_incremental(void);
-diff --git a/migration/options.c b/migration/options.c
-index 88a9a45913..bd33c5da0a 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -33,6 +33,12 @@ bool migrate_background_snapshot(void)
-     return s->capabilities[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT];
- }
- 
-+bool migrate_colo(void)
-+{
-+    MigrationState *s = migrate_get_current();
-+    return s->capabilities[MIGRATION_CAPABILITY_X_COLO];
-+}
-+
- bool migrate_dirty_bitmaps(void)
- {
-     MigrationState *s;
-diff --git a/migration/options.h b/migration/options.h
-index 0dfa0af245..2a0ee61ff8 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -18,6 +18,7 @@
- 
- bool migrate_auto_converge(void);
- bool migrate_background_snapshot(void);
-+bool migrate_colo(void);
- bool migrate_dirty_bitmaps(void);
- bool migrate_ignore_shared(void);
- bool migrate_late_block_activate(void);
--- 
-2.39.1
-
diff --git a/kvm-migration-Move-migrate_postcopy-to-options.c.patch b/kvm-migration-Move-migrate_postcopy-to-options.c.patch
deleted file mode 100644
index 892ec9e..0000000
--- a/kvm-migration-Move-migrate_postcopy-to-options.c.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 710fe195a3c13ffe96795a7a2b550c00319997ea Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Thu, 2 Mar 2023 10:44:20 +0100
-Subject: [PATCH 47/56] migration: Move migrate_postcopy() to options.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [46/50] a4f3455b3524a331f44b481bf7a79318aef5abaa (peterx/qemu-kvm)
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Fabiano Rosas <farosas@suse.de>
-(cherry picked from commit f774fde5d4e97cbfc64dab6622c2c53c5fe5c9fe)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c | 5 -----
- migration/migration.h | 2 --
- migration/options.c   | 8 ++++++++
- migration/options.h   | 9 +++++++++
- 4 files changed, 17 insertions(+), 7 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index f27ce30be2..46a5ea4d42 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -2245,11 +2245,6 @@ void qmp_migrate_continue(MigrationStatus state, Error **errp)
-     qemu_sem_post(&s->pause_sem);
- }
- 
--bool migrate_postcopy(void)
--{
--    return migrate_postcopy_ram() || migrate_dirty_bitmaps();
--}
--
- int migrate_use_tls(void)
- {
-     MigrationState *s;
-diff --git a/migration/migration.h b/migration/migration.h
-index 3ae938b19c..dcf906868d 100644
---- a/migration/migration.h
-+++ b/migration/migration.h
-@@ -447,8 +447,6 @@ bool migration_is_blocked(Error **errp);
- bool migration_in_postcopy(void);
- MigrationState *migrate_get_current(void);
- 
--bool migrate_postcopy(void);
--
- int migrate_use_tls(void);
- 
- uint64_t ram_get_total_transferred_pages(void);
-diff --git a/migration/options.c b/migration/options.c
-index 615534c151..8bd2d949ae 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -204,6 +204,14 @@ bool migrate_zero_copy_send(void)
- 
-     return s->capabilities[MIGRATION_CAPABILITY_ZERO_COPY_SEND];
- }
-+
-+/* pseudo capabilities */
-+
-+bool migrate_postcopy(void)
-+{
-+    return migrate_postcopy_ram() || migrate_dirty_bitmaps();
-+}
-+
- typedef enum WriteTrackingSupport {
-     WT_SUPPORT_UNKNOWN = 0,
-     WT_SUPPORT_ABSENT,
-diff --git a/migration/options.h b/migration/options.h
-index 99f6bbd7a1..093bc907a1 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -38,6 +38,15 @@ bool migrate_xbzrle(void);
- bool migrate_zero_blocks(void);
- bool migrate_zero_copy_send(void);
- 
-+/*
-+ * pseudo capabilities
-+ *
-+ * These are functions that are used in a similar way to capabilities
-+ * check, but they are not a capability.
-+ */
-+
-+bool migrate_postcopy(void);
-+
- /* capabilities helpers */
- 
- bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp);
--- 
-2.39.1
-
diff --git a/kvm-migration-Move-migrate_use_block-to-options.c.patch b/kvm-migration-Move-migrate_use_block-to-options.c.patch
deleted file mode 100644
index f7cb338..0000000
--- a/kvm-migration-Move-migrate_use_block-to-options.c.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From 276877a71778a5cef0dc5bc843e2679f0fdabb77 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Wed, 1 Mar 2023 22:23:57 +0100
-Subject: [PATCH 30/56] migration: Move migrate_use_block() to options.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [29/50] fcaeb0e07cf828f3cd0d115515b30d913525a0a2 (peterx/qemu-kvm)
-
-Once that we are there, we rename the function to migrate_block()
-to be consistent with all other capabilities.
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-(cherry picked from commit 9d4b1e5f22a838285ebeb8f0eb7cc8df1161998f)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/block.c     |  2 +-
- migration/migration.c | 11 +----------
- migration/migration.h |  1 -
- migration/options.c   |  9 +++++++++
- migration/options.h   |  1 +
- migration/savevm.c    |  2 +-
- 6 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/migration/block.c b/migration/block.c
-index 4b167fa5cf..f0977217cf 100644
---- a/migration/block.c
-+++ b/migration/block.c
-@@ -1001,7 +1001,7 @@ static int block_load(QEMUFile *f, void *opaque, int version_id)
- 
- static bool block_is_active(void *opaque)
- {
--    return migrate_use_block();
-+    return migrate_block();
- }
- 
- static SaveVMHandlers savevm_block_handlers = {
-diff --git a/migration/migration.c b/migration/migration.c
-index a4ede4294e..96f82bd165 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -2415,7 +2415,7 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc,
-             error_setg(errp, "No disk migration is required in COLO mode");
-             return false;
-         }
--        if (migrate_use_block() || migrate_use_block_incremental()) {
-+        if (migrate_block() || migrate_use_block_incremental()) {
-             error_setg(errp, "Command options are incompatible with "
-                        "current migration capabilities");
-             return false;
-@@ -2622,15 +2622,6 @@ static int64_t migrate_max_postcopy_bandwidth(void)
-     return s->parameters.max_postcopy_bandwidth;
- }
- 
--bool migrate_use_block(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->capabilities[MIGRATION_CAPABILITY_BLOCK];
--}
--
- bool migrate_use_return_path(void)
- {
-     MigrationState *s;
-diff --git a/migration/migration.h b/migration/migration.h
-index e2bb5b1e2f..d4b68b08a5 100644
---- a/migration/migration.h
-+++ b/migration/migration.h
-@@ -457,7 +457,6 @@ int migrate_multifd_zstd_level(void);
- int migrate_use_tls(void);
- uint64_t migrate_xbzrle_cache_size(void);
- 
--bool migrate_use_block(void);
- bool migrate_use_block_incremental(void);
- int migrate_max_cpu_throttle(void);
- bool migrate_use_return_path(void);
-diff --git a/migration/options.c b/migration/options.c
-index 25264c500e..fe1eadeed6 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -33,6 +33,15 @@ bool migrate_background_snapshot(void)
-     return s->capabilities[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT];
- }
- 
-+bool migrate_block(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->capabilities[MIGRATION_CAPABILITY_BLOCK];
-+}
-+
- bool migrate_colo(void)
- {
-     MigrationState *s = migrate_get_current();
-diff --git a/migration/options.h b/migration/options.h
-index 8f76a88329..e985a5233e 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -18,6 +18,7 @@
- 
- bool migrate_auto_converge(void);
- bool migrate_background_snapshot(void);
-+bool migrate_block(void);
- bool migrate_colo(void);
- bool migrate_compress(void);
- bool migrate_dirty_bitmaps(void);
-diff --git a/migration/savevm.c b/migration/savevm.c
-index ebcf571e37..9671211339 100644
---- a/migration/savevm.c
-+++ b/migration/savevm.c
-@@ -1612,7 +1612,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
-         return -EINVAL;
-     }
- 
--    if (migrate_use_block()) {
-+    if (migrate_block()) {
-         error_setg(errp, "Block migration and snapshots are incompatible");
-         return -EINVAL;
-     }
--- 
-2.39.1
-
diff --git a/kvm-migration-Move-migrate_use_block_incremental-to-opti.patch b/kvm-migration-Move-migrate_use_block_incremental-to-opti.patch
deleted file mode 100644
index 3f20289..0000000
--- a/kvm-migration-Move-migrate_use_block_incremental-to-opti.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From def66503f4ccb97cf8029f88efe8e955edc8d32f Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Thu, 2 Mar 2023 00:49:47 +0100
-Subject: [PATCH 39/56] migration: Move migrate_use_block_incremental() to
- option.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [38/50] 961fda6464df3384fbcee88c726b56a33c26e14e (peterx/qemu-kvm)
-
-To be consistent with every other parameter, rename to
-migrate_block_incremental().
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-(cherry picked from commit 6f8be7080a1f79bf3832cf798fba1697c409c597)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/block.c     |  2 +-
- migration/migration.c | 11 +----------
- migration/migration.h |  1 -
- migration/options.c   |  9 +++++++++
- migration/options.h   |  1 +
- 5 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/migration/block.c b/migration/block.c
-index f0977217cf..6d532ac7a2 100644
---- a/migration/block.c
-+++ b/migration/block.c
-@@ -417,7 +417,7 @@ static int init_blk_migration(QEMUFile *f)
-         bmds->bulk_completed = 0;
-         bmds->total_sectors = sectors;
-         bmds->completed_sectors = 0;
--        bmds->shared_base = migrate_use_block_incremental();
-+        bmds->shared_base = migrate_block_incremental();
- 
-         assert(i < num_bs);
-         bmds_bs[i].bmds = bmds;
-diff --git a/migration/migration.c b/migration/migration.c
-index 78bca9a93f..724e841eb9 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -2157,7 +2157,7 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc,
-             error_setg(errp, "No disk migration is required in COLO mode");
-             return false;
-         }
--        if (migrate_block() || migrate_use_block_incremental()) {
-+        if (migrate_block() || migrate_block_incremental()) {
-             error_setg(errp, "Command options are incompatible with "
-                        "current migration capabilities");
-             return false;
-@@ -2273,15 +2273,6 @@ int migrate_use_tls(void)
-     return s->parameters.tls_creds && *s->parameters.tls_creds;
- }
- 
--bool migrate_use_block_incremental(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->parameters.block_incremental;
--}
--
- /* migration thread support */
- /*
-  * Something bad happened to the RP stream, mark an error
-diff --git a/migration/migration.h b/migration/migration.h
-index 8451e5f2fe..86051af132 100644
---- a/migration/migration.h
-+++ b/migration/migration.h
-@@ -451,7 +451,6 @@ bool migrate_postcopy(void);
- 
- int migrate_use_tls(void);
- 
--bool migrate_use_block_incremental(void);
- int migrate_max_cpu_throttle(void);
- 
- uint64_t ram_get_total_transferred_pages(void);
-diff --git a/migration/options.c b/migration/options.c
-index 8d15be858c..2b6d88b4b9 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -463,6 +463,15 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,
- 
- /* parameters */
- 
-+bool migrate_block_incremental(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->parameters.block_incremental;
-+}
-+
- int migrate_compress_level(void)
- {
-     MigrationState *s;
-diff --git a/migration/options.h b/migration/options.h
-index b24ee92283..96d5a8e6e4 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -45,6 +45,7 @@ bool migrate_cap_set(int cap, bool value, Error **errp);
- 
- /* parameters */
- 
-+bool migrate_block_incremental(void);
- int migrate_compress_level(void);
- int migrate_compress_threads(void);
- int migrate_compress_wait_thread(void);
--- 
-2.39.1
-
diff --git a/kvm-migration-Move-migrate_use_compression-to-options.c.patch b/kvm-migration-Move-migrate_use_compression-to-options.c.patch
deleted file mode 100644
index 8b74183..0000000
--- a/kvm-migration-Move-migrate_use_compression-to-options.c.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-From ae183bfc9d7b001d3c4929556b095a76203bc08d Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Wed, 1 Mar 2023 22:03:48 +0100
-Subject: [PATCH 25/56] migration: Move migrate_use_compression() to options.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [24/50] 126b865f51bd4a1ae3a46411fdcd59033bfc5376 (peterx/qemu-kvm)
-
-Once that we are there, we rename the function to migrate_compress()
-to be consistent with all other capabilities.
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-(cherry picked from commit a7a94d14358dd7b445e20c2f26218ff987747642)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c | 11 +----------
- migration/migration.h |  1 -
- migration/options.c   |  9 +++++++++
- migration/options.h   |  1 +
- migration/ram.c       | 16 ++++++++--------
- 5 files changed, 19 insertions(+), 19 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index 59ee0ef82b..c6e32555a8 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -1133,7 +1133,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)
-         info->xbzrle_cache->overflow = xbzrle_counters.overflow;
-     }
- 
--    if (migrate_use_compression()) {
-+    if (migrate_compress()) {
-         info->compression = g_malloc0(sizeof(*info->compression));
-         info->compression->pages = compression_counters.pages;
-         info->compression->busy = compression_counters.busy;
-@@ -2522,15 +2522,6 @@ bool migrate_postcopy(void)
-     return migrate_postcopy_ram() || migrate_dirty_bitmaps();
- }
- 
--bool migrate_use_compression(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->capabilities[MIGRATION_CAPABILITY_COMPRESS];
--}
--
- int migrate_compress_level(void)
- {
-     MigrationState *s;
-diff --git a/migration/migration.h b/migration/migration.h
-index 42f0c68b6f..77aa91c840 100644
---- a/migration/migration.h
-+++ b/migration/migration.h
-@@ -471,7 +471,6 @@ bool migrate_use_return_path(void);
- 
- uint64_t ram_get_total_transferred_pages(void);
- 
--bool migrate_use_compression(void);
- int migrate_compress_level(void);
- int migrate_compress_threads(void);
- int migrate_compress_wait_thread(void);
-diff --git a/migration/options.c b/migration/options.c
-index bd33c5da0a..fa7a13d3dc 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -39,6 +39,15 @@ bool migrate_colo(void)
-     return s->capabilities[MIGRATION_CAPABILITY_X_COLO];
- }
- 
-+bool migrate_compress(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->capabilities[MIGRATION_CAPABILITY_COMPRESS];
-+}
-+
- bool migrate_dirty_bitmaps(void)
- {
-     MigrationState *s;
-diff --git a/migration/options.h b/migration/options.h
-index 2a0ee61ff8..da2193fd94 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -19,6 +19,7 @@
- bool migrate_auto_converge(void);
- bool migrate_background_snapshot(void);
- bool migrate_colo(void);
-+bool migrate_compress(void);
- bool migrate_dirty_bitmaps(void);
- bool migrate_ignore_shared(void);
- bool migrate_late_block_activate(void);
-diff --git a/migration/ram.c b/migration/ram.c
-index 912ccd89fa..d050d0c5fd 100644
---- a/migration/ram.c
-+++ b/migration/ram.c
-@@ -586,7 +586,7 @@ static void compress_threads_save_cleanup(void)
- {
-     int i, thread_count;
- 
--    if (!migrate_use_compression() || !comp_param) {
-+    if (!migrate_compress() || !comp_param) {
-         return;
-     }
- 
-@@ -625,7 +625,7 @@ static int compress_threads_save_setup(void)
- {
-     int i, thread_count;
- 
--    if (!migrate_use_compression()) {
-+    if (!migrate_compress()) {
-         return 0;
-     }
-     thread_count = migrate_compress_threads();
-@@ -1155,7 +1155,7 @@ static void migration_update_rates(RAMState *rs, int64_t end_time)
-         rs->xbzrle_bytes_prev = xbzrle_counters.bytes;
-     }
- 
--    if (migrate_use_compression()) {
-+    if (migrate_compress()) {
-         compression_counters.busy_rate = (double)(compression_counters.busy -
-             rs->compress_thread_busy_prev) / page_count;
-         rs->compress_thread_busy_prev = compression_counters.busy;
-@@ -2270,7 +2270,7 @@ int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t len)
- 
- static bool save_page_use_compression(RAMState *rs)
- {
--    if (!migrate_use_compression()) {
-+    if (!migrate_compress()) {
-         return false;
-     }
- 
-@@ -3734,7 +3734,7 @@ static int wait_for_decompress_done(void)
- {
-     int idx, thread_count;
- 
--    if (!migrate_use_compression()) {
-+    if (!migrate_compress()) {
-         return 0;
-     }
- 
-@@ -3753,7 +3753,7 @@ static void compress_threads_load_cleanup(void)
- {
-     int i, thread_count;
- 
--    if (!migrate_use_compression()) {
-+    if (!migrate_compress()) {
-         return;
-     }
-     thread_count = migrate_decompress_threads();
-@@ -3794,7 +3794,7 @@ static int compress_threads_load_setup(QEMUFile *f)
- {
-     int i, thread_count;
- 
--    if (!migrate_use_compression()) {
-+    if (!migrate_compress()) {
-         return 0;
-     }
- 
-@@ -4260,7 +4260,7 @@ static int ram_load_precopy(QEMUFile *f)
-     int flags = 0, ret = 0, invalid_flags = 0, len = 0, i = 0;
-     /* ADVISE is earlier, it shows the source has the postcopy capability on */
-     bool postcopy_advised = migration_incoming_postcopy_advised();
--    if (!migrate_use_compression()) {
-+    if (!migrate_compress()) {
-         invalid_flags |= RAM_SAVE_FLAG_COMPRESS_PAGE;
-     }
- 
--- 
-2.39.1
-
diff --git a/kvm-migration-Move-migrate_use_events-to-options.c.patch b/kvm-migration-Move-migrate_use_events-to-options.c.patch
deleted file mode 100644
index 41e05c3..0000000
--- a/kvm-migration-Move-migrate_use_events-to-options.c.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 940f1eb4347c72edb3e1abc02c8d7e7c95753dcf Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Wed, 1 Mar 2023 22:08:09 +0100
-Subject: [PATCH 26/56] migration: Move migrate_use_events() to options.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [25/50] b3acd949af2a0fae18061d360e4f51dc12d32c6c (peterx/qemu-kvm)
-
-Once that we are there, we rename the function to migrate_events()
-to be consistent with all other capabilities.
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-(cherry picked from commit b890902c9c025b87d02e718eec3090fd3525ab18)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c | 11 +----------
- migration/migration.h |  1 -
- migration/options.c   |  9 +++++++++
- migration/options.h   |  1 +
- migration/ram.c       |  2 +-
- 5 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index c6e32555a8..032cd5c050 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -353,7 +353,7 @@ void migration_incoming_state_destroy(void)
- 
- static void migrate_generate_event(int new_state)
- {
--    if (migrate_use_events()) {
-+    if (migrate_events()) {
-         qapi_event_send_migration(new_state);
-     }
- }
-@@ -2558,15 +2558,6 @@ int migrate_decompress_threads(void)
-     return s->parameters.decompress_threads;
- }
- 
--bool migrate_use_events(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->capabilities[MIGRATION_CAPABILITY_EVENTS];
--}
--
- bool migrate_use_multifd(void)
- {
-     MigrationState *s;
-diff --git a/migration/migration.h b/migration/migration.h
-index 77aa91c840..bd06520c19 100644
---- a/migration/migration.h
-+++ b/migration/migration.h
-@@ -475,7 +475,6 @@ int migrate_compress_level(void);
- int migrate_compress_threads(void);
- int migrate_compress_wait_thread(void);
- int migrate_decompress_threads(void);
--bool migrate_use_events(void);
- 
- /* Sending on the return path - generic and then for each message type */
- void migrate_send_rp_shut(MigrationIncomingState *mis,
-diff --git a/migration/options.c b/migration/options.c
-index fa7a13d3dc..d2219ee0e4 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -57,6 +57,15 @@ bool migrate_dirty_bitmaps(void)
-     return s->capabilities[MIGRATION_CAPABILITY_DIRTY_BITMAPS];
- }
- 
-+bool migrate_events(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->capabilities[MIGRATION_CAPABILITY_EVENTS];
-+}
-+
- bool migrate_ignore_shared(void)
- {
-     MigrationState *s;
-diff --git a/migration/options.h b/migration/options.h
-index da2193fd94..b998024eba 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -21,6 +21,7 @@ bool migrate_background_snapshot(void);
- bool migrate_colo(void);
- bool migrate_compress(void);
- bool migrate_dirty_bitmaps(void);
-+bool migrate_events(void);
- bool migrate_ignore_shared(void);
- bool migrate_late_block_activate(void);
- bool migrate_pause_before_switchover(void);
-diff --git a/migration/ram.c b/migration/ram.c
-index d050d0c5fd..ee454a3849 100644
---- a/migration/ram.c
-+++ b/migration/ram.c
-@@ -1246,7 +1246,7 @@ static void migration_bitmap_sync(RAMState *rs)
-         rs->num_dirty_pages_period = 0;
-         rs->bytes_xfer_prev = stat64_get(&ram_counters.transferred);
-     }
--    if (migrate_use_events()) {
-+    if (migrate_events()) {
-         uint64_t generation = stat64_get(&ram_counters.dirty_sync_count);
-         qapi_event_send_migration_pass(generation);
-     }
--- 
-2.39.1
-
diff --git a/kvm-migration-Move-migrate_use_multifd-to-options.c.patch b/kvm-migration-Move-migrate_use_multifd-to-options.c.patch
deleted file mode 100644
index 97d6597..0000000
--- a/kvm-migration-Move-migrate_use_multifd-to-options.c.patch
+++ /dev/null
@@ -1,247 +0,0 @@
-From afd8fb766af2be5cff97753b026847b91b09a30e Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Wed, 1 Mar 2023 22:10:29 +0100
-Subject: [PATCH 27/56] migration: Move migrate_use_multifd() to options.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [26/50] f2d72eae9cc80b2402ef613e809b40aa296d2e4c (peterx/qemu-kvm)
-
-Once that we are there, we rename the function to migrate_multifd()
-to be consistent with all other capabilities.
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-(cherry picked from commit 51b07548f7c31793adc178c7460c5f4369733c61)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c | 19 +++++--------------
- migration/migration.h |  1 -
- migration/multifd.c   | 16 ++++++++--------
- migration/options.c   |  9 +++++++++
- migration/options.h   |  1 +
- migration/ram.c       |  2 +-
- migration/socket.c    |  2 +-
- 7 files changed, 25 insertions(+), 25 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index 032cd5c050..e1d7f25786 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -186,7 +186,7 @@ static void migrate_fd_cancel(MigrationState *s);
- 
- static bool migration_needs_multiple_sockets(void)
- {
--    return migrate_use_multifd() || migrate_postcopy_preempt();
-+    return migrate_multifd() || migrate_postcopy_preempt();
- }
- 
- static bool uri_supports_multi_channels(const char *uri)
-@@ -732,7 +732,7 @@ void migration_fd_process_incoming(QEMUFile *f, Error **errp)
- static bool migration_should_start_incoming(bool main_channel)
- {
-     /* Multifd doesn't start unless all channels are established */
--    if (migrate_use_multifd()) {
-+    if (migrate_multifd()) {
-         return migration_has_all_channels();
-     }
- 
-@@ -759,7 +759,7 @@ void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp)
-     uint32_t channel_magic = 0;
-     int ret = 0;
- 
--    if (migrate_use_multifd() && !migrate_postcopy_ram() &&
-+    if (migrate_multifd() && !migrate_postcopy_ram() &&
-         qio_channel_has_feature(ioc, QIO_CHANNEL_FEATURE_READ_MSG_PEEK)) {
-         /*
-          * With multiple channels, it is possible that we receive channels
-@@ -798,7 +798,7 @@ void migration_ioc_process_incoming(QIOChannel *ioc, Error **errp)
-     } else {
-         /* Multiple connections */
-         assert(migration_needs_multiple_sockets());
--        if (migrate_use_multifd()) {
-+        if (migrate_multifd()) {
-             multifd_recv_new_channel(ioc, &local_err);
-         } else {
-             assert(migrate_postcopy_preempt());
-@@ -834,7 +834,7 @@ bool migration_has_all_channels(void)
-         return false;
-     }
- 
--    if (migrate_use_multifd()) {
-+    if (migrate_multifd()) {
-         return multifd_recv_all_channels_created();
-     }
- 
-@@ -2558,15 +2558,6 @@ int migrate_decompress_threads(void)
-     return s->parameters.decompress_threads;
- }
- 
--bool migrate_use_multifd(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->capabilities[MIGRATION_CAPABILITY_MULTIFD];
--}
--
- int migrate_multifd_channels(void)
- {
-     MigrationState *s;
-diff --git a/migration/migration.h b/migration/migration.h
-index bd06520c19..49c0e13f41 100644
---- a/migration/migration.h
-+++ b/migration/migration.h
-@@ -449,7 +449,6 @@ MigrationState *migrate_get_current(void);
- 
- bool migrate_postcopy(void);
- 
--bool migrate_use_multifd(void);
- int migrate_multifd_channels(void);
- MultiFDCompression migrate_multifd_compression(void);
- int migrate_multifd_zlib_level(void);
-diff --git a/migration/multifd.c b/migration/multifd.c
-index 903df2117b..6807328189 100644
---- a/migration/multifd.c
-+++ b/migration/multifd.c
-@@ -516,7 +516,7 @@ void multifd_save_cleanup(void)
- {
-     int i;
- 
--    if (!migrate_use_multifd()) {
-+    if (!migrate_multifd()) {
-         return;
-     }
-     multifd_send_terminate_threads(NULL);
-@@ -587,7 +587,7 @@ int multifd_send_sync_main(QEMUFile *f)
-     int i;
-     bool flush_zero_copy;
- 
--    if (!migrate_use_multifd()) {
-+    if (!migrate_multifd()) {
-         return 0;
-     }
-     if (multifd_send_state->pages->num) {
-@@ -911,7 +911,7 @@ int multifd_save_setup(Error **errp)
-     uint32_t page_count = MULTIFD_PACKET_SIZE / qemu_target_page_size();
-     uint8_t i;
- 
--    if (!migrate_use_multifd()) {
-+    if (!migrate_multifd()) {
-         return 0;
-     }
- 
-@@ -1016,7 +1016,7 @@ static void multifd_recv_terminate_threads(Error *err)
- 
- void multifd_load_shutdown(void)
- {
--    if (migrate_use_multifd()) {
-+    if (migrate_multifd()) {
-         multifd_recv_terminate_threads(NULL);
-     }
- }
-@@ -1025,7 +1025,7 @@ void multifd_load_cleanup(void)
- {
-     int i;
- 
--    if (!migrate_use_multifd()) {
-+    if (!migrate_multifd()) {
-         return;
-     }
-     multifd_recv_terminate_threads(NULL);
-@@ -1072,7 +1072,7 @@ void multifd_recv_sync_main(void)
- {
-     int i;
- 
--    if (!migrate_use_multifd()) {
-+    if (!migrate_multifd()) {
-         return;
-     }
-     for (i = 0; i < migrate_multifd_channels(); i++) {
-@@ -1170,7 +1170,7 @@ int multifd_load_setup(Error **errp)
-      * Return successfully if multiFD recv state is already initialised
-      * or multiFD is not enabled.
-      */
--    if (multifd_recv_state || !migrate_use_multifd()) {
-+    if (multifd_recv_state || !migrate_multifd()) {
-         return 0;
-     }
- 
-@@ -1216,7 +1216,7 @@ bool multifd_recv_all_channels_created(void)
- {
-     int thread_count = migrate_multifd_channels();
- 
--    if (!migrate_use_multifd()) {
-+    if (!migrate_multifd()) {
-         return true;
-     }
- 
-diff --git a/migration/options.c b/migration/options.c
-index d2219ee0e4..58673fc101 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -84,6 +84,15 @@ bool migrate_late_block_activate(void)
-     return s->capabilities[MIGRATION_CAPABILITY_LATE_BLOCK_ACTIVATE];
- }
- 
-+bool migrate_multifd(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->capabilities[MIGRATION_CAPABILITY_MULTIFD];
-+}
-+
- bool migrate_pause_before_switchover(void)
- {
-     MigrationState *s;
-diff --git a/migration/options.h b/migration/options.h
-index b998024eba..d07269ee38 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -24,6 +24,7 @@ bool migrate_dirty_bitmaps(void);
- bool migrate_events(void);
- bool migrate_ignore_shared(void);
- bool migrate_late_block_activate(void);
-+bool migrate_multifd(void);
- bool migrate_pause_before_switchover(void);
- bool migrate_postcopy_blocktime(void);
- bool migrate_postcopy_preempt(void);
-diff --git a/migration/ram.c b/migration/ram.c
-index ee454a3849..859dd7b63f 100644
---- a/migration/ram.c
-+++ b/migration/ram.c
-@@ -2362,7 +2362,7 @@ static int ram_save_target_page_legacy(RAMState *rs, PageSearchStatus *pss)
-      * if host page size == guest page size the dest guest during run may
-      * still see partially copied pages which is data corruption.
-      */
--    if (migrate_use_multifd() && !migration_in_postcopy()) {
-+    if (migrate_multifd() && !migration_in_postcopy()) {
-         return ram_save_multifd_page(pss->pss_channel, block, offset);
-     }
- 
-diff --git a/migration/socket.c b/migration/socket.c
-index ebf9ac41af..f4835a256a 100644
---- a/migration/socket.c
-+++ b/migration/socket.c
-@@ -183,7 +183,7 @@ socket_start_incoming_migration_internal(SocketAddress *saddr,
- 
-     qio_net_listener_set_name(listener, "migration-socket-listener");
- 
--    if (migrate_use_multifd()) {
-+    if (migrate_multifd()) {
-         num = migrate_multifd_channels();
-     } else if (migrate_postcopy_preempt()) {
-         num = RAM_CHANNEL_MAX;
--- 
-2.39.1
-
diff --git a/kvm-migration-Move-migrate_use_return-to-options.c.patch b/kvm-migration-Move-migrate_use_return-to-options.c.patch
deleted file mode 100644
index b250d40..0000000
--- a/kvm-migration-Move-migrate_use_return-to-options.c.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 145b630767dbc7020ddf39b20075f4691f71321a Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Wed, 1 Mar 2023 22:25:47 +0100
-Subject: [PATCH 31/56] migration: Move migrate_use_return() to options.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [30/50] 5cc150188bcc61b69ea0844253597594ab18fc13 (peterx/qemu-kvm)
-
-Once that we are there, we rename the function to migrate_return_path()
-to be consistent with all other capabilities.
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-(cherry picked from commit 38ad1110e368bf91453c0abbd657224d57b65d47)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c | 11 +----------
- migration/migration.h |  1 -
- migration/options.c   |  9 +++++++++
- migration/options.h   |  1 +
- migration/rdma.c      |  6 +++---
- 5 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index 96f82bd165..f7facecd66 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -2622,15 +2622,6 @@ static int64_t migrate_max_postcopy_bandwidth(void)
-     return s->parameters.max_postcopy_bandwidth;
- }
- 
--bool migrate_use_return_path(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->capabilities[MIGRATION_CAPABILITY_RETURN_PATH];
--}
--
- bool migrate_use_block_incremental(void)
- {
-     MigrationState *s;
-@@ -4175,7 +4166,7 @@ void migrate_fd_connect(MigrationState *s, Error *error_in)
-      * precopy, only if user specified "return-path" capability would
-      * QEMU uses the return path.
-      */
--    if (migrate_postcopy_ram() || migrate_use_return_path()) {
-+    if (migrate_postcopy_ram() || migrate_return_path()) {
-         if (open_return_path_on_source(s, !resume)) {
-             error_report("Unable to open return-path for postcopy");
-             migrate_set_state(&s->state, s->state, MIGRATION_STATUS_FAILED);
-diff --git a/migration/migration.h b/migration/migration.h
-index d4b68b08a5..24184622a8 100644
---- a/migration/migration.h
-+++ b/migration/migration.h
-@@ -459,7 +459,6 @@ uint64_t migrate_xbzrle_cache_size(void);
- 
- bool migrate_use_block_incremental(void);
- int migrate_max_cpu_throttle(void);
--bool migrate_use_return_path(void);
- 
- uint64_t ram_get_total_transferred_pages(void);
- 
-diff --git a/migration/options.c b/migration/options.c
-index fe1eadeed6..2003e413da 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -147,6 +147,15 @@ bool migrate_release_ram(void)
-     return s->capabilities[MIGRATION_CAPABILITY_RELEASE_RAM];
- }
- 
-+bool migrate_return_path(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->capabilities[MIGRATION_CAPABILITY_RETURN_PATH];
-+}
-+
- bool migrate_validate_uuid(void)
- {
-     MigrationState *s;
-diff --git a/migration/options.h b/migration/options.h
-index e985a5233e..316efd1063 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -31,6 +31,7 @@ bool migrate_postcopy_blocktime(void);
- bool migrate_postcopy_preempt(void);
- bool migrate_postcopy_ram(void);
- bool migrate_release_ram(void);
-+bool migrate_return_path(void);
- bool migrate_validate_uuid(void);
- bool migrate_xbzrle(void);
- bool migrate_zero_blocks(void);
-diff --git a/migration/rdma.c b/migration/rdma.c
-index f35f021963..bf55e2f163 100644
---- a/migration/rdma.c
-+++ b/migration/rdma.c
-@@ -3373,7 +3373,7 @@ static int qemu_rdma_accept(RDMAContext *rdma)
-      * initialize the RDMAContext for return path for postcopy after first
-      * connection request reached.
-      */
--    if ((migrate_postcopy() || migrate_use_return_path())
-+    if ((migrate_postcopy() || migrate_return_path())
-         && !rdma->is_return_path) {
-         rdma_return_path = qemu_rdma_data_init(rdma->host_port, NULL);
-         if (rdma_return_path == NULL) {
-@@ -3456,7 +3456,7 @@ static int qemu_rdma_accept(RDMAContext *rdma)
-     }
- 
-     /* Accept the second connection request for return path */
--    if ((migrate_postcopy() || migrate_use_return_path())
-+    if ((migrate_postcopy() || migrate_return_path())
-         && !rdma->is_return_path) {
-         qemu_set_fd_handler(rdma->channel->fd, rdma_accept_incoming_migration,
-                             NULL,
-@@ -4193,7 +4193,7 @@ void rdma_start_outgoing_migration(void *opaque,
-     }
- 
-     /* RDMA postcopy need a separate queue pair for return path */
--    if (migrate_postcopy() || migrate_use_return_path()) {
-+    if (migrate_postcopy() || migrate_return_path()) {
-         rdma_return_path = qemu_rdma_data_init(host_port, errp);
- 
-         if (rdma_return_path == NULL) {
--- 
-2.39.1
-
diff --git a/kvm-migration-Move-migrate_use_tls-to-options.c.patch b/kvm-migration-Move-migrate_use_tls-to-options.c.patch
deleted file mode 100644
index 84734af..0000000
--- a/kvm-migration-Move-migrate_use_tls-to-options.c.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From 2e2df63892e191e91216b8253171162f69b93387 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Thu, 2 Mar 2023 10:41:23 +0100
-Subject: [PATCH 49/56] migration: Move migrate_use_tls() to options.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [48/50] 314431b0f5e92d2211e58a8161f32d7b67d69e38 (peterx/qemu-kvm)
-
-Once there, rename it to migrate_tls() and make it return bool for
-consistency.
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-
----
-
-Fix typos found by fabiano
-
-(cherry picked from commit 10d4703be5d884bbbb6ecafe0e8bb270ad6ea937)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c |  9 ---------
- migration/migration.h |  2 --
- migration/options.c   | 11 ++++++++++-
- migration/options.h   |  1 +
- migration/tls.c       |  3 ++-
- 5 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index c2e109329d..22ef83c619 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -2177,15 +2177,6 @@ void qmp_migrate_continue(MigrationStatus state, Error **errp)
-     qemu_sem_post(&s->pause_sem);
- }
- 
--int migrate_use_tls(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->parameters.tls_creds && *s->parameters.tls_creds;
--}
--
- /* migration thread support */
- /*
-  * Something bad happened to the RP stream, mark an error
-diff --git a/migration/migration.h b/migration/migration.h
-index dcf906868d..2b71df8617 100644
---- a/migration/migration.h
-+++ b/migration/migration.h
-@@ -447,8 +447,6 @@ bool migration_is_blocked(Error **errp);
- bool migration_in_postcopy(void);
- MigrationState *migrate_get_current(void);
- 
--int migrate_use_tls(void);
--
- uint64_t ram_get_total_transferred_pages(void);
- 
- /* Sending on the return path - generic and then for each message type */
-diff --git a/migration/options.c b/migration/options.c
-index 8e8753d9be..d4c0714683 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -214,6 +214,15 @@ bool migrate_postcopy(void)
-     return migrate_postcopy_ram() || migrate_dirty_bitmaps();
- }
- 
-+bool migrate_tls(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->parameters.tls_creds && *s->parameters.tls_creds;
-+}
-+
- typedef enum WriteTrackingSupport {
-     WT_SUPPORT_UNKNOWN = 0,
-     WT_SUPPORT_ABSENT,
-@@ -363,7 +372,7 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp)
-          new_caps[MIGRATION_CAPABILITY_COMPRESS] ||
-          new_caps[MIGRATION_CAPABILITY_XBZRLE] ||
-          migrate_multifd_compression() ||
--         migrate_use_tls())) {
-+         migrate_tls())) {
-         error_setg(errp,
-                    "Zero copy only available for non-compressed non-TLS multifd migration");
-         return false;
-diff --git a/migration/options.h b/migration/options.h
-index 1b78fa9f3d..13318a16c7 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -46,6 +46,7 @@ bool migrate_zero_copy_send(void);
-  */
- 
- bool migrate_postcopy(void);
-+bool migrate_tls(void);
- 
- /* capabilities helpers */
- 
-diff --git a/migration/tls.c b/migration/tls.c
-index 4d2166a209..acd38e0b62 100644
---- a/migration/tls.c
-+++ b/migration/tls.c
-@@ -22,6 +22,7 @@
- #include "channel.h"
- #include "migration.h"
- #include "tls.h"
-+#include "options.h"
- #include "crypto/tlscreds.h"
- #include "qemu/error-report.h"
- #include "qapi/error.h"
-@@ -165,7 +166,7 @@ void migration_tls_channel_connect(MigrationState *s,
- 
- bool migrate_channel_requires_tls_upgrade(QIOChannel *ioc)
- {
--    if (!migrate_use_tls()) {
-+    if (!migrate_tls()) {
-         return false;
-     }
- 
--- 
-2.39.1
-
diff --git a/kvm-migration-Move-migrate_use_xbzrle-to-options.c.patch b/kvm-migration-Move-migrate_use_xbzrle-to-options.c.patch
deleted file mode 100644
index e3a8bab..0000000
--- a/kvm-migration-Move-migrate_use_xbzrle-to-options.c.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-From 2184f7dae0df5fa52deba2dc884e09c6bdbc7b5f Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Wed, 1 Mar 2023 22:20:13 +0100
-Subject: [PATCH 29/56] migration: Move migrate_use_xbzrle() to options.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [28/50] fc8bee0f691a96e6bd0b41f2511abe507b81fea5 (peterx/qemu-kvm)
-
-Once that we are there, we rename the function to migrate_xbzrle()
-to be consistent with all other capabilities.
-We change the type to return bool also for consistency.
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-(cherry picked from commit 87dca0c9bb63014ef73ad82f7aedea1cb5a822e7)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c | 11 +----------
- migration/migration.h |  1 -
- migration/options.c   |  9 +++++++++
- migration/options.h   |  1 +
- migration/ram.c       | 10 +++++-----
- 5 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index 1d63718e88..a4ede4294e 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -1122,7 +1122,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)
-     info->ram->downtime_bytes = stat64_get(&ram_counters.downtime_bytes);
-     info->ram->postcopy_bytes = stat64_get(&ram_counters.postcopy_bytes);
- 
--    if (migrate_use_xbzrle()) {
-+    if (migrate_xbzrle()) {
-         info->xbzrle_cache = g_malloc0(sizeof(*info->xbzrle_cache));
-         info->xbzrle_cache->cache_size = migrate_xbzrle_cache_size();
-         info->xbzrle_cache->bytes = xbzrle_counters.bytes;
-@@ -2604,15 +2604,6 @@ int migrate_use_tls(void)
-     return s->parameters.tls_creds && *s->parameters.tls_creds;
- }
- 
--int migrate_use_xbzrle(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->capabilities[MIGRATION_CAPABILITY_XBZRLE];
--}
--
- uint64_t migrate_xbzrle_cache_size(void)
- {
-     MigrationState *s;
-diff --git a/migration/migration.h b/migration/migration.h
-index c939f82d53..e2bb5b1e2f 100644
---- a/migration/migration.h
-+++ b/migration/migration.h
-@@ -455,7 +455,6 @@ int migrate_multifd_zlib_level(void);
- int migrate_multifd_zstd_level(void);
- 
- int migrate_use_tls(void);
--int migrate_use_xbzrle(void);
- uint64_t migrate_xbzrle_cache_size(void);
- 
- bool migrate_use_block(void);
-diff --git a/migration/options.c b/migration/options.c
-index f357c99996..25264c500e 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -147,6 +147,15 @@ bool migrate_validate_uuid(void)
-     return s->capabilities[MIGRATION_CAPABILITY_VALIDATE_UUID];
- }
- 
-+bool migrate_xbzrle(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->capabilities[MIGRATION_CAPABILITY_XBZRLE];
-+}
-+
- bool migrate_zero_blocks(void)
- {
-     MigrationState *s;
-diff --git a/migration/options.h b/migration/options.h
-index ad22f4d24a..8f76a88329 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -31,6 +31,7 @@ bool migrate_postcopy_preempt(void);
- bool migrate_postcopy_ram(void);
- bool migrate_release_ram(void);
- bool migrate_validate_uuid(void);
-+bool migrate_xbzrle(void);
- bool migrate_zero_blocks(void);
- bool migrate_zero_copy_send(void);
- 
-diff --git a/migration/ram.c b/migration/ram.c
-index 859dd7b63f..4576d0d849 100644
---- a/migration/ram.c
-+++ b/migration/ram.c
-@@ -156,14 +156,14 @@ static struct {
- 
- static void XBZRLE_cache_lock(void)
- {
--    if (migrate_use_xbzrle()) {
-+    if (migrate_xbzrle()) {
-         qemu_mutex_lock(&XBZRLE.lock);
-     }
- }
- 
- static void XBZRLE_cache_unlock(void)
- {
--    if (migrate_use_xbzrle()) {
-+    if (migrate_xbzrle()) {
-         qemu_mutex_unlock(&XBZRLE.lock);
-     }
- }
-@@ -1137,7 +1137,7 @@ static void migration_update_rates(RAMState *rs, int64_t end_time)
-         return;
-     }
- 
--    if (migrate_use_xbzrle()) {
-+    if (migrate_xbzrle()) {
-         double encoded_size, unencoded_size;
- 
-         xbzrle_counters.cache_miss_rate = (double)(xbzrle_counters.cache_miss -
-@@ -1626,7 +1626,7 @@ static int find_dirty_block(RAMState *rs, PageSearchStatus *pss)
-             /* Flag that we've looped */
-             pss->complete_round = true;
-             /* After the first round, enable XBZRLE. */
--            if (migrate_use_xbzrle()) {
-+            if (migrate_xbzrle()) {
-                 rs->xbzrle_enabled = true;
-             }
-         }
-@@ -2979,7 +2979,7 @@ static int xbzrle_init(void)
- {
-     Error *local_err = NULL;
- 
--    if (!migrate_use_xbzrle()) {
-+    if (!migrate_xbzrle()) {
-         return 0;
-     }
- 
--- 
-2.39.1
-
diff --git a/kvm-migration-Move-migrate_use_zero_copy_send-to-options.patch b/kvm-migration-Move-migrate_use_zero_copy_send-to-options.patch
deleted file mode 100644
index 90031df..0000000
--- a/kvm-migration-Move-migrate_use_zero_copy_send-to-options.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From 6eb252887378d639ad2e90dd426a1812d4b72ca6 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Wed, 1 Mar 2023 22:17:14 +0100
-Subject: [PATCH 28/56] migration: Move migrate_use_zero_copy_send() to
- options.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [27/50] 5a4c2b5e75c62e0f60f9c4121a2756bd140a60d9 (peterx/qemu-kvm)
-
-Once that we are there, we rename the function to
-migrate_zero_copy_send() to be consistent with all other capabilities.
-
-We can remove the CONFIG_LINUX guard.  We already check that we can't
-setup this capability in migrate_caps_check().
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-(cherry picked from commit b4bc342c766640e0cb8a0b72f71e0ee5545fb790)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c | 13 +------------
- migration/migration.h |  5 -----
- migration/multifd.c   |  8 ++++----
- migration/options.c   |  9 +++++++++
- migration/options.h   |  1 +
- migration/socket.c    |  2 +-
- 6 files changed, 16 insertions(+), 22 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index e1d7f25786..1d63718e88 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -1609,7 +1609,7 @@ static bool migrate_params_check(MigrationParameters *params, Error **errp)
-     }
- 
- #ifdef CONFIG_LINUX
--    if (migrate_use_zero_copy_send() &&
-+    if (migrate_zero_copy_send() &&
-         ((params->has_multifd_compression && params->multifd_compression) ||
-          (params->tls_creds && *params->tls_creds))) {
-         error_setg(errp,
-@@ -2595,17 +2595,6 @@ int migrate_multifd_zstd_level(void)
-     return s->parameters.multifd_zstd_level;
- }
- 
--#ifdef CONFIG_LINUX
--bool migrate_use_zero_copy_send(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->capabilities[MIGRATION_CAPABILITY_ZERO_COPY_SEND];
--}
--#endif
--
- int migrate_use_tls(void)
- {
-     MigrationState *s;
-diff --git a/migration/migration.h b/migration/migration.h
-index 49c0e13f41..c939f82d53 100644
---- a/migration/migration.h
-+++ b/migration/migration.h
-@@ -454,11 +454,6 @@ MultiFDCompression migrate_multifd_compression(void);
- int migrate_multifd_zlib_level(void);
- int migrate_multifd_zstd_level(void);
- 
--#ifdef CONFIG_LINUX
--bool migrate_use_zero_copy_send(void);
--#else
--#define migrate_use_zero_copy_send() (false)
--#endif
- int migrate_use_tls(void);
- int migrate_use_xbzrle(void);
- uint64_t migrate_xbzrle_cache_size(void);
-diff --git a/migration/multifd.c b/migration/multifd.c
-index 6807328189..cce3ad6988 100644
---- a/migration/multifd.c
-+++ b/migration/multifd.c
-@@ -25,7 +25,7 @@
- #include "trace.h"
- #include "multifd.h"
- #include "threadinfo.h"
--
-+#include "options.h"
- #include "qemu/yank.h"
- #include "io/channel-socket.h"
- #include "yank_functions.h"
-@@ -608,7 +608,7 @@ int multifd_send_sync_main(QEMUFile *f)
-      * all the dirty bitmaps.
-      */
- 
--    flush_zero_copy = migrate_use_zero_copy_send();
-+    flush_zero_copy = migrate_zero_copy_send();
- 
-     for (i = 0; i < migrate_multifd_channels(); i++) {
-         MultiFDSendParams *p = &multifd_send_state->params[i];
-@@ -653,7 +653,7 @@ static void *multifd_send_thread(void *opaque)
-     MigrationThread *thread = NULL;
-     Error *local_err = NULL;
-     int ret = 0;
--    bool use_zero_copy_send = migrate_use_zero_copy_send();
-+    bool use_zero_copy_send = migrate_zero_copy_send();
- 
-     thread = MigrationThreadAdd(p->name, qemu_get_thread_id());
- 
-@@ -945,7 +945,7 @@ int multifd_save_setup(Error **errp)
-         p->page_size = qemu_target_page_size();
-         p->page_count = page_count;
- 
--        if (migrate_use_zero_copy_send()) {
-+        if (migrate_zero_copy_send()) {
-             p->write_flags = QIO_CHANNEL_WRITE_FLAG_ZERO_COPY;
-         } else {
-             p->write_flags = 0;
-diff --git a/migration/options.c b/migration/options.c
-index 58673fc101..f357c99996 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -155,3 +155,12 @@ bool migrate_zero_blocks(void)
- 
-     return s->capabilities[MIGRATION_CAPABILITY_ZERO_BLOCKS];
- }
-+
-+bool migrate_zero_copy_send(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->capabilities[MIGRATION_CAPABILITY_ZERO_COPY_SEND];
-+}
-diff --git a/migration/options.h b/migration/options.h
-index d07269ee38..ad22f4d24a 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -32,5 +32,6 @@ bool migrate_postcopy_ram(void);
- bool migrate_release_ram(void);
- bool migrate_validate_uuid(void);
- bool migrate_zero_blocks(void);
-+bool migrate_zero_copy_send(void);
- 
- #endif
-diff --git a/migration/socket.c b/migration/socket.c
-index f4835a256a..1b6f5baefb 100644
---- a/migration/socket.c
-+++ b/migration/socket.c
-@@ -98,7 +98,7 @@ static void socket_outgoing_migration(QIOTask *task,
- 
-     trace_migration_socket_outgoing_connected(data->hostname);
- 
--    if (migrate_use_zero_copy_send() &&
-+    if (migrate_zero_copy_send() &&
-         !qio_channel_has_feature(sioc, QIO_CHANNEL_FEATURE_WRITE_ZERO_COPY)) {
-         error_setg(&err, "Zero copy send feature not detected in host kernel");
-     }
--- 
-2.39.1
-
diff --git a/kvm-migration-Move-migration_properties-to-options.c.patch b/kvm-migration-Move-migration_properties-to-options.c.patch
deleted file mode 100644
index 145b510..0000000
--- a/kvm-migration-Move-migration_properties-to-options.c.patch
+++ /dev/null
@@ -1,409 +0,0 @@
-From 0911e025a9dc8a0c85944ac11fb9df72e5ad0677 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:57 +0200
-Subject: [PATCH 09/37] migration: Move migration_properties to options.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [7/28] ff07358afa0c90f13125b177b0e08c74ef1b9905 (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit f9436522c8dd
-Author: Juan Quintela <quintela@redhat.com>
-Date:   Thu Mar 2 12:55:57 2023 +0100
-
-    migration: Move migration_properties to options.c
-
-    Signed-off-by: Juan Quintela <quintela@redhat.com>
-    Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- migration/migration.c | 157 ------------------------------------------
- migration/options.c   | 155 +++++++++++++++++++++++++++++++++++++++++
- migration/options.h   |   7 ++
- 3 files changed, 162 insertions(+), 157 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index 08f87f2b0e..1ac5f19bc2 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -52,8 +52,6 @@
- #include "io/channel-tls.h"
- #include "migration/colo.h"
- #include "hw/boards.h"
--#include "hw/qdev-properties.h"
--#include "hw/qdev-properties-system.h"
- #include "monitor/monitor.h"
- #include "net/announce.h"
- #include "qemu/queue.h"
-@@ -65,51 +63,6 @@
- #include "sysemu/qtest.h"
- #include "options.h"
- 
--#define MAX_THROTTLE  (128 << 20)      /* Migration transfer speed throttling */
--
--/* Time in milliseconds we are allowed to stop the source,
-- * for sending the last part */
--#define DEFAULT_MIGRATE_SET_DOWNTIME 300
--
--/* Default compression thread count */
--#define DEFAULT_MIGRATE_COMPRESS_THREAD_COUNT 8
--/* Default decompression thread count, usually decompression is at
-- * least 4 times as fast as compression.*/
--#define DEFAULT_MIGRATE_DECOMPRESS_THREAD_COUNT 2
--/*0: means nocompress, 1: best speed, ... 9: best compress ratio */
--#define DEFAULT_MIGRATE_COMPRESS_LEVEL 1
--/* Define default autoconverge cpu throttle migration parameters */
--#define DEFAULT_MIGRATE_THROTTLE_TRIGGER_THRESHOLD 50
--#define DEFAULT_MIGRATE_CPU_THROTTLE_INITIAL 20
--#define DEFAULT_MIGRATE_CPU_THROTTLE_INCREMENT 10
--#define DEFAULT_MIGRATE_MAX_CPU_THROTTLE 99
--
--/* Migration XBZRLE default cache size */
--#define DEFAULT_MIGRATE_XBZRLE_CACHE_SIZE (64 * 1024 * 1024)
--
--/* The delay time (in ms) between two COLO checkpoints */
--#define DEFAULT_MIGRATE_X_CHECKPOINT_DELAY (200 * 100)
--#define DEFAULT_MIGRATE_MULTIFD_CHANNELS 2
--#define DEFAULT_MIGRATE_MULTIFD_COMPRESSION MULTIFD_COMPRESSION_NONE
--/* 0: means nocompress, 1: best speed, ... 9: best compress ratio */
--#define DEFAULT_MIGRATE_MULTIFD_ZLIB_LEVEL 1
--/* 0: means nocompress, 1: best speed, ... 20: best compress ratio */
--#define DEFAULT_MIGRATE_MULTIFD_ZSTD_LEVEL 1
--
--/* Background transfer rate for postcopy, 0 means unlimited, note
-- * that page requests can still exceed this limit.
-- */
--#define DEFAULT_MIGRATE_MAX_POSTCOPY_BANDWIDTH 0
--
--/*
-- * Parameters for self_announce_delay giving a stream of RARP/ARP
-- * packets after migration.
-- */
--#define DEFAULT_MIGRATE_ANNOUNCE_INITIAL  50
--#define DEFAULT_MIGRATE_ANNOUNCE_MAX     550
--#define DEFAULT_MIGRATE_ANNOUNCE_ROUNDS    5
--#define DEFAULT_MIGRATE_ANNOUNCE_STEP    100
--
- static NotifierList migration_state_notifiers =
-     NOTIFIER_LIST_INITIALIZER(migration_state_notifiers);
- 
-@@ -3336,116 +3289,6 @@ void migrate_fd_connect(MigrationState *s, Error *error_in)
-     s->migration_thread_running = true;
- }
- 
--#define DEFINE_PROP_MIG_CAP(name, x)             \
--    DEFINE_PROP_BOOL(name, MigrationState, capabilities[x], false)
--
--static Property migration_properties[] = {
--    DEFINE_PROP_BOOL("store-global-state", MigrationState,
--                     store_global_state, true),
--    DEFINE_PROP_BOOL("send-configuration", MigrationState,
--                     send_configuration, true),
--    DEFINE_PROP_BOOL("send-section-footer", MigrationState,
--                     send_section_footer, true),
--    DEFINE_PROP_BOOL("decompress-error-check", MigrationState,
--                      decompress_error_check, true),
--    DEFINE_PROP_UINT8("x-clear-bitmap-shift", MigrationState,
--                      clear_bitmap_shift, CLEAR_BITMAP_SHIFT_DEFAULT),
--    DEFINE_PROP_BOOL("x-preempt-pre-7-2", MigrationState,
--                     preempt_pre_7_2, false),
--
--    /* Migration parameters */
--    DEFINE_PROP_UINT8("x-compress-level", MigrationState,
--                      parameters.compress_level,
--                      DEFAULT_MIGRATE_COMPRESS_LEVEL),
--    DEFINE_PROP_UINT8("x-compress-threads", MigrationState,
--                      parameters.compress_threads,
--                      DEFAULT_MIGRATE_COMPRESS_THREAD_COUNT),
--    DEFINE_PROP_BOOL("x-compress-wait-thread", MigrationState,
--                      parameters.compress_wait_thread, true),
--    DEFINE_PROP_UINT8("x-decompress-threads", MigrationState,
--                      parameters.decompress_threads,
--                      DEFAULT_MIGRATE_DECOMPRESS_THREAD_COUNT),
--    DEFINE_PROP_UINT8("x-throttle-trigger-threshold", MigrationState,
--                      parameters.throttle_trigger_threshold,
--                      DEFAULT_MIGRATE_THROTTLE_TRIGGER_THRESHOLD),
--    DEFINE_PROP_UINT8("x-cpu-throttle-initial", MigrationState,
--                      parameters.cpu_throttle_initial,
--                      DEFAULT_MIGRATE_CPU_THROTTLE_INITIAL),
--    DEFINE_PROP_UINT8("x-cpu-throttle-increment", MigrationState,
--                      parameters.cpu_throttle_increment,
--                      DEFAULT_MIGRATE_CPU_THROTTLE_INCREMENT),
--    DEFINE_PROP_BOOL("x-cpu-throttle-tailslow", MigrationState,
--                      parameters.cpu_throttle_tailslow, false),
--    DEFINE_PROP_SIZE("x-max-bandwidth", MigrationState,
--                      parameters.max_bandwidth, MAX_THROTTLE),
--    DEFINE_PROP_UINT64("x-downtime-limit", MigrationState,
--                      parameters.downtime_limit,
--                      DEFAULT_MIGRATE_SET_DOWNTIME),
--    DEFINE_PROP_UINT32("x-checkpoint-delay", MigrationState,
--                      parameters.x_checkpoint_delay,
--                      DEFAULT_MIGRATE_X_CHECKPOINT_DELAY),
--    DEFINE_PROP_UINT8("multifd-channels", MigrationState,
--                      parameters.multifd_channels,
--                      DEFAULT_MIGRATE_MULTIFD_CHANNELS),
--    DEFINE_PROP_MULTIFD_COMPRESSION("multifd-compression", MigrationState,
--                      parameters.multifd_compression,
--                      DEFAULT_MIGRATE_MULTIFD_COMPRESSION),
--    DEFINE_PROP_UINT8("multifd-zlib-level", MigrationState,
--                      parameters.multifd_zlib_level,
--                      DEFAULT_MIGRATE_MULTIFD_ZLIB_LEVEL),
--    DEFINE_PROP_UINT8("multifd-zstd-level", MigrationState,
--                      parameters.multifd_zstd_level,
--                      DEFAULT_MIGRATE_MULTIFD_ZSTD_LEVEL),
--    DEFINE_PROP_SIZE("xbzrle-cache-size", MigrationState,
--                      parameters.xbzrle_cache_size,
--                      DEFAULT_MIGRATE_XBZRLE_CACHE_SIZE),
--    DEFINE_PROP_SIZE("max-postcopy-bandwidth", MigrationState,
--                      parameters.max_postcopy_bandwidth,
--                      DEFAULT_MIGRATE_MAX_POSTCOPY_BANDWIDTH),
--    DEFINE_PROP_UINT8("max-cpu-throttle", MigrationState,
--                      parameters.max_cpu_throttle,
--                      DEFAULT_MIGRATE_MAX_CPU_THROTTLE),
--    DEFINE_PROP_SIZE("announce-initial", MigrationState,
--                      parameters.announce_initial,
--                      DEFAULT_MIGRATE_ANNOUNCE_INITIAL),
--    DEFINE_PROP_SIZE("announce-max", MigrationState,
--                      parameters.announce_max,
--                      DEFAULT_MIGRATE_ANNOUNCE_MAX),
--    DEFINE_PROP_SIZE("announce-rounds", MigrationState,
--                      parameters.announce_rounds,
--                      DEFAULT_MIGRATE_ANNOUNCE_ROUNDS),
--    DEFINE_PROP_SIZE("announce-step", MigrationState,
--                      parameters.announce_step,
--                      DEFAULT_MIGRATE_ANNOUNCE_STEP),
--    DEFINE_PROP_STRING("tls-creds", MigrationState, parameters.tls_creds),
--    DEFINE_PROP_STRING("tls-hostname", MigrationState, parameters.tls_hostname),
--    DEFINE_PROP_STRING("tls-authz", MigrationState, parameters.tls_authz),
--
--    /* Migration capabilities */
--    DEFINE_PROP_MIG_CAP("x-xbzrle", MIGRATION_CAPABILITY_XBZRLE),
--    DEFINE_PROP_MIG_CAP("x-rdma-pin-all", MIGRATION_CAPABILITY_RDMA_PIN_ALL),
--    DEFINE_PROP_MIG_CAP("x-auto-converge", MIGRATION_CAPABILITY_AUTO_CONVERGE),
--    DEFINE_PROP_MIG_CAP("x-zero-blocks", MIGRATION_CAPABILITY_ZERO_BLOCKS),
--    DEFINE_PROP_MIG_CAP("x-compress", MIGRATION_CAPABILITY_COMPRESS),
--    DEFINE_PROP_MIG_CAP("x-events", MIGRATION_CAPABILITY_EVENTS),
--    DEFINE_PROP_MIG_CAP("x-postcopy-ram", MIGRATION_CAPABILITY_POSTCOPY_RAM),
--    DEFINE_PROP_MIG_CAP("x-postcopy-preempt",
--                        MIGRATION_CAPABILITY_POSTCOPY_PREEMPT),
--    DEFINE_PROP_MIG_CAP("x-colo", MIGRATION_CAPABILITY_X_COLO),
--    DEFINE_PROP_MIG_CAP("x-release-ram", MIGRATION_CAPABILITY_RELEASE_RAM),
--    DEFINE_PROP_MIG_CAP("x-block", MIGRATION_CAPABILITY_BLOCK),
--    DEFINE_PROP_MIG_CAP("x-return-path", MIGRATION_CAPABILITY_RETURN_PATH),
--    DEFINE_PROP_MIG_CAP("x-multifd", MIGRATION_CAPABILITY_MULTIFD),
--    DEFINE_PROP_MIG_CAP("x-background-snapshot",
--            MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT),
--#ifdef CONFIG_LINUX
--    DEFINE_PROP_MIG_CAP("x-zero-copy-send",
--            MIGRATION_CAPABILITY_ZERO_COPY_SEND),
--#endif
--
--    DEFINE_PROP_END_OF_LIST(),
--};
--
- static void migration_class_init(ObjectClass *klass, void *data)
- {
-     DeviceClass *dc = DEVICE_CLASS(klass);
-diff --git a/migration/options.c b/migration/options.c
-index bcfe244fa9..a76984276d 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -31,6 +31,161 @@
- #define MAX_MIGRATE_DOWNTIME_SECONDS 2000
- #define MAX_MIGRATE_DOWNTIME (MAX_MIGRATE_DOWNTIME_SECONDS * 1000)
- 
-+#define MAX_THROTTLE  (128 << 20)      /* Migration transfer speed throttling */
-+
-+/* Time in milliseconds we are allowed to stop the source,
-+ * for sending the last part */
-+#define DEFAULT_MIGRATE_SET_DOWNTIME 300
-+
-+/* Default compression thread count */
-+#define DEFAULT_MIGRATE_COMPRESS_THREAD_COUNT 8
-+/* Default decompression thread count, usually decompression is at
-+ * least 4 times as fast as compression.*/
-+#define DEFAULT_MIGRATE_DECOMPRESS_THREAD_COUNT 2
-+/*0: means nocompress, 1: best speed, ... 9: best compress ratio */
-+#define DEFAULT_MIGRATE_COMPRESS_LEVEL 1
-+/* Define default autoconverge cpu throttle migration parameters */
-+#define DEFAULT_MIGRATE_THROTTLE_TRIGGER_THRESHOLD 50
-+#define DEFAULT_MIGRATE_CPU_THROTTLE_INITIAL 20
-+#define DEFAULT_MIGRATE_CPU_THROTTLE_INCREMENT 10
-+#define DEFAULT_MIGRATE_MAX_CPU_THROTTLE 99
-+
-+/* Migration XBZRLE default cache size */
-+#define DEFAULT_MIGRATE_XBZRLE_CACHE_SIZE (64 * 1024 * 1024)
-+
-+/* The delay time (in ms) between two COLO checkpoints */
-+#define DEFAULT_MIGRATE_X_CHECKPOINT_DELAY (200 * 100)
-+#define DEFAULT_MIGRATE_MULTIFD_CHANNELS 2
-+#define DEFAULT_MIGRATE_MULTIFD_COMPRESSION MULTIFD_COMPRESSION_NONE
-+/* 0: means nocompress, 1: best speed, ... 9: best compress ratio */
-+#define DEFAULT_MIGRATE_MULTIFD_ZLIB_LEVEL 1
-+/* 0: means nocompress, 1: best speed, ... 20: best compress ratio */
-+#define DEFAULT_MIGRATE_MULTIFD_ZSTD_LEVEL 1
-+
-+/* Background transfer rate for postcopy, 0 means unlimited, note
-+ * that page requests can still exceed this limit.
-+ */
-+#define DEFAULT_MIGRATE_MAX_POSTCOPY_BANDWIDTH 0
-+
-+/*
-+ * Parameters for self_announce_delay giving a stream of RARP/ARP
-+ * packets after migration.
-+ */
-+#define DEFAULT_MIGRATE_ANNOUNCE_INITIAL  50
-+#define DEFAULT_MIGRATE_ANNOUNCE_MAX     550
-+#define DEFAULT_MIGRATE_ANNOUNCE_ROUNDS    5
-+#define DEFAULT_MIGRATE_ANNOUNCE_STEP    100
-+
-+#define DEFINE_PROP_MIG_CAP(name, x)             \
-+    DEFINE_PROP_BOOL(name, MigrationState, capabilities[x], false)
-+
-+Property migration_properties[] = {
-+    DEFINE_PROP_BOOL("store-global-state", MigrationState,
-+                     store_global_state, true),
-+    DEFINE_PROP_BOOL("send-configuration", MigrationState,
-+                     send_configuration, true),
-+    DEFINE_PROP_BOOL("send-section-footer", MigrationState,
-+                     send_section_footer, true),
-+    DEFINE_PROP_BOOL("decompress-error-check", MigrationState,
-+                      decompress_error_check, true),
-+    DEFINE_PROP_UINT8("x-clear-bitmap-shift", MigrationState,
-+                      clear_bitmap_shift, CLEAR_BITMAP_SHIFT_DEFAULT),
-+    DEFINE_PROP_BOOL("x-preempt-pre-7-2", MigrationState,
-+                     preempt_pre_7_2, false),
-+
-+    /* Migration parameters */
-+    DEFINE_PROP_UINT8("x-compress-level", MigrationState,
-+                      parameters.compress_level,
-+                      DEFAULT_MIGRATE_COMPRESS_LEVEL),
-+    DEFINE_PROP_UINT8("x-compress-threads", MigrationState,
-+                      parameters.compress_threads,
-+                      DEFAULT_MIGRATE_COMPRESS_THREAD_COUNT),
-+    DEFINE_PROP_BOOL("x-compress-wait-thread", MigrationState,
-+                      parameters.compress_wait_thread, true),
-+    DEFINE_PROP_UINT8("x-decompress-threads", MigrationState,
-+                      parameters.decompress_threads,
-+                      DEFAULT_MIGRATE_DECOMPRESS_THREAD_COUNT),
-+    DEFINE_PROP_UINT8("x-throttle-trigger-threshold", MigrationState,
-+                      parameters.throttle_trigger_threshold,
-+                      DEFAULT_MIGRATE_THROTTLE_TRIGGER_THRESHOLD),
-+    DEFINE_PROP_UINT8("x-cpu-throttle-initial", MigrationState,
-+                      parameters.cpu_throttle_initial,
-+                      DEFAULT_MIGRATE_CPU_THROTTLE_INITIAL),
-+    DEFINE_PROP_UINT8("x-cpu-throttle-increment", MigrationState,
-+                      parameters.cpu_throttle_increment,
-+                      DEFAULT_MIGRATE_CPU_THROTTLE_INCREMENT),
-+    DEFINE_PROP_BOOL("x-cpu-throttle-tailslow", MigrationState,
-+                      parameters.cpu_throttle_tailslow, false),
-+    DEFINE_PROP_SIZE("x-max-bandwidth", MigrationState,
-+                      parameters.max_bandwidth, MAX_THROTTLE),
-+    DEFINE_PROP_UINT64("x-downtime-limit", MigrationState,
-+                      parameters.downtime_limit,
-+                      DEFAULT_MIGRATE_SET_DOWNTIME),
-+    DEFINE_PROP_UINT32("x-checkpoint-delay", MigrationState,
-+                      parameters.x_checkpoint_delay,
-+                      DEFAULT_MIGRATE_X_CHECKPOINT_DELAY),
-+    DEFINE_PROP_UINT8("multifd-channels", MigrationState,
-+                      parameters.multifd_channels,
-+                      DEFAULT_MIGRATE_MULTIFD_CHANNELS),
-+    DEFINE_PROP_MULTIFD_COMPRESSION("multifd-compression", MigrationState,
-+                      parameters.multifd_compression,
-+                      DEFAULT_MIGRATE_MULTIFD_COMPRESSION),
-+    DEFINE_PROP_UINT8("multifd-zlib-level", MigrationState,
-+                      parameters.multifd_zlib_level,
-+                      DEFAULT_MIGRATE_MULTIFD_ZLIB_LEVEL),
-+    DEFINE_PROP_UINT8("multifd-zstd-level", MigrationState,
-+                      parameters.multifd_zstd_level,
-+                      DEFAULT_MIGRATE_MULTIFD_ZSTD_LEVEL),
-+    DEFINE_PROP_SIZE("xbzrle-cache-size", MigrationState,
-+                      parameters.xbzrle_cache_size,
-+                      DEFAULT_MIGRATE_XBZRLE_CACHE_SIZE),
-+    DEFINE_PROP_SIZE("max-postcopy-bandwidth", MigrationState,
-+                      parameters.max_postcopy_bandwidth,
-+                      DEFAULT_MIGRATE_MAX_POSTCOPY_BANDWIDTH),
-+    DEFINE_PROP_UINT8("max-cpu-throttle", MigrationState,
-+                      parameters.max_cpu_throttle,
-+                      DEFAULT_MIGRATE_MAX_CPU_THROTTLE),
-+    DEFINE_PROP_SIZE("announce-initial", MigrationState,
-+                      parameters.announce_initial,
-+                      DEFAULT_MIGRATE_ANNOUNCE_INITIAL),
-+    DEFINE_PROP_SIZE("announce-max", MigrationState,
-+                      parameters.announce_max,
-+                      DEFAULT_MIGRATE_ANNOUNCE_MAX),
-+    DEFINE_PROP_SIZE("announce-rounds", MigrationState,
-+                      parameters.announce_rounds,
-+                      DEFAULT_MIGRATE_ANNOUNCE_ROUNDS),
-+    DEFINE_PROP_SIZE("announce-step", MigrationState,
-+                      parameters.announce_step,
-+                      DEFAULT_MIGRATE_ANNOUNCE_STEP),
-+    DEFINE_PROP_STRING("tls-creds", MigrationState, parameters.tls_creds),
-+    DEFINE_PROP_STRING("tls-hostname", MigrationState, parameters.tls_hostname),
-+    DEFINE_PROP_STRING("tls-authz", MigrationState, parameters.tls_authz),
-+
-+    /* Migration capabilities */
-+    DEFINE_PROP_MIG_CAP("x-xbzrle", MIGRATION_CAPABILITY_XBZRLE),
-+    DEFINE_PROP_MIG_CAP("x-rdma-pin-all", MIGRATION_CAPABILITY_RDMA_PIN_ALL),
-+    DEFINE_PROP_MIG_CAP("x-auto-converge", MIGRATION_CAPABILITY_AUTO_CONVERGE),
-+    DEFINE_PROP_MIG_CAP("x-zero-blocks", MIGRATION_CAPABILITY_ZERO_BLOCKS),
-+    DEFINE_PROP_MIG_CAP("x-compress", MIGRATION_CAPABILITY_COMPRESS),
-+    DEFINE_PROP_MIG_CAP("x-events", MIGRATION_CAPABILITY_EVENTS),
-+    DEFINE_PROP_MIG_CAP("x-postcopy-ram", MIGRATION_CAPABILITY_POSTCOPY_RAM),
-+    DEFINE_PROP_MIG_CAP("x-postcopy-preempt",
-+                        MIGRATION_CAPABILITY_POSTCOPY_PREEMPT),
-+    DEFINE_PROP_MIG_CAP("x-colo", MIGRATION_CAPABILITY_X_COLO),
-+    DEFINE_PROP_MIG_CAP("x-release-ram", MIGRATION_CAPABILITY_RELEASE_RAM),
-+    DEFINE_PROP_MIG_CAP("x-block", MIGRATION_CAPABILITY_BLOCK),
-+    DEFINE_PROP_MIG_CAP("x-return-path", MIGRATION_CAPABILITY_RETURN_PATH),
-+    DEFINE_PROP_MIG_CAP("x-multifd", MIGRATION_CAPABILITY_MULTIFD),
-+    DEFINE_PROP_MIG_CAP("x-background-snapshot",
-+            MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT),
-+#ifdef CONFIG_LINUX
-+    DEFINE_PROP_MIG_CAP("x-zero-copy-send",
-+            MIGRATION_CAPABILITY_ZERO_COPY_SEND),
-+#endif
-+
-+    DEFINE_PROP_END_OF_LIST(),
-+};
-+
- bool migrate_auto_converge(void)
- {
-     MigrationState *s = migrate_get_current();
-diff --git a/migration/options.h b/migration/options.h
-index 89067e59a0..7b0f7245ad 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -14,6 +14,9 @@
- #ifndef QEMU_MIGRATION_OPTIONS_H
- #define QEMU_MIGRATION_OPTIONS_H
- 
-+#include "hw/qdev-properties.h"
-+#include "hw/qdev-properties-system.h"
-+
- /* constants */
- 
- /* Amount of time to allocate to each "chunk" of bandwidth-throttled
-@@ -21,6 +24,10 @@
- #define BUFFER_DELAY     100
- #define XFER_LIMIT_RATIO (1000 / BUFFER_DELAY)
- 
-+/* migration properties */
-+
-+extern Property migration_properties[];
-+
- /* capabilities */
- 
- bool migrate_auto_converge(void);
--- 
-2.39.3
-
diff --git a/kvm-migration-Move-parameters-functions-to-option.c.patch b/kvm-migration-Move-parameters-functions-to-option.c.patch
deleted file mode 100644
index ad4510b..0000000
--- a/kvm-migration-Move-parameters-functions-to-option.c.patch
+++ /dev/null
@@ -1,317 +0,0 @@
-From d5ea4c82c44a59ac70313eb1eac77999ca5fde36 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Thu, 2 Mar 2023 00:39:03 +0100
-Subject: [PATCH 37/56] migration: Move parameters functions to option.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [36/50] 2540921028025504723e762c0a1d2f295ac5a6d1 (peterx/qemu-kvm)
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-(cherry picked from commit 1dfc4b9e19bcf1ad41a1be9ac82db35b9647c3c1)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c    | 91 ---------------------------------------
- migration/migration.h    | 11 -----
- migration/multifd-zlib.c |  1 +
- migration/multifd-zstd.c |  1 +
- migration/options.c      | 93 ++++++++++++++++++++++++++++++++++++++++
- migration/options.h      | 13 ++++++
- 6 files changed, 108 insertions(+), 102 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index 880a51210e..7f2e770deb 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -2264,79 +2264,6 @@ bool migrate_postcopy(void)
-     return migrate_postcopy_ram() || migrate_dirty_bitmaps();
- }
- 
--int migrate_compress_level(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->parameters.compress_level;
--}
--
--int migrate_compress_threads(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->parameters.compress_threads;
--}
--
--int migrate_compress_wait_thread(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->parameters.compress_wait_thread;
--}
--
--int migrate_decompress_threads(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->parameters.decompress_threads;
--}
--
--int migrate_multifd_channels(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->parameters.multifd_channels;
--}
--
--MultiFDCompression migrate_multifd_compression(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    assert(s->parameters.multifd_compression < MULTIFD_COMPRESSION__MAX);
--    return s->parameters.multifd_compression;
--}
--
--int migrate_multifd_zlib_level(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->parameters.multifd_zlib_level;
--}
--
--int migrate_multifd_zstd_level(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->parameters.multifd_zstd_level;
--}
--
- int migrate_use_tls(void)
- {
-     MigrationState *s;
-@@ -2346,24 +2273,6 @@ int migrate_use_tls(void)
-     return s->parameters.tls_creds && *s->parameters.tls_creds;
- }
- 
--uint64_t migrate_xbzrle_cache_size(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->parameters.xbzrle_cache_size;
--}
--
--static int64_t migrate_max_postcopy_bandwidth(void)
--{
--    MigrationState *s;
--
--    s = migrate_get_current();
--
--    return s->parameters.max_postcopy_bandwidth;
--}
--
- bool migrate_use_block_incremental(void)
- {
-     MigrationState *s;
-diff --git a/migration/migration.h b/migration/migration.h
-index 24184622a8..8451e5f2fe 100644
---- a/migration/migration.h
-+++ b/migration/migration.h
-@@ -449,24 +449,13 @@ MigrationState *migrate_get_current(void);
- 
- bool migrate_postcopy(void);
- 
--int migrate_multifd_channels(void);
--MultiFDCompression migrate_multifd_compression(void);
--int migrate_multifd_zlib_level(void);
--int migrate_multifd_zstd_level(void);
--
- int migrate_use_tls(void);
--uint64_t migrate_xbzrle_cache_size(void);
- 
- bool migrate_use_block_incremental(void);
- int migrate_max_cpu_throttle(void);
- 
- uint64_t ram_get_total_transferred_pages(void);
- 
--int migrate_compress_level(void);
--int migrate_compress_threads(void);
--int migrate_compress_wait_thread(void);
--int migrate_decompress_threads(void);
--
- /* Sending on the return path - generic and then for each message type */
- void migrate_send_rp_shut(MigrationIncomingState *mis,
-                           uint32_t value);
-diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c
-index 37770248e1..81701250ad 100644
---- a/migration/multifd-zlib.c
-+++ b/migration/multifd-zlib.c
-@@ -18,6 +18,7 @@
- #include "qapi/error.h"
- #include "migration.h"
- #include "trace.h"
-+#include "options.h"
- #include "multifd.h"
- 
- struct zlib_data {
-diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c
-index f4a8e1ed1f..d1d29e76cc 100644
---- a/migration/multifd-zstd.c
-+++ b/migration/multifd-zstd.c
-@@ -18,6 +18,7 @@
- #include "qapi/error.h"
- #include "migration.h"
- #include "trace.h"
-+#include "options.h"
- #include "multifd.h"
- 
- struct zstd_data {
-diff --git a/migration/options.c b/migration/options.c
-index f3b2d6e482..8d15be858c 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -460,3 +460,96 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,
-         s->capabilities[cap->value->capability] = cap->value->state;
-     }
- }
-+
-+/* parameters */
-+
-+int migrate_compress_level(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->parameters.compress_level;
-+}
-+
-+int migrate_compress_threads(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->parameters.compress_threads;
-+}
-+
-+int migrate_compress_wait_thread(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->parameters.compress_wait_thread;
-+}
-+
-+int migrate_decompress_threads(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->parameters.decompress_threads;
-+}
-+
-+int64_t migrate_max_postcopy_bandwidth(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->parameters.max_postcopy_bandwidth;
-+}
-+
-+int migrate_multifd_channels(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->parameters.multifd_channels;
-+}
-+
-+MultiFDCompression migrate_multifd_compression(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    assert(s->parameters.multifd_compression < MULTIFD_COMPRESSION__MAX);
-+    return s->parameters.multifd_compression;
-+}
-+
-+int migrate_multifd_zlib_level(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->parameters.multifd_zlib_level;
-+}
-+
-+int migrate_multifd_zstd_level(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->parameters.multifd_zstd_level;
-+}
-+
-+uint64_t migrate_xbzrle_cache_size(void)
-+{
-+    MigrationState *s;
-+
-+    s = migrate_get_current();
-+
-+    return s->parameters.xbzrle_cache_size;
-+}
-diff --git a/migration/options.h b/migration/options.h
-index 5979e4ff90..b24ee92283 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -43,4 +43,17 @@ bool migrate_zero_copy_send(void);
- bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp);
- bool migrate_cap_set(int cap, bool value, Error **errp);
- 
-+/* parameters */
-+
-+int migrate_compress_level(void);
-+int migrate_compress_threads(void);
-+int migrate_compress_wait_thread(void);
-+int migrate_decompress_threads(void);
-+int64_t migrate_max_postcopy_bandwidth(void);
-+int migrate_multifd_channels(void);
-+MultiFDCompression migrate_multifd_compression(void);
-+int migrate_multifd_zlib_level(void);
-+int migrate_multifd_zstd_level(void);
-+uint64_t migrate_xbzrle_cache_size(void);
-+
- #endif
--- 
-2.39.1
-
diff --git a/kvm-migration-Move-qmp_migrate_set_capabilities-to-optio.patch b/kvm-migration-Move-qmp_migrate_set_capabilities-to-optio.patch
deleted file mode 100644
index 10f185b..0000000
--- a/kvm-migration-Move-qmp_migrate_set_capabilities-to-optio.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From d967ec22cdb20e0a846f050a2bc7bd4caa87940d Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Wed, 1 Mar 2023 23:18:02 +0100
-Subject: [PATCH 35/56] migration: Move qmp_migrate_set_capabilities() to
- options.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [34/50] 16b62ca7e06c58d71389c449dc19c11939dd0882 (peterx/qemu-kvm)
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-(cherry picked from commit 45c1de13f09b1fd4ea26f54e6da12aae52f34cb8)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c | 26 --------------------------
- migration/options.c   | 26 ++++++++++++++++++++++++++
- 2 files changed, 26 insertions(+), 26 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index 3dc8ee4875..369cd91796 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -1222,32 +1222,6 @@ MigrationInfo *qmp_query_migrate(Error **errp)
-     return info;
- }
- 
--void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,
--                                  Error **errp)
--{
--    MigrationState *s = migrate_get_current();
--    MigrationCapabilityStatusList *cap;
--    bool new_caps[MIGRATION_CAPABILITY__MAX];
--
--    if (migration_is_running(s->state)) {
--        error_setg(errp, QERR_MIGRATION_ACTIVE);
--        return;
--    }
--
--    memcpy(new_caps, s->capabilities, sizeof(new_caps));
--    for (cap = params; cap; cap = cap->next) {
--        new_caps[cap->value->capability] = cap->value->state;
--    }
--
--    if (!migrate_caps_check(s->capabilities, new_caps, errp)) {
--        return;
--    }
--
--    for (cap = params; cap; cap = cap->next) {
--        s->capabilities[cap->value->capability] = cap->value->state;
--    }
--}
--
- /*
-  * Check whether the parameters are valid. Error will be put into errp
-  * (if provided). Return true if valid, otherwise false.
-diff --git a/migration/options.c b/migration/options.c
-index ff621bdeb3..4cbe77e35a 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -413,3 +413,29 @@ MigrationCapabilityStatusList *qmp_query_migrate_capabilities(Error **errp)
- 
-     return head;
- }
-+
-+void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,
-+                                  Error **errp)
-+{
-+    MigrationState *s = migrate_get_current();
-+    MigrationCapabilityStatusList *cap;
-+    bool new_caps[MIGRATION_CAPABILITY__MAX];
-+
-+    if (migration_is_running(s->state)) {
-+        error_setg(errp, QERR_MIGRATION_ACTIVE);
-+        return;
-+    }
-+
-+    memcpy(new_caps, s->capabilities, sizeof(new_caps));
-+    for (cap = params; cap; cap = cap->next) {
-+        new_caps[cap->value->capability] = cap->value->state;
-+    }
-+
-+    if (!migrate_caps_check(s->capabilities, new_caps, errp)) {
-+        return;
-+    }
-+
-+    for (cap = params; cap; cap = cap->next) {
-+        s->capabilities[cap->value->capability] = cap->value->state;
-+    }
-+}
--- 
-2.39.1
-
diff --git a/kvm-migration-Move-qmp_migrate_set_parameters-to-options.patch b/kvm-migration-Move-qmp_migrate_set_parameters-to-options.patch
deleted file mode 100644
index 3685a33..0000000
--- a/kvm-migration-Move-qmp_migrate_set_parameters-to-options.patch
+++ /dev/null
@@ -1,943 +0,0 @@
-From 944bf4759d1279c342ddd29c47d47c9670b64625 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Thu, 2 Mar 2023 10:13:16 +0100
-Subject: [PATCH 50/56] migration: Move qmp_migrate_set_parameters() to
- options.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [49/50] b55f7afe868e117d4212f1518b9a37514cc99b33 (peterx/qemu-kvm)
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-(cherry picked from commit 09d6c9658474e8573c5ada58dca8b20fe47dd99e)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c | 420 ------------------------------------------
- migration/options.c   | 418 +++++++++++++++++++++++++++++++++++++++++
- migration/options.h   |  11 ++
- 3 files changed, 429 insertions(+), 420 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index 22ef83c619..08f87f2b0e 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -67,19 +67,10 @@
- 
- #define MAX_THROTTLE  (128 << 20)      /* Migration transfer speed throttling */
- 
--/* Amount of time to allocate to each "chunk" of bandwidth-throttled
-- * data. */
--#define BUFFER_DELAY     100
--#define XFER_LIMIT_RATIO (1000 / BUFFER_DELAY)
--
- /* Time in milliseconds we are allowed to stop the source,
-  * for sending the last part */
- #define DEFAULT_MIGRATE_SET_DOWNTIME 300
- 
--/* Maximum migrate downtime set to 2000 seconds */
--#define MAX_MIGRATE_DOWNTIME_SECONDS 2000
--#define MAX_MIGRATE_DOWNTIME (MAX_MIGRATE_DOWNTIME_SECONDS * 1000)
--
- /* Default compression thread count */
- #define DEFAULT_MIGRATE_COMPRESS_THREAD_COUNT 8
- /* Default decompression thread count, usually decompression is at
-@@ -1140,417 +1131,6 @@ MigrationInfo *qmp_query_migrate(Error **errp)
-     return info;
- }
- 
--/*
-- * Check whether the parameters are valid. Error will be put into errp
-- * (if provided). Return true if valid, otherwise false.
-- */
--static bool migrate_params_check(MigrationParameters *params, Error **errp)
--{
--    if (params->has_compress_level &&
--        (params->compress_level > 9)) {
--        error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "compress_level",
--                   "a value between 0 and 9");
--        return false;
--    }
--
--    if (params->has_compress_threads && (params->compress_threads < 1)) {
--        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
--                   "compress_threads",
--                   "a value between 1 and 255");
--        return false;
--    }
--
--    if (params->has_decompress_threads && (params->decompress_threads < 1)) {
--        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
--                   "decompress_threads",
--                   "a value between 1 and 255");
--        return false;
--    }
--
--    if (params->has_throttle_trigger_threshold &&
--        (params->throttle_trigger_threshold < 1 ||
--         params->throttle_trigger_threshold > 100)) {
--        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
--                   "throttle_trigger_threshold",
--                   "an integer in the range of 1 to 100");
--        return false;
--    }
--
--    if (params->has_cpu_throttle_initial &&
--        (params->cpu_throttle_initial < 1 ||
--         params->cpu_throttle_initial > 99)) {
--        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
--                   "cpu_throttle_initial",
--                   "an integer in the range of 1 to 99");
--        return false;
--    }
--
--    if (params->has_cpu_throttle_increment &&
--        (params->cpu_throttle_increment < 1 ||
--         params->cpu_throttle_increment > 99)) {
--        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
--                   "cpu_throttle_increment",
--                   "an integer in the range of 1 to 99");
--        return false;
--    }
--
--    if (params->has_max_bandwidth && (params->max_bandwidth > SIZE_MAX)) {
--        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
--                   "max_bandwidth",
--                   "an integer in the range of 0 to "stringify(SIZE_MAX)
--                   " bytes/second");
--        return false;
--    }
--
--    if (params->has_downtime_limit &&
--        (params->downtime_limit > MAX_MIGRATE_DOWNTIME)) {
--        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
--                   "downtime_limit",
--                   "an integer in the range of 0 to "
--                    stringify(MAX_MIGRATE_DOWNTIME)" ms");
--        return false;
--    }
--
--    /* x_checkpoint_delay is now always positive */
--
--    if (params->has_multifd_channels && (params->multifd_channels < 1)) {
--        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
--                   "multifd_channels",
--                   "a value between 1 and 255");
--        return false;
--    }
--
--    if (params->has_multifd_zlib_level &&
--        (params->multifd_zlib_level > 9)) {
--        error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "multifd_zlib_level",
--                   "a value between 0 and 9");
--        return false;
--    }
--
--    if (params->has_multifd_zstd_level &&
--        (params->multifd_zstd_level > 20)) {
--        error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "multifd_zstd_level",
--                   "a value between 0 and 20");
--        return false;
--    }
--
--    if (params->has_xbzrle_cache_size &&
--        (params->xbzrle_cache_size < qemu_target_page_size() ||
--         !is_power_of_2(params->xbzrle_cache_size))) {
--        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
--                   "xbzrle_cache_size",
--                   "a power of two no less than the target page size");
--        return false;
--    }
--
--    if (params->has_max_cpu_throttle &&
--        (params->max_cpu_throttle < params->cpu_throttle_initial ||
--         params->max_cpu_throttle > 99)) {
--        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
--                   "max_cpu_throttle",
--                   "an integer in the range of cpu_throttle_initial to 99");
--        return false;
--    }
--
--    if (params->has_announce_initial &&
--        params->announce_initial > 100000) {
--        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
--                   "announce_initial",
--                   "a value between 0 and 100000");
--        return false;
--    }
--    if (params->has_announce_max &&
--        params->announce_max > 100000) {
--        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
--                   "announce_max",
--                   "a value between 0 and 100000");
--       return false;
--    }
--    if (params->has_announce_rounds &&
--        params->announce_rounds > 1000) {
--        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
--                   "announce_rounds",
--                   "a value between 0 and 1000");
--       return false;
--    }
--    if (params->has_announce_step &&
--        (params->announce_step < 1 ||
--        params->announce_step > 10000)) {
--        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
--                   "announce_step",
--                   "a value between 0 and 10000");
--       return false;
--    }
--
--    if (params->has_block_bitmap_mapping &&
--        !check_dirty_bitmap_mig_alias_map(params->block_bitmap_mapping, errp)) {
--        error_prepend(errp, "Invalid mapping given for block-bitmap-mapping: ");
--        return false;
--    }
--
--#ifdef CONFIG_LINUX
--    if (migrate_zero_copy_send() &&
--        ((params->has_multifd_compression && params->multifd_compression) ||
--         (params->tls_creds && *params->tls_creds))) {
--        error_setg(errp,
--                   "Zero copy only available for non-compressed non-TLS multifd migration");
--        return false;
--    }
--#endif
--
--    return true;
--}
--
--static void migrate_params_test_apply(MigrateSetParameters *params,
--                                      MigrationParameters *dest)
--{
--    *dest = migrate_get_current()->parameters;
--
--    /* TODO use QAPI_CLONE() instead of duplicating it inline */
--
--    if (params->has_compress_level) {
--        dest->compress_level = params->compress_level;
--    }
--
--    if (params->has_compress_threads) {
--        dest->compress_threads = params->compress_threads;
--    }
--
--    if (params->has_compress_wait_thread) {
--        dest->compress_wait_thread = params->compress_wait_thread;
--    }
--
--    if (params->has_decompress_threads) {
--        dest->decompress_threads = params->decompress_threads;
--    }
--
--    if (params->has_throttle_trigger_threshold) {
--        dest->throttle_trigger_threshold = params->throttle_trigger_threshold;
--    }
--
--    if (params->has_cpu_throttle_initial) {
--        dest->cpu_throttle_initial = params->cpu_throttle_initial;
--    }
--
--    if (params->has_cpu_throttle_increment) {
--        dest->cpu_throttle_increment = params->cpu_throttle_increment;
--    }
--
--    if (params->has_cpu_throttle_tailslow) {
--        dest->cpu_throttle_tailslow = params->cpu_throttle_tailslow;
--    }
--
--    if (params->tls_creds) {
--        assert(params->tls_creds->type == QTYPE_QSTRING);
--        dest->tls_creds = params->tls_creds->u.s;
--    }
--
--    if (params->tls_hostname) {
--        assert(params->tls_hostname->type == QTYPE_QSTRING);
--        dest->tls_hostname = params->tls_hostname->u.s;
--    }
--
--    if (params->has_max_bandwidth) {
--        dest->max_bandwidth = params->max_bandwidth;
--    }
--
--    if (params->has_downtime_limit) {
--        dest->downtime_limit = params->downtime_limit;
--    }
--
--    if (params->has_x_checkpoint_delay) {
--        dest->x_checkpoint_delay = params->x_checkpoint_delay;
--    }
--
--    if (params->has_block_incremental) {
--        dest->block_incremental = params->block_incremental;
--    }
--    if (params->has_multifd_channels) {
--        dest->multifd_channels = params->multifd_channels;
--    }
--    if (params->has_multifd_compression) {
--        dest->multifd_compression = params->multifd_compression;
--    }
--    if (params->has_xbzrle_cache_size) {
--        dest->xbzrle_cache_size = params->xbzrle_cache_size;
--    }
--    if (params->has_max_postcopy_bandwidth) {
--        dest->max_postcopy_bandwidth = params->max_postcopy_bandwidth;
--    }
--    if (params->has_max_cpu_throttle) {
--        dest->max_cpu_throttle = params->max_cpu_throttle;
--    }
--    if (params->has_announce_initial) {
--        dest->announce_initial = params->announce_initial;
--    }
--    if (params->has_announce_max) {
--        dest->announce_max = params->announce_max;
--    }
--    if (params->has_announce_rounds) {
--        dest->announce_rounds = params->announce_rounds;
--    }
--    if (params->has_announce_step) {
--        dest->announce_step = params->announce_step;
--    }
--
--    if (params->has_block_bitmap_mapping) {
--        dest->has_block_bitmap_mapping = true;
--        dest->block_bitmap_mapping = params->block_bitmap_mapping;
--    }
--}
--
--static void migrate_params_apply(MigrateSetParameters *params, Error **errp)
--{
--    MigrationState *s = migrate_get_current();
--
--    /* TODO use QAPI_CLONE() instead of duplicating it inline */
--
--    if (params->has_compress_level) {
--        s->parameters.compress_level = params->compress_level;
--    }
--
--    if (params->has_compress_threads) {
--        s->parameters.compress_threads = params->compress_threads;
--    }
--
--    if (params->has_compress_wait_thread) {
--        s->parameters.compress_wait_thread = params->compress_wait_thread;
--    }
--
--    if (params->has_decompress_threads) {
--        s->parameters.decompress_threads = params->decompress_threads;
--    }
--
--    if (params->has_throttle_trigger_threshold) {
--        s->parameters.throttle_trigger_threshold = params->throttle_trigger_threshold;
--    }
--
--    if (params->has_cpu_throttle_initial) {
--        s->parameters.cpu_throttle_initial = params->cpu_throttle_initial;
--    }
--
--    if (params->has_cpu_throttle_increment) {
--        s->parameters.cpu_throttle_increment = params->cpu_throttle_increment;
--    }
--
--    if (params->has_cpu_throttle_tailslow) {
--        s->parameters.cpu_throttle_tailslow = params->cpu_throttle_tailslow;
--    }
--
--    if (params->tls_creds) {
--        g_free(s->parameters.tls_creds);
--        assert(params->tls_creds->type == QTYPE_QSTRING);
--        s->parameters.tls_creds = g_strdup(params->tls_creds->u.s);
--    }
--
--    if (params->tls_hostname) {
--        g_free(s->parameters.tls_hostname);
--        assert(params->tls_hostname->type == QTYPE_QSTRING);
--        s->parameters.tls_hostname = g_strdup(params->tls_hostname->u.s);
--    }
--
--    if (params->tls_authz) {
--        g_free(s->parameters.tls_authz);
--        assert(params->tls_authz->type == QTYPE_QSTRING);
--        s->parameters.tls_authz = g_strdup(params->tls_authz->u.s);
--    }
--
--    if (params->has_max_bandwidth) {
--        s->parameters.max_bandwidth = params->max_bandwidth;
--        if (s->to_dst_file && !migration_in_postcopy()) {
--            qemu_file_set_rate_limit(s->to_dst_file,
--                                s->parameters.max_bandwidth / XFER_LIMIT_RATIO);
--        }
--    }
--
--    if (params->has_downtime_limit) {
--        s->parameters.downtime_limit = params->downtime_limit;
--    }
--
--    if (params->has_x_checkpoint_delay) {
--        s->parameters.x_checkpoint_delay = params->x_checkpoint_delay;
--        if (migration_in_colo_state()) {
--            colo_checkpoint_notify(s);
--        }
--    }
--
--    if (params->has_block_incremental) {
--        s->parameters.block_incremental = params->block_incremental;
--    }
--    if (params->has_multifd_channels) {
--        s->parameters.multifd_channels = params->multifd_channels;
--    }
--    if (params->has_multifd_compression) {
--        s->parameters.multifd_compression = params->multifd_compression;
--    }
--    if (params->has_xbzrle_cache_size) {
--        s->parameters.xbzrle_cache_size = params->xbzrle_cache_size;
--        xbzrle_cache_resize(params->xbzrle_cache_size, errp);
--    }
--    if (params->has_max_postcopy_bandwidth) {
--        s->parameters.max_postcopy_bandwidth = params->max_postcopy_bandwidth;
--        if (s->to_dst_file && migration_in_postcopy()) {
--            qemu_file_set_rate_limit(s->to_dst_file,
--                    s->parameters.max_postcopy_bandwidth / XFER_LIMIT_RATIO);
--        }
--    }
--    if (params->has_max_cpu_throttle) {
--        s->parameters.max_cpu_throttle = params->max_cpu_throttle;
--    }
--    if (params->has_announce_initial) {
--        s->parameters.announce_initial = params->announce_initial;
--    }
--    if (params->has_announce_max) {
--        s->parameters.announce_max = params->announce_max;
--    }
--    if (params->has_announce_rounds) {
--        s->parameters.announce_rounds = params->announce_rounds;
--    }
--    if (params->has_announce_step) {
--        s->parameters.announce_step = params->announce_step;
--    }
--
--    if (params->has_block_bitmap_mapping) {
--        qapi_free_BitmapMigrationNodeAliasList(
--            s->parameters.block_bitmap_mapping);
--
--        s->parameters.has_block_bitmap_mapping = true;
--        s->parameters.block_bitmap_mapping =
--            QAPI_CLONE(BitmapMigrationNodeAliasList,
--                       params->block_bitmap_mapping);
--    }
--}
--
--void qmp_migrate_set_parameters(MigrateSetParameters *params, Error **errp)
--{
--    MigrationParameters tmp;
--
--    /* TODO Rewrite "" to null instead */
--    if (params->tls_creds
--        && params->tls_creds->type == QTYPE_QNULL) {
--        qobject_unref(params->tls_creds->u.n);
--        params->tls_creds->type = QTYPE_QSTRING;
--        params->tls_creds->u.s = strdup("");
--    }
--    /* TODO Rewrite "" to null instead */
--    if (params->tls_hostname
--        && params->tls_hostname->type == QTYPE_QNULL) {
--        qobject_unref(params->tls_hostname->u.n);
--        params->tls_hostname->type = QTYPE_QSTRING;
--        params->tls_hostname->u.s = strdup("");
--    }
--
--    migrate_params_test_apply(params, &tmp);
--
--    if (!migrate_params_check(&tmp, errp)) {
--        /* Invalid parameter */
--        return;
--    }
--
--    migrate_params_apply(params, errp);
--}
--
--
- void qmp_migrate_start_postcopy(Error **errp)
- {
-     MigrationState *s = migrate_get_current();
-diff --git a/migration/options.c b/migration/options.c
-index d4c0714683..4701c75a4d 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -12,17 +12,25 @@
-  */
- 
- #include "qemu/osdep.h"
-+#include "exec/target_page.h"
- #include "qapi/clone-visitor.h"
- #include "qapi/error.h"
- #include "qapi/qapi-commands-migration.h"
- #include "qapi/qapi-visit-migration.h"
- #include "qapi/qmp/qerror.h"
-+#include "qapi/qmp/qnull.h"
- #include "sysemu/runstate.h"
-+#include "migration/colo.h"
- #include "migration/misc.h"
- #include "migration.h"
-+#include "qemu-file.h"
- #include "ram.h"
- #include "options.h"
- 
-+/* Maximum migrate downtime set to 2000 seconds */
-+#define MAX_MIGRATE_DOWNTIME_SECONDS 2000
-+#define MAX_MIGRATE_DOWNTIME (MAX_MIGRATE_DOWNTIME_SECONDS * 1000)
-+
- bool migrate_auto_converge(void)
- {
-     MigrationState *s;
-@@ -729,3 +737,413 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp)
- 
-     return params;
- }
-+
-+/*
-+ * Check whether the parameters are valid. Error will be put into errp
-+ * (if provided). Return true if valid, otherwise false.
-+ */
-+bool migrate_params_check(MigrationParameters *params, Error **errp)
-+{
-+    if (params->has_compress_level &&
-+        (params->compress_level > 9)) {
-+        error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "compress_level",
-+                   "a value between 0 and 9");
-+        return false;
-+    }
-+
-+    if (params->has_compress_threads && (params->compress_threads < 1)) {
-+        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
-+                   "compress_threads",
-+                   "a value between 1 and 255");
-+        return false;
-+    }
-+
-+    if (params->has_decompress_threads && (params->decompress_threads < 1)) {
-+        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
-+                   "decompress_threads",
-+                   "a value between 1 and 255");
-+        return false;
-+    }
-+
-+    if (params->has_throttle_trigger_threshold &&
-+        (params->throttle_trigger_threshold < 1 ||
-+         params->throttle_trigger_threshold > 100)) {
-+        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
-+                   "throttle_trigger_threshold",
-+                   "an integer in the range of 1 to 100");
-+        return false;
-+    }
-+
-+    if (params->has_cpu_throttle_initial &&
-+        (params->cpu_throttle_initial < 1 ||
-+         params->cpu_throttle_initial > 99)) {
-+        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
-+                   "cpu_throttle_initial",
-+                   "an integer in the range of 1 to 99");
-+        return false;
-+    }
-+
-+    if (params->has_cpu_throttle_increment &&
-+        (params->cpu_throttle_increment < 1 ||
-+         params->cpu_throttle_increment > 99)) {
-+        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
-+                   "cpu_throttle_increment",
-+                   "an integer in the range of 1 to 99");
-+        return false;
-+    }
-+
-+    if (params->has_max_bandwidth && (params->max_bandwidth > SIZE_MAX)) {
-+        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
-+                   "max_bandwidth",
-+                   "an integer in the range of 0 to "stringify(SIZE_MAX)
-+                   " bytes/second");
-+        return false;
-+    }
-+
-+    if (params->has_downtime_limit &&
-+        (params->downtime_limit > MAX_MIGRATE_DOWNTIME)) {
-+        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
-+                   "downtime_limit",
-+                   "an integer in the range of 0 to "
-+                    stringify(MAX_MIGRATE_DOWNTIME)" ms");
-+        return false;
-+    }
-+
-+    /* x_checkpoint_delay is now always positive */
-+
-+    if (params->has_multifd_channels && (params->multifd_channels < 1)) {
-+        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
-+                   "multifd_channels",
-+                   "a value between 1 and 255");
-+        return false;
-+    }
-+
-+    if (params->has_multifd_zlib_level &&
-+        (params->multifd_zlib_level > 9)) {
-+        error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "multifd_zlib_level",
-+                   "a value between 0 and 9");
-+        return false;
-+    }
-+
-+    if (params->has_multifd_zstd_level &&
-+        (params->multifd_zstd_level > 20)) {
-+        error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "multifd_zstd_level",
-+                   "a value between 0 and 20");
-+        return false;
-+    }
-+
-+    if (params->has_xbzrle_cache_size &&
-+        (params->xbzrle_cache_size < qemu_target_page_size() ||
-+         !is_power_of_2(params->xbzrle_cache_size))) {
-+        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
-+                   "xbzrle_cache_size",
-+                   "a power of two no less than the target page size");
-+        return false;
-+    }
-+
-+    if (params->has_max_cpu_throttle &&
-+        (params->max_cpu_throttle < params->cpu_throttle_initial ||
-+         params->max_cpu_throttle > 99)) {
-+        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
-+                   "max_cpu_throttle",
-+                   "an integer in the range of cpu_throttle_initial to 99");
-+        return false;
-+    }
-+
-+    if (params->has_announce_initial &&
-+        params->announce_initial > 100000) {
-+        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
-+                   "announce_initial",
-+                   "a value between 0 and 100000");
-+        return false;
-+    }
-+    if (params->has_announce_max &&
-+        params->announce_max > 100000) {
-+        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
-+                   "announce_max",
-+                   "a value between 0 and 100000");
-+       return false;
-+    }
-+    if (params->has_announce_rounds &&
-+        params->announce_rounds > 1000) {
-+        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
-+                   "announce_rounds",
-+                   "a value between 0 and 1000");
-+       return false;
-+    }
-+    if (params->has_announce_step &&
-+        (params->announce_step < 1 ||
-+        params->announce_step > 10000)) {
-+        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,
-+                   "announce_step",
-+                   "a value between 0 and 10000");
-+       return false;
-+    }
-+
-+    if (params->has_block_bitmap_mapping &&
-+        !check_dirty_bitmap_mig_alias_map(params->block_bitmap_mapping, errp)) {
-+        error_prepend(errp, "Invalid mapping given for block-bitmap-mapping: ");
-+        return false;
-+    }
-+
-+#ifdef CONFIG_LINUX
-+    if (migrate_zero_copy_send() &&
-+        ((params->has_multifd_compression && params->multifd_compression) ||
-+         (params->tls_creds && *params->tls_creds))) {
-+        error_setg(errp,
-+                   "Zero copy only available for non-compressed non-TLS multifd migration");
-+        return false;
-+    }
-+#endif
-+
-+    return true;
-+}
-+
-+static void migrate_params_test_apply(MigrateSetParameters *params,
-+                                      MigrationParameters *dest)
-+{
-+    *dest = migrate_get_current()->parameters;
-+
-+    /* TODO use QAPI_CLONE() instead of duplicating it inline */
-+
-+    if (params->has_compress_level) {
-+        dest->compress_level = params->compress_level;
-+    }
-+
-+    if (params->has_compress_threads) {
-+        dest->compress_threads = params->compress_threads;
-+    }
-+
-+    if (params->has_compress_wait_thread) {
-+        dest->compress_wait_thread = params->compress_wait_thread;
-+    }
-+
-+    if (params->has_decompress_threads) {
-+        dest->decompress_threads = params->decompress_threads;
-+    }
-+
-+    if (params->has_throttle_trigger_threshold) {
-+        dest->throttle_trigger_threshold = params->throttle_trigger_threshold;
-+    }
-+
-+    if (params->has_cpu_throttle_initial) {
-+        dest->cpu_throttle_initial = params->cpu_throttle_initial;
-+    }
-+
-+    if (params->has_cpu_throttle_increment) {
-+        dest->cpu_throttle_increment = params->cpu_throttle_increment;
-+    }
-+
-+    if (params->has_cpu_throttle_tailslow) {
-+        dest->cpu_throttle_tailslow = params->cpu_throttle_tailslow;
-+    }
-+
-+    if (params->tls_creds) {
-+        assert(params->tls_creds->type == QTYPE_QSTRING);
-+        dest->tls_creds = params->tls_creds->u.s;
-+    }
-+
-+    if (params->tls_hostname) {
-+        assert(params->tls_hostname->type == QTYPE_QSTRING);
-+        dest->tls_hostname = params->tls_hostname->u.s;
-+    }
-+
-+    if (params->has_max_bandwidth) {
-+        dest->max_bandwidth = params->max_bandwidth;
-+    }
-+
-+    if (params->has_downtime_limit) {
-+        dest->downtime_limit = params->downtime_limit;
-+    }
-+
-+    if (params->has_x_checkpoint_delay) {
-+        dest->x_checkpoint_delay = params->x_checkpoint_delay;
-+    }
-+
-+    if (params->has_block_incremental) {
-+        dest->block_incremental = params->block_incremental;
-+    }
-+    if (params->has_multifd_channels) {
-+        dest->multifd_channels = params->multifd_channels;
-+    }
-+    if (params->has_multifd_compression) {
-+        dest->multifd_compression = params->multifd_compression;
-+    }
-+    if (params->has_xbzrle_cache_size) {
-+        dest->xbzrle_cache_size = params->xbzrle_cache_size;
-+    }
-+    if (params->has_max_postcopy_bandwidth) {
-+        dest->max_postcopy_bandwidth = params->max_postcopy_bandwidth;
-+    }
-+    if (params->has_max_cpu_throttle) {
-+        dest->max_cpu_throttle = params->max_cpu_throttle;
-+    }
-+    if (params->has_announce_initial) {
-+        dest->announce_initial = params->announce_initial;
-+    }
-+    if (params->has_announce_max) {
-+        dest->announce_max = params->announce_max;
-+    }
-+    if (params->has_announce_rounds) {
-+        dest->announce_rounds = params->announce_rounds;
-+    }
-+    if (params->has_announce_step) {
-+        dest->announce_step = params->announce_step;
-+    }
-+
-+    if (params->has_block_bitmap_mapping) {
-+        dest->has_block_bitmap_mapping = true;
-+        dest->block_bitmap_mapping = params->block_bitmap_mapping;
-+    }
-+}
-+
-+static void migrate_params_apply(MigrateSetParameters *params, Error **errp)
-+{
-+    MigrationState *s = migrate_get_current();
-+
-+    /* TODO use QAPI_CLONE() instead of duplicating it inline */
-+
-+    if (params->has_compress_level) {
-+        s->parameters.compress_level = params->compress_level;
-+    }
-+
-+    if (params->has_compress_threads) {
-+        s->parameters.compress_threads = params->compress_threads;
-+    }
-+
-+    if (params->has_compress_wait_thread) {
-+        s->parameters.compress_wait_thread = params->compress_wait_thread;
-+    }
-+
-+    if (params->has_decompress_threads) {
-+        s->parameters.decompress_threads = params->decompress_threads;
-+    }
-+
-+    if (params->has_throttle_trigger_threshold) {
-+        s->parameters.throttle_trigger_threshold = params->throttle_trigger_threshold;
-+    }
-+
-+    if (params->has_cpu_throttle_initial) {
-+        s->parameters.cpu_throttle_initial = params->cpu_throttle_initial;
-+    }
-+
-+    if (params->has_cpu_throttle_increment) {
-+        s->parameters.cpu_throttle_increment = params->cpu_throttle_increment;
-+    }
-+
-+    if (params->has_cpu_throttle_tailslow) {
-+        s->parameters.cpu_throttle_tailslow = params->cpu_throttle_tailslow;
-+    }
-+
-+    if (params->tls_creds) {
-+        g_free(s->parameters.tls_creds);
-+        assert(params->tls_creds->type == QTYPE_QSTRING);
-+        s->parameters.tls_creds = g_strdup(params->tls_creds->u.s);
-+    }
-+
-+    if (params->tls_hostname) {
-+        g_free(s->parameters.tls_hostname);
-+        assert(params->tls_hostname->type == QTYPE_QSTRING);
-+        s->parameters.tls_hostname = g_strdup(params->tls_hostname->u.s);
-+    }
-+
-+    if (params->tls_authz) {
-+        g_free(s->parameters.tls_authz);
-+        assert(params->tls_authz->type == QTYPE_QSTRING);
-+        s->parameters.tls_authz = g_strdup(params->tls_authz->u.s);
-+    }
-+
-+    if (params->has_max_bandwidth) {
-+        s->parameters.max_bandwidth = params->max_bandwidth;
-+        if (s->to_dst_file && !migration_in_postcopy()) {
-+            qemu_file_set_rate_limit(s->to_dst_file,
-+                                s->parameters.max_bandwidth / XFER_LIMIT_RATIO);
-+        }
-+    }
-+
-+    if (params->has_downtime_limit) {
-+        s->parameters.downtime_limit = params->downtime_limit;
-+    }
-+
-+    if (params->has_x_checkpoint_delay) {
-+        s->parameters.x_checkpoint_delay = params->x_checkpoint_delay;
-+        if (migration_in_colo_state()) {
-+            colo_checkpoint_notify(s);
-+        }
-+    }
-+
-+    if (params->has_block_incremental) {
-+        s->parameters.block_incremental = params->block_incremental;
-+    }
-+    if (params->has_multifd_channels) {
-+        s->parameters.multifd_channels = params->multifd_channels;
-+    }
-+    if (params->has_multifd_compression) {
-+        s->parameters.multifd_compression = params->multifd_compression;
-+    }
-+    if (params->has_xbzrle_cache_size) {
-+        s->parameters.xbzrle_cache_size = params->xbzrle_cache_size;
-+        xbzrle_cache_resize(params->xbzrle_cache_size, errp);
-+    }
-+    if (params->has_max_postcopy_bandwidth) {
-+        s->parameters.max_postcopy_bandwidth = params->max_postcopy_bandwidth;
-+        if (s->to_dst_file && migration_in_postcopy()) {
-+            qemu_file_set_rate_limit(s->to_dst_file,
-+                    s->parameters.max_postcopy_bandwidth / XFER_LIMIT_RATIO);
-+        }
-+    }
-+    if (params->has_max_cpu_throttle) {
-+        s->parameters.max_cpu_throttle = params->max_cpu_throttle;
-+    }
-+    if (params->has_announce_initial) {
-+        s->parameters.announce_initial = params->announce_initial;
-+    }
-+    if (params->has_announce_max) {
-+        s->parameters.announce_max = params->announce_max;
-+    }
-+    if (params->has_announce_rounds) {
-+        s->parameters.announce_rounds = params->announce_rounds;
-+    }
-+    if (params->has_announce_step) {
-+        s->parameters.announce_step = params->announce_step;
-+    }
-+
-+    if (params->has_block_bitmap_mapping) {
-+        qapi_free_BitmapMigrationNodeAliasList(
-+            s->parameters.block_bitmap_mapping);
-+
-+        s->parameters.has_block_bitmap_mapping = true;
-+        s->parameters.block_bitmap_mapping =
-+            QAPI_CLONE(BitmapMigrationNodeAliasList,
-+                       params->block_bitmap_mapping);
-+    }
-+}
-+
-+void qmp_migrate_set_parameters(MigrateSetParameters *params, Error **errp)
-+{
-+    MigrationParameters tmp;
-+
-+    /* TODO Rewrite "" to null instead */
-+    if (params->tls_creds
-+        && params->tls_creds->type == QTYPE_QNULL) {
-+        qobject_unref(params->tls_creds->u.n);
-+        params->tls_creds->type = QTYPE_QSTRING;
-+        params->tls_creds->u.s = strdup("");
-+    }
-+    /* TODO Rewrite "" to null instead */
-+    if (params->tls_hostname
-+        && params->tls_hostname->type == QTYPE_QNULL) {
-+        qobject_unref(params->tls_hostname->u.n);
-+        params->tls_hostname->type = QTYPE_QSTRING;
-+        params->tls_hostname->u.s = strdup("");
-+    }
-+
-+    migrate_params_test_apply(params, &tmp);
-+
-+    if (!migrate_params_check(&tmp, errp)) {
-+        /* Invalid parameter */
-+        return;
-+    }
-+
-+    migrate_params_apply(params, errp);
-+}
-diff --git a/migration/options.h b/migration/options.h
-index 13318a16c7..89067e59a0 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -14,6 +14,13 @@
- #ifndef QEMU_MIGRATION_OPTIONS_H
- #define QEMU_MIGRATION_OPTIONS_H
- 
-+/* constants */
-+
-+/* Amount of time to allocate to each "chunk" of bandwidth-throttled
-+ * data. */
-+#define BUFFER_DELAY     100
-+#define XFER_LIMIT_RATIO (1000 / BUFFER_DELAY)
-+
- /* capabilities */
- 
- bool migrate_auto_converge(void);
-@@ -74,4 +81,8 @@ int migrate_multifd_zstd_level(void);
- uint8_t migrate_throttle_trigger_threshold(void);
- uint64_t migrate_xbzrle_cache_size(void);
- 
-+/* parameters helpers */
-+
-+bool migrate_params_check(MigrationParameters *params, Error **errp);
-+
- #endif
--- 
-2.39.1
-
diff --git a/kvm-migration-Move-qmp_query_migrate_capabilities-to-opt.patch b/kvm-migration-Move-qmp_query_migrate_capabilities-to-opt.patch
deleted file mode 100644
index d2564de..0000000
--- a/kvm-migration-Move-qmp_query_migrate_capabilities-to-opt.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 00cc3c3598828588619a7b3696819060bddaddb8 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Wed, 1 Mar 2023 23:15:59 +0100
-Subject: [PATCH 34/56] migration: Move qmp_query_migrate_capabilities() to
- options.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [33/50] dbfa8f1e7aa7e000b4622ce2da12d7d418710f19 (peterx/qemu-kvm)
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-(cherry picked from commit 4d0c6b695bf5252402ebf967f83baebfd2f4b91e)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c | 22 ----------------------
- migration/options.c   | 23 +++++++++++++++++++++++
- 2 files changed, 23 insertions(+), 22 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index d9e30ca918..3dc8ee4875 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -886,28 +886,6 @@ void migrate_send_rp_resume_ack(MigrationIncomingState *mis, uint32_t value)
-     migrate_send_rp_message(mis, MIG_RP_MSG_RESUME_ACK, sizeof(buf), &buf);
- }
- 
--MigrationCapabilityStatusList *qmp_query_migrate_capabilities(Error **errp)
--{
--    MigrationCapabilityStatusList *head = NULL, **tail = &head;
--    MigrationCapabilityStatus *caps;
--    MigrationState *s = migrate_get_current();
--    int i;
--
--    for (i = 0; i < MIGRATION_CAPABILITY__MAX; i++) {
--#ifndef CONFIG_LIVE_BLOCK_MIGRATION
--        if (i == MIGRATION_CAPABILITY_BLOCK) {
--            continue;
--        }
--#endif
--        caps = g_malloc0(sizeof(*caps));
--        caps->capability = i;
--        caps->state = s->capabilities[i];
--        QAPI_LIST_APPEND(tail, caps);
--    }
--
--    return head;
--}
--
- MigrationParameters *qmp_query_migrate_parameters(Error **errp)
- {
-     MigrationParameters *params;
-diff --git a/migration/options.c b/migration/options.c
-index 367c930f46..ff621bdeb3 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -13,6 +13,7 @@
- 
- #include "qemu/osdep.h"
- #include "qapi/error.h"
-+#include "qapi/qapi-commands-migration.h"
- #include "sysemu/runstate.h"
- #include "migration.h"
- #include "ram.h"
-@@ -390,3 +391,25 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp)
- 
-     return true;
- }
-+
-+MigrationCapabilityStatusList *qmp_query_migrate_capabilities(Error **errp)
-+{
-+    MigrationCapabilityStatusList *head = NULL, **tail = &head;
-+    MigrationCapabilityStatus *caps;
-+    MigrationState *s = migrate_get_current();
-+    int i;
-+
-+    for (i = 0; i < MIGRATION_CAPABILITY__MAX; i++) {
-+#ifndef CONFIG_LIVE_BLOCK_MIGRATION
-+        if (i == MIGRATION_CAPABILITY_BLOCK) {
-+            continue;
-+        }
-+#endif
-+        caps = g_malloc0(sizeof(*caps));
-+        caps->capability = i;
-+        caps->state = s->capabilities[i];
-+        QAPI_LIST_APPEND(tail, caps);
-+    }
-+
-+    return head;
-+}
--- 
-2.39.1
-
diff --git a/kvm-migration-Pass-migrate_caps_check-the-old-and-new-ca.patch b/kvm-migration-Pass-migrate_caps_check-the-old-and-new-ca.patch
deleted file mode 100644
index 7339ce0..0000000
--- a/kvm-migration-Pass-migrate_caps_check-the-old-and-new-ca.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-From 4782b59a8b0b5762f87505ac7a83b37ddd2e0b3f Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Wed, 1 Mar 2023 20:28:56 +0100
-Subject: [PATCH 19/56] migration: Pass migrate_caps_check() the old and new
- caps
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [18/50] df78d680d03f15d7cb7401ad89e68a4fc93fa835 (peterx/qemu-kvm)
-
-We used to pass the old capabilities array and the new
-capabilities as a list.
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-(cherry picked from commit b02c7fc9ef447787414e6fa67eff75e7b7b30180)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c | 80 +++++++++++++++++--------------------------
- 1 file changed, 31 insertions(+), 49 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index d8e5fb6226..e8f596bcfa 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -1299,30 +1299,20 @@ WriteTrackingSupport migrate_query_write_tracking(void)
- }
- 
- /**
-- * @migration_caps_check - check capability validity
-+ * @migration_caps_check - check capability compatibility
-  *
-- * @cap_list: old capability list, array of bool
-- * @params: new capabilities to be applied soon
-+ * @old_caps: old capability list
-+ * @new_caps: new capability list
-  * @errp: set *errp if the check failed, with reason
-  *
-  * Returns true if check passed, otherwise false.
-  */
--static bool migrate_caps_check(bool *cap_list,
--                               MigrationCapabilityStatusList *params,
--                               Error **errp)
-+static bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp)
- {
--    MigrationCapabilityStatusList *cap;
--    bool old_postcopy_cap;
-     MigrationIncomingState *mis = migration_incoming_get_current();
- 
--    old_postcopy_cap = cap_list[MIGRATION_CAPABILITY_POSTCOPY_RAM];
--
--    for (cap = params; cap; cap = cap->next) {
--        cap_list[cap->value->capability] = cap->value->state;
--    }
--
- #ifndef CONFIG_LIVE_BLOCK_MIGRATION
--    if (cap_list[MIGRATION_CAPABILITY_BLOCK]) {
-+    if (new_caps[MIGRATION_CAPABILITY_BLOCK]) {
-         error_setg(errp, "QEMU compiled without old-style (blk/-b, inc/-i) "
-                    "block migration");
-         error_append_hint(errp, "Use drive_mirror+NBD instead.\n");
-@@ -1331,7 +1321,7 @@ static bool migrate_caps_check(bool *cap_list,
- #endif
- 
- #ifndef CONFIG_REPLICATION
--    if (cap_list[MIGRATION_CAPABILITY_X_COLO]) {
-+    if (new_caps[MIGRATION_CAPABILITY_X_COLO]) {
-         error_setg(errp, "QEMU compiled without replication module"
-                    " can't enable COLO");
-         error_append_hint(errp, "Please enable replication before COLO.\n");
-@@ -1339,12 +1329,13 @@ static bool migrate_caps_check(bool *cap_list,
-     }
- #endif
- 
--    if (cap_list[MIGRATION_CAPABILITY_POSTCOPY_RAM]) {
-+    if (new_caps[MIGRATION_CAPABILITY_POSTCOPY_RAM]) {
-         /* This check is reasonably expensive, so only when it's being
-          * set the first time, also it's only the destination that needs
-          * special support.
-          */
--        if (!old_postcopy_cap && runstate_check(RUN_STATE_INMIGRATE) &&
-+        if (!old_caps[MIGRATION_CAPABILITY_POSTCOPY_RAM] &&
-+            runstate_check(RUN_STATE_INMIGRATE) &&
-             !postcopy_ram_supported_by_host(mis)) {
-             /* postcopy_ram_supported_by_host will have emitted a more
-              * detailed message
-@@ -1353,13 +1344,13 @@ static bool migrate_caps_check(bool *cap_list,
-             return false;
-         }
- 
--        if (cap_list[MIGRATION_CAPABILITY_X_IGNORE_SHARED]) {
-+        if (new_caps[MIGRATION_CAPABILITY_X_IGNORE_SHARED]) {
-             error_setg(errp, "Postcopy is not compatible with ignore-shared");
-             return false;
-         }
-     }
- 
--    if (cap_list[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT]) {
-+    if (new_caps[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT]) {
-         WriteTrackingSupport wt_support;
-         int idx;
-         /*
-@@ -1383,7 +1374,7 @@ static bool migrate_caps_check(bool *cap_list,
-          */
-         for (idx = 0; idx < check_caps_background_snapshot.size; idx++) {
-             int incomp_cap = check_caps_background_snapshot.caps[idx];
--            if (cap_list[incomp_cap]) {
-+            if (new_caps[incomp_cap]) {
-                 error_setg(errp,
-                         "Background-snapshot is not compatible with %s",
-                         MigrationCapability_str(incomp_cap));
-@@ -1393,10 +1384,10 @@ static bool migrate_caps_check(bool *cap_list,
-     }
- 
- #ifdef CONFIG_LINUX
--    if (cap_list[MIGRATION_CAPABILITY_ZERO_COPY_SEND] &&
--        (!cap_list[MIGRATION_CAPABILITY_MULTIFD] ||
--         cap_list[MIGRATION_CAPABILITY_COMPRESS] ||
--         cap_list[MIGRATION_CAPABILITY_XBZRLE] ||
-+    if (new_caps[MIGRATION_CAPABILITY_ZERO_COPY_SEND] &&
-+        (!new_caps[MIGRATION_CAPABILITY_MULTIFD] ||
-+         new_caps[MIGRATION_CAPABILITY_COMPRESS] ||
-+         new_caps[MIGRATION_CAPABILITY_XBZRLE] ||
-          migrate_multifd_compression() ||
-          migrate_use_tls())) {
-         error_setg(errp,
-@@ -1404,15 +1395,15 @@ static bool migrate_caps_check(bool *cap_list,
-         return false;
-     }
- #else
--    if (cap_list[MIGRATION_CAPABILITY_ZERO_COPY_SEND]) {
-+    if (new_caps[MIGRATION_CAPABILITY_ZERO_COPY_SEND]) {
-         error_setg(errp,
-                    "Zero copy currently only available on Linux");
-         return false;
-     }
- #endif
- 
--    if (cap_list[MIGRATION_CAPABILITY_POSTCOPY_PREEMPT]) {
--        if (!cap_list[MIGRATION_CAPABILITY_POSTCOPY_RAM]) {
-+    if (new_caps[MIGRATION_CAPABILITY_POSTCOPY_PREEMPT]) {
-+        if (!new_caps[MIGRATION_CAPABILITY_POSTCOPY_RAM]) {
-             error_setg(errp, "Postcopy preempt requires postcopy-ram");
-             return false;
-         }
-@@ -1423,14 +1414,14 @@ static bool migrate_caps_check(bool *cap_list,
-          * different compression channels, which is not compatible with the
-          * preempt assumptions on channel assignments.
-          */
--        if (cap_list[MIGRATION_CAPABILITY_COMPRESS]) {
-+        if (new_caps[MIGRATION_CAPABILITY_COMPRESS]) {
-             error_setg(errp, "Postcopy preempt not compatible with compress");
-             return false;
-         }
-     }
- 
--    if (cap_list[MIGRATION_CAPABILITY_MULTIFD]) {
--        if (cap_list[MIGRATION_CAPABILITY_COMPRESS]) {
-+    if (new_caps[MIGRATION_CAPABILITY_MULTIFD]) {
-+        if (new_caps[MIGRATION_CAPABILITY_COMPRESS]) {
-             error_setg(errp, "Multifd is not compatible with compress");
-             return false;
-         }
-@@ -1486,15 +1477,19 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,
- {
-     MigrationState *s = migrate_get_current();
-     MigrationCapabilityStatusList *cap;
--    bool cap_list[MIGRATION_CAPABILITY__MAX];
-+    bool new_caps[MIGRATION_CAPABILITY__MAX];
- 
-     if (migration_is_running(s->state)) {
-         error_setg(errp, QERR_MIGRATION_ACTIVE);
-         return;
-     }
- 
--    memcpy(cap_list, s->capabilities, sizeof(cap_list));
--    if (!migrate_caps_check(cap_list, params, errp)) {
-+    memcpy(new_caps, s->capabilities, sizeof(new_caps));
-+    for (cap = params; cap; cap = cap->next) {
-+        new_caps[cap->value->capability] = cap->value->state;
-+    }
-+
-+    if (!migrate_caps_check(s->capabilities, new_caps, errp)) {
-         return;
-     }
- 
-@@ -4634,27 +4629,14 @@ static void migration_instance_init(Object *obj)
-  */
- static bool migration_object_check(MigrationState *ms, Error **errp)
- {
--    MigrationCapabilityStatusList *head = NULL;
-     /* Assuming all off */
--    bool cap_list[MIGRATION_CAPABILITY__MAX] = { 0 }, ret;
--    int i;
-+    bool old_caps[MIGRATION_CAPABILITY__MAX] = { 0 };
- 
-     if (!migrate_params_check(&ms->parameters, errp)) {
-         return false;
-     }
- 
--    for (i = 0; i < MIGRATION_CAPABILITY__MAX; i++) {
--        if (ms->capabilities[i]) {
--            QAPI_LIST_PREPEND(head, migrate_cap_add(i, true));
--        }
--    }
--
--    ret = migrate_caps_check(cap_list, head, errp);
--
--    /* It works with head == NULL */
--    qapi_free_MigrationCapabilityStatusList(head);
--
--    return ret;
-+    return migrate_caps_check(old_caps, ms->capabilities, errp);
- }
- 
- static const TypeInfo migration_type = {
--- 
-2.39.1
-
diff --git a/kvm-migration-Rename-duplicate-to-zero_pages.patch b/kvm-migration-Rename-duplicate-to-zero_pages.patch
deleted file mode 100644
index 22acab5..0000000
--- a/kvm-migration-Rename-duplicate-to-zero_pages.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 3cecf66655a0dd599666bcac8add2dee85d5651f Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Wed, 19 Apr 2023 18:16:05 +0200
-Subject: [PATCH 16/56] migration: Rename duplicate to zero_pages
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [15/50] 89db3c8b167c0f411ba95ce2730540c0e8f1206b (peterx/qemu-kvm)
-
-Rest of counters that refer to pages has a _pages suffix.
-And historically, this showed the number of pages composed of the same
-character, here comes the name "duplicated".  But since years ago, it
-refers to the number of zero_pages.
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Peter Xu <peterx@redhat.com>
-(cherry picked from commit 1a386e8de5995fb5478ea99baa6d3e71abcf4b80)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c |  2 +-
- migration/ram.c       | 10 +++++-----
- migration/ram.h       |  2 +-
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index 39501a0ed8..c15e2a61ca 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -1142,7 +1142,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)
-     info->ram = g_malloc0(sizeof(*info->ram));
-     info->ram->transferred = stat64_get(&ram_counters.transferred);
-     info->ram->total = ram_bytes_total();
--    info->ram->duplicate = stat64_get(&ram_counters.duplicate);
-+    info->ram->duplicate = stat64_get(&ram_counters.zero_pages);
-     /* legacy value.  It is not used anymore */
-     info->ram->skipped = 0;
-     info->ram->normal = stat64_get(&ram_counters.normal);
-diff --git a/migration/ram.c b/migration/ram.c
-index fe69ecaef4..19d345a030 100644
---- a/migration/ram.c
-+++ b/migration/ram.c
-@@ -1119,7 +1119,7 @@ uint64_t ram_pagesize_summary(void)
- uint64_t ram_get_total_transferred_pages(void)
- {
-     return stat64_get(&ram_counters.normal) +
--        stat64_get(&ram_counters.duplicate) +
-+        stat64_get(&ram_counters.zero_pages) +
-         compression_counters.pages + xbzrle_counters.pages;
- }
- 
-@@ -1320,7 +1320,7 @@ static int save_zero_page(PageSearchStatus *pss, QEMUFile *f, RAMBlock *block,
-     int len = save_zero_page_to_file(pss, f, block, offset);
- 
-     if (len) {
--        stat64_add(&ram_counters.duplicate, 1);
-+        stat64_add(&ram_counters.zero_pages, 1);
-         ram_transferred_add(len);
-         return 1;
-     }
-@@ -1359,7 +1359,7 @@ static bool control_save_page(PageSearchStatus *pss, RAMBlock *block,
-     if (bytes_xmit > 0) {
-         stat64_add(&ram_counters.normal, 1);
-     } else if (bytes_xmit == 0) {
--        stat64_add(&ram_counters.duplicate, 1);
-+        stat64_add(&ram_counters.zero_pages, 1);
-     }
- 
-     return true;
-@@ -1486,7 +1486,7 @@ update_compress_thread_counts(const CompressParam *param, int bytes_xmit)
-     ram_transferred_add(bytes_xmit);
- 
-     if (param->zero_page) {
--        stat64_add(&ram_counters.duplicate, 1);
-+        stat64_add(&ram_counters.zero_pages, 1);
-         return;
-     }
- 
-@@ -2621,7 +2621,7 @@ void acct_update_position(QEMUFile *f, size_t size, bool zero)
-     uint64_t pages = size / TARGET_PAGE_SIZE;
- 
-     if (zero) {
--        stat64_add(&ram_counters.duplicate, pages);
-+        stat64_add(&ram_counters.zero_pages, pages);
-     } else {
-         stat64_add(&ram_counters.normal, pages);
-         ram_transferred_add(size);
-diff --git a/migration/ram.h b/migration/ram.h
-index afa68521d7..55258334fe 100644
---- a/migration/ram.h
-+++ b/migration/ram.h
-@@ -45,7 +45,7 @@ typedef struct {
-     Stat64 dirty_sync_count;
-     Stat64 dirty_sync_missed_zero_copy;
-     Stat64 downtime_bytes;
--    Stat64 duplicate;
-+    Stat64 zero_pages;
-     Stat64 multifd_bytes;
-     Stat64 normal;
-     Stat64 postcopy_bytes;
--- 
-2.39.1
-
diff --git a/kvm-migration-Rename-normal-to-normal_pages.patch b/kvm-migration-Rename-normal-to-normal_pages.patch
deleted file mode 100644
index 8ad6447..0000000
--- a/kvm-migration-Rename-normal-to-normal_pages.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 7e27e7ea83856e1a7222ff46d91495f48fb6be4d Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Wed, 19 Apr 2023 18:19:45 +0200
-Subject: [PATCH 17/56] migration: Rename normal to normal_pages
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [16/50] 7df8b946918def9657bbe357861a6d72b5399ac6 (peterx/qemu-kvm)
-
-Rest of counters that refer to pages has a _pages suffix.
-And historically, this showed the number of full pages transferred.
-The name "normal" refered to the fact that they were sent without any
-optimization (compression, xbzrle, zero_page, ...).
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Peter Xu <peterx@redhat.com>
-(cherry picked from commit 8c0cda8fa0de0a50148e2c60552afca9cffca643)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c |  2 +-
- migration/ram.c       | 10 +++++-----
- migration/ram.h       |  2 +-
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index c15e2a61ca..f1b3439e5f 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -1145,7 +1145,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)
-     info->ram->duplicate = stat64_get(&ram_counters.zero_pages);
-     /* legacy value.  It is not used anymore */
-     info->ram->skipped = 0;
--    info->ram->normal = stat64_get(&ram_counters.normal);
-+    info->ram->normal = stat64_get(&ram_counters.normal_pages);
-     info->ram->normal_bytes = info->ram->normal * page_size;
-     info->ram->mbps = s->mbps;
-     info->ram->dirty_sync_count =
-diff --git a/migration/ram.c b/migration/ram.c
-index 19d345a030..229714045a 100644
---- a/migration/ram.c
-+++ b/migration/ram.c
-@@ -1118,7 +1118,7 @@ uint64_t ram_pagesize_summary(void)
- 
- uint64_t ram_get_total_transferred_pages(void)
- {
--    return stat64_get(&ram_counters.normal) +
-+    return stat64_get(&ram_counters.normal_pages) +
-         stat64_get(&ram_counters.zero_pages) +
-         compression_counters.pages + xbzrle_counters.pages;
- }
-@@ -1357,7 +1357,7 @@ static bool control_save_page(PageSearchStatus *pss, RAMBlock *block,
-     }
- 
-     if (bytes_xmit > 0) {
--        stat64_add(&ram_counters.normal, 1);
-+        stat64_add(&ram_counters.normal_pages, 1);
-     } else if (bytes_xmit == 0) {
-         stat64_add(&ram_counters.zero_pages, 1);
-     }
-@@ -1391,7 +1391,7 @@ static int save_normal_page(PageSearchStatus *pss, RAMBlock *block,
-         qemu_put_buffer(file, buf, TARGET_PAGE_SIZE);
-     }
-     ram_transferred_add(TARGET_PAGE_SIZE);
--    stat64_add(&ram_counters.normal, 1);
-+    stat64_add(&ram_counters.normal_pages, 1);
-     return 1;
- }
- 
-@@ -1447,7 +1447,7 @@ static int ram_save_multifd_page(QEMUFile *file, RAMBlock *block,
-     if (multifd_queue_page(file, block, offset) < 0) {
-         return -1;
-     }
--    stat64_add(&ram_counters.normal, 1);
-+    stat64_add(&ram_counters.normal_pages, 1);
- 
-     return 1;
- }
-@@ -2623,7 +2623,7 @@ void acct_update_position(QEMUFile *f, size_t size, bool zero)
-     if (zero) {
-         stat64_add(&ram_counters.zero_pages, pages);
-     } else {
--        stat64_add(&ram_counters.normal, pages);
-+        stat64_add(&ram_counters.normal_pages, pages);
-         ram_transferred_add(size);
-         qemu_file_credit_transfer(f, size);
-     }
-diff --git a/migration/ram.h b/migration/ram.h
-index 55258334fe..a6e0d70226 100644
---- a/migration/ram.h
-+++ b/migration/ram.h
-@@ -47,7 +47,7 @@ typedef struct {
-     Stat64 downtime_bytes;
-     Stat64 zero_pages;
-     Stat64 multifd_bytes;
--    Stat64 normal;
-+    Stat64 normal_pages;
-     Stat64 postcopy_bytes;
-     Stat64 postcopy_requests;
-     Stat64 precopy_bytes;
--- 
-2.39.1
-
diff --git a/kvm-migration-Update-atomic-stats-out-of-the-mutex.patch b/kvm-migration-Update-atomic-stats-out-of-the-mutex.patch
deleted file mode 100644
index 7e78d82..0000000
--- a/kvm-migration-Update-atomic-stats-out-of-the-mutex.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From c0d377e1bf442a09b82fddbb8588fcddf6439854 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Thu, 24 Nov 2022 17:26:19 +0100
-Subject: [PATCH 09/56] migration: Update atomic stats out of the mutex
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [8/50] 88e9dbc9a3e5aef60a7c98c871144904c7062b1f (peterx/qemu-kvm)
-
-Reviewed-by: David Edmondson <david.edmondson@oracle.com>
-Reviewed-by: Peter Xu <peterx@redhat.com>
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-(cherry picked from commit 30fb22cda45bea43a3c0e26049ebdd71a9503ffd)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/multifd.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/migration/multifd.c b/migration/multifd.c
-index 01fab01a92..6ef3a27938 100644
---- a/migration/multifd.c
-+++ b/migration/multifd.c
-@@ -433,8 +433,8 @@ static int multifd_send_pages(QEMUFile *f)
-     transferred = ((uint64_t) pages->num) * p->page_size + p->packet_len;
-     qemu_file_acct_rate_limit(f, transferred);
-     ram_counters.multifd_bytes += transferred;
--    stat64_add(&ram_counters.transferred, transferred);
-     qemu_mutex_unlock(&p->mutex);
-+    stat64_add(&ram_counters.transferred, transferred);
-     qemu_sem_post(&p->sem);
- 
-     return 1;
-@@ -628,8 +628,8 @@ int multifd_send_sync_main(QEMUFile *f)
-         p->pending_job++;
-         qemu_file_acct_rate_limit(f, p->packet_len);
-         ram_counters.multifd_bytes += p->packet_len;
--        stat64_add(&ram_counters.transferred, p->packet_len);
-         qemu_mutex_unlock(&p->mutex);
-+        stat64_add(&ram_counters.transferred, p->packet_len);
-         qemu_sem_post(&p->sem);
-     }
-     for (i = 0; i < migrate_multifd_channels(); i++) {
--- 
-2.39.1
-
diff --git a/kvm-migration-Use-migrate_max_postcopy_bandwidth.patch b/kvm-migration-Use-migrate_max_postcopy_bandwidth.patch
deleted file mode 100644
index f179761..0000000
--- a/kvm-migration-Use-migrate_max_postcopy_bandwidth.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8d203baa6cbd1f371e308c2c9d59a5ca7d29dca8 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Thu, 2 Mar 2023 10:55:30 +0100
-Subject: [PATCH 38/56] migration: Use migrate_max_postcopy_bandwidth()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [37/50] d62948e9ee40a85ed9b460a583c3b0e43cd5d47f (peterx/qemu-kvm)
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-(cherry picked from commit 5390adec03a7d8bc6bcf5887f726b0ddaeb90681)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index 7f2e770deb..78bca9a93f 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -3799,7 +3799,7 @@ void migrate_fd_connect(MigrationState *s, Error *error_in)
- 
-     if (resume) {
-         /* This is a resumed migration */
--        rate_limit = s->parameters.max_postcopy_bandwidth /
-+        rate_limit = migrate_max_postcopy_bandwidth() /
-             XFER_LIMIT_RATIO;
-     } else {
-         /* This is a fresh new migration */
--- 
-2.39.1
-
diff --git a/kvm-migration-mark-mixed-functions-that-can-suspend.patch b/kvm-migration-mark-mixed-functions-that-can-suspend.patch
deleted file mode 100644
index 9451696..0000000
--- a/kvm-migration-mark-mixed-functions-that-can-suspend.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From cfdf5715a2334ad06b5966ec986d134bbd5ba08b Mon Sep 17 00:00:00 2001
-From: Paolo Bonzini <pbonzini@redhat.com>
-Date: Fri, 16 Dec 2022 12:48:16 +0100
-Subject: [PATCH 05/56] migration: mark mixed functions that can suspend
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [4/50] 9f055b526edd06a3440999d5de91e5d624678c7d (peterx/qemu-kvm)
-
-There should be no paths from a coroutine_fn to aio_poll, however in
-practice coroutine_mixed_fn will call aio_poll in the !qemu_in_coroutine()
-path.  By marking mixed functions, we can track accurately the call paths
-that execute entirely in coroutine context, and find more missing
-coroutine_fn markers.  This results in more accurate checks that
-coroutine code does not end up blocking.
-
-If the marking were extended transitively to all functions that call
-these ones, static analysis could be done much more efficiently.
-However, this is a start and makes it possible to use vrc's path-based
-searches to find potential bugs where coroutine_fns call blocking functions.
-
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-(cherry picked from commit 394b9407e4c515f96df6647d629ee28cbb86f07c)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- include/migration/qemu-file-types.h |  4 ++--
- migration/qemu-file.c               | 14 +++++++-------
- migration/qemu-file.h               |  6 +++---
- 3 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/include/migration/qemu-file-types.h b/include/migration/qemu-file-types.h
-index 2867e3da84..1436f9ce92 100644
---- a/include/migration/qemu-file-types.h
-+++ b/include/migration/qemu-file-types.h
-@@ -35,7 +35,7 @@ void qemu_put_byte(QEMUFile *f, int v);
- void qemu_put_be16(QEMUFile *f, unsigned int v);
- void qemu_put_be32(QEMUFile *f, unsigned int v);
- void qemu_put_be64(QEMUFile *f, uint64_t v);
--size_t qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_t size);
-+size_t coroutine_mixed_fn qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_t size);
- 
- int qemu_get_byte(QEMUFile *f);
- 
-@@ -161,7 +161,7 @@ static inline void qemu_get_sbe64s(QEMUFile *f, int64_t *pv)
-     qemu_get_be64s(f, (uint64_t *)pv);
- }
- 
--size_t qemu_get_counted_string(QEMUFile *f, char buf[256]);
-+size_t coroutine_mixed_fn qemu_get_counted_string(QEMUFile *f, char buf[256]);
- 
- void qemu_put_counted_string(QEMUFile *f, const char *name);
- 
-diff --git a/migration/qemu-file.c b/migration/qemu-file.c
-index 102ab3b439..ee04240a21 100644
---- a/migration/qemu-file.c
-+++ b/migration/qemu-file.c
-@@ -392,7 +392,7 @@ size_t ram_control_save_page(QEMUFile *f, ram_addr_t block_offset,
-  * case if the underlying file descriptor gives a short read, and that can
-  * happen even on a blocking fd.
-  */
--static ssize_t qemu_fill_buffer(QEMUFile *f)
-+static ssize_t coroutine_mixed_fn qemu_fill_buffer(QEMUFile *f)
- {
-     int len;
-     int pending;
-@@ -585,7 +585,7 @@ void qemu_file_skip(QEMUFile *f, int size)
-  * return as many as it managed to read (assuming blocking fd's which
-  * all current QEMUFile are)
-  */
--size_t qemu_peek_buffer(QEMUFile *f, uint8_t **buf, size_t size, size_t offset)
-+size_t coroutine_mixed_fn qemu_peek_buffer(QEMUFile *f, uint8_t **buf, size_t size, size_t offset)
- {
-     ssize_t pending;
-     size_t index;
-@@ -633,7 +633,7 @@ size_t qemu_peek_buffer(QEMUFile *f, uint8_t **buf, size_t size, size_t offset)
-  * return as many as it managed to read (assuming blocking fd's which
-  * all current QEMUFile are)
-  */
--size_t qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_t size)
-+size_t coroutine_mixed_fn qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_t size)
- {
-     size_t pending = size;
-     size_t done = 0;
-@@ -674,7 +674,7 @@ size_t qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_t size)
-  * Note: Since **buf may get changed, the caller should take care to
-  *       keep a pointer to the original buffer if it needs to deallocate it.
-  */
--size_t qemu_get_buffer_in_place(QEMUFile *f, uint8_t **buf, size_t size)
-+size_t coroutine_mixed_fn qemu_get_buffer_in_place(QEMUFile *f, uint8_t **buf, size_t size)
- {
-     if (size < IO_BUF_SIZE) {
-         size_t res;
-@@ -696,7 +696,7 @@ size_t qemu_get_buffer_in_place(QEMUFile *f, uint8_t **buf, size_t size)
-  * Peeks a single byte from the buffer; this isn't guaranteed to work if
-  * offset leaves a gap after the previous read/peeked data.
-  */
--int qemu_peek_byte(QEMUFile *f, int offset)
-+int coroutine_mixed_fn qemu_peek_byte(QEMUFile *f, int offset)
- {
-     int index = f->buf_index + offset;
- 
-@@ -713,7 +713,7 @@ int qemu_peek_byte(QEMUFile *f, int offset)
-     return f->buf[index];
- }
- 
--int qemu_get_byte(QEMUFile *f)
-+int coroutine_mixed_fn qemu_get_byte(QEMUFile *f)
- {
-     int result;
- 
-@@ -894,7 +894,7 @@ int qemu_put_qemu_file(QEMUFile *f_des, QEMUFile *f_src)
-  *          else 0
-  *          (Note a 0 length string will return 0 either way)
-  */
--size_t qemu_get_counted_string(QEMUFile *f, char buf[256])
-+size_t coroutine_fn qemu_get_counted_string(QEMUFile *f, char buf[256])
- {
-     size_t len = qemu_get_byte(f);
-     size_t res = qemu_get_buffer(f, (uint8_t *)buf, len);
-diff --git a/migration/qemu-file.h b/migration/qemu-file.h
-index 9d0155a2a1..d16cd50448 100644
---- a/migration/qemu-file.h
-+++ b/migration/qemu-file.h
-@@ -108,8 +108,8 @@ bool qemu_file_is_writable(QEMUFile *f);
- 
- #include "migration/qemu-file-types.h"
- 
--size_t qemu_peek_buffer(QEMUFile *f, uint8_t **buf, size_t size, size_t offset);
--size_t qemu_get_buffer_in_place(QEMUFile *f, uint8_t **buf, size_t size);
-+size_t coroutine_mixed_fn qemu_peek_buffer(QEMUFile *f, uint8_t **buf, size_t size, size_t offset);
-+size_t coroutine_mixed_fn qemu_get_buffer_in_place(QEMUFile *f, uint8_t **buf, size_t size);
- ssize_t qemu_put_compression_data(QEMUFile *f, z_stream *stream,
-                                   const uint8_t *p, size_t size);
- int qemu_put_qemu_file(QEMUFile *f_des, QEMUFile *f_src);
-@@ -119,7 +119,7 @@ int qemu_put_qemu_file(QEMUFile *f_des, QEMUFile *f_src);
-  * is; you aren't guaranteed to be able to peak to +n bytes unless you've
-  * previously peeked +n-1.
-  */
--int qemu_peek_byte(QEMUFile *f, int offset);
-+int coroutine_mixed_fn qemu_peek_byte(QEMUFile *f, int offset);
- void qemu_file_skip(QEMUFile *f, int size);
- /*
-  * qemu_file_credit_transfer:
--- 
-2.39.1
-
diff --git a/kvm-migration-move-migration_global_dump-to-migration-hm.patch b/kvm-migration-move-migration_global_dump-to-migration-hm.patch
deleted file mode 100644
index 4e73c80..0000000
--- a/kvm-migration-move-migration_global_dump-to-migration-hm.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 96e6914cbfb18bb8287c57b9ac9a6b364d3e7a22 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Wed, 22 Feb 2023 17:18:05 +0100
-Subject: [PATCH 20/56] migration: move migration_global_dump() to
- migration-hmp-cmds.c
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [19/50] c8d330a2833c706b9bd78f7154be882e3977ad06 (peterx/qemu-kvm)
-
-It is only used there, so we can make it static.
-Once there, remove spice.h that it is not used.
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Peter Xu <peterx@redhat.com>
-Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-
----
-
-fix David Edmonson ui/qemu-spice.h unintended removal
-
-(cherry picked from commit c938157713e723165a42cb6e8364adb6fcbd0e22)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- include/migration/misc.h       |  1 -
- migration/migration-hmp-cmds.c | 22 +++++++++++++++++++++-
- migration/migration.c          | 19 -------------------
- 3 files changed, 21 insertions(+), 21 deletions(-)
-
-diff --git a/include/migration/misc.h b/include/migration/misc.h
-index 8b49841016..5ebe13b4b9 100644
---- a/include/migration/misc.h
-+++ b/include/migration/misc.h
-@@ -66,7 +66,6 @@ bool migration_has_finished(MigrationState *);
- bool migration_has_failed(MigrationState *);
- /* ...and after the device transmission */
- bool migration_in_postcopy_after_devices(MigrationState *);
--void migration_global_dump(Monitor *mon);
- /* True if incoming migration entered POSTCOPY_INCOMING_DISCARD */
- bool migration_in_incoming_postcopy(void);
- /* True if incoming migration entered POSTCOPY_INCOMING_ADVISE */
-diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c
-index 72519ea99f..71da91967a 100644
---- a/migration/migration-hmp-cmds.c
-+++ b/migration/migration-hmp-cmds.c
-@@ -15,7 +15,6 @@
- 
- #include "qemu/osdep.h"
- #include "block/qapi.h"
--#include "migration/misc.h"
- #include "migration/snapshot.h"
- #include "monitor/hmp.h"
- #include "monitor/monitor.h"
-@@ -30,6 +29,27 @@
- #include "qemu/sockets.h"
- #include "sysemu/runstate.h"
- #include "ui/qemu-spice.h"
-+#include "sysemu/sysemu.h"
-+#include "migration.h"
-+
-+static void migration_global_dump(Monitor *mon)
-+{
-+    MigrationState *ms = migrate_get_current();
-+
-+    monitor_printf(mon, "globals:\n");
-+    monitor_printf(mon, "store-global-state: %s\n",
-+                   ms->store_global_state ? "on" : "off");
-+    monitor_printf(mon, "only-migratable: %s\n",
-+                   only_migratable ? "on" : "off");
-+    monitor_printf(mon, "send-configuration: %s\n",
-+                   ms->send_configuration ? "on" : "off");
-+    monitor_printf(mon, "send-section-footer: %s\n",
-+                   ms->send_section_footer ? "on" : "off");
-+    monitor_printf(mon, "decompress-error-check: %s\n",
-+                   ms->decompress_error_check ? "on" : "off");
-+    monitor_printf(mon, "clear-bitmap-shift: %u\n",
-+                   ms->clear_bitmap_shift);
-+}
- 
- void hmp_info_migrate(Monitor *mon, const QDict *qdict)
- {
-diff --git a/migration/migration.c b/migration/migration.c
-index e8f596bcfa..aa96ffdc5b 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -4420,25 +4420,6 @@ void migrate_fd_connect(MigrationState *s, Error *error_in)
-     s->migration_thread_running = true;
- }
- 
--void migration_global_dump(Monitor *mon)
--{
--    MigrationState *ms = migrate_get_current();
--
--    monitor_printf(mon, "globals:\n");
--    monitor_printf(mon, "store-global-state: %s\n",
--                   ms->store_global_state ? "on" : "off");
--    monitor_printf(mon, "only-migratable: %s\n",
--                   only_migratable ? "on" : "off");
--    monitor_printf(mon, "send-configuration: %s\n",
--                   ms->send_configuration ? "on" : "off");
--    monitor_printf(mon, "send-section-footer: %s\n",
--                   ms->send_section_footer ? "on" : "off");
--    monitor_printf(mon, "decompress-error-check: %s\n",
--                   ms->decompress_error_check ? "on" : "off");
--    monitor_printf(mon, "clear-bitmap-shift: %u\n",
--                   ms->clear_bitmap_shift);
--}
--
- #define DEFINE_PROP_MIG_CAP(name, x)             \
-     DEFINE_PROP_BOOL(name, MigrationState, capabilities[x], false)
- 
--- 
-2.39.1
-
diff --git a/kvm-migration-postcopy-Detect-file-system-on-dest-host.patch b/kvm-migration-postcopy-Detect-file-system-on-dest-host.patch
deleted file mode 100644
index 7700466..0000000
--- a/kvm-migration-postcopy-Detect-file-system-on-dest-host.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 4827d5be5357ab89e0c46f606ad828bf97d36471 Mon Sep 17 00:00:00 2001
-From: Peter Xu <peterx@redhat.com>
-Date: Wed, 19 Apr 2023 12:17:38 -0400
-Subject: [PATCH 04/56] migration/postcopy: Detect file system on dest host
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [3/50] 121aeeda8a019f79dba6c077c7018bd1c86f3d71 (peterx/qemu-kvm)
-
-Postcopy requires the memory support userfaultfd to work.  Right now we
-check it but it's a bit too late (when switching to postcopy migration).
-
-Do that early right at enabling of postcopy.
-
-Note that this is still only a best effort because ramblocks can be
-dynamically created.  We can add check in hostmem creations and fail if
-postcopy enabled, but maybe that's too aggressive.
-
-Still, we have chance to fail the most obvious where we know there's an
-existing unsupported ramblock.
-
-Signed-off-by: Peter Xu <peterx@redhat.com>
-Reviewed-by: Juan Quintela <quintela@redhat.com>
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-(cherry picked from commit ae30b9b2892b85e6c3d5c0b8d1949c4d77a2954a)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/postcopy-ram.c | 34 ++++++++++++++++++++++++++++++----
- 1 file changed, 30 insertions(+), 4 deletions(-)
-
-diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
-index 93f39f8e06..bbb8af61ae 100644
---- a/migration/postcopy-ram.c
-+++ b/migration/postcopy-ram.c
-@@ -36,6 +36,7 @@
- #include "yank_functions.h"
- #include "tls.h"
- #include "qemu/userfaultfd.h"
-+#include "qemu/mmap-alloc.h"
- 
- /* Arbitrary limit on size of each discard command,
-  * keeps them around ~200 bytes
-@@ -336,11 +337,12 @@ static bool ufd_check_and_apply(int ufd, MigrationIncomingState *mis)
- 
- /* Callback from postcopy_ram_supported_by_host block iterator.
-  */
--static int test_ramblock_postcopiable(RAMBlock *rb, void *opaque)
-+static int test_ramblock_postcopiable(RAMBlock *rb)
- {
-     const char *block_name = qemu_ram_get_idstr(rb);
-     ram_addr_t length = qemu_ram_get_used_length(rb);
-     size_t pagesize = qemu_ram_pagesize(rb);
-+    QemuFsType fs;
- 
-     if (length % pagesize) {
-         error_report("Postcopy requires RAM blocks to be a page size multiple,"
-@@ -348,6 +350,15 @@ static int test_ramblock_postcopiable(RAMBlock *rb, void *opaque)
-                      "page size of 0x%zx", block_name, length, pagesize);
-         return 1;
-     }
-+
-+    if (rb->fd >= 0) {
-+        fs = qemu_fd_getfs(rb->fd);
-+        if (fs != QEMU_FS_TYPE_TMPFS && fs != QEMU_FS_TYPE_HUGETLBFS) {
-+            error_report("Host backend files need to be TMPFS or HUGETLBFS only");
-+            return 1;
-+        }
-+    }
-+
-     return 0;
- }
- 
-@@ -366,6 +377,7 @@ bool postcopy_ram_supported_by_host(MigrationIncomingState *mis)
-     struct uffdio_range range_struct;
-     uint64_t feature_mask;
-     Error *local_err = NULL;
-+    RAMBlock *block;
- 
-     if (qemu_target_page_size() > pagesize) {
-         error_report("Target page size bigger than host page size");
-@@ -390,9 +402,23 @@ bool postcopy_ram_supported_by_host(MigrationIncomingState *mis)
-         goto out;
-     }
- 
--    /* We don't support postcopy with shared RAM yet */
--    if (foreach_not_ignored_block(test_ramblock_postcopiable, NULL)) {
--        goto out;
-+    /*
-+     * We don't support postcopy with some type of ramblocks.
-+     *
-+     * NOTE: we explicitly ignored ramblock_is_ignored() instead we checked
-+     * all possible ramblocks.  This is because this function can be called
-+     * when creating the migration object, during the phase RAM_MIGRATABLE
-+     * is not even properly set for all the ramblocks.
-+     *
-+     * A side effect of this is we'll also check against RAM_SHARED
-+     * ramblocks even if migrate_ignore_shared() is set (in which case
-+     * we'll never migrate RAM_SHARED at all), but normally this shouldn't
-+     * affect in reality, or we can revisit.
-+     */
-+    RAMBLOCK_FOREACH(block) {
-+        if (test_ramblock_postcopiable(block)) {
-+            goto out;
-+        }
-     }
- 
-     /*
--- 
-2.39.1
-
diff --git a/kvm-migration-remove-extra-whitespace-character-for-code.patch b/kvm-migration-remove-extra-whitespace-character-for-code.patch
deleted file mode 100644
index 88eb791..0000000
--- a/kvm-migration-remove-extra-whitespace-character-for-code.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 93c9a1ae812720d3a29980a3c5fcfc1e916993de Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=E6=9D=8E=E7=9A=86=E4=BF=8A?= <a_lijiejun@163.com>
-Date: Fri, 17 Mar 2023 09:57:13 +0000
-Subject: [PATCH 07/56] migration: remove extra whitespace character for code
- style
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [6/50] bc1cd812f8dfc18e47e1644b5333c703eae23d2d (peterx/qemu-kvm)
-
-Fix code style.
-
-Signed-off-by: 李皆俊 <a_lijiejun@163.com>
-Reviewed-by: Juan Quintela <quintela@redhat.com>
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-(cherry picked from commit 8ebb6ecc3798e66a9ba98355983762bedfa1b72d)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/ram.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/migration/ram.c b/migration/ram.c
-index 79d881f735..0e68099bf9 100644
---- a/migration/ram.c
-+++ b/migration/ram.c
-@@ -3293,7 +3293,7 @@ static int ram_save_setup(QEMUFile *f, void *opaque)
- 
-     migration_ops = g_malloc0(sizeof(MigrationOps));
-     migration_ops->ram_save_target_page = ram_save_target_page_legacy;
--    ret =  multifd_send_sync_main(f);
-+    ret = multifd_send_sync_main(f);
-     if (ret < 0) {
-         return ret;
-     }
--- 
-2.39.1
-
diff --git a/kvm-migration-rename-enabled_capabilities-to-capabilitie.patch b/kvm-migration-rename-enabled_capabilities-to-capabilitie.patch
deleted file mode 100644
index 52b19b3..0000000
--- a/kvm-migration-rename-enabled_capabilities-to-capabilitie.patch
+++ /dev/null
@@ -1,329 +0,0 @@
-From ee566ec12099992f9134bda1db92dd568427245a Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Wed, 1 Mar 2023 18:26:59 +0100
-Subject: [PATCH 18/56] migration: rename enabled_capabilities to capabilities
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [17/50] 841a27addf273d8f559bc8ebd2c854200e8ca673 (peterx/qemu-kvm)
-
-It is clear from the context what that means, and such a long name
-with the extra long names of the capabilities make very difficilut to
-stay inside the 80 columns limit.
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-(cherry picked from commit 0cec2056ff67557c18d7b8ab1b70ab47c9e31f2f)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration.c | 52 +++++++++++++++++++++----------------------
- migration/migration.h |  2 +-
- migration/rdma.c      |  4 ++--
- migration/savevm.c    |  6 ++---
- 4 files changed, 31 insertions(+), 33 deletions(-)
-
-diff --git a/migration/migration.c b/migration/migration.c
-index f1b3439e5f..d8e5fb6226 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -364,8 +364,7 @@ static bool migrate_late_block_activate(void)
- 
-     s = migrate_get_current();
- 
--    return s->enabled_capabilities[
--        MIGRATION_CAPABILITY_LATE_BLOCK_ACTIVATE];
-+    return s->capabilities[MIGRATION_CAPABILITY_LATE_BLOCK_ACTIVATE];
- }
- 
- /*
-@@ -944,7 +943,7 @@ MigrationCapabilityStatusList *qmp_query_migrate_capabilities(Error **errp)
- #endif
-         caps = g_malloc0(sizeof(*caps));
-         caps->capability = i;
--        caps->state = s->enabled_capabilities[i];
-+        caps->state = s->capabilities[i];
-         QAPI_LIST_APPEND(tail, caps);
-     }
- 
-@@ -1494,13 +1493,13 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,
-         return;
-     }
- 
--    memcpy(cap_list, s->enabled_capabilities, sizeof(cap_list));
-+    memcpy(cap_list, s->capabilities, sizeof(cap_list));
-     if (!migrate_caps_check(cap_list, params, errp)) {
-         return;
-     }
- 
-     for (cap = params; cap; cap = cap->next) {
--        s->enabled_capabilities[cap->value->capability] = cap->value->state;
-+        s->capabilities[cap->value->capability] = cap->value->state;
-     }
- }
- 
-@@ -2569,7 +2568,7 @@ bool migrate_release_ram(void)
- 
-     s = migrate_get_current();
- 
--    return s->enabled_capabilities[MIGRATION_CAPABILITY_RELEASE_RAM];
-+    return s->capabilities[MIGRATION_CAPABILITY_RELEASE_RAM];
- }
- 
- bool migrate_postcopy_ram(void)
-@@ -2578,7 +2577,7 @@ bool migrate_postcopy_ram(void)
- 
-     s = migrate_get_current();
- 
--    return s->enabled_capabilities[MIGRATION_CAPABILITY_POSTCOPY_RAM];
-+    return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_RAM];
- }
- 
- bool migrate_postcopy(void)
-@@ -2592,7 +2591,7 @@ bool migrate_auto_converge(void)
- 
-     s = migrate_get_current();
- 
--    return s->enabled_capabilities[MIGRATION_CAPABILITY_AUTO_CONVERGE];
-+    return s->capabilities[MIGRATION_CAPABILITY_AUTO_CONVERGE];
- }
- 
- bool migrate_zero_blocks(void)
-@@ -2601,7 +2600,7 @@ bool migrate_zero_blocks(void)
- 
-     s = migrate_get_current();
- 
--    return s->enabled_capabilities[MIGRATION_CAPABILITY_ZERO_BLOCKS];
-+    return s->capabilities[MIGRATION_CAPABILITY_ZERO_BLOCKS];
- }
- 
- bool migrate_postcopy_blocktime(void)
-@@ -2610,7 +2609,7 @@ bool migrate_postcopy_blocktime(void)
- 
-     s = migrate_get_current();
- 
--    return s->enabled_capabilities[MIGRATION_CAPABILITY_POSTCOPY_BLOCKTIME];
-+    return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_BLOCKTIME];
- }
- 
- bool migrate_use_compression(void)
-@@ -2619,7 +2618,7 @@ bool migrate_use_compression(void)
- 
-     s = migrate_get_current();
- 
--    return s->enabled_capabilities[MIGRATION_CAPABILITY_COMPRESS];
-+    return s->capabilities[MIGRATION_CAPABILITY_COMPRESS];
- }
- 
- int migrate_compress_level(void)
-@@ -2664,7 +2663,7 @@ bool migrate_dirty_bitmaps(void)
- 
-     s = migrate_get_current();
- 
--    return s->enabled_capabilities[MIGRATION_CAPABILITY_DIRTY_BITMAPS];
-+    return s->capabilities[MIGRATION_CAPABILITY_DIRTY_BITMAPS];
- }
- 
- bool migrate_ignore_shared(void)
-@@ -2673,7 +2672,7 @@ bool migrate_ignore_shared(void)
- 
-     s = migrate_get_current();
- 
--    return s->enabled_capabilities[MIGRATION_CAPABILITY_X_IGNORE_SHARED];
-+    return s->capabilities[MIGRATION_CAPABILITY_X_IGNORE_SHARED];
- }
- 
- bool migrate_validate_uuid(void)
-@@ -2682,7 +2681,7 @@ bool migrate_validate_uuid(void)
- 
-     s = migrate_get_current();
- 
--    return s->enabled_capabilities[MIGRATION_CAPABILITY_VALIDATE_UUID];
-+    return s->capabilities[MIGRATION_CAPABILITY_VALIDATE_UUID];
- }
- 
- bool migrate_use_events(void)
-@@ -2691,7 +2690,7 @@ bool migrate_use_events(void)
- 
-     s = migrate_get_current();
- 
--    return s->enabled_capabilities[MIGRATION_CAPABILITY_EVENTS];
-+    return s->capabilities[MIGRATION_CAPABILITY_EVENTS];
- }
- 
- bool migrate_use_multifd(void)
-@@ -2700,7 +2699,7 @@ bool migrate_use_multifd(void)
- 
-     s = migrate_get_current();
- 
--    return s->enabled_capabilities[MIGRATION_CAPABILITY_MULTIFD];
-+    return s->capabilities[MIGRATION_CAPABILITY_MULTIFD];
- }
- 
- bool migrate_pause_before_switchover(void)
-@@ -2709,8 +2708,7 @@ bool migrate_pause_before_switchover(void)
- 
-     s = migrate_get_current();
- 
--    return s->enabled_capabilities[
--        MIGRATION_CAPABILITY_PAUSE_BEFORE_SWITCHOVER];
-+    return s->capabilities[MIGRATION_CAPABILITY_PAUSE_BEFORE_SWITCHOVER];
- }
- 
- int migrate_multifd_channels(void)
-@@ -2757,7 +2755,7 @@ bool migrate_use_zero_copy_send(void)
- 
-     s = migrate_get_current();
- 
--    return s->enabled_capabilities[MIGRATION_CAPABILITY_ZERO_COPY_SEND];
-+    return s->capabilities[MIGRATION_CAPABILITY_ZERO_COPY_SEND];
- }
- #endif
- 
-@@ -2776,7 +2774,7 @@ int migrate_use_xbzrle(void)
- 
-     s = migrate_get_current();
- 
--    return s->enabled_capabilities[MIGRATION_CAPABILITY_XBZRLE];
-+    return s->capabilities[MIGRATION_CAPABILITY_XBZRLE];
- }
- 
- uint64_t migrate_xbzrle_cache_size(void)
-@@ -2803,7 +2801,7 @@ bool migrate_use_block(void)
- 
-     s = migrate_get_current();
- 
--    return s->enabled_capabilities[MIGRATION_CAPABILITY_BLOCK];
-+    return s->capabilities[MIGRATION_CAPABILITY_BLOCK];
- }
- 
- bool migrate_use_return_path(void)
-@@ -2812,7 +2810,7 @@ bool migrate_use_return_path(void)
- 
-     s = migrate_get_current();
- 
--    return s->enabled_capabilities[MIGRATION_CAPABILITY_RETURN_PATH];
-+    return s->capabilities[MIGRATION_CAPABILITY_RETURN_PATH];
- }
- 
- bool migrate_use_block_incremental(void)
-@@ -2830,7 +2828,7 @@ bool migrate_background_snapshot(void)
- 
-     s = migrate_get_current();
- 
--    return s->enabled_capabilities[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT];
-+    return s->capabilities[MIGRATION_CAPABILITY_BACKGROUND_SNAPSHOT];
- }
- 
- bool migrate_postcopy_preempt(void)
-@@ -2839,7 +2837,7 @@ bool migrate_postcopy_preempt(void)
- 
-     s = migrate_get_current();
- 
--    return s->enabled_capabilities[MIGRATION_CAPABILITY_POSTCOPY_PREEMPT];
-+    return s->capabilities[MIGRATION_CAPABILITY_POSTCOPY_PREEMPT];
- }
- 
- /* migration thread support */
-@@ -3584,7 +3582,7 @@ fail:
- bool migrate_colo_enabled(void)
- {
-     MigrationState *s = migrate_get_current();
--    return s->enabled_capabilities[MIGRATION_CAPABILITY_X_COLO];
-+    return s->capabilities[MIGRATION_CAPABILITY_X_COLO];
- }
- 
- typedef enum MigThrError {
-@@ -4447,7 +4445,7 @@ void migration_global_dump(Monitor *mon)
- }
- 
- #define DEFINE_PROP_MIG_CAP(name, x)             \
--    DEFINE_PROP_BOOL(name, MigrationState, enabled_capabilities[x], false)
-+    DEFINE_PROP_BOOL(name, MigrationState, capabilities[x], false)
- 
- static Property migration_properties[] = {
-     DEFINE_PROP_BOOL("store-global-state", MigrationState,
-@@ -4646,7 +4644,7 @@ static bool migration_object_check(MigrationState *ms, Error **errp)
-     }
- 
-     for (i = 0; i < MIGRATION_CAPABILITY__MAX; i++) {
--        if (ms->enabled_capabilities[i]) {
-+        if (ms->capabilities[i]) {
-             QAPI_LIST_PREPEND(head, migrate_cap_add(i, true));
-         }
-     }
-diff --git a/migration/migration.h b/migration/migration.h
-index 310ae8901b..04e0860b4e 100644
---- a/migration/migration.h
-+++ b/migration/migration.h
-@@ -310,7 +310,7 @@ struct MigrationState {
-     int64_t downtime_start;
-     int64_t downtime;
-     int64_t expected_downtime;
--    bool enabled_capabilities[MIGRATION_CAPABILITY__MAX];
-+    bool capabilities[MIGRATION_CAPABILITY__MAX];
-     int64_t setup_time;
-     /*
-      * Whether guest was running when we enter the completion stage.
-diff --git a/migration/rdma.c b/migration/rdma.c
-index df646be35e..f35f021963 100644
---- a/migration/rdma.c
-+++ b/migration/rdma.c
-@@ -4179,7 +4179,7 @@ void rdma_start_outgoing_migration(void *opaque,
-     }
- 
-     ret = qemu_rdma_source_init(rdma,
--        s->enabled_capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL], errp);
-+        s->capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL], errp);
- 
-     if (ret) {
-         goto err;
-@@ -4201,7 +4201,7 @@ void rdma_start_outgoing_migration(void *opaque,
-         }
- 
-         ret = qemu_rdma_source_init(rdma_return_path,
--            s->enabled_capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL], errp);
-+            s->capabilities[MIGRATION_CAPABILITY_RDMA_PIN_ALL], errp);
- 
-         if (ret) {
-             goto return_path_err;
-diff --git a/migration/savevm.c b/migration/savevm.c
-index aa54a67fda..589ef926ab 100644
---- a/migration/savevm.c
-+++ b/migration/savevm.c
-@@ -253,7 +253,7 @@ static uint32_t get_validatable_capabilities_count(void)
-     uint32_t result = 0;
-     int i;
-     for (i = 0; i < MIGRATION_CAPABILITY__MAX; i++) {
--        if (should_validate_capability(i) && s->enabled_capabilities[i]) {
-+        if (should_validate_capability(i) && s->capabilities[i]) {
-             result++;
-         }
-     }
-@@ -275,7 +275,7 @@ static int configuration_pre_save(void *opaque)
-     state->capabilities = g_renew(MigrationCapability, state->capabilities,
-                                   state->caps_count);
-     for (i = j = 0; i < MIGRATION_CAPABILITY__MAX; i++) {
--        if (should_validate_capability(i) && s->enabled_capabilities[i]) {
-+        if (should_validate_capability(i) && s->capabilities[i]) {
-             state->capabilities[j++] = i;
-         }
-     }
-@@ -325,7 +325,7 @@ static bool configuration_validate_capabilities(SaveState *state)
-             continue;
-         }
-         source_state = test_bit(i, source_caps_bm);
--        target_state = s->enabled_capabilities[i];
-+        target_state = s->capabilities[i];
-         if (source_state != target_state) {
-             error_report("Capability %s is %s, but received capability is %s",
-                          MigrationCapability_str(i),
--- 
-2.39.1
-
diff --git a/kvm-multifd-Create-property-multifd-flush-after-each-sec.patch b/kvm-multifd-Create-property-multifd-flush-after-each-sec.patch
deleted file mode 100644
index 0bebd2e..0000000
--- a/kvm-multifd-Create-property-multifd-flush-after-each-sec.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 2a5ea92ca0a5dffad54e4d06a683f683996cea9a Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Tue, 21 Jun 2022 12:13:14 +0200
-Subject: [PATCH 05/12] multifd: Create property
- multifd-flush-after-each-section
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: quintela1 <quintela@redhat.com>
-RH-MergeRequest: 186: Multifd flushes its channels 10 times per second
-RH-Bugzilla: 2196295
-RH-Acked-by: Peter Xu <peterx@redhat.com>
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Commit: [1/3] 5bf5348e8be5b1d1629b859ce1ddb7aa0d72c0d6 (juan.quintela/c9s-qemu-kvm)
-
-We used to flush all channels at the end of each RAM section
-sent.  That is not needed, so preparing to only flush after a full
-iteration through all the RAM.
-
-Default value of the property is false.  But we return "true" in
-migrate_multifd_flush_after_each_section() until we implement the code
-in following patches.
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
-Acked-by: Peter Xu <peterx@redhat.com>
-
----
-
-Rename each-iteration to after-each-section
-Rename multifd-sync-after-each-section to
-       multifd-flush-after-each-section
-Move to machine-8.0 (peter)
-
-conflit hw_compat_8_0 and hw_compat_rhel_9_2
-
-(cherry picked from commit 77c259a4cb1c9799754b48f570301ebf1de5ded8)
----
- hw/core/machine.c     |  2 ++
- migration/migration.h | 12 ++++++++++++
- migration/options.c   | 13 +++++++++++++
- migration/options.h   |  1 +
- 4 files changed, 28 insertions(+)
-
-diff --git a/hw/core/machine.c b/hw/core/machine.c
-index 5abdc8c39b..5ea52317b9 100644
---- a/hw/core/machine.c
-+++ b/hw/core/machine.c
-@@ -54,6 +54,8 @@ const char *rhel_old_machine_deprecation =
-     "machine types for previous major releases are deprecated";
- 
- GlobalProperty hw_compat_rhel_9_2[] = {
-+  /* hw_compat_rhel_9_2 from hw_compat_8_0 */
-+  { "migration", "multifd-flush-after-each-section", "on"},
-   /* hw_compat_rhel_9_2 from hw_compat_7_2 */
-   { "e1000e", "migrate-timadj", "off" },
-   /* hw_compat_rhel_9_2 from hw_compat_7_2 */
-diff --git a/migration/migration.h b/migration/migration.h
-index 7ccf460aa2..04c78c1fd6 100644
---- a/migration/migration.h
-+++ b/migration/migration.h
-@@ -411,6 +411,18 @@ struct MigrationState {
-      */
-     bool preempt_pre_7_2;
- 
-+    /*
-+     * flush every channel after each section sent.
-+     *
-+     * This assures that we can't mix pages from one iteration through
-+     * ram pages with pages for the following iteration.  We really
-+     * only need to do this flush after we have go through all the
-+     * dirty pages.  For historical reasons, we do that after each
-+     * section.  This is suboptimal (we flush too many times).
-+     * Default value is false.  Setting this property has no effect
-+     * until the patch that removes this comment.  (since 8.1)
-+     */
-+    bool multifd_flush_after_each_section;
-     /*
-      * This decides the size of guest memory chunk that will be used
-      * to track dirty bitmap clearing.  The size of memory chunk will
-diff --git a/migration/options.c b/migration/options.c
-index ccd7ef3907..5b0d080ecb 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -88,6 +88,8 @@ Property migration_properties[] = {
-                      send_section_footer, true),
-     DEFINE_PROP_BOOL("decompress-error-check", MigrationState,
-                       decompress_error_check, true),
-+    DEFINE_PROP_BOOL("multifd-flush-after-each-section", MigrationState,
-+                      multifd_flush_after_each_section, true),
-     DEFINE_PROP_UINT8("x-clear-bitmap-shift", MigrationState,
-                       clear_bitmap_shift, CLEAR_BITMAP_SHIFT_DEFAULT),
-     DEFINE_PROP_BOOL("x-preempt-pre-7-2", MigrationState,
-@@ -344,6 +346,17 @@ bool migrate_zero_copy_send(void)
- 
- /* pseudo capabilities */
- 
-+bool migrate_multifd_flush_after_each_section(void)
-+{
-+    MigrationState *s = migrate_get_current();
-+
-+    /*
-+     * Until the patch that remove this comment, we always return that
-+     * the property is enabled.
-+     */
-+    return true || s->multifd_flush_after_each_section;
-+}
-+
- bool migrate_postcopy(void)
- {
-     return migrate_postcopy_ram() || migrate_dirty_bitmaps();
-diff --git a/migration/options.h b/migration/options.h
-index 0fc7be6869..271f49ae5f 100644
---- a/migration/options.h
-+++ b/migration/options.h
-@@ -60,6 +60,7 @@ bool migrate_zero_copy_send(void);
-  * check, but they are not a capability.
-  */
- 
-+bool migrate_multifd_flush_after_each_section(void);
- bool migrate_postcopy(void);
- bool migrate_tls(void);
- 
--- 
-2.39.3
-
diff --git a/kvm-multifd-Fix-the-number-of-channels-ready.patch b/kvm-multifd-Fix-the-number-of-channels-ready.patch
deleted file mode 100644
index abf21e6..0000000
--- a/kvm-multifd-Fix-the-number-of-channels-ready.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From af6f2a543c7db6d67d33fd12615a50e57fc3fe66 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Wed, 26 Apr 2023 12:20:36 +0200
-Subject: [PATCH 19/21] multifd: Fix the number of channels ready
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Leonardo Brás <leobras@redhat.com>
-RH-MergeRequest: 171: multifd: Fix the number of channels ready
-RH-Bugzilla: 2196289
-RH-Acked-by: Peter Xu <peterx@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [1/1] a5e271ba249d85b27a68d3cff10480ca3a112c5d (LeoBras/centos-qemu-kvm)
-
-We don't wait in the sem when we are doing a sync_main.  Make it wait
-there.  To make things clearer, we mark the channel ready at the
-begining of the thread loop.
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Fabiano Rosas <farosas@suse.de>
-(cherry picked from commit d2026ee117147893f8d80f060cede6d872ecbd7f)
-Signed-off-by: Leonardo Bras <leobras@redhat.com>
----
- migration/multifd.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/migration/multifd.c b/migration/multifd.c
-index cce3ad6988..6a59c03dd2 100644
---- a/migration/multifd.c
-+++ b/migration/multifd.c
-@@ -635,6 +635,7 @@ int multifd_send_sync_main(QEMUFile *f)
-     for (i = 0; i < migrate_multifd_channels(); i++) {
-         MultiFDSendParams *p = &multifd_send_state->params[i];
- 
-+        qemu_sem_wait(&multifd_send_state->channels_ready);
-         trace_multifd_send_sync_main_wait(p->id);
-         qemu_sem_wait(&p->sem_sync);
- 
-@@ -668,6 +669,7 @@ static void *multifd_send_thread(void *opaque)
-     p->num_packets = 1;
- 
-     while (true) {
-+        qemu_sem_post(&multifd_send_state->channels_ready);
-         qemu_sem_wait(&p->sem);
- 
-         if (qatomic_read(&multifd_send_state->exiting)) {
-@@ -736,7 +738,6 @@ static void *multifd_send_thread(void *opaque)
-             if (flags & MULTIFD_FLAG_SYNC) {
-                 qemu_sem_post(&p->sem_sync);
-             }
--            qemu_sem_post(&multifd_send_state->channels_ready);
-         } else if (p->quit) {
-             qemu_mutex_unlock(&p->mutex);
-             break;
--- 
-2.39.3
-
diff --git a/kvm-multifd-Only-flush-once-each-full-round-of-memory.patch b/kvm-multifd-Only-flush-once-each-full-round-of-memory.patch
deleted file mode 100644
index 3f76384..0000000
--- a/kvm-multifd-Only-flush-once-each-full-round-of-memory.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From e6f770506091eada46c63ac1c8b934b508e3807f Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Tue, 21 Jun 2022 13:36:11 +0200
-Subject: [PATCH 07/12] multifd: Only flush once each full round of memory
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: quintela1 <quintela@redhat.com>
-RH-MergeRequest: 186: Multifd flushes its channels 10 times per second
-RH-Bugzilla: 2196295
-RH-Acked-by: Peter Xu <peterx@redhat.com>
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Commit: [3/3] 33f76dfc72a2552a42dc7f0fe3923564185a7bf7 (juan.quintela/c9s-qemu-kvm)
-
-We need to add a new flag to mean to flush at that point.
-Notice that we still flush at the end of setup and at the end of
-complete stages.
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Acked-by: Peter Xu <peterx@redhat.com>
-
----
-
-Add missing qemu_fflush(), now it passes all tests always.
-In the previous version, the check that changes the default value to
-false got lost in some rebase.  Get it back.
-
-(cherry picked from commit 294e5a4034e81b3d8db03b4e0f691386f20d6ed3)
----
- migration/migration.h |  3 +--
- migration/options.c   |  8 ++------
- migration/ram.c       | 28 +++++++++++++++++++++++++++-
- 3 files changed, 30 insertions(+), 9 deletions(-)
-
-diff --git a/migration/migration.h b/migration/migration.h
-index 04c78c1fd6..dfec649af8 100644
---- a/migration/migration.h
-+++ b/migration/migration.h
-@@ -419,8 +419,7 @@ struct MigrationState {
-      * only need to do this flush after we have go through all the
-      * dirty pages.  For historical reasons, we do that after each
-      * section.  This is suboptimal (we flush too many times).
--     * Default value is false.  Setting this property has no effect
--     * until the patch that removes this comment.  (since 8.1)
-+     * Default value is false. (since 8.1)
-      */
-     bool multifd_flush_after_each_section;
-     /*
-diff --git a/migration/options.c b/migration/options.c
-index 5b0d080ecb..e13c7cb8e5 100644
---- a/migration/options.c
-+++ b/migration/options.c
-@@ -89,7 +89,7 @@ Property migration_properties[] = {
-     DEFINE_PROP_BOOL("decompress-error-check", MigrationState,
-                       decompress_error_check, true),
-     DEFINE_PROP_BOOL("multifd-flush-after-each-section", MigrationState,
--                      multifd_flush_after_each_section, true),
-+                      multifd_flush_after_each_section, false),
-     DEFINE_PROP_UINT8("x-clear-bitmap-shift", MigrationState,
-                       clear_bitmap_shift, CLEAR_BITMAP_SHIFT_DEFAULT),
-     DEFINE_PROP_BOOL("x-preempt-pre-7-2", MigrationState,
-@@ -350,11 +350,7 @@ bool migrate_multifd_flush_after_each_section(void)
- {
-     MigrationState *s = migrate_get_current();
- 
--    /*
--     * Until the patch that remove this comment, we always return that
--     * the property is enabled.
--     */
--    return true || s->multifd_flush_after_each_section;
-+    return s->multifd_flush_after_each_section;
- }
- 
- bool migrate_postcopy(void)
-diff --git a/migration/ram.c b/migration/ram.c
-index 1e2414d681..e9dcda8b9d 100644
---- a/migration/ram.c
-+++ b/migration/ram.c
-@@ -86,6 +86,7 @@
- #define RAM_SAVE_FLAG_XBZRLE   0x40
- /* 0x80 is reserved in qemu-file.h for RAM_SAVE_FLAG_HOOK */
- #define RAM_SAVE_FLAG_COMPRESS_PAGE    0x100
-+#define RAM_SAVE_FLAG_MULTIFD_FLUSH    0x200
- /* We can't use any flag that is bigger than 0x200 */
- 
- int (*xbzrle_encode_buffer_func)(uint8_t *, uint8_t *, int,
-@@ -1581,6 +1582,7 @@ retry:
-  * associated with the search process.
-  *
-  * Returns:
-+ *         <0: An error happened
-  *         PAGE_ALL_CLEAN: no dirty page found, give up
-  *         PAGE_TRY_AGAIN: no dirty page found, retry for next block
-  *         PAGE_DIRTY_FOUND: dirty page found
-@@ -1608,6 +1610,15 @@ static int find_dirty_block(RAMState *rs, PageSearchStatus *pss)
-         pss->page = 0;
-         pss->block = QLIST_NEXT_RCU(pss->block, next);
-         if (!pss->block) {
-+            if (!migrate_multifd_flush_after_each_section()) {
-+                QEMUFile *f = rs->pss[RAM_CHANNEL_PRECOPY].pss_channel;
-+                int ret = multifd_send_sync_main(f);
-+                if (ret < 0) {
-+                    return ret;
-+                }
-+                qemu_put_be64(f, RAM_SAVE_FLAG_MULTIFD_FLUSH);
-+                qemu_fflush(f);
-+            }
-             /*
-              * If memory migration starts over, we will meet a dirtied page
-              * which may still exists in compression threads's ring, so we
-@@ -2600,6 +2611,9 @@ static int ram_find_and_save_block(RAMState *rs)
-                     break;
-                 } else if (res == PAGE_TRY_AGAIN) {
-                     continue;
-+                } else if (res < 0) {
-+                    pages = res;
-+                    break;
-                 }
-             }
-         }
-@@ -3286,6 +3300,10 @@ static int ram_save_setup(QEMUFile *f, void *opaque)
-         return ret;
-     }
- 
-+    if (!migrate_multifd_flush_after_each_section()) {
-+        qemu_put_be64(f, RAM_SAVE_FLAG_MULTIFD_FLUSH);
-+    }
-+
-     qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
-     qemu_fflush(f);
- 
-@@ -3471,6 +3489,9 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
-         return ret;
-     }
- 
-+    if (!migrate_multifd_flush_after_each_section()) {
-+        qemu_put_be64(f, RAM_SAVE_FLAG_MULTIFD_FLUSH);
-+    }
-     qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
-     qemu_fflush(f);
- 
-@@ -4152,7 +4173,9 @@ int ram_load_postcopy(QEMUFile *f, int channel)
-             }
-             decompress_data_with_multi_threads(f, page_buffer, len);
-             break;
--
-+        case RAM_SAVE_FLAG_MULTIFD_FLUSH:
-+            multifd_recv_sync_main();
-+            break;
-         case RAM_SAVE_FLAG_EOS:
-             /* normal exit */
-             if (migrate_multifd_flush_after_each_section()) {
-@@ -4426,6 +4449,9 @@ static int ram_load_precopy(QEMUFile *f)
-                 break;
-             }
-             break;
-+        case RAM_SAVE_FLAG_MULTIFD_FLUSH:
-+            multifd_recv_sync_main();
-+            break;
-         case RAM_SAVE_FLAG_EOS:
-             /* normal exit */
-             if (migrate_multifd_flush_after_each_section()) {
--- 
-2.39.3
-
diff --git a/kvm-multifd-Protect-multifd_send_sync_main-calls.patch b/kvm-multifd-Protect-multifd_send_sync_main-calls.patch
deleted file mode 100644
index 779841f..0000000
--- a/kvm-multifd-Protect-multifd_send_sync_main-calls.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From c4bfb4900b95e13bef2d86b83c33786c7c4f6289 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Tue, 21 Jun 2022 12:21:32 +0200
-Subject: [PATCH 06/12] multifd: Protect multifd_send_sync_main() calls
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: quintela1 <quintela@redhat.com>
-RH-MergeRequest: 186: Multifd flushes its channels 10 times per second
-RH-Bugzilla: 2196295
-RH-Acked-by: Peter Xu <peterx@redhat.com>
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Commit: [2/3] a91adf59c6b2f39bf4a308f566b00e39cae6e0ae (juan.quintela/c9s-qemu-kvm)
-
-We only need to do that on the ram_save_iterate() call on sending and
-on destination when we get a RAM_SAVE_FLAG_EOS.
-
-In setup() and complete() we need to synch in both new and old cases,
-so don't add a check there.
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
-Acked-by: Peter Xu <peterx@redhat.com>
-
----
-
-Remove the wrappers that we take out on patch 5.
-
-(cherry picked from commit b05292c237030343516d073b1a1e5f49ffc017a8)
----
- migration/ram.c | 16 +++++++++++-----
- 1 file changed, 11 insertions(+), 5 deletions(-)
-
-diff --git a/migration/ram.c b/migration/ram.c
-index 01356f60a4..1e2414d681 100644
---- a/migration/ram.c
-+++ b/migration/ram.c
-@@ -3394,9 +3394,11 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
- out:
-     if (ret >= 0
-         && migration_is_setup_or_active(migrate_get_current()->state)) {
--        ret = multifd_send_sync_main(rs->pss[RAM_CHANNEL_PRECOPY].pss_channel);
--        if (ret < 0) {
--            return ret;
-+        if (migrate_multifd_flush_after_each_section()) {
-+            ret = multifd_send_sync_main(rs->pss[RAM_CHANNEL_PRECOPY].pss_channel);
-+            if (ret < 0) {
-+                return ret;
-+            }
-         }
- 
-         qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
-@@ -4153,7 +4155,9 @@ int ram_load_postcopy(QEMUFile *f, int channel)
- 
-         case RAM_SAVE_FLAG_EOS:
-             /* normal exit */
--            multifd_recv_sync_main();
-+            if (migrate_multifd_flush_after_each_section()) {
-+                multifd_recv_sync_main();
-+            }
-             break;
-         default:
-             error_report("Unknown combination of migration flags: 0x%x"
-@@ -4424,7 +4428,9 @@ static int ram_load_precopy(QEMUFile *f)
-             break;
-         case RAM_SAVE_FLAG_EOS:
-             /* normal exit */
--            multifd_recv_sync_main();
-+            if (migrate_multifd_flush_after_each_section()) {
-+                multifd_recv_sync_main();
-+            }
-             break;
-         default:
-             if (flags & RAM_SAVE_FLAG_HOOK) {
--- 
-2.39.3
-
diff --git a/kvm-nbd-server-Fix-drained_poll-to-wake-coroutine-in-rig.patch b/kvm-nbd-server-Fix-drained_poll-to-wake-coroutine-in-rig.patch
deleted file mode 100644
index 214b6dd..0000000
--- a/kvm-nbd-server-Fix-drained_poll-to-wake-coroutine-in-rig.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From 639f65d2cd4c6627a1d22c4b418b41400fe40154 Mon Sep 17 00:00:00 2001
-From: Kevin Wolf <kwolf@redhat.com>
-Date: Wed, 17 May 2023 17:28:33 +0200
-Subject: [PATCH 03/21] nbd/server: Fix drained_poll to wake coroutine in right
- AioContext
-
-RH-Author: Kevin Wolf <kwolf@redhat.com>
-RH-MergeRequest: 166: block/graph-lock: Disable locking for now
-RH-Bugzilla: 2186725
-RH-Acked-by: Eric Blake <eblake@redhat.com>
-RH-Acked-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
-RH-Commit: [3/4] 177092e61360c2feb04377890b32fdeb2d1cfefc (kmwolf/centos-qemu-kvm)
-
-nbd_drained_poll() generally runs in the main thread, not whatever
-iothread the NBD server coroutine is meant to run in, so it can't
-directly reenter the coroutines to wake them up.
-
-The code seems to have the right intention, it specifies the correct
-AioContext when it calls qemu_aio_coroutine_enter(). However, this
-functions doesn't schedule the coroutine to run in that AioContext, but
-it assumes it is already called in the home thread of the AioContext.
-
-To fix this, add a new thread-safe qio_channel_wake_read() that can be
-called in the main thread to wake up the coroutine in its AioContext,
-and use this in nbd_drained_poll().
-
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Message-Id: <20230517152834.277483-3-kwolf@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-(cherry picked from commit 7c1f51bf38de8cea4ed5030467646c37b46edeb7)
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
----
- include/io/channel.h | 10 ++++++++++
- io/channel.c         | 33 +++++++++++++++++++++++++++------
- nbd/server.c         |  3 +--
- 3 files changed, 38 insertions(+), 8 deletions(-)
-
-diff --git a/include/io/channel.h b/include/io/channel.h
-index 153fbd2904..2b905423a9 100644
---- a/include/io/channel.h
-+++ b/include/io/channel.h
-@@ -757,6 +757,16 @@ void qio_channel_detach_aio_context(QIOChannel *ioc);
- void coroutine_fn qio_channel_yield(QIOChannel *ioc,
-                                     GIOCondition condition);
- 
-+/**
-+ * qio_channel_wake_read:
-+ * @ioc: the channel object
-+ *
-+ * If qio_channel_yield() is currently waiting for the channel to become
-+ * readable, interrupt it and reenter immediately. This function is safe to call
-+ * from any thread.
-+ */
-+void qio_channel_wake_read(QIOChannel *ioc);
-+
- /**
-  * qio_channel_wait:
-  * @ioc: the channel object
-diff --git a/io/channel.c b/io/channel.c
-index a8c7f11649..3c9b7beb65 100644
---- a/io/channel.c
-+++ b/io/channel.c
-@@ -19,6 +19,7 @@
-  */
- 
- #include "qemu/osdep.h"
-+#include "block/aio-wait.h"
- #include "io/channel.h"
- #include "qapi/error.h"
- #include "qemu/main-loop.h"
-@@ -514,7 +515,11 @@ int qio_channel_flush(QIOChannel *ioc,
- static void qio_channel_restart_read(void *opaque)
- {
-     QIOChannel *ioc = opaque;
--    Coroutine *co = ioc->read_coroutine;
-+    Coroutine *co = qatomic_xchg(&ioc->read_coroutine, NULL);
-+
-+    if (!co) {
-+        return;
-+    }
- 
-     /* Assert that aio_co_wake() reenters the coroutine directly */
-     assert(qemu_get_current_aio_context() ==
-@@ -525,7 +530,11 @@ static void qio_channel_restart_read(void *opaque)
- static void qio_channel_restart_write(void *opaque)
- {
-     QIOChannel *ioc = opaque;
--    Coroutine *co = ioc->write_coroutine;
-+    Coroutine *co = qatomic_xchg(&ioc->write_coroutine, NULL);
-+
-+    if (!co) {
-+        return;
-+    }
- 
-     /* Assert that aio_co_wake() reenters the coroutine directly */
-     assert(qemu_get_current_aio_context() ==
-@@ -568,7 +577,11 @@ void qio_channel_detach_aio_context(QIOChannel *ioc)
- void coroutine_fn qio_channel_yield(QIOChannel *ioc,
-                                     GIOCondition condition)
- {
-+    AioContext *ioc_ctx = ioc->ctx ?: qemu_get_aio_context();
-+
-     assert(qemu_in_coroutine());
-+    assert(in_aio_context_home_thread(ioc_ctx));
-+
-     if (condition == G_IO_IN) {
-         assert(!ioc->read_coroutine);
-         ioc->read_coroutine = qemu_coroutine_self();
-@@ -580,18 +593,26 @@ void coroutine_fn qio_channel_yield(QIOChannel *ioc,
-     }
-     qio_channel_set_aio_fd_handlers(ioc);
-     qemu_coroutine_yield();
-+    assert(in_aio_context_home_thread(ioc_ctx));
- 
-     /* Allow interrupting the operation by reentering the coroutine other than
-      * through the aio_fd_handlers. */
--    if (condition == G_IO_IN && ioc->read_coroutine) {
--        ioc->read_coroutine = NULL;
-+    if (condition == G_IO_IN) {
-+        assert(ioc->read_coroutine == NULL);
-         qio_channel_set_aio_fd_handlers(ioc);
--    } else if (condition == G_IO_OUT && ioc->write_coroutine) {
--        ioc->write_coroutine = NULL;
-+    } else if (condition == G_IO_OUT) {
-+        assert(ioc->write_coroutine == NULL);
-         qio_channel_set_aio_fd_handlers(ioc);
-     }
- }
- 
-+void qio_channel_wake_read(QIOChannel *ioc)
-+{
-+    Coroutine *co = qatomic_xchg(&ioc->read_coroutine, NULL);
-+    if (co) {
-+        aio_co_wake(co);
-+    }
-+}
- 
- static gboolean qio_channel_wait_complete(QIOChannel *ioc,
-                                           GIOCondition condition,
-diff --git a/nbd/server.c b/nbd/server.c
-index 3d8d0d81df..ea47522e8f 100644
---- a/nbd/server.c
-+++ b/nbd/server.c
-@@ -1599,8 +1599,7 @@ static bool nbd_drained_poll(void *opaque)
-              * enter it here so we don't depend on the client to wake it up.
-              */
-             if (client->recv_coroutine != NULL && client->read_yielding) {
--                qemu_aio_coroutine_enter(exp->common.ctx,
--                                         client->recv_coroutine);
-+                qio_channel_wake_read(client->ioc);
-             }
- 
-             return true;
--- 
-2.39.3
-
diff --git a/kvm-net-socket-move-fd-type-checking-to-its-own-function.patch b/kvm-net-socket-move-fd-type-checking-to-its-own-function.patch
deleted file mode 100644
index 20b9c04..0000000
--- a/kvm-net-socket-move-fd-type-checking-to-its-own-function.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From d6b3f9e4b388b8d621761104ddf075d6087f6d6c Mon Sep 17 00:00:00 2001
-From: Laurent Vivier <lvivier@redhat.com>
-Date: Fri, 9 Jun 2023 09:27:47 +0200
-Subject: [PATCH 09/12] net: socket: move fd type checking to its own function
-
-RH-Author: Laurent Vivier <lvivier@redhat.com>
-RH-MergeRequest: 187: net: socket: do not close file descriptor if it's not a socket
-RH-Jira: RHEL-582
-RH-Acked-by: Stefano Brivio <None>
-RH-Acked-by: Jason Wang <jasowang@redhat.com>
-RH-Acked-by: David Gibson (Red Hat) <dgibson@redhat.com>
-RH-Commit: [2/3] 9726f0ae81ac209b5db33dc7767f652867d8ca0a (lvivier/qemu-kvm-centos)
-
-JIRA: https://issues.redhat.com/browse/RHEL-582
-
-Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
-Signed-off-by: Laurent Vivier <lvivier@redhat.com>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
-(cherry picked from commit 23455ae341656ca867ee4a171826b9d280d6acb5)
----
- net/socket.c | 28 ++++++++++++++++++++--------
- 1 file changed, 20 insertions(+), 8 deletions(-)
-
-diff --git a/net/socket.c b/net/socket.c
-index 24dcaa55bc..6b1f0fec3a 100644
---- a/net/socket.c
-+++ b/net/socket.c
-@@ -446,16 +446,32 @@ static NetSocketState *net_socket_fd_init_stream(NetClientState *peer,
-     return s;
- }
- 
-+static int net_socket_fd_check(int fd, Error **errp)
-+{
-+    int so_type, optlen = sizeof(so_type);
-+
-+    if (getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&so_type,
-+        (socklen_t *)&optlen) < 0) {
-+        error_setg(errp, "can't get socket option SO_TYPE");
-+        return -1;
-+    }
-+    if (so_type != SOCK_DGRAM && so_type != SOCK_STREAM) {
-+        error_setg(errp, "socket type=%d for fd=%d must be either"
-+                   " SOCK_DGRAM or SOCK_STREAM", so_type, fd);
-+        return -1;
-+    }
-+    return so_type;
-+}
-+
- static NetSocketState *net_socket_fd_init(NetClientState *peer,
-                                           const char *model, const char *name,
-                                           int fd, int is_connected,
-                                           const char *mc, Error **errp)
- {
--    int so_type = -1, optlen=sizeof(so_type);
-+    int so_type;
- 
--    if(getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&so_type,
--        (socklen_t *)&optlen)< 0) {
--        error_setg(errp, "can't get socket option SO_TYPE");
-+    so_type = net_socket_fd_check(fd, errp);
-+    if (so_type < 0) {
-         close(fd);
-         return NULL;
-     }
-@@ -465,10 +481,6 @@ static NetSocketState *net_socket_fd_init(NetClientState *peer,
-                                         mc, errp);
-     case SOCK_STREAM:
-         return net_socket_fd_init_stream(peer, model, name, fd, is_connected);
--    default:
--        error_setg(errp, "socket type=%d for fd=%d must be either"
--                   " SOCK_DGRAM or SOCK_STREAM", so_type, fd);
--        close(fd);
-     }
-     return NULL;
- }
--- 
-2.39.3
-
diff --git a/kvm-net-socket-prepare-to-cleanup-net_init_socket.patch b/kvm-net-socket-prepare-to-cleanup-net_init_socket.patch
deleted file mode 100644
index 269da29..0000000
--- a/kvm-net-socket-prepare-to-cleanup-net_init_socket.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From a467540e49e76c5961d86e3f47d3f8fcad8cef09 Mon Sep 17 00:00:00 2001
-From: Laurent Vivier <lvivier@redhat.com>
-Date: Fri, 9 Jun 2023 09:27:46 +0200
-Subject: [PATCH 08/12] net: socket: prepare to cleanup net_init_socket()
-
-RH-Author: Laurent Vivier <lvivier@redhat.com>
-RH-MergeRequest: 187: net: socket: do not close file descriptor if it's not a socket
-RH-Jira: RHEL-582
-RH-Acked-by: Stefano Brivio <None>
-RH-Acked-by: Jason Wang <jasowang@redhat.com>
-RH-Acked-by: David Gibson (Red Hat) <dgibson@redhat.com>
-RH-Commit: [1/3] 3e4f8370586ae1ac2474fef971a239edb31eeb67 (lvivier/qemu-kvm-centos)
-
-JIRA: https://issues.redhat.com/browse/RHEL-582
-
-Use directly net_socket_fd_init_stream() and net_socket_fd_init_dgram()
-when the socket type is already known.
-
-Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
-Signed-off-by: Laurent Vivier <lvivier@redhat.com>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
-(cherry picked from commit 006c3fa74c3edb978ff46d2851699e9a95609da5)
----
- net/socket.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/net/socket.c b/net/socket.c
-index ba6e5b0b00..24dcaa55bc 100644
---- a/net/socket.c
-+++ b/net/socket.c
-@@ -587,7 +587,7 @@ static int net_socket_connect_init(NetClientState *peer,
-             break;
-         }
-     }
--    s = net_socket_fd_init(peer, model, name, fd, connected, NULL, errp);
-+    s = net_socket_fd_init_stream(peer, model, name, fd, connected);
-     if (!s) {
-         return -1;
-     }
-@@ -629,7 +629,7 @@ static int net_socket_mcast_init(NetClientState *peer,
-         return -1;
-     }
- 
--    s = net_socket_fd_init(peer, model, name, fd, 0, NULL, errp);
-+    s = net_socket_fd_init_dgram(peer, model, name, fd, 0, NULL, errp);
-     if (!s) {
-         return -1;
-     }
-@@ -683,7 +683,7 @@ static int net_socket_udp_init(NetClientState *peer,
-     }
-     qemu_socket_set_nonblock(fd);
- 
--    s = net_socket_fd_init(peer, model, name, fd, 0, NULL, errp);
-+    s = net_socket_fd_init_dgram(peer, model, name, fd, 0, NULL, errp);
-     if (!s) {
-         return -1;
-     }
--- 
-2.39.3
-
diff --git a/kvm-net-socket-remove-net_init_socket.patch b/kvm-net-socket-remove-net_init_socket.patch
deleted file mode 100644
index 98c96f2..0000000
--- a/kvm-net-socket-remove-net_init_socket.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From ecb4f97895849c562112b76a30ddc2037e8df79e Mon Sep 17 00:00:00 2001
-From: Laurent Vivier <lvivier@redhat.com>
-Date: Fri, 9 Jun 2023 09:27:48 +0200
-Subject: [PATCH 10/12] net: socket: remove net_init_socket()
-
-RH-Author: Laurent Vivier <lvivier@redhat.com>
-RH-MergeRequest: 187: net: socket: do not close file descriptor if it's not a socket
-RH-Jira: RHEL-582
-RH-Acked-by: Stefano Brivio <None>
-RH-Acked-by: Jason Wang <jasowang@redhat.com>
-RH-Acked-by: David Gibson (Red Hat) <dgibson@redhat.com>
-RH-Commit: [3/3] e1d7939f5df4a77c2fff62d1ae4899a7a3615ad9 (lvivier/qemu-kvm-centos)
-
-JIRA: https://issues.redhat.com/browse/RHEL-582
-
-Move the file descriptor type checking before doing anything with it.
-If it's not usable, don't close it as it could be in use by another
-part of QEMU, only fail and report an error.
-
-Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
-Signed-off-by: Laurent Vivier <lvivier@redhat.com>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
-(cherry picked from commit b6aeee02980e193f744f74c48fd900940feb2799)
----
- net/socket.c | 43 +++++++++++++++++--------------------------
- 1 file changed, 17 insertions(+), 26 deletions(-)
-
-diff --git a/net/socket.c b/net/socket.c
-index 6b1f0fec3a..8e3702e1f3 100644
---- a/net/socket.c
-+++ b/net/socket.c
-@@ -463,28 +463,6 @@ static int net_socket_fd_check(int fd, Error **errp)
-     return so_type;
- }
- 
--static NetSocketState *net_socket_fd_init(NetClientState *peer,
--                                          const char *model, const char *name,
--                                          int fd, int is_connected,
--                                          const char *mc, Error **errp)
--{
--    int so_type;
--
--    so_type = net_socket_fd_check(fd, errp);
--    if (so_type < 0) {
--        close(fd);
--        return NULL;
--    }
--    switch(so_type) {
--    case SOCK_DGRAM:
--        return net_socket_fd_init_dgram(peer, model, name, fd, is_connected,
--                                        mc, errp);
--    case SOCK_STREAM:
--        return net_socket_fd_init_stream(peer, model, name, fd, is_connected);
--    }
--    return NULL;
--}
--
- static void net_socket_accept(void *opaque)
- {
-     NetSocketState *s = opaque;
-@@ -728,21 +706,34 @@ int net_init_socket(const Netdev *netdev, const char *name,
-     }
- 
-     if (sock->fd) {
--        int fd, ret;
-+        int fd, ret, so_type;
- 
-         fd = monitor_fd_param(monitor_cur(), sock->fd, errp);
-         if (fd == -1) {
-             return -1;
-         }
-+        so_type = net_socket_fd_check(fd, errp);
-+        if (so_type < 0) {
-+            return -1;
-+        }
-         ret = qemu_socket_try_set_nonblock(fd);
-         if (ret < 0) {
-             error_setg_errno(errp, -ret, "%s: Can't use file descriptor %d",
-                              name, fd);
-             return -1;
-         }
--        if (!net_socket_fd_init(peer, "socket", name, fd, 1, sock->mcast,
--                                errp)) {
--            return -1;
-+        switch (so_type) {
-+        case SOCK_DGRAM:
-+            if (!net_socket_fd_init_dgram(peer, "socket", name, fd, 1,
-+                                          sock->mcast, errp)) {
-+                return -1;
-+            }
-+            break;
-+        case SOCK_STREAM:
-+            if (!net_socket_fd_init_stream(peer, "socket", name, fd, 1)) {
-+                return -1;
-+            }
-+            break;
-         }
-         return 0;
-     }
--- 
-2.39.3
-
diff --git a/kvm-numa-Validate-cluster-and-NUMA-node-boundary-if-requ.patch b/kvm-numa-Validate-cluster-and-NUMA-node-boundary-if-requ.patch
deleted file mode 100644
index 66d68f1..0000000
--- a/kvm-numa-Validate-cluster-and-NUMA-node-boundary-if-requ.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From 760a2f284f6d4cd3cd3b1685411bbca21c4ad233 Mon Sep 17 00:00:00 2001
-From: Gavin Shan <gshan@redhat.com>
-Date: Tue, 27 Jun 2023 20:20:09 +1000
-Subject: [PATCH 1/6] numa: Validate cluster and NUMA node boundary if required
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Gavin Shan <gshan@redhat.com>
-RH-MergeRequest: 175: hw/arm: Validate CPU cluster and NUMA node boundary for RHEL machines
-RH-Bugzilla: 2171363
-RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Commit: [1/3] 24580064b9a0076ec4d9a916839d85135ac48cd9
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2171363
-
-For some architectures like ARM64, multiple CPUs in one cluster can be
-associated with different NUMA nodes, which is irregular configuration
-because we shouldn't have this in baremetal environment. The irregular
-configuration causes Linux guest to misbehave, as the following warning
-messages indicate.
-
-  -smp 6,maxcpus=6,sockets=2,clusters=1,cores=3,threads=1 \
-  -numa node,nodeid=0,cpus=0-1,memdev=ram0                \
-  -numa node,nodeid=1,cpus=2-3,memdev=ram1                \
-  -numa node,nodeid=2,cpus=4-5,memdev=ram2                \
-
-  ------------[ cut here ]------------
-  WARNING: CPU: 0 PID: 1 at kernel/sched/topology.c:2271 build_sched_domains+0x284/0x910
-  Modules linked in:
-  CPU: 0 PID: 1 Comm: swapper/0 Not tainted 5.14.0-268.el9.aarch64 #1
-  pstate: 00400005 (nzcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
-  pc : build_sched_domains+0x284/0x910
-  lr : build_sched_domains+0x184/0x910
-  sp : ffff80000804bd50
-  x29: ffff80000804bd50 x28: 0000000000000002 x27: 0000000000000000
-  x26: ffff800009cf9a80 x25: 0000000000000000 x24: ffff800009cbf840
-  x23: ffff000080325000 x22: ffff0000005df800 x21: ffff80000a4ce508
-  x20: 0000000000000000 x19: ffff000080324440 x18: 0000000000000014
-  x17: 00000000388925c0 x16: 000000005386a066 x15: 000000009c10cc2e
-  x14: 00000000000001c0 x13: 0000000000000001 x12: ffff00007fffb1a0
-  x11: ffff00007fffb180 x10: ffff80000a4ce508 x9 : 0000000000000041
-  x8 : ffff80000a4ce500 x7 : ffff80000a4cf920 x6 : 0000000000000001
-  x5 : 0000000000000001 x4 : 0000000000000007 x3 : 0000000000000002
-  x2 : 0000000000001000 x1 : ffff80000a4cf928 x0 : 0000000000000001
-  Call trace:
-   build_sched_domains+0x284/0x910
-   sched_init_domains+0xac/0xe0
-   sched_init_smp+0x48/0xc8
-   kernel_init_freeable+0x140/0x1ac
-   kernel_init+0x28/0x140
-   ret_from_fork+0x10/0x20
-
-Improve the situation to warn when multiple CPUs in one cluster have
-been associated with different NUMA nodes. However, one NUMA node is
-allowed to be associated with different clusters.
-
-Signed-off-by: Gavin Shan <gshan@redhat.com>
-Acked-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-Acked-by: Igor Mammedov <imammedo@redhat.com>
-Message-Id: <20230509002739.18388-2-gshan@redhat.com>
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-(cherry picked from commit a494fdb715832000ee9047a549a35aacfea8175e)
-Signed-off-by: Gavin Shan <gshan@redhat.com>
----
- hw/core/machine.c   | 42 ++++++++++++++++++++++++++++++++++++++++++
- include/hw/boards.h |  1 +
- 2 files changed, 43 insertions(+)
-
-diff --git a/hw/core/machine.c b/hw/core/machine.c
-index c28702b690..5abdc8c39b 100644
---- a/hw/core/machine.c
-+++ b/hw/core/machine.c
-@@ -1496,6 +1496,45 @@ static void machine_numa_finish_cpu_init(MachineState *machine)
-     g_string_free(s, true);
- }
- 
-+static void validate_cpu_cluster_to_numa_boundary(MachineState *ms)
-+{
-+    MachineClass *mc = MACHINE_GET_CLASS(ms);
-+    NumaState *state = ms->numa_state;
-+    const CPUArchIdList *possible_cpus = mc->possible_cpu_arch_ids(ms);
-+    const CPUArchId *cpus = possible_cpus->cpus;
-+    int i, j;
-+
-+    if (state->num_nodes <= 1 || possible_cpus->len <= 1) {
-+        return;
-+    }
-+
-+    /*
-+     * The Linux scheduling domain can't be parsed when the multiple CPUs
-+     * in one cluster have been associated with different NUMA nodes. However,
-+     * it's fine to associate one NUMA node with CPUs in different clusters.
-+     */
-+    for (i = 0; i < possible_cpus->len; i++) {
-+        for (j = i + 1; j < possible_cpus->len; j++) {
-+            if (cpus[i].props.has_socket_id &&
-+                cpus[i].props.has_cluster_id &&
-+                cpus[i].props.has_node_id &&
-+                cpus[j].props.has_socket_id &&
-+                cpus[j].props.has_cluster_id &&
-+                cpus[j].props.has_node_id &&
-+                cpus[i].props.socket_id == cpus[j].props.socket_id &&
-+                cpus[i].props.cluster_id == cpus[j].props.cluster_id &&
-+                cpus[i].props.node_id != cpus[j].props.node_id) {
-+                warn_report("CPU-%d and CPU-%d in socket-%" PRId64 "-cluster-%" PRId64
-+                             " have been associated with node-%" PRId64 " and node-%" PRId64
-+                             " respectively. It can cause OSes like Linux to"
-+                             " misbehave", i, j, cpus[i].props.socket_id,
-+                             cpus[i].props.cluster_id, cpus[i].props.node_id,
-+                             cpus[j].props.node_id);
-+            }
-+        }
-+    }
-+}
-+
- MemoryRegion *machine_consume_memdev(MachineState *machine,
-                                      HostMemoryBackend *backend)
- {
-@@ -1581,6 +1620,9 @@ void machine_run_board_init(MachineState *machine, const char *mem_path, Error *
-         numa_complete_configuration(machine);
-         if (machine->numa_state->num_nodes) {
-             machine_numa_finish_cpu_init(machine);
-+            if (machine_class->cpu_cluster_has_numa_boundary) {
-+                validate_cpu_cluster_to_numa_boundary(machine);
-+            }
-         }
-     }
- 
-diff --git a/include/hw/boards.h b/include/hw/boards.h
-index 5f08bd7550..3628671228 100644
---- a/include/hw/boards.h
-+++ b/include/hw/boards.h
-@@ -275,6 +275,7 @@ struct MachineClass {
-     bool nvdimm_supported;
-     bool numa_mem_supported;
-     bool auto_enable_numa;
-+    bool cpu_cluster_has_numa_boundary;
-     SMPCompatProps smp_props;
-     const char *default_ram_id;
- 
--- 
-2.39.3
-
diff --git a/kvm-pc-bios-s390-ccw-Don-t-use-__bss_start-with-the-larl.patch b/kvm-pc-bios-s390-ccw-Don-t-use-__bss_start-with-the-larl.patch
deleted file mode 100644
index 312af68..0000000
--- a/kvm-pc-bios-s390-ccw-Don-t-use-__bss_start-with-the-larl.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 7495a51c586818925470fb247882f5ba0f7b0ffd Mon Sep 17 00:00:00 2001
-From: Thomas Huth <thuth@redhat.com>
-Date: Tue, 27 Jun 2023 09:47:03 +0200
-Subject: [PATCH 34/37] pc-bios/s390-ccw: Don't use __bss_start with the "larl"
- instruction
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Thomas Huth <thuth@redhat.com>
-RH-MergeRequest: 180: Fix misaligned symbol error in the s390-ccw image during qemu-kvm build with binutils 2.40
-RH-Bugzilla: 2220866
-RH-Acked-by: Cédric Le Goater <clg@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [4/4] 2483a50c0ed37fa29db649ec44220ac83c215698 (thuth/qemu-kvm-cs9)
-
-start.S currently cannot be compiled with Clang 16 and binutils 2.40:
-
- ld: start.o(.text+0x8): misaligned symbol `__bss_start' (0xc1e5) for
-     relocation R_390_PC32DBL
-
-According to the built-in linker script of ld, the symbol __bss_start
-can actually point *before* the .bss section and does not need to have
-any alignment, so in certain situations (like when using the internal
-assembler of Clang), the __bss_start symbol can indeed be unaligned
-and thus it is not suitable for being used with the "larl" instruction
-that needs an address that is at least aligned to halfwords.
-The problem went unnoticed so far since binutils <= 2.39 did not
-check the alignment, but starting with binutils 2.40, such unaligned
-addresses are now refused.
-
-Fix it by loading the address indirectly instead.
-
-Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=2216662
-Reported-by: Miroslav Rezanina <mrezanin@redhat.com>
-Suggested-by:  Andreas Krebbel <andreas.krebbel@de.ibm.com>
-Message-Id: <20230629104821.194859-8-thuth@redhat.com>
-Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
-Signed-off-by: Thomas Huth <thuth@redhat.com>
-(cherry picked from commit 7cd50cbe4ca3e2860b31b06ec92c17c54bd82d48)
----
- pc-bios/s390-ccw/start.S | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/pc-bios/s390-ccw/start.S b/pc-bios/s390-ccw/start.S
-index abd6fe6639..22c1c296df 100644
---- a/pc-bios/s390-ccw/start.S
-+++ b/pc-bios/s390-ccw/start.S
-@@ -19,7 +19,8 @@ _start:
-     larl    %r15,stack + STACK_SIZE - STACK_FRAME_SIZE   /* Set up stack */
- 
-     /* clear bss */
--    larl    %r2,__bss_start
-+    larl    %r2,bss_start_literal   /* __bss_start might be unaligned ... */
-+    lg      %r2,0(%r2)              /* ... so load it indirectly */
-     larl    %r3,_end
-     slgr    %r3,%r2    /* get sizeof bss */
-     ltgr    %r3,%r3    /* bss empty? */
-@@ -45,7 +46,6 @@ done:
- memsetxc:
-     xc      0(1,%r1),0(%r1)
- 
--
- /*
-  * void disabled_wait(void)
-  *
-@@ -113,6 +113,8 @@ io_new_code:
-     br      %r14
- 
-     .align  8
-+bss_start_literal:
-+    .quad   __bss_start
- disabled_wait_psw:
-     .quad   0x0002000180000000,0x0000000000000000
- enabled_wait_psw:
--- 
-2.39.3
-
diff --git a/kvm-pc-bios-s390-ccw-Fix-indentation-in-start.S.patch b/kvm-pc-bios-s390-ccw-Fix-indentation-in-start.S.patch
deleted file mode 100644
index bd13187..0000000
--- a/kvm-pc-bios-s390-ccw-Fix-indentation-in-start.S.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-From 24bc8fc932ae1c88cc2e97f0f90786a7be411bb2 Mon Sep 17 00:00:00 2001
-From: Thomas Huth <thuth@redhat.com>
-Date: Tue, 27 Jun 2023 09:47:00 +0200
-Subject: [PATCH 32/37] pc-bios/s390-ccw: Fix indentation in start.S
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Thomas Huth <thuth@redhat.com>
-RH-MergeRequest: 180: Fix misaligned symbol error in the s390-ccw image during qemu-kvm build with binutils 2.40
-RH-Bugzilla: 2220866
-RH-Acked-by: Cédric Le Goater <clg@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [2/4] cf8fa053602ce1cfac0b6efa67f491688d4f9348 (thuth/qemu-kvm-cs9)
-
-start.S is currently indented with a mixture of spaces and tabs, which
-is quite ugly. QEMU coding style says indentation should be 4 spaces,
-and this is also what we are using in the assembler files in the
-tests/tcg/s390x/ folder already, so let's adjust start.S accordingly.
-
-Reviewed-by: Cédric Le Goater <clg@redhat.com>
-Message-Id: <20230627074703.99608-2-thuth@redhat.com>
-Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
-Reviewed-by: Eric Farman <farman@linux.ibm.com>
-Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-Signed-off-by: Thomas Huth <thuth@redhat.com>
-(cherry picked from commit f52420fa4fd9f519dc42c20d2616aba4149adc25)
----
- pc-bios/s390-ccw/start.S | 136 +++++++++++++++++++--------------------
- 1 file changed, 68 insertions(+), 68 deletions(-)
-
-diff --git a/pc-bios/s390-ccw/start.S b/pc-bios/s390-ccw/start.S
-index 6072906df4..d29de09cc6 100644
---- a/pc-bios/s390-ccw/start.S
-+++ b/pc-bios/s390-ccw/start.S
-@@ -10,37 +10,37 @@
-  * directory.
-  */
- 
--        .globl _start
-+    .globl _start
- _start:
- 
--	larl   %r15, stack + 0x8000	/* Set up stack */
-+    larl    %r15,stack + 0x8000     /* Set up stack */
- 
--	/* clear bss */
--	larl %r2, __bss_start
--	larl %r3, _end
--	slgr %r3, %r2		/* get sizeof bss */
--	ltgr	%r3,%r3 	/* bss empty? */
--	jz	done
--	aghi	%r3,-1
--	srlg	%r4,%r3,8	/* how many 256 byte chunks? */
--	ltgr	%r4,%r4
--	lgr	%r1,%r2
--	jz	remainder
-+    /* clear bss */
-+    larl    %r2,__bss_start
-+    larl    %r3,_end
-+    slgr    %r3,%r2    /* get sizeof bss */
-+    ltgr    %r3,%r3    /* bss empty? */
-+    jz      done
-+    aghi    %r3,-1
-+    srlg    %r4,%r3,8  /* how many 256 byte chunks? */
-+    ltgr    %r4,%r4
-+    lgr     %r1,%r2
-+    jz      remainder
- loop:
--	xc	0(256,%r1),0(%r1)
--	la	%r1,256(%r1)
--	brctg	%r4,loop
-+    xc      0(256,%r1),0(%r1)
-+    la      %r1,256(%r1)
-+    brctg   %r4,loop
- remainder:
--	larl	%r2,memsetxc
--	ex	%r3,0(%r2)
-+    larl    %r2,memsetxc
-+    ex      %r3,0(%r2)
- done:
--        /* set up a pgm exception disabled wait psw */
--        larl	%r2, disabled_wait_psw
--        mvc	0x01d0(16), 0(%r2)
--        j      main		/* And call C */
-+    /* set up a pgm exception disabled wait psw */
-+    larl    %r2,disabled_wait_psw
-+    mvc     0x01d0(16),0(%r2)
-+    j       main       /* And call C */
- 
- memsetxc:
--	xc	0(1,%r1),0(%r1)
-+    xc      0(1,%r1),0(%r1)
- 
- 
- /*
-@@ -48,11 +48,11 @@ memsetxc:
-  *
-  * stops the current guest cpu.
-  */
--	.globl disabled_wait
-+    .globl disabled_wait
- disabled_wait:
--	larl	%r1,disabled_wait_psw
--	lpswe	0(%r1)
--1:	j	1b
-+    larl    %r1,disabled_wait_psw
-+    lpswe   0(%r1)
-+1:  j       1b
- 
- 
- /*
-@@ -60,61 +60,61 @@ disabled_wait:
-  *
-  * eats one sclp interrupt
-  */
--        .globl consume_sclp_int
-+    .globl consume_sclp_int
- consume_sclp_int:
--        /* enable service interrupts in cr0 */
--        stctg   %c0,%c0,0(%r15)
--        oi      6(%r15),0x2
--        lctlg   %c0,%c0,0(%r15)
--        /* prepare external call handler */
--        larl %r1, external_new_code
--        stg %r1, 0x1b8
--        larl %r1, external_new_mask
--        mvc 0x1b0(8),0(%r1)
--        /* load enabled wait PSW */
--        larl %r1, enabled_wait_psw
--        lpswe 0(%r1)
-+    /* enable service interrupts in cr0 */
-+    stctg   %c0,%c0,0(%r15)
-+    oi      6(%r15),0x2
-+    lctlg   %c0,%c0,0(%r15)
-+    /* prepare external call handler */
-+    larl    %r1,external_new_code
-+    stg     %r1,0x1b8
-+    larl    %r1,external_new_mask
-+    mvc     0x1b0(8),0(%r1)
-+    /* load enabled wait PSW */
-+    larl    %r1,enabled_wait_psw
-+    lpswe   0(%r1)
- 
- /*
-  * void consume_io_int(void)
-  *
-  * eats one I/O interrupt
-  */
--        .globl consume_io_int
-+    .globl consume_io_int
- consume_io_int:
--        /* enable I/O interrupts in cr6 */
--        stctg %c6,%c6,0(%r15)
--        oi    4(%r15), 0xff
--        lctlg %c6,%c6,0(%r15)
--        /* prepare i/o call handler */
--        larl  %r1, io_new_code
--        stg   %r1, 0x1f8
--        larl  %r1, io_new_mask
--        mvc   0x1f0(8),0(%r1)
--        /* load enabled wait PSW */
--        larl  %r1, enabled_wait_psw
--        lpswe 0(%r1)
-+    /* enable I/O interrupts in cr6 */
-+    stctg   %c6,%c6,0(%r15)
-+    oi      4(%r15), 0xff
-+    lctlg   %c6,%c6,0(%r15)
-+    /* prepare i/o call handler */
-+    larl    %r1,io_new_code
-+    stg     %r1,0x1f8
-+    larl    %r1,io_new_mask
-+    mvc     0x1f0(8),0(%r1)
-+    /* load enabled wait PSW */
-+    larl    %r1,enabled_wait_psw
-+    lpswe   0(%r1)
- 
- external_new_code:
--        /* disable service interrupts in cr0 */
--        stctg   %c0,%c0,0(%r15)
--        ni      6(%r15),0xfd
--        lctlg   %c0,%c0,0(%r15)
--        br      %r14
-+    /* disable service interrupts in cr0 */
-+    stctg   %c0,%c0,0(%r15)
-+    ni      6(%r15),0xfd
-+    lctlg   %c0,%c0,0(%r15)
-+    br      %r14
- 
- io_new_code:
--        /* disable I/O interrupts in cr6 */
--        stctg %c6,%c6,0(%r15)
--        ni    4(%r15), 0x00
--        lctlg %c6,%c6,0(%r15)
--        br    %r14
-+    /* disable I/O interrupts in cr6 */
-+    stctg   %c6,%c6,0(%r15)
-+    ni      4(%r15),0x00
-+    lctlg   %c6,%c6,0(%r15)
-+    br      %r14
- 
--        .align  8
-+    .align  8
- disabled_wait_psw:
--        .quad   0x0002000180000000,0x0000000000000000
-+    .quad   0x0002000180000000,0x0000000000000000
- enabled_wait_psw:
--        .quad   0x0302000180000000,0x0000000000000000
-+    .quad   0x0302000180000000,0x0000000000000000
- external_new_mask:
--        .quad   0x0000000180000000
-+    .quad   0x0000000180000000
- io_new_mask:
--        .quad   0x0000000180000000
-+    .quad   0x0000000180000000
--- 
-2.39.3
-
diff --git a/kvm-pc-bios-s390-ccw-Makefile-Use-z-noexecstack-to-silen.patch b/kvm-pc-bios-s390-ccw-Makefile-Use-z-noexecstack-to-silen.patch
deleted file mode 100644
index 907fe43..0000000
--- a/kvm-pc-bios-s390-ccw-Makefile-Use-z-noexecstack-to-silen.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From b5b243cbbb897b236c08699529e13457e1e49924 Mon Sep 17 00:00:00 2001
-From: Thomas Huth <thuth@redhat.com>
-Date: Thu, 22 Jun 2023 15:08:22 +0200
-Subject: [PATCH 31/37] pc-bios/s390-ccw/Makefile: Use -z noexecstack to
- silence linker warning
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Thomas Huth <thuth@redhat.com>
-RH-MergeRequest: 180: Fix misaligned symbol error in the s390-ccw image during qemu-kvm build with binutils 2.40
-RH-Bugzilla: 2220866
-RH-Acked-by: Cédric Le Goater <clg@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [1/4] 04f6f83169f1c5545a0e2772b4babfc6a50bd5bf (thuth/qemu-kvm-cs9)
-
-Recent versions of ld complain when linking the s390-ccw bios:
-
- /usr/bin/ld: warning: start.o: missing .note.GNU-stack section implies
-              executable stack
- /usr/bin/ld: NOTE: This behaviour is deprecated and will be removed in
-              a future version of the linker
-
-We can silence the warning by telling the linker to mark the stack
-as not executable.
-
-Message-Id: <20230622130822.396793-1-thuth@redhat.com>
-Acked-by: Christian Borntraeger <borntraeger@linux.ibm.com>
-Signed-off-by: Thomas Huth <thuth@redhat.com>
-(cherry picked from commit 442ef32ee5b6059a8f247fb2def9d449578d0a89)
----
- pc-bios/s390-ccw/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
-index 10e8f5cb63..2a590af4a9 100644
---- a/pc-bios/s390-ccw/Makefile
-+++ b/pc-bios/s390-ccw/Makefile
-@@ -53,7 +53,7 @@ config-cc.mak: Makefile
- 	    $(call cc-option,-march=z900,-march=z10)) 3> config-cc.mak
- -include config-cc.mak
- 
--LDFLAGS += -Wl,-pie -nostdlib
-+LDFLAGS += -Wl,-pie -nostdlib -z noexecstack
- 
- build-all: s390-ccw.img s390-netboot.img
- 
--- 
-2.39.3
-
diff --git a/kvm-pc-bios-s390-ccw-Provide-space-for-initial-stack-fra.patch b/kvm-pc-bios-s390-ccw-Provide-space-for-initial-stack-fra.patch
deleted file mode 100644
index 0c4ce6f..0000000
--- a/kvm-pc-bios-s390-ccw-Provide-space-for-initial-stack-fra.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 2c52aebf90f28121a3e46a9305304406023b9747 Mon Sep 17 00:00:00 2001
-From: Thomas Huth <thuth@redhat.com>
-Date: Tue, 27 Jun 2023 09:47:01 +0200
-Subject: [PATCH 33/37] pc-bios/s390-ccw: Provide space for initial stack frame
- in start.S
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Thomas Huth <thuth@redhat.com>
-RH-MergeRequest: 180: Fix misaligned symbol error in the s390-ccw image during qemu-kvm build with binutils 2.40
-RH-Bugzilla: 2220866
-RH-Acked-by: Cédric Le Goater <clg@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [3/4] c2f69ce5998861fe20b799bf0113def8cf0cd128 (thuth/qemu-kvm-cs9)
-
-Providing the space of a stack frame is the duty of the caller,
-so we should reserve 160 bytes before jumping into the main function.
-Otherwise the main() function might write past the stack array.
-
-While we're at it, add a proper STACK_SIZE macro for the stack size
-instead of using magic numbers (this is also required for the following
-patch).
-
-Reviewed-by: Christian Borntraeger <borntraeger@linux.ibm.com>
-Reviewed-by: Cédric Le Goater <clg@redhat.com>
-Message-Id: <20230627074703.99608-3-thuth@redhat.com>
-Reviewed-by: Eric Farman <farman@linux.ibm.com>
-Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
-Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
-Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-Signed-off-by: Thomas Huth <thuth@redhat.com>
-(cherry picked from commit 74fe98ee7fb3344dbd085d1fa32c0dc2fc2c831f)
----
- pc-bios/s390-ccw/start.S | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/pc-bios/s390-ccw/start.S b/pc-bios/s390-ccw/start.S
-index d29de09cc6..abd6fe6639 100644
---- a/pc-bios/s390-ccw/start.S
-+++ b/pc-bios/s390-ccw/start.S
-@@ -10,10 +10,13 @@
-  * directory.
-  */
- 
-+#define STACK_SIZE        0x8000
-+#define STACK_FRAME_SIZE  160
-+
-     .globl _start
- _start:
- 
--    larl    %r15,stack + 0x8000     /* Set up stack */
-+    larl    %r15,stack + STACK_SIZE - STACK_FRAME_SIZE   /* Set up stack */
- 
-     /* clear bss */
-     larl    %r2,__bss_start
--- 
-2.39.3
-
diff --git a/kvm-pcie-Add-hotplug-detect-state-register-to-cmask.patch b/kvm-pcie-Add-hotplug-detect-state-register-to-cmask.patch
deleted file mode 100644
index 1ec1c82..0000000
--- a/kvm-pcie-Add-hotplug-detect-state-register-to-cmask.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 2732b6c5ef249d3ec9affca66768cc2fc476ff7c Mon Sep 17 00:00:00 2001
-From: Leonardo Bras <leobras@redhat.com>
-Date: Thu, 6 Jul 2023 01:55:47 -0300
-Subject: [PATCH 11/12] pcie: Add hotplug detect state register to cmask
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Leonardo Brás <leobras@redhat.com>
-RH-MergeRequest: 188: pcie: Add hotplug detect state register to cmask
-RH-Bugzilla: 2215819
-RH-Acked-by: Peter Xu <peterx@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [1/1] a125fa337711bddbc957c399044393e82272b143 (LeoBras/centos-qemu-kvm)
-
-When trying to migrate a machine type pc-q35-6.0 or lower, with this
-cmdline options,
-
--device driver=pcie-root-port,port=18,chassis=19,id=pcie-root-port18,bus=pcie.0,addr=0x12 \
--device driver=nec-usb-xhci,p2=4,p3=4,id=nex-usb-xhci0,bus=pcie-root-port18,addr=0x12.0x1
-
-the following bug happens after all ram pages were sent:
-
-qemu-kvm: get_pci_config_device: Bad config data: i=0x6e read: 0 device: 40 cmask: ff wmask: 0 w1cmask:19
-qemu-kvm: Failed to load PCIDevice:config
-qemu-kvm: Failed to load pcie-root-port:parent_obj.parent_obj.parent_obj
-qemu-kvm: error while loading state for instance 0x0 of device '0000:00:12.0/pcie-root-port'
-qemu-kvm: load of migration failed: Invalid argument
-
-This happens on pc-q35-6.0 or lower because of:
-{ "ICH9-LPC", ACPI_PM_PROP_ACPI_PCIHP_BRIDGE, "off" }
-
-In this scenario, hotplug_handler_plug() calls pcie_cap_slot_plug_cb(),
-which sets dev->config byte 0x6e with bit PCI_EXP_SLTSTA_PDS to signal PCI
-hotplug for the guest. After a while the guest will deal with this hotplug
-and qemu will clear the above bit.
-
-Then, during migration, get_pci_config_device() will compare the
-configs of both the freshly created device and the one that is being
-received via migration, which will differ due to the PCI_EXP_SLTSTA_PDS bit
-and cause the bug to reproduce.
-
-To avoid this fake incompatibility, there are tree fields in PCIDevice that
-can help:
-
-- wmask: Used to implement R/W bytes, and
-- w1cmask: Used to implement RW1C(Write 1 to Clear) bytes
-- cmask: Used to enable config checks on load.
-
-According to PCI Express® Base Specification Revision 5.0 Version 1.0,
-table 7-27 (Slot Status Register) bit 6, the "Presence Detect State" is
-listed as RO (read-only), so it only makes sense to make use of the cmask
-field.
-
-So, clear PCI_EXP_SLTSTA_PDS bit on cmask, so the fake incompatibility on
-get_pci_config_device() does not abort the migration.
-
-Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=2215819
-Signed-off-by: Leonardo Bras <leobras@redhat.com>
-Message-Id: <20230706045546.593605-3-leobras@redhat.com>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-Reviewed-by: Juan Quintela <quintela@redhat.com>
-(cherry picked from commit 625b370c45f4acd155ee625d61c0057d770a5b5e)
-Signed-off-by: Leonardo Bras <leobras@redhat.com>
----
- hw/pci/pcie.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
-index b8c24cf45f..8bc4a4ee57 100644
---- a/hw/pci/pcie.c
-+++ b/hw/pci/pcie.c
-@@ -659,6 +659,10 @@ void pcie_cap_slot_init(PCIDevice *dev, PCIESlot *s)
-     pci_word_test_and_set_mask(dev->w1cmask + pos + PCI_EXP_SLTSTA,
-                                PCI_EXP_HP_EV_SUPPORTED);
- 
-+    /* Avoid migration abortion when this device hot-removed by guest */
-+    pci_word_test_and_clear_mask(dev->cmask + pos + PCI_EXP_SLTSTA,
-+                                 PCI_EXP_SLTSTA_PDS);
-+
-     dev->exp.hpev_notified = false;
- 
-     qbus_set_hotplug_handler(BUS(pci_bridge_get_sec_bus(PCI_BRIDGE(dev))),
--- 
-2.39.3
-
diff --git a/kvm-postcopy-ram-do-not-use-qatomic_mb_read.patch b/kvm-postcopy-ram-do-not-use-qatomic_mb_read.patch
deleted file mode 100644
index 0421e33..0000000
--- a/kvm-postcopy-ram-do-not-use-qatomic_mb_read.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ab9b8620c62540f3267d005c198920671ef9abc3 Mon Sep 17 00:00:00 2001
-From: Paolo Bonzini <pbonzini@redhat.com>
-Date: Fri, 3 Mar 2023 11:15:28 +0100
-Subject: [PATCH 06/56] postcopy-ram: do not use qatomic_mb_read
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [5/50] 534c0e13362dfc994fa90c79bfb5ed6ee8c27dfc (peterx/qemu-kvm)
-
-It does not even pair with a qatomic_mb_set(), so it is clearer to use
-load-acquire in this case; they are synonyms.
-
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-(cherry picked from commit 4592eaf38755a28300d113cd128f65b5b38495f2)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/postcopy-ram.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
-index bbb8af61ae..d7b48dd920 100644
---- a/migration/postcopy-ram.c
-+++ b/migration/postcopy-ram.c
-@@ -1526,7 +1526,7 @@ static PostcopyState incoming_postcopy_state;
- 
- PostcopyState  postcopy_state_get(void)
- {
--    return qatomic_mb_read(&incoming_postcopy_state);
-+    return qatomic_load_acquire(&incoming_postcopy_state);
- }
- 
- /* Set the state and return the old state */
--- 
-2.39.1
-
diff --git a/kvm-qapi-add-fdset-feature-for-BlockdevOptionsVirtioBlkV.patch b/kvm-qapi-add-fdset-feature-for-BlockdevOptionsVirtioBlkV.patch
deleted file mode 100644
index abaadf8..0000000
--- a/kvm-qapi-add-fdset-feature-for-BlockdevOptionsVirtioBlkV.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 99f27e14856c528f442b628e8f4a7881e6e63179 Mon Sep 17 00:00:00 2001
-From: Stefano Garzarella <sgarzare@redhat.com>
-Date: Tue, 30 May 2023 09:19:41 +0200
-Subject: [PATCH 4/5] qapi: add '@fdset' feature for
- BlockdevOptionsVirtioBlkVhostVdpa
-
-RH-Author: Stefano Garzarella <sgarzare@redhat.com>
-RH-MergeRequest: 169: block/blkio: support fd passing for virtio-blk-vhost-vdpa driver
-RH-Bugzilla: 2180076
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
-RH-Commit: [2/2] abee2a542e41f9eaa17dd204b74778e232d1eb60 (sgarzarella/qemu-kvm-c-9-s)
-
-The virtio-blk-vhost-vdpa driver in libblkio 1.3.0 supports the fd
-passing through the new 'fd' property.
-
-Since now we are using qemu_open() on '@path' if the virtio-blk driver
-supports the fd passing, let's announce it.
-In this way, the management layer can pass the file descriptor of an
-already opened vhost-vdpa character device. This is useful especially
-when the device can only be accessed with certain privileges.
-
-Add the '@fdset' feature only when the virtio-blk-vhost-vdpa driver
-in libblkio supports it.
-
-Suggested-by: Markus Armbruster <armbru@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
-Message-id: 20230530071941.8954-3-sgarzare@redhat.com
-Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-(cherry picked from commit 98b126f5e3228a346c774e569e26689943b401dd)
-- changed doc indentantion since QAPI parser failed downstream because
-  we don't have commit 08349786c84306863a3b659c8a9b28bb74c405c6
-  downstream. It relaxed the indentation rules.
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
----
- meson.build          | 4 ++++
- qapi/block-core.json | 6 ++++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index d964e741e7..a18cc64531 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1843,6 +1843,10 @@ config_host_data.set('CONFIG_LZO', lzo.found())
- config_host_data.set('CONFIG_MPATH', mpathpersist.found())
- config_host_data.set('CONFIG_MPATH_NEW_API', mpathpersist_new_api)
- config_host_data.set('CONFIG_BLKIO', blkio.found())
-+if blkio.found()
-+  config_host_data.set('CONFIG_BLKIO_VHOST_VDPA_FD',
-+                       blkio.version().version_compare('>=1.3.0'))
-+endif
- config_host_data.set('CONFIG_CURL', curl.found())
- config_host_data.set('CONFIG_CURSES', curses.found())
- config_host_data.set('CONFIG_GBM', gbm.found())
-diff --git a/qapi/block-core.json b/qapi/block-core.json
-index c05ad0c07e..81b48a8d3b 100644
---- a/qapi/block-core.json
-+++ b/qapi/block-core.json
-@@ -3841,10 +3841,16 @@
- #
- # @path: path to the vhost-vdpa character device.
- #
-+# Features:
-+# @fdset: Member @path supports the special "/dev/fdset/N" path
-+#         (since 8.1)
-+#
- # Since: 7.2
- ##
- { 'struct': 'BlockdevOptionsVirtioBlkVhostVdpa',
-   'data': { 'path': 'str' },
-+  'features': [ { 'name' :'fdset',
-+                  'if': 'CONFIG_BLKIO_VHOST_VDPA_FD' } ],
-   'if': 'CONFIG_BLKIO' }
- 
- ##
--- 
-2.39.3
-
diff --git a/kvm-qapi-i386-sev-Change-the-reduced-phys-bits-value-fro.patch b/kvm-qapi-i386-sev-Change-the-reduced-phys-bits-value-fro.patch
deleted file mode 100644
index a95895b..0000000
--- a/kvm-qapi-i386-sev-Change-the-reduced-phys-bits-value-fro.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From cbf9c74ef46d71c015b9de53f4514941dca8a035 Mon Sep 17 00:00:00 2001
-From: Bandan Das <bsd@redhat.com>
-Date: Thu, 3 Aug 2023 14:19:37 -0400
-Subject: [PATCH 10/14] qapi, i386/sev: Change the reduced-phys-bits value from
- 5 to 1
-
-RH-Author: Bandan Das <None>
-RH-MergeRequest: 196: Updates to SEV reduced-phys-bits parameter
-RH-Bugzilla: 2214839
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [1/4] 4243578db33f89461e60b745eb96fee402218c9f (bdas1/qemu-kvm)
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2214839
-
-commit 798a818f50a9bfc01e8b5943090de458863b897b
-Author: Tom Lendacky <thomas.lendacky@amd.com>
-Date:   Fri Sep 30 10:14:27 2022 -0500
-
-    qapi, i386/sev: Change the reduced-phys-bits value from 5 to 1
-
-    A guest only ever experiences, at most, 1 bit of reduced physical
-    addressing. Change the query-sev-capabilities json comment to use 1.
-
-    Fixes: 31dd67f684 ("sev/i386: qmp: add query-sev-capabilities command")
-    Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
-    Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
-    Message-Id: <cb96d8e09154533af4b4e6988469bc0b32390b65.1664550870.git.thomas.lendacky@amd.com>
-    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-
-Signed-off-by: Bandan Das <bsd@redhat.com>
----
- qapi/misc-target.json | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qapi/misc-target.json b/qapi/misc-target.json
-index de91054523..bf04042f45 100644
---- a/qapi/misc-target.json
-+++ b/qapi/misc-target.json
-@@ -172,7 +172,7 @@
- # -> { "execute": "query-sev-capabilities" }
- # <- { "return": { "pdh": "8CCDD8DDD", "cert-chain": "888CCCDDDEE",
- #                  "cpu0-id": "2lvmGwo+...61iEinw==",
--#                  "cbitpos": 47, "reduced-phys-bits": 5}}
-+#                  "cbitpos": 47, "reduced-phys-bits": 1}}
- #
- ##
- { 'command': 'query-sev-capabilities', 'returns': 'SevCapability',
--- 
-2.39.3
-
diff --git a/kvm-qemu-options.hx-Update-the-reduced-phys-bits-documen.patch b/kvm-qemu-options.hx-Update-the-reduced-phys-bits-documen.patch
deleted file mode 100644
index 6830692..0000000
--- a/kvm-qemu-options.hx-Update-the-reduced-phys-bits-documen.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 50c833fc3c7d8d3a5124cfdb2f2dc06b910c2252 Mon Sep 17 00:00:00 2001
-From: Bandan Das <bsd@redhat.com>
-Date: Thu, 3 Aug 2023 14:21:25 -0400
-Subject: [PATCH 11/14] qemu-options.hx: Update the reduced-phys-bits
- documentation
-
-RH-Author: Bandan Das <None>
-RH-MergeRequest: 196: Updates to SEV reduced-phys-bits parameter
-RH-Bugzilla: 2214839
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [2/4] b0c4a19e9f4185c97ddf71857bc9367cea01ffa8 (bdas1/qemu-kvm)
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2214839
-
-commit 326e3015c4c6f3197157ea0bb00826ae740e2fad
-Author: Tom Lendacky <thomas.lendacky@amd.com>
-Date:   Fri Sep 30 10:14:28 2022 -0500
-
-    qemu-options.hx: Update the reduced-phys-bits documentation
-
-    A guest only ever experiences, at most, 1 bit of reduced physical
-    addressing. Update the documentation to reflect this as well as change
-    the example value on the reduced-phys-bits option.
-
-    Fixes: a9b4942f48 ("target/i386: add Secure Encrypted Virtualization (SEV) object")
-    Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
-    Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
-    Message-Id: <13a62ced1808546c1d398e2025cf85f4c94ae123.1664550870.git.thomas.lendacky@amd.com>
-    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-
-Signed-off-by: Bandan Das <bsd@redhat.com>
----
- qemu-options.hx | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/qemu-options.hx b/qemu-options.hx
-index b18f933703..edf10a5aac 100644
---- a/qemu-options.hx
-+++ b/qemu-options.hx
-@@ -5417,7 +5417,7 @@ SRST
-         physical address space. The ``reduced-phys-bits`` is used to
-         provide the number of bits we loose in physical address space.
-         Similar to C-bit, the value is Host family dependent. On EPYC,
--        the value should be 5.
-+        a guest will lose a maximum of 1 bit, so the value should be 1.
- 
-         The ``sev-device`` provides the device file to use for
-         communicating with the SEV firmware running inside AMD Secure
-@@ -5452,7 +5452,7 @@ SRST
- 
-              # |qemu_system_x86| \\
-                  ...... \\
--                 -object sev-guest,id=sev0,cbitpos=47,reduced-phys-bits=5 \\
-+                 -object sev-guest,id=sev0,cbitpos=47,reduced-phys-bits=1 \\
-                  -machine ...,memory-encryption=sev0 \\
-                  .....
- 
--- 
-2.39.3
-
diff --git a/kvm-raven-disable-reentrancy-detection-for-iomem.patch b/kvm-raven-disable-reentrancy-detection-for-iomem.patch
deleted file mode 100644
index 4a4a2cc..0000000
--- a/kvm-raven-disable-reentrancy-detection-for-iomem.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 936e21428a04524ccffeb36110d1aa61de9f44e5 Mon Sep 17 00:00:00 2001
-From: Jon Maloy <jmaloy@redhat.com>
-Date: Tue, 9 May 2023 10:29:03 -0400
-Subject: [PATCH 11/21] raven: disable reentrancy detection for iomem
-
-RH-Author: Jon Maloy <jmaloy@redhat.com>
-RH-MergeRequest: 165: memory: prevent dma-reentracy issues
-RH-Jira: RHEL-516
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [7/13] 48278583aa1ab08b912f49cd8b3a79d1bb3abf5f (jmaloy/jmaloy-qemu-kvm-2)
-
-Jira: https://issues.redhat.com/browse/RHEL-516
-Upstream: Merged
-CVE: CVE-2023-2680
-
-commit 6dad5a6810d9c60ca320d01276f6133bbcfa1fc7
-Author: Alexander Bulekov <alxndr@bu.edu>
-Date:   Thu Apr 27 17:10:12 2023 -0400
-
-    raven: disable reentrancy detection for iomem
-
-    As the code is designed for re-entrant calls from raven_io_ops to
-    pci-conf, mark raven_io_ops as reentrancy-safe.
-
-    Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
-    Message-Id: <20230427211013.2994127-8-alxndr@bu.edu>
-    Signed-off-by: Thomas Huth <thuth@redhat.com>
-
-Signed-off-by: Jon Maloy <jmaloy@redhat.com>
----
- hw/pci-host/raven.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c
-index 072ffe3c5e..9a11ac4b2b 100644
---- a/hw/pci-host/raven.c
-+++ b/hw/pci-host/raven.c
-@@ -294,6 +294,13 @@ static void raven_pcihost_initfn(Object *obj)
-     memory_region_init(&s->pci_memory, obj, "pci-memory", 0x3f000000);
-     address_space_init(&s->pci_io_as, &s->pci_io, "raven-io");
- 
-+    /*
-+     * Raven's raven_io_ops use the address-space API to access pci-conf-idx
-+     * (which is also owned by the raven device). As such, mark the
-+     * pci_io_non_contiguous as re-entrancy safe.
-+     */
-+    s->pci_io_non_contiguous.disable_reentrancy_guard = true;
-+
-     /* CPU address space */
-     memory_region_add_subregion(address_space_mem, PCI_IO_BASE_ADDR,
-                                 &s->pci_io);
--- 
-2.39.3
-
diff --git a/kvm-s390x-ap-Wire-up-the-device-request-notifier-interfa.patch b/kvm-s390x-ap-Wire-up-the-device-request-notifier-interfa.patch
deleted file mode 100644
index d0eb303..0000000
--- a/kvm-s390x-ap-Wire-up-the-device-request-notifier-interfa.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-From 41987ce0dd79d8734088002cbd34f20704dd017a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Mon, 17 Jul 2023 17:36:07 +0200
-Subject: [PATCH 04/12] s390x/ap: Wire up the device request notifier interface
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 185: Backport s390x fixes from QEMU 8.1
-RH-Jira: RHEL-794
-RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
-RH-Acked-by: Thomas Huth <thuth@redhat.com>
-RH-Commit: [1/1] ab6c912a1b8cdb584adacac16af79352fdfe7355 (clegoate/qemu-kvm-c9s)
-
-Jira: https://issues.redhat.com/browse/RHEL-794
-
-commit 1360b2ad1f673d32a09de5826cd71ecd0510164a
-Author: Tony Krowiak <akrowiak@linux.ibm.com>
-Date:   Fri Jun 2 10:11:25 2023 -0400
-
-    s390x/ap: Wire up the device request notifier interface
-
-    Let's wire up the device request notifier interface to handle device unplug
-    requests for AP.
-
-    Signed-off-by: Tony Krowiak <akrowiak@linux.ibm.com>
-    Link: https://lore.kernel.org/qemu-devel/20230530225544.280031-1-akrowiak@linux.ibm.com/
-    Signed-off-by: Cédric Le Goater <clg@redhat.com>
-
-Backport note:
-
-    - linux-headers/linux/vfio.h
-      updated to v6.5-rc1 level for VFIO_AP_REQ_IRQ_INDEX definition
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- hw/vfio/ap.c               | 113 +++++++++++++++++++++++++++++++++++++
- linux-headers/linux/vfio.h |   9 +++
- 2 files changed, 122 insertions(+)
-
-diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c
-index e0dd561e85..6e21d1da5a 100644
---- a/hw/vfio/ap.c
-+++ b/hw/vfio/ap.c
-@@ -18,6 +18,8 @@
- #include "hw/vfio/vfio-common.h"
- #include "hw/s390x/ap-device.h"
- #include "qemu/error-report.h"
-+#include "qemu/event_notifier.h"
-+#include "qemu/main-loop.h"
- #include "qemu/module.h"
- #include "qemu/option.h"
- #include "qemu/config-file.h"
-@@ -33,6 +35,7 @@
- struct VFIOAPDevice {
-     APDevice apdev;
-     VFIODevice vdev;
-+    EventNotifier req_notifier;
- };
- 
- OBJECT_DECLARE_SIMPLE_TYPE(VFIOAPDevice, VFIO_AP_DEVICE)
-@@ -84,10 +87,110 @@ static VFIOGroup *vfio_ap_get_group(VFIOAPDevice *vapdev, Error **errp)
-     return vfio_get_group(groupid, &address_space_memory, errp);
- }
- 
-+static void vfio_ap_req_notifier_handler(void *opaque)
-+{
-+    VFIOAPDevice *vapdev = opaque;
-+    Error *err = NULL;
-+
-+    if (!event_notifier_test_and_clear(&vapdev->req_notifier)) {
-+        return;
-+    }
-+
-+    qdev_unplug(DEVICE(vapdev), &err);
-+
-+    if (err) {
-+        warn_reportf_err(err, VFIO_MSG_PREFIX, vapdev->vdev.name);
-+    }
-+}
-+
-+static void vfio_ap_register_irq_notifier(VFIOAPDevice *vapdev,
-+                                          unsigned int irq, Error **errp)
-+{
-+    int fd;
-+    size_t argsz;
-+    IOHandler *fd_read;
-+    EventNotifier *notifier;
-+    struct vfio_irq_info *irq_info;
-+    VFIODevice *vdev = &vapdev->vdev;
-+
-+    switch (irq) {
-+    case VFIO_AP_REQ_IRQ_INDEX:
-+        notifier = &vapdev->req_notifier;
-+        fd_read = vfio_ap_req_notifier_handler;
-+        break;
-+    default:
-+        error_setg(errp, "vfio: Unsupported device irq(%d)", irq);
-+        return;
-+    }
-+
-+    if (vdev->num_irqs < irq + 1) {
-+        error_setg(errp, "vfio: IRQ %u not available (number of irqs %u)",
-+                   irq, vdev->num_irqs);
-+        return;
-+    }
-+
-+    argsz = sizeof(*irq_info);
-+    irq_info = g_malloc0(argsz);
-+    irq_info->index = irq;
-+    irq_info->argsz = argsz;
-+
-+    if (ioctl(vdev->fd, VFIO_DEVICE_GET_IRQ_INFO,
-+              irq_info) < 0 || irq_info->count < 1) {
-+        error_setg_errno(errp, errno, "vfio: Error getting irq info");
-+        goto out_free_info;
-+    }
-+
-+    if (event_notifier_init(notifier, 0)) {
-+        error_setg_errno(errp, errno,
-+                         "vfio: Unable to init event notifier for irq (%d)",
-+                         irq);
-+        goto out_free_info;
-+    }
-+
-+    fd = event_notifier_get_fd(notifier);
-+    qemu_set_fd_handler(fd, fd_read, NULL, vapdev);
-+
-+    if (vfio_set_irq_signaling(vdev, irq, 0, VFIO_IRQ_SET_ACTION_TRIGGER, fd,
-+                               errp)) {
-+        qemu_set_fd_handler(fd, NULL, NULL, vapdev);
-+        event_notifier_cleanup(notifier);
-+    }
-+
-+out_free_info:
-+    g_free(irq_info);
-+
-+}
-+
-+static void vfio_ap_unregister_irq_notifier(VFIOAPDevice *vapdev,
-+                                            unsigned int irq)
-+{
-+    Error *err = NULL;
-+    EventNotifier *notifier;
-+
-+    switch (irq) {
-+    case VFIO_AP_REQ_IRQ_INDEX:
-+        notifier = &vapdev->req_notifier;
-+        break;
-+    default:
-+        error_report("vfio: Unsupported device irq(%d)", irq);
-+        return;
-+    }
-+
-+    if (vfio_set_irq_signaling(&vapdev->vdev, irq, 0,
-+                               VFIO_IRQ_SET_ACTION_TRIGGER, -1, &err)) {
-+        warn_reportf_err(err, VFIO_MSG_PREFIX, vapdev->vdev.name);
-+    }
-+
-+    qemu_set_fd_handler(event_notifier_get_fd(notifier),
-+                        NULL, NULL, vapdev);
-+    event_notifier_cleanup(notifier);
-+}
-+
- static void vfio_ap_realize(DeviceState *dev, Error **errp)
- {
-     int ret;
-     char *mdevid;
-+    Error *err = NULL;
-     VFIOGroup *vfio_group;
-     APDevice *apdev = AP_DEVICE(dev);
-     VFIOAPDevice *vapdev = VFIO_AP_DEVICE(apdev);
-@@ -116,6 +219,15 @@ static void vfio_ap_realize(DeviceState *dev, Error **errp)
-         goto out_get_dev_err;
-     }
- 
-+    vfio_ap_register_irq_notifier(vapdev, VFIO_AP_REQ_IRQ_INDEX, &err);
-+    if (err) {
-+        /*
-+         * Report this error, but do not make it a failing condition.
-+         * Lack of this IRQ in the host does not prevent normal operation.
-+         */
-+        error_report_err(err);
-+    }
-+
-     return;
- 
- out_get_dev_err:
-@@ -129,6 +241,7 @@ static void vfio_ap_unrealize(DeviceState *dev)
-     VFIOAPDevice *vapdev = VFIO_AP_DEVICE(apdev);
-     VFIOGroup *group = vapdev->vdev.group;
- 
-+    vfio_ap_unregister_irq_notifier(vapdev, VFIO_AP_REQ_IRQ_INDEX);
-     vfio_ap_put_device(vapdev);
-     vfio_put_group(group);
- }
-diff --git a/linux-headers/linux/vfio.h b/linux-headers/linux/vfio.h
-index c59692ce0b..ce464957c8 100644
---- a/linux-headers/linux/vfio.h
-+++ b/linux-headers/linux/vfio.h
-@@ -642,6 +642,15 @@ enum {
- 	VFIO_CCW_NUM_IRQS
- };
- 
-+/*
-+ * The vfio-ap bus driver makes use of the following IRQ index mapping.
-+ * Unimplemented IRQ types return a count of zero.
-+ */
-+enum {
-+        VFIO_AP_REQ_IRQ_INDEX,
-+        VFIO_AP_NUM_IRQS
-+};
-+
- /**
-  * VFIO_DEVICE_GET_PCI_HOT_RESET_INFO - _IOWR(VFIO_TYPE, VFIO_BASE + 12,
-  *					      struct vfio_pci_hot_reset_info)
--- 
-2.39.3
-
diff --git a/kvm-s390x-pv-Fix-spurious-warning-with-asynchronous-tear.patch b/kvm-s390x-pv-Fix-spurious-warning-with-asynchronous-tear.patch
deleted file mode 100644
index ecf1353..0000000
--- a/kvm-s390x-pv-Fix-spurious-warning-with-asynchronous-tear.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 3cab2a638a10ece2b76d9f33a3c5dc6f64f1bbaa Mon Sep 17 00:00:00 2001
-From: Claudio Imbrenda <imbrenda@linux.ibm.com>
-Date: Wed, 10 May 2023 12:55:31 +0200
-Subject: [PATCH 21/21] s390x/pv: Fix spurious warning with asynchronous
- teardown
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Thomas Huth <thuth@redhat.com>
-RH-MergeRequest: 173: Improve memory reclaiming for z15 Secure Execution guests
-RH-Bugzilla: 2168500
-RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: Cédric Le Goater <clg@redhat.com>
-RH-Commit: [2/2] cb690d3155ea22c6df00a4d75b72f501515e5556 (thuth/qemu-kvm-cs9)
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2168500
-
-Kernel commit 292a7d6fca33 ("KVM: s390: pv: fix asynchronous teardown
-for small VMs") causes the KVM_PV_ASYNC_CLEANUP_PREPARE ioctl to fail
-if the VM is not larger than 2GiB. QEMU would attempt it and fail,
-print an error message, and then proceed with a normal teardown.
-
-Avoid attempting to use asynchronous teardown altogether when the VM is
-not larger than 2 GiB. This will avoid triggering the error message and
-also avoid pointless overhead; normal teardown is fast enough for small
-VMs.
-
-Reported-by: Marc Hartmayer <mhartmay@linux.ibm.com>
-Fixes: c3a073c610 ("s390x/pv: Add support for asynchronous teardown for reboot")
-Link: https://lore.kernel.org/all/20230421085036.52511-2-imbrenda@linux.ibm.com/
-Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
-Message-Id: <20230510105531.30623-2-imbrenda@linux.ibm.com>
-Reviewed-by: Thomas Huth <thuth@redhat.com>
-[thuth: Fix inline function parameter in pv.h]
-Signed-off-by: Thomas Huth <thuth@redhat.com>
-(cherry picked from commit 88693ab2a53f2f3d25cb39a7b5034ab391bc5a81)
----
- hw/s390x/pv.c              | 10 ++++++++--
- hw/s390x/s390-virtio-ccw.c |  2 +-
- include/hw/s390x/pv.h      |  6 +++---
- 3 files changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/hw/s390x/pv.c b/hw/s390x/pv.c
-index 49ea38236c..b63f3784c6 100644
---- a/hw/s390x/pv.c
-+++ b/hw/s390x/pv.c
-@@ -13,6 +13,7 @@
- 
- #include <linux/kvm.h>
- 
-+#include "qemu/units.h"
- #include "qapi/error.h"
- #include "qemu/error-report.h"
- #include "sysemu/kvm.h"
-@@ -115,7 +116,7 @@ static void *s390_pv_do_unprot_async_fn(void *p)
-      return NULL;
- }
- 
--bool s390_pv_vm_try_disable_async(void)
-+bool s390_pv_vm_try_disable_async(S390CcwMachineState *ms)
- {
-     /*
-      * t is only needed to create the thread; once qemu_thread_create
-@@ -123,7 +124,12 @@ bool s390_pv_vm_try_disable_async(void)
-      */
-     QemuThread t;
- 
--    if (!kvm_check_extension(kvm_state, KVM_CAP_S390_PROTECTED_ASYNC_DISABLE)) {
-+    /*
-+     * If the feature is not present or if the VM is not larger than 2 GiB,
-+     * KVM_PV_ASYNC_CLEANUP_PREPARE fill fail; no point in attempting it.
-+     */
-+    if ((MACHINE(ms)->maxram_size <= 2 * GiB) ||
-+        !kvm_check_extension(kvm_state, KVM_CAP_S390_PROTECTED_ASYNC_DISABLE)) {
-         return false;
-     }
-     if (s390_pv_cmd(KVM_PV_ASYNC_CLEANUP_PREPARE, NULL) != 0) {
-diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
-index 6a0b93c63d..d95c595f88 100644
---- a/hw/s390x/s390-virtio-ccw.c
-+++ b/hw/s390x/s390-virtio-ccw.c
-@@ -330,7 +330,7 @@ static inline void s390_do_cpu_ipl(CPUState *cs, run_on_cpu_data arg)
- 
- static void s390_machine_unprotect(S390CcwMachineState *ms)
- {
--    if (!s390_pv_vm_try_disable_async()) {
-+    if (!s390_pv_vm_try_disable_async(ms)) {
-         s390_pv_vm_disable();
-     }
-     ms->pv = false;
-diff --git a/include/hw/s390x/pv.h b/include/hw/s390x/pv.h
-index 966306a9db..7b935e2246 100644
---- a/include/hw/s390x/pv.h
-+++ b/include/hw/s390x/pv.h
-@@ -14,10 +14,10 @@
- 
- #include "qapi/error.h"
- #include "sysemu/kvm.h"
-+#include "hw/s390x/s390-virtio-ccw.h"
- 
- #ifdef CONFIG_KVM
- #include "cpu.h"
--#include "hw/s390x/s390-virtio-ccw.h"
- 
- static inline bool s390_is_pv(void)
- {
-@@ -41,7 +41,7 @@ static inline bool s390_is_pv(void)
- int s390_pv_query_info(void);
- int s390_pv_vm_enable(void);
- void s390_pv_vm_disable(void);
--bool s390_pv_vm_try_disable_async(void);
-+bool s390_pv_vm_try_disable_async(S390CcwMachineState *ms);
- int s390_pv_set_sec_parms(uint64_t origin, uint64_t length);
- int s390_pv_unpack(uint64_t addr, uint64_t size, uint64_t tweak);
- void s390_pv_prep_reset(void);
-@@ -61,7 +61,7 @@ static inline bool s390_is_pv(void) { return false; }
- static inline int s390_pv_query_info(void) { return 0; }
- static inline int s390_pv_vm_enable(void) { return 0; }
- static inline void s390_pv_vm_disable(void) {}
--static inline bool s390_pv_vm_try_disable_async(void) { return false; }
-+static inline bool s390_pv_vm_try_disable_async(S390CcwMachineState *ms) { return false; }
- static inline int s390_pv_set_sec_parms(uint64_t origin, uint64_t length) { return 0; }
- static inline int s390_pv_unpack(uint64_t addr, uint64_t size, uint64_t tweak) { return 0; }
- static inline void s390_pv_prep_reset(void) {}
--- 
-2.39.3
-
diff --git a/kvm-scsi-cleanup-scsi_clear_unit_attention.patch b/kvm-scsi-cleanup-scsi_clear_unit_attention.patch
deleted file mode 100644
index 11dda3a..0000000
--- a/kvm-scsi-cleanup-scsi_clear_unit_attention.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 5dd7d26c034c26b2d4d9b91b8d1a7b605e19730f Mon Sep 17 00:00:00 2001
-From: Stefano Garzarella <sgarzare@redhat.com>
-Date: Wed, 12 Jul 2023 15:43:51 +0200
-Subject: [PATCH 02/12] scsi: cleanup scsi_clear_unit_attention()
-
-RH-Author: Stefano Garzarella <sgarzare@redhat.com>
-RH-MergeRequest: 184: scsi: fix issue with Linux guest and unit attention
-RH-Bugzilla: 2176702
-RH-Acked-by: Thomas Huth <thuth@redhat.com>
-RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
-RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
-RH-Commit: [2/3] b3a06a91644e44fae3d76d0fbe72448652db517a (sgarzarella/qemu-kvm-c-9-s)
-
-The previous commit moved the unit attention clearing when we create
-the request. So now we can clean scsi_clear_unit_attention() to handle
-only the case of the REPORT LUNS command: this is the only case in
-which a UNIT ATTENTION is cleared without having been reported.
-
-Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
-Message-ID: <20230712134352.118655-3-sgarzare@redhat.com>
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-(cherry picked from commit ba947dab98e7cd4337c70975bd255701a2a6aad8)
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
----
- hw/scsi/scsi-bus.c | 28 ++++++----------------------
- 1 file changed, 6 insertions(+), 22 deletions(-)
-
-diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
-index 5d22313b9d..cecd26479e 100644
---- a/hw/scsi/scsi-bus.c
-+++ b/hw/scsi/scsi-bus.c
-@@ -828,26 +828,12 @@ static void scsi_clear_unit_attention(SCSIRequest *req)
-         return;
-     }
- 
--    if (req->dev->unit_attention.key != UNIT_ATTENTION &&
--        req->bus->unit_attention.key != UNIT_ATTENTION) {
--        return;
--    }
--
--    /*
--     * If an INQUIRY command enters the enabled command state,
--     * the device server shall [not] clear any unit attention condition;
--     * See also MMC-6, paragraphs 6.5 and 6.6.2.
--     */
--    if (req->cmd.buf[0] == INQUIRY ||
--        req->cmd.buf[0] == GET_CONFIGURATION ||
--        req->cmd.buf[0] == GET_EVENT_STATUS_NOTIFICATION) {
--        return;
--    }
--
-     if (req->dev->unit_attention.key == UNIT_ATTENTION) {
-         ua = &req->dev->unit_attention;
--    } else {
-+    } else if (req->bus->unit_attention.key == UNIT_ATTENTION) {
-         ua = &req->bus->unit_attention;
-+    } else {
-+        return;
-     }
- 
-     /*
-@@ -856,12 +842,10 @@ static void scsi_clear_unit_attention(SCSIRequest *req)
-      * with an additional sense code of REPORTED LUNS DATA HAS CHANGED.
-      */
-     if (req->cmd.buf[0] == REPORT_LUNS &&
--        !(ua->asc == SENSE_CODE(REPORTED_LUNS_CHANGED).asc &&
--          ua->ascq == SENSE_CODE(REPORTED_LUNS_CHANGED).ascq)) {
--        return;
-+        ua->asc == SENSE_CODE(REPORTED_LUNS_CHANGED).asc &&
-+        ua->ascq == SENSE_CODE(REPORTED_LUNS_CHANGED).ascq) {
-+        *ua = SENSE_CODE(NO_SENSE);
-     }
--
--    *ua = SENSE_CODE(NO_SENSE);
- }
- 
- int scsi_req_get_sense(SCSIRequest *req, uint8_t *buf, int len)
--- 
-2.39.3
-
diff --git a/kvm-scsi-clear-unit-attention-only-for-REPORT-LUNS-comma.patch b/kvm-scsi-clear-unit-attention-only-for-REPORT-LUNS-comma.patch
deleted file mode 100644
index cb3b24e..0000000
--- a/kvm-scsi-clear-unit-attention-only-for-REPORT-LUNS-comma.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 0a784c45a7b7ee32c36bf86eebb24c8431a89f49 Mon Sep 17 00:00:00 2001
-From: Stefano Garzarella <sgarzare@redhat.com>
-Date: Wed, 12 Jul 2023 15:43:52 +0200
-Subject: [PATCH 03/12] scsi: clear unit attention only for REPORT LUNS
- commands
-
-RH-Author: Stefano Garzarella <sgarzare@redhat.com>
-RH-MergeRequest: 184: scsi: fix issue with Linux guest and unit attention
-RH-Bugzilla: 2176702
-RH-Acked-by: Thomas Huth <thuth@redhat.com>
-RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
-RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
-RH-Commit: [3/3] 01d5e112ef9ae204d96ceb01b4a453fdb4e8b669 (sgarzarella/qemu-kvm-c-9-s)
-
-scsi_clear_unit_attention() now only handles REPORTED LUNS DATA HAS
-CHANGED.
-
-This only happens when we handle REPORT LUNS commands, so let's rename
-the function in scsi_clear_reported_luns_changed() and call it only in
-scsi_target_emulate_report_luns().
-
-Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
-Message-ID: <20230712134352.118655-4-sgarzare@redhat.com>
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-(cherry picked from commit 2eb5599e8a73e70a9e86a97120818ff95a43a23a)
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
----
- hw/scsi/scsi-bus.c | 34 +++++++++++-----------------------
- 1 file changed, 11 insertions(+), 23 deletions(-)
-
-diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
-index cecd26479e..9542410800 100644
---- a/hw/scsi/scsi-bus.c
-+++ b/hw/scsi/scsi-bus.c
-@@ -22,6 +22,7 @@ static char *scsibus_get_fw_dev_path(DeviceState *dev);
- static void scsi_req_dequeue(SCSIRequest *req);
- static uint8_t *scsi_target_alloc_buf(SCSIRequest *req, size_t len);
- static void scsi_target_free_buf(SCSIRequest *req);
-+static void scsi_clear_reported_luns_changed(SCSIRequest *req);
- 
- static int next_scsi_bus;
- 
-@@ -518,6 +519,14 @@ static bool scsi_target_emulate_report_luns(SCSITargetReq *r)
- 
-     /* store the LUN list length */
-     stl_be_p(&r->buf[0], len - 8);
-+
-+    /*
-+     * If a REPORT LUNS command enters the enabled command state, [...]
-+     * the device server shall clear any pending unit attention condition
-+     * with an additional sense code of REPORTED LUNS DATA HAS CHANGED.
-+     */
-+    scsi_clear_reported_luns_changed(&r->req);
-+
-     return true;
- }
- 
-@@ -816,18 +825,10 @@ uint8_t *scsi_req_get_buf(SCSIRequest *req)
-     return req->ops->get_buf(req);
- }
- 
--static void scsi_clear_unit_attention(SCSIRequest *req)
-+static void scsi_clear_reported_luns_changed(SCSIRequest *req)
- {
-     SCSISense *ua;
- 
--    /*
--     * scsi_fetch_unit_attention_sense() already cleaned the unit attention
--     * in this case.
--     */
--    if (req->ops == &reqops_unit_attention) {
--        return;
--    }
--
-     if (req->dev->unit_attention.key == UNIT_ATTENTION) {
-         ua = &req->dev->unit_attention;
-     } else if (req->bus->unit_attention.key == UNIT_ATTENTION) {
-@@ -836,13 +837,7 @@ static void scsi_clear_unit_attention(SCSIRequest *req)
-         return;
-     }
- 
--    /*
--     * If a REPORT LUNS command enters the enabled command state, [...]
--     * the device server shall clear any pending unit attention condition
--     * with an additional sense code of REPORTED LUNS DATA HAS CHANGED.
--     */
--    if (req->cmd.buf[0] == REPORT_LUNS &&
--        ua->asc == SENSE_CODE(REPORTED_LUNS_CHANGED).asc &&
-+    if (ua->asc == SENSE_CODE(REPORTED_LUNS_CHANGED).asc &&
-         ua->ascq == SENSE_CODE(REPORTED_LUNS_CHANGED).ascq) {
-         *ua = SENSE_CODE(NO_SENSE);
-     }
-@@ -1528,13 +1523,6 @@ void scsi_req_complete(SCSIRequest *req, int status)
-         req->dev->sense_is_ua = false;
-     }
- 
--    /*
--     * Unit attention state is now stored in the device's sense buffer
--     * if the HBA didn't do autosense.  Clear the pending unit attention
--     * flags.
--     */
--    scsi_clear_unit_attention(req);
--
-     scsi_req_ref(req);
-     scsi_req_dequeue(req);
-     req->bus->info->complete(req, req->residual);
--- 
-2.39.3
-
diff --git a/kvm-scsi-fetch-unit-attention-when-creating-the-request.patch b/kvm-scsi-fetch-unit-attention-when-creating-the-request.patch
deleted file mode 100644
index a41ae82..0000000
--- a/kvm-scsi-fetch-unit-attention-when-creating-the-request.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 562ea3a2d602cf41c548f3ddf52c43c04fded347 Mon Sep 17 00:00:00 2001
-From: Stefano Garzarella <sgarzare@redhat.com>
-Date: Wed, 12 Jul 2023 15:43:50 +0200
-Subject: [PATCH 01/12] scsi: fetch unit attention when creating the request
-
-RH-Author: Stefano Garzarella <sgarzare@redhat.com>
-RH-MergeRequest: 184: scsi: fix issue with Linux guest and unit attention
-RH-Bugzilla: 2176702
-RH-Acked-by: Thomas Huth <thuth@redhat.com>
-RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
-RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
-RH-Commit: [1/3] 04563caac45d0110ea65eda8e55472556cd317c0 (sgarzarella/qemu-kvm-c-9-s)
-
-Commit 1880ad4f4e ("virtio-scsi: Batched prepare for cmd reqs") split
-calls to scsi_req_new() and scsi_req_enqueue() in the virtio-scsi device.
-No ill effects were observed until commit 8cc5583abe ("virtio-scsi: Send
-"REPORTED LUNS CHANGED" sense data upon disk hotplug events") added a
-unit attention that was easy to trigger with device hotplug and
-hot-unplug.
-
-Because the two calls were separated, all requests in the batch were
-prepared calling scsi_req_new() to report a sense.  The first one
-submitted would report the right sense and reset it to NO_SENSE, while
-the others reported CHECK_CONDITION with no sense data.  This caused
-SCSI errors in Linux.
-
-To solve this issue, let's fetch the unit attention as early as possible
-when we prepare the request, so that only the first request in the batch
-will use the unit attention SCSIReqOps and the others will not report
-CHECK CONDITION.
-
-Fixes: 1880ad4f4e ("virtio-scsi: Batched prepare for cmd reqs")
-Fixes: 8cc5583abe ("virtio-scsi: Send "REPORTED LUNS CHANGED" sense data upon disk hotplug events")
-Reported-by: Thomas Huth <thuth@redhat.com>
-Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=2176702
-Co-developed-by: Paolo Bonzini <pbonzini@redhat.com>
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
-Message-ID: <20230712134352.118655-2-sgarzare@redhat.com>
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-(cherry picked from commit 9472083e642bfb9bc836b38662baddd9bc964ebc)
-Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
----
- hw/scsi/scsi-bus.c     | 36 +++++++++++++++++++++++++++++++++---
- include/hw/scsi/scsi.h |  1 +
- 2 files changed, 34 insertions(+), 3 deletions(-)
-
-diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
-index 3c20b47ad0..5d22313b9d 100644
---- a/hw/scsi/scsi-bus.c
-+++ b/hw/scsi/scsi-bus.c
-@@ -413,19 +413,35 @@ static const struct SCSIReqOps reqops_invalid_opcode = {
- 
- /* SCSIReqOps implementation for unit attention conditions.  */
- 
--static int32_t scsi_unit_attention(SCSIRequest *req, uint8_t *buf)
-+static void scsi_fetch_unit_attention_sense(SCSIRequest *req)
- {
-+    SCSISense *ua = NULL;
-+
-     if (req->dev->unit_attention.key == UNIT_ATTENTION) {
--        scsi_req_build_sense(req, req->dev->unit_attention);
-+        ua = &req->dev->unit_attention;
-     } else if (req->bus->unit_attention.key == UNIT_ATTENTION) {
--        scsi_req_build_sense(req, req->bus->unit_attention);
-+        ua = &req->bus->unit_attention;
-     }
-+
-+    /*
-+     * Fetch the unit attention sense immediately so that another
-+     * scsi_req_new does not use reqops_unit_attention.
-+     */
-+    if (ua) {
-+        scsi_req_build_sense(req, *ua);
-+        *ua = SENSE_CODE(NO_SENSE);
-+    }
-+}
-+
-+static int32_t scsi_unit_attention(SCSIRequest *req, uint8_t *buf)
-+{
-     scsi_req_complete(req, CHECK_CONDITION);
-     return 0;
- }
- 
- static const struct SCSIReqOps reqops_unit_attention = {
-     .size         = sizeof(SCSIRequest),
-+    .init_req     = scsi_fetch_unit_attention_sense,
-     .send_command = scsi_unit_attention
- };
- 
-@@ -699,6 +715,11 @@ SCSIRequest *scsi_req_alloc(const SCSIReqOps *reqops, SCSIDevice *d,
-     object_ref(OBJECT(d));
-     object_ref(OBJECT(qbus->parent));
-     notifier_list_init(&req->cancel_notifiers);
-+
-+    if (reqops->init_req) {
-+        reqops->init_req(req);
-+    }
-+
-     trace_scsi_req_alloc(req->dev->id, req->lun, req->tag);
-     return req;
- }
-@@ -798,6 +819,15 @@ uint8_t *scsi_req_get_buf(SCSIRequest *req)
- static void scsi_clear_unit_attention(SCSIRequest *req)
- {
-     SCSISense *ua;
-+
-+    /*
-+     * scsi_fetch_unit_attention_sense() already cleaned the unit attention
-+     * in this case.
-+     */
-+    if (req->ops == &reqops_unit_attention) {
-+        return;
-+    }
-+
-     if (req->dev->unit_attention.key != UNIT_ATTENTION &&
-         req->bus->unit_attention.key != UNIT_ATTENTION) {
-         return;
-diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h
-index 6f23a7a73e..1787ddd01e 100644
---- a/include/hw/scsi/scsi.h
-+++ b/include/hw/scsi/scsi.h
-@@ -108,6 +108,7 @@ int cdrom_read_toc_raw(int nb_sectors, uint8_t *buf, int msf, int session_num);
- /* scsi-bus.c */
- struct SCSIReqOps {
-     size_t size;
-+    void (*init_req)(SCSIRequest *req);
-     void (*free_req)(SCSIRequest *req);
-     int32_t (*send_command)(SCSIRequest *req, uint8_t *buf);
-     void (*read_data)(SCSIRequest *req);
--- 
-2.39.3
-
diff --git a/kvm-spice-move-client_migrate_info-command-to-ui.patch b/kvm-spice-move-client_migrate_info-command-to-ui.patch
deleted file mode 100644
index f1de158..0000000
--- a/kvm-spice-move-client_migrate_info-command-to-ui.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-From 00f6e941e75f378c84c773a15efde7dd085d9ce3 Mon Sep 17 00:00:00 2001
-From: Juan Quintela <quintela@redhat.com>
-Date: Wed, 1 Mar 2023 19:40:14 +0100
-Subject: [PATCH 21/56] spice: move client_migrate_info command to ui/
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [20/50] a587bb001b51a1f9fdf2fcfb0978bb931ae443b6 (peterx/qemu-kvm)
-
-It has nothing to do with migration, except for the "migrate" in the
-name of the command.  Move it with the rest of the ui commands.
-
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-(cherry picked from commit f9e1ef7482f1ee289b04f4b45702a1701bc8929d)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- migration/migration-hmp-cmds.c | 17 -----------------
- migration/migration.c          | 30 ------------------------------
- qapi/migration.json            | 28 ----------------------------
- qapi/ui.json                   | 28 ++++++++++++++++++++++++++++
- ui/ui-hmp-cmds.c               | 17 +++++++++++++++++
- ui/ui-qmp-cmds.c               | 29 +++++++++++++++++++++++++++++
- 6 files changed, 74 insertions(+), 75 deletions(-)
-
-diff --git a/migration/migration-hmp-cmds.c b/migration/migration-hmp-cmds.c
-index 71da91967a..4e9f00e7dc 100644
---- a/migration/migration-hmp-cmds.c
-+++ b/migration/migration-hmp-cmds.c
-@@ -636,23 +636,6 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict)
-     hmp_handle_error(mon, err);
- }
- 
--void hmp_client_migrate_info(Monitor *mon, const QDict *qdict)
--{
--    Error *err = NULL;
--    const char *protocol = qdict_get_str(qdict, "protocol");
--    const char *hostname = qdict_get_str(qdict, "hostname");
--    bool has_port        = qdict_haskey(qdict, "port");
--    int port             = qdict_get_try_int(qdict, "port", -1);
--    bool has_tls_port    = qdict_haskey(qdict, "tls-port");
--    int tls_port         = qdict_get_try_int(qdict, "tls-port", -1);
--    const char *cert_subject = qdict_get_try_str(qdict, "cert-subject");
--
--    qmp_client_migrate_info(protocol, hostname,
--                            has_port, port, has_tls_port, tls_port,
--                            cert_subject, &err);
--    hmp_handle_error(mon, err);
--}
--
- void hmp_migrate_start_postcopy(Monitor *mon, const QDict *qdict)
- {
-     Error *err = NULL;
-diff --git a/migration/migration.c b/migration/migration.c
-index aa96ffdc5b..b745d829a4 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -63,7 +63,6 @@
- #include "sysemu/cpus.h"
- #include "yank_functions.h"
- #include "sysemu/qtest.h"
--#include "ui/qemu-spice.h"
- 
- #define MAX_THROTTLE  (128 << 20)      /* Migration transfer speed throttling */
- 
-@@ -1018,35 +1017,6 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp)
-     return params;
- }
- 
--void qmp_client_migrate_info(const char *protocol, const char *hostname,
--                             bool has_port, int64_t port,
--                             bool has_tls_port, int64_t tls_port,
--                             const char *cert_subject,
--                             Error **errp)
--{
--    if (strcmp(protocol, "spice") == 0) {
--        if (!qemu_using_spice(errp)) {
--            return;
--        }
--
--        if (!has_port && !has_tls_port) {
--            error_setg(errp, QERR_MISSING_PARAMETER, "port/tls-port");
--            return;
--        }
--
--        if (qemu_spice.migrate_info(hostname,
--                                    has_port ? port : -1,
--                                    has_tls_port ? tls_port : -1,
--                                    cert_subject)) {
--            error_setg(errp, "Could not set up display for migration");
--            return;
--        }
--        return;
--    }
--
--    error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "protocol", "'spice'");
--}
--
- AnnounceParameters *migrate_announce_params(void)
- {
-     static AnnounceParameters ap;
-diff --git a/qapi/migration.json b/qapi/migration.json
-index c84fa10e86..2c35b7b9cf 100644
---- a/qapi/migration.json
-+++ b/qapi/migration.json
-@@ -1203,34 +1203,6 @@
- { 'command': 'query-migrate-parameters',
-   'returns': 'MigrationParameters' }
- 
--##
--# @client_migrate_info:
--#
--# Set migration information for remote display.  This makes the server
--# ask the client to automatically reconnect using the new parameters
--# once migration finished successfully.  Only implemented for SPICE.
--#
--# @protocol: must be "spice"
--# @hostname: migration target hostname
--# @port: spice tcp port for plaintext channels
--# @tls-port: spice tcp port for tls-secured channels
--# @cert-subject: server certificate subject
--#
--# Since: 0.14
--#
--# Example:
--#
--# -> { "execute": "client_migrate_info",
--#      "arguments": { "protocol": "spice",
--#                     "hostname": "virt42.lab.kraxel.org",
--#                     "port": 1234 } }
--# <- { "return": {} }
--#
--##
--{ 'command': 'client_migrate_info',
--  'data': { 'protocol': 'str', 'hostname': 'str', '*port': 'int',
--            '*tls-port': 'int', '*cert-subject': 'str' } }
--
- ##
- # @migrate-start-postcopy:
- #
-diff --git a/qapi/ui.json b/qapi/ui.json
-index 98322342f7..7ddd27a932 100644
---- a/qapi/ui.json
-+++ b/qapi/ui.json
-@@ -1554,3 +1554,31 @@
- { 'command': 'display-update',
-   'data': 'DisplayUpdateOptions',
-   'boxed' : true }
-+
-+##
-+# @client_migrate_info:
-+#
-+# Set migration information for remote display.  This makes the server
-+# ask the client to automatically reconnect using the new parameters
-+# once migration finished successfully.  Only implemented for SPICE.
-+#
-+# @protocol: must be "spice"
-+# @hostname: migration target hostname
-+# @port: spice tcp port for plaintext channels
-+# @tls-port: spice tcp port for tls-secured channels
-+# @cert-subject: server certificate subject
-+#
-+# Since: 0.14
-+#
-+# Example:
-+#
-+# -> { "execute": "client_migrate_info",
-+#      "arguments": { "protocol": "spice",
-+#                     "hostname": "virt42.lab.kraxel.org",
-+#                     "port": 1234 } }
-+# <- { "return": {} }
-+#
-+##
-+{ 'command': 'client_migrate_info',
-+  'data': { 'protocol': 'str', 'hostname': 'str', '*port': 'int',
-+            '*tls-port': 'int', '*cert-subject': 'str' } }
-diff --git a/ui/ui-hmp-cmds.c b/ui/ui-hmp-cmds.c
-index 5c456ecc02..c671389473 100644
---- a/ui/ui-hmp-cmds.c
-+++ b/ui/ui-hmp-cmds.c
-@@ -458,3 +458,20 @@ hmp_screendump(Monitor *mon, const QDict *qdict)
- end:
-     hmp_handle_error(mon, err);
- }
-+
-+void hmp_client_migrate_info(Monitor *mon, const QDict *qdict)
-+{
-+    Error *err = NULL;
-+    const char *protocol = qdict_get_str(qdict, "protocol");
-+    const char *hostname = qdict_get_str(qdict, "hostname");
-+    bool has_port        = qdict_haskey(qdict, "port");
-+    int port             = qdict_get_try_int(qdict, "port", -1);
-+    bool has_tls_port    = qdict_haskey(qdict, "tls-port");
-+    int tls_port         = qdict_get_try_int(qdict, "tls-port", -1);
-+    const char *cert_subject = qdict_get_try_str(qdict, "cert-subject");
-+
-+    qmp_client_migrate_info(protocol, hostname,
-+                            has_port, port, has_tls_port, tls_port,
-+                            cert_subject, &err);
-+    hmp_handle_error(mon, err);
-+}
-diff --git a/ui/ui-qmp-cmds.c b/ui/ui-qmp-cmds.c
-index dbc4afcd73..a37a7024f3 100644
---- a/ui/ui-qmp-cmds.c
-+++ b/ui/ui-qmp-cmds.c
-@@ -175,3 +175,32 @@ void qmp_display_update(DisplayUpdateOptions *arg, Error **errp)
-         abort();
-     }
- }
-+
-+void qmp_client_migrate_info(const char *protocol, const char *hostname,
-+                             bool has_port, int64_t port,
-+                             bool has_tls_port, int64_t tls_port,
-+                             const char *cert_subject,
-+                             Error **errp)
-+{
-+    if (strcmp(protocol, "spice") == 0) {
-+        if (!qemu_using_spice(errp)) {
-+            return;
-+        }
-+
-+        if (!has_port && !has_tls_port) {
-+            error_setg(errp, QERR_MISSING_PARAMETER, "port/tls-port");
-+            return;
-+        }
-+
-+        if (qemu_spice.migrate_info(hostname,
-+                                    has_port ? port : -1,
-+                                    has_tls_port ? tls_port : -1,
-+                                    cert_subject)) {
-+            error_setg(errp, "Could not set up display for migration");
-+            return;
-+        }
-+        return;
-+    }
-+
-+    error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "protocol", "'spice'");
-+}
--- 
-2.39.1
-
diff --git a/kvm-target-i386-Add-EPYC-Genoa-model-to-support-Zen-4-pr.patch b/kvm-target-i386-Add-EPYC-Genoa-model-to-support-Zen-4-pr.patch
deleted file mode 100644
index 43c239a..0000000
--- a/kvm-target-i386-Add-EPYC-Genoa-model-to-support-Zen-4-pr.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-From 03011d00cfb5862edb7394a9b79b269198af5c89 Mon Sep 17 00:00:00 2001
-From: Bandan Das <bsd@redhat.com>
-Date: Wed, 9 Aug 2023 12:48:34 -0400
-Subject: [PATCH 7/7] target/i386: Add EPYC-Genoa model to support Zen 4
- processor series
-
-RH-Author: Bandan Das <None>
-RH-MergeRequest: 198: Add EPYC-Genoa CPU model in qemu
-RH-Bugzilla: 2094913
-RH-Acked-by: Wei Huang <None>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [7/7] 158091c691169a5d30c7c8005371ee7a0d9fc4ce (bdas1/qemu-kvm)
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2094913
-
-commit 166b1741884dd4fd7090b753cd7333868457a29b
-Author: Babu Moger <babu.moger@amd.com>
-Date:   Thu May 4 15:53:12 2023 -0500
-
-    target/i386: Add EPYC-Genoa model to support Zen 4 processor series
-
-    Adds the support for AMD EPYC Genoa generation processors. The model
-    display for the new processor will be EPYC-Genoa.
-
-    Adds the following new feature bits on top of the feature bits from
-    the previous generation EPYC models.
-
-    avx512f         : AVX-512 Foundation instruction
-    avx512dq        : AVX-512 Doubleword & Quadword Instruction
-    avx512ifma      : AVX-512 Integer Fused Multiply Add instruction
-    avx512cd        : AVX-512 Conflict Detection instruction
-    avx512bw        : AVX-512 Byte and Word Instructions
-    avx512vl        : AVX-512 Vector Length Extension Instructions
-    avx512vbmi      : AVX-512 Vector Byte Manipulation Instruction
-    avx512_vbmi2    : AVX-512 Additional Vector Byte Manipulation Instruction
-    gfni            : AVX-512 Galois Field New Instructions
-    avx512_vnni     : AVX-512 Vector Neural Network Instructions
-    avx512_bitalg   : AVX-512 Bit Algorithms, add bit algorithms Instructions
-    avx512_vpopcntdq: AVX-512 AVX-512 Vector Population Count Doubleword and
-                      Quadword Instructions
-    avx512_bf16     : AVX-512 BFLOAT16 instructions
-    la57            : 57-bit virtual address support (5-level Page Tables)
-    vnmi            : Virtual NMI (VNMI) allows the hypervisor to inject the NMI
-                      into the guest without using Event Injection mechanism
-                      meaning not required to track the guest NMI and intercepting
-                      the IRET.
-    auto-ibrs       : The AMD Zen4 core supports a new feature called Automatic IBRS.
-                      It is a "set-and-forget" feature that means that, unlike e.g.,
-                      s/w-toggled SPEC_CTRL.IBRS, h/w manages its IBRS mitigation
-                      resources automatically across CPL transitions.
-
-    Signed-off-by: Babu Moger <babu.moger@amd.com>
-    Message-Id: <20230504205313.225073-8-babu.moger@amd.com>
-    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-
-Signed-off-by: Bandan Das <bsd@redhat.com>
----
- target/i386/cpu.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 122 insertions(+)
-
-diff --git a/target/i386/cpu.c b/target/i386/cpu.c
-index f1baefe775..b27db050a2 100644
---- a/target/i386/cpu.c
-+++ b/target/i386/cpu.c
-@@ -1973,6 +1973,56 @@ static const CPUCaches epyc_milan_v2_cache_info = {
-     },
- };
- 
-+static const CPUCaches epyc_genoa_cache_info = {
-+    .l1d_cache = &(CPUCacheInfo) {
-+        .type = DATA_CACHE,
-+        .level = 1,
-+        .size = 32 * KiB,
-+        .line_size = 64,
-+        .associativity = 8,
-+        .partitions = 1,
-+        .sets = 64,
-+        .lines_per_tag = 1,
-+        .self_init = 1,
-+        .no_invd_sharing = true,
-+    },
-+    .l1i_cache = &(CPUCacheInfo) {
-+        .type = INSTRUCTION_CACHE,
-+        .level = 1,
-+        .size = 32 * KiB,
-+        .line_size = 64,
-+        .associativity = 8,
-+        .partitions = 1,
-+        .sets = 64,
-+        .lines_per_tag = 1,
-+        .self_init = 1,
-+        .no_invd_sharing = true,
-+    },
-+    .l2_cache = &(CPUCacheInfo) {
-+        .type = UNIFIED_CACHE,
-+        .level = 2,
-+        .size = 1 * MiB,
-+        .line_size = 64,
-+        .associativity = 8,
-+        .partitions = 1,
-+        .sets = 2048,
-+        .lines_per_tag = 1,
-+    },
-+    .l3_cache = &(CPUCacheInfo) {
-+        .type = UNIFIED_CACHE,
-+        .level = 3,
-+        .size = 32 * MiB,
-+        .line_size = 64,
-+        .associativity = 16,
-+        .partitions = 1,
-+        .sets = 32768,
-+        .lines_per_tag = 1,
-+        .self_init = true,
-+        .inclusive = true,
-+        .complex_indexing = false,
-+    },
-+};
-+
- /* The following VMX features are not supported by KVM and are left out in the
-  * CPU definitions:
-  *
-@@ -4493,6 +4543,78 @@ static const X86CPUDefinition builtin_x86_defs[] = {
-             { /* end of list */ }
-         }
-     },
-+    {
-+        .name = "EPYC-Genoa",
-+        .level = 0xd,
-+        .vendor = CPUID_VENDOR_AMD,
-+        .family = 25,
-+        .model = 17,
-+        .stepping = 0,
-+        .features[FEAT_1_EDX] =
-+            CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX | CPUID_CLFLUSH |
-+            CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | CPUID_MCA | CPUID_PGE |
-+            CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 | CPUID_MCE |
-+            CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE | CPUID_DE |
-+            CPUID_VME | CPUID_FP87,
-+        .features[FEAT_1_ECX] =
-+            CPUID_EXT_RDRAND | CPUID_EXT_F16C | CPUID_EXT_AVX |
-+            CPUID_EXT_XSAVE | CPUID_EXT_AES |  CPUID_EXT_POPCNT |
-+            CPUID_EXT_MOVBE | CPUID_EXT_SSE42 | CPUID_EXT_SSE41 |
-+            CPUID_EXT_PCID | CPUID_EXT_CX16 | CPUID_EXT_FMA |
-+            CPUID_EXT_SSSE3 | CPUID_EXT_MONITOR | CPUID_EXT_PCLMULQDQ |
-+            CPUID_EXT_SSE3,
-+        .features[FEAT_8000_0001_EDX] =
-+            CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPUID_EXT2_PDPE1GB |
-+            CPUID_EXT2_FFXSR | CPUID_EXT2_MMXEXT | CPUID_EXT2_NX |
-+            CPUID_EXT2_SYSCALL,
-+        .features[FEAT_8000_0001_ECX] =
-+            CPUID_EXT3_OSVW | CPUID_EXT3_3DNOWPREFETCH |
-+            CPUID_EXT3_MISALIGNSSE | CPUID_EXT3_SSE4A | CPUID_EXT3_ABM |
-+            CPUID_EXT3_CR8LEG | CPUID_EXT3_SVM | CPUID_EXT3_LAHF_LM |
-+            CPUID_EXT3_TOPOEXT | CPUID_EXT3_PERFCORE,
-+        .features[FEAT_8000_0008_EBX] =
-+            CPUID_8000_0008_EBX_CLZERO | CPUID_8000_0008_EBX_XSAVEERPTR |
-+            CPUID_8000_0008_EBX_WBNOINVD | CPUID_8000_0008_EBX_IBPB |
-+            CPUID_8000_0008_EBX_IBRS | CPUID_8000_0008_EBX_STIBP |
-+            CPUID_8000_0008_EBX_STIBP_ALWAYS_ON |
-+            CPUID_8000_0008_EBX_AMD_SSBD | CPUID_8000_0008_EBX_AMD_PSFD,
-+        .features[FEAT_8000_0021_EAX] =
-+            CPUID_8000_0021_EAX_No_NESTED_DATA_BP |
-+            CPUID_8000_0021_EAX_LFENCE_ALWAYS_SERIALIZING |
-+            CPUID_8000_0021_EAX_NULL_SEL_CLR_BASE |
-+            CPUID_8000_0021_EAX_AUTO_IBRS,
-+        .features[FEAT_7_0_EBX] =
-+            CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 | CPUID_7_0_EBX_AVX2 |
-+            CPUID_7_0_EBX_SMEP | CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS |
-+            CPUID_7_0_EBX_INVPCID | CPUID_7_0_EBX_AVX512F |
-+            CPUID_7_0_EBX_AVX512DQ | CPUID_7_0_EBX_RDSEED | CPUID_7_0_EBX_ADX |
-+            CPUID_7_0_EBX_SMAP | CPUID_7_0_EBX_AVX512IFMA |
-+            CPUID_7_0_EBX_CLFLUSHOPT | CPUID_7_0_EBX_CLWB |
-+            CPUID_7_0_EBX_AVX512CD | CPUID_7_0_EBX_SHA_NI |
-+            CPUID_7_0_EBX_AVX512BW | CPUID_7_0_EBX_AVX512VL,
-+        .features[FEAT_7_0_ECX] =
-+            CPUID_7_0_ECX_AVX512_VBMI | CPUID_7_0_ECX_UMIP | CPUID_7_0_ECX_PKU |
-+            CPUID_7_0_ECX_AVX512_VBMI2 | CPUID_7_0_ECX_GFNI |
-+            CPUID_7_0_ECX_VAES | CPUID_7_0_ECX_VPCLMULQDQ |
-+            CPUID_7_0_ECX_AVX512VNNI | CPUID_7_0_ECX_AVX512BITALG |
-+            CPUID_7_0_ECX_AVX512_VPOPCNTDQ | CPUID_7_0_ECX_LA57 |
-+            CPUID_7_0_ECX_RDPID,
-+        .features[FEAT_7_0_EDX] =
-+            CPUID_7_0_EDX_FSRM,
-+        .features[FEAT_7_1_EAX] =
-+            CPUID_7_1_EAX_AVX512_BF16,
-+        .features[FEAT_XSAVE] =
-+            CPUID_XSAVE_XSAVEOPT | CPUID_XSAVE_XSAVEC |
-+            CPUID_XSAVE_XGETBV1 | CPUID_XSAVE_XSAVES,
-+        .features[FEAT_6_EAX] =
-+            CPUID_6_EAX_ARAT,
-+        .features[FEAT_SVM] =
-+            CPUID_SVM_NPT | CPUID_SVM_NRIPSAVE | CPUID_SVM_VNMI |
-+            CPUID_SVM_SVME_ADDR_CHK,
-+        .xlevel = 0x80000022,
-+        .model_id = "AMD EPYC-Genoa Processor",
-+        .cache_info = &epyc_genoa_cache_info,
-+    },
- };
- 
- /*
--- 
-2.39.3
-
diff --git a/kvm-target-i386-Add-VNMI-and-automatic-IBRS-feature-bits.patch b/kvm-target-i386-Add-VNMI-and-automatic-IBRS-feature-bits.patch
deleted file mode 100644
index 5e8f79b..0000000
--- a/kvm-target-i386-Add-VNMI-and-automatic-IBRS-feature-bits.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 95c5cee20741b055dea9ac3ad3176bbaa1eaf705 Mon Sep 17 00:00:00 2001
-From: Bandan Das <bsd@redhat.com>
-Date: Wed, 9 Aug 2023 12:46:25 -0400
-Subject: [PATCH 6/7] target/i386: Add VNMI and automatic IBRS feature bits
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Bandan Das <None>
-RH-MergeRequest: 198: Add EPYC-Genoa CPU model in qemu
-RH-Bugzilla: 2094913
-RH-Acked-by: Wei Huang <None>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [6/7] 24c0fb08973aa2615817f67576550ce2efadb75c (bdas1/qemu-kvm)
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2094913
-
-commit 62a798d4bc2c3e767d94670776c77a7df274d7c5
-Author: Babu Moger <babu.moger@amd.com>
-Date:   Thu May 4 15:53:11 2023 -0500
-
-    target/i386: Add VNMI and automatic IBRS feature bits
-
-    Add the following featute bits.
-
-    vnmi: Virtual NMI (VNMI) allows the hypervisor to inject the NMI into the
-          guest without using Event Injection mechanism meaning not required to
-          track the guest NMI and intercepting the IRET.
-          The presence of this feature is indicated via the CPUID function
-          0x8000000A_EDX[25].
-
-    automatic-ibrs :
-          The AMD Zen4 core supports a new feature called Automatic IBRS.
-          It is a "set-and-forget" feature that means that, unlike e.g.,
-          s/w-toggled SPEC_CTRL.IBRS, h/w manages its IBRS mitigation
-          resources automatically across CPL transitions.
-          The presence of this feature is indicated via the CPUID function
-          0x80000021_EAX[8].
-
-    The documention for the features are available in the links below.
-    a. Processor Programming Reference (PPR) for AMD Family 19h Model 01h,
-       Revision B1 Processors
-    b. AMD64 Architecture Programmer’s Manual Volumes 1–5 Publication No. Revision
-       40332 4.05 Date October 2022
-
-    Signed-off-by: Santosh Shukla <santosh.shukla@amd.com>
-    Signed-off-by: Kim Phillips <kim.phillips@amd.com>
-    Signed-off-by: Babu Moger <babu.moger@amd.com>
-    Link: https://www.amd.com/system/files/TechDocs/55898_B1_pub_0.50.zip
-    Link: https://www.amd.com/system/files/TechDocs/40332_4.05.pdf
-    Message-Id: <20230504205313.225073-7-babu.moger@amd.com>
-    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-
-Signed-off-by: Bandan Das <bsd@redhat.com>
----
- target/i386/cpu.c | 4 ++--
- target/i386/cpu.h | 3 +++
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/target/i386/cpu.c b/target/i386/cpu.c
-index bbddc682df..f1baefe775 100644
---- a/target/i386/cpu.c
-+++ b/target/i386/cpu.c
-@@ -806,7 +806,7 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] = {
-             "pfthreshold", "avic", NULL, "v-vmsave-vmload",
-             "vgif", NULL, NULL, NULL,
-             NULL, NULL, NULL, NULL,
--            NULL, NULL, NULL, NULL,
-+            NULL, "vnmi", NULL, NULL,
-             "svme-addr-chk", NULL, NULL, NULL,
-         },
-         .cpuid = { .eax = 0x8000000A, .reg = R_EDX, },
-@@ -925,7 +925,7 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] = {
-         .feat_names = {
-             "no-nested-data-bp", NULL, "lfence-always-serializing", NULL,
-             NULL, NULL, "null-sel-clr-base", NULL,
--            NULL, NULL, NULL, NULL,
-+            "auto-ibrs", NULL, NULL, NULL,
-             NULL, NULL, NULL, NULL,
-             NULL, NULL, NULL, NULL,
-             NULL, NULL, NULL, NULL,
-diff --git a/target/i386/cpu.h b/target/i386/cpu.h
-index c37abf62ae..f7d225e4f1 100644
---- a/target/i386/cpu.h
-+++ b/target/i386/cpu.h
-@@ -773,6 +773,7 @@ uint64_t x86_cpu_get_supported_feature_word(FeatureWord w,
- #define CPUID_SVM_AVIC            (1U << 13)
- #define CPUID_SVM_V_VMSAVE_VMLOAD (1U << 15)
- #define CPUID_SVM_VGIF            (1U << 16)
-+#define CPUID_SVM_VNMI            (1U << 25)
- #define CPUID_SVM_SVME_ADDR_CHK   (1U << 28)
- 
- /* Support RDFSBASE/RDGSBASE/WRFSBASE/WRGSBASE */
-@@ -948,6 +949,8 @@ uint64_t x86_cpu_get_supported_feature_word(FeatureWord w,
- #define CPUID_8000_0021_EAX_LFENCE_ALWAYS_SERIALIZING    (1U << 2)
- /* Null Selector Clears Base */
- #define CPUID_8000_0021_EAX_NULL_SEL_CLR_BASE    (1U << 6)
-+/* Automatic IBRS */
-+#define CPUID_8000_0021_EAX_AUTO_IBRS   (1U << 8)
- 
- #define CPUID_XSAVE_XSAVEOPT   (1U << 0)
- #define CPUID_XSAVE_XSAVEC     (1U << 1)
--- 
-2.39.3
-
diff --git a/kvm-target-i386-Add-a-couple-of-feature-bits-in-8000_000.patch b/kvm-target-i386-Add-a-couple-of-feature-bits-in-8000_000.patch
deleted file mode 100644
index 772bbbd..0000000
--- a/kvm-target-i386-Add-a-couple-of-feature-bits-in-8000_000.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 2d7fb99c02a7666f1d8fe70a4749f0b7771a68ed Mon Sep 17 00:00:00 2001
-From: Bandan Das <bsd@redhat.com>
-Date: Wed, 9 Aug 2023 12:29:55 -0400
-Subject: [PATCH 3/7] target/i386: Add a couple of feature bits in
- 8000_0008_EBX
-
-RH-Author: Bandan Das <None>
-RH-MergeRequest: 198: Add EPYC-Genoa CPU model in qemu
-RH-Bugzilla: 2094913
-RH-Acked-by: Wei Huang <None>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [3/7] b11020b249d4ecc2e3e1ddf4fdc4b52c42ec2642 (bdas1/qemu-kvm)
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2094913
-
-commit bb039a230e6a7920d71d21fa9afee2653a678c48
-Author: Babu Moger <babu.moger@amd.com>
-Date:   Thu May 4 15:53:08 2023 -0500
-
-    target/i386: Add a couple of feature bits in 8000_0008_EBX
-
-    Add the following feature bits.
-
-    amd-psfd : Predictive Store Forwarding Disable:
-               PSF is a hardware-based micro-architectural optimization
-               designed to improve the performance of code execution by
-               predicting address dependencies between loads and stores.
-               While SSBD (Speculative Store Bypass Disable) disables both
-               PSF and speculative store bypass, PSFD only disables PSF.
-               PSFD may be desirable for the software which is concerned
-               with the speculative behavior of PSF but desires a smaller
-               performance impact than setting SSBD.
-               Depends on the following kernel commit:
-               b73a54321ad8 ("KVM: x86: Expose Predictive Store Forwarding Disable")
-
-    stibp-always-on :
-               Single Thread Indirect Branch Prediction mode has enhanced
-               performance and may be left always on.
-
-    The documentation for the features are available in the links below.
-    a. Processor Programming Reference (PPR) for AMD Family 19h Model 01h,
-       Revision B1 Processors
-    b. SECURITY ANALYSIS OF AMD PREDICTIVE STORE FORWARDING
-
-    Signed-off-by: Babu Moger <babu.moger@amd.com>
-    Acked-by: Michael S. Tsirkin <mst@redhat.com>
-    Link: https://www.amd.com/system/files/documents/security-analysis-predictive-store-forwarding.pdf
-    Link: https://www.amd.com/system/files/TechDocs/55898_B1_pub_0.50.zip
-    Message-Id: <20230504205313.225073-4-babu.moger@amd.com>
-    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-
-Signed-off-by: Bandan Das <bsd@redhat.com>
----
- target/i386/cpu.c | 4 ++--
- target/i386/cpu.h | 4 ++++
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/target/i386/cpu.c b/target/i386/cpu.c
-index 8aa7eb611c..c8f88aefc7 100644
---- a/target/i386/cpu.c
-+++ b/target/i386/cpu.c
-@@ -911,10 +911,10 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] = {
-             NULL, NULL, NULL, NULL,
-             NULL, "wbnoinvd", NULL, NULL,
-             "ibpb", NULL, "ibrs", "amd-stibp",
--            NULL, NULL, NULL, NULL,
-+            NULL, "stibp-always-on", NULL, NULL,
-             NULL, NULL, NULL, NULL,
-             "amd-ssbd", "virt-ssbd", "amd-no-ssb", NULL,
--            NULL, NULL, NULL, NULL,
-+            "amd-psfd", NULL, NULL, NULL,
-         },
-         .cpuid = { .eax = 0x80000008, .reg = R_EBX, },
-         .tcg_features = 0,
-diff --git a/target/i386/cpu.h b/target/i386/cpu.h
-index c28b9df217..81d2200543 100644
---- a/target/i386/cpu.h
-+++ b/target/i386/cpu.h
-@@ -934,8 +934,12 @@ uint64_t x86_cpu_get_supported_feature_word(FeatureWord w,
- #define CPUID_8000_0008_EBX_IBRS        (1U << 14)
- /* Single Thread Indirect Branch Predictors */
- #define CPUID_8000_0008_EBX_STIBP       (1U << 15)
-+/* STIBP mode has enhanced performance and may be left always on */
-+#define CPUID_8000_0008_EBX_STIBP_ALWAYS_ON    (1U << 17)
- /* Speculative Store Bypass Disable */
- #define CPUID_8000_0008_EBX_AMD_SSBD    (1U << 24)
-+/* Predictive Store Forwarding Disable */
-+#define CPUID_8000_0008_EBX_AMD_PSFD    (1U << 28)
- 
- #define CPUID_XSAVE_XSAVEOPT   (1U << 0)
- #define CPUID_XSAVE_XSAVEC     (1U << 1)
--- 
-2.39.3
-
diff --git a/kvm-target-i386-Add-feature-bits-for-CPUID_Fn80000021_EA.patch b/kvm-target-i386-Add-feature-bits-for-CPUID_Fn80000021_EA.patch
deleted file mode 100644
index c714e49..0000000
--- a/kvm-target-i386-Add-feature-bits-for-CPUID_Fn80000021_EA.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 2a2f74c53258ef67034307b59afe2f4c679afaa2 Mon Sep 17 00:00:00 2001
-From: Bandan Das <bsd@redhat.com>
-Date: Wed, 9 Aug 2023 12:32:00 -0400
-Subject: [PATCH 4/7] target/i386: Add feature bits for CPUID_Fn80000021_EAX
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Bandan Das <None>
-RH-MergeRequest: 198: Add EPYC-Genoa CPU model in qemu
-RH-Bugzilla: 2094913
-RH-Acked-by: Wei Huang <None>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [4/7] 133044a7245226308406a684a875e1f96a394516 (bdas1/qemu-kvm)
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2094913
-
-commit b70eec312b185197d639bff689007727e596afd1
-Author: Babu Moger <babu.moger@amd.com>
-Date:   Thu May 4 15:53:09 2023 -0500
-
-    target/i386: Add feature bits for CPUID_Fn80000021_EAX
-
-    Add the following feature bits.
-    no-nested-data-bp         : Processor ignores nested data breakpoints.
-    lfence-always-serializing : LFENCE instruction is always serializing.
-    null-sel-cls-base         : Null Selector Clears Base. When this bit is
-                                set, a null segment load clears the segment base.
-
-    The documentation for the features are available in the links below.
-    a. Processor Programming Reference (PPR) for AMD Family 19h Model 01h,
-       Revision B1 Processors
-    b. AMD64 Architecture Programmer’s Manual Volumes 1–5 Publication No. Revision
-        40332 4.05 Date October 2022
-
-    Signed-off-by: Babu Moger <babu.moger@amd.com>
-    Acked-by: Michael S. Tsirkin <mst@redhat.com>
-    Link: https://www.amd.com/system/files/TechDocs/55898_B1_pub_0.50.zip
-    Link: https://www.amd.com/system/files/TechDocs/40332_4.05.pdf
-    Message-Id: <20230504205313.225073-5-babu.moger@amd.com>
-    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-
-Signed-off-by: Bandan Das <bsd@redhat.com>
----
- target/i386/cpu.c | 24 ++++++++++++++++++++++++
- target/i386/cpu.h |  8 ++++++++
- 2 files changed, 32 insertions(+)
-
-diff --git a/target/i386/cpu.c b/target/i386/cpu.c
-index c8f88aefc7..7ddebbaa3c 100644
---- a/target/i386/cpu.c
-+++ b/target/i386/cpu.c
-@@ -920,6 +920,22 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] = {
-         .tcg_features = 0,
-         .unmigratable_flags = 0,
-     },
-+    [FEAT_8000_0021_EAX] = {
-+        .type = CPUID_FEATURE_WORD,
-+        .feat_names = {
-+            "no-nested-data-bp", NULL, "lfence-always-serializing", NULL,
-+            NULL, NULL, "null-sel-clr-base", NULL,
-+            NULL, NULL, NULL, NULL,
-+            NULL, NULL, NULL, NULL,
-+            NULL, NULL, NULL, NULL,
-+            NULL, NULL, NULL, NULL,
-+            NULL, NULL, NULL, NULL,
-+            NULL, NULL, NULL, NULL,
-+        },
-+        .cpuid = { .eax = 0x80000021, .reg = R_EAX, },
-+        .tcg_features = 0,
-+        .unmigratable_flags = 0,
-+    },
-     [FEAT_XSAVE] = {
-         .type = CPUID_FEATURE_WORD,
-         .feat_names = {
-@@ -6156,6 +6172,10 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
-             *ebx |= (sev_get_reduced_phys_bits() & 0x3f) << 6; /* EBX[11:6] */
-         }
-         break;
-+    case 0x80000021:
-+        *eax = env->features[FEAT_8000_0021_EAX];
-+        *ebx = *ecx = *edx = 0;
-+        break;
-     default:
-         /* reserved values: zero */
-         *eax = 0;
-@@ -6585,6 +6605,10 @@ void x86_cpu_expand_features(X86CPU *cpu, Error **errp)
-             x86_cpu_adjust_level(cpu, &env->cpuid_min_xlevel, 0x8000001F);
-         }
- 
-+        if (env->features[FEAT_8000_0021_EAX]) {
-+            x86_cpu_adjust_level(cpu, &env->cpuid_min_xlevel, 0x80000021);
-+        }
-+
-         /* SGX requires CPUID[0x12] for EPC enumeration */
-         if (env->features[FEAT_7_0_EBX] & CPUID_7_0_EBX_SGX) {
-             x86_cpu_adjust_level(cpu, &env->cpuid_min_level, 0x12);
-diff --git a/target/i386/cpu.h b/target/i386/cpu.h
-index 81d2200543..c37abf62ae 100644
---- a/target/i386/cpu.h
-+++ b/target/i386/cpu.h
-@@ -600,6 +600,7 @@ typedef enum FeatureWord {
-     FEAT_8000_0001_ECX, /* CPUID[8000_0001].ECX */
-     FEAT_8000_0007_EDX, /* CPUID[8000_0007].EDX */
-     FEAT_8000_0008_EBX, /* CPUID[8000_0008].EBX */
-+    FEAT_8000_0021_EAX, /* CPUID[8000_0021].EAX */
-     FEAT_C000_0001_EDX, /* CPUID[C000_0001].EDX */
-     FEAT_KVM,           /* CPUID[4000_0001].EAX (KVM_CPUID_FEATURES) */
-     FEAT_KVM_HINTS,     /* CPUID[4000_0001].EDX */
-@@ -941,6 +942,13 @@ uint64_t x86_cpu_get_supported_feature_word(FeatureWord w,
- /* Predictive Store Forwarding Disable */
- #define CPUID_8000_0008_EBX_AMD_PSFD    (1U << 28)
- 
-+/* Processor ignores nested data breakpoints */
-+#define CPUID_8000_0021_EAX_No_NESTED_DATA_BP    (1U << 0)
-+/* LFENCE is always serializing */
-+#define CPUID_8000_0021_EAX_LFENCE_ALWAYS_SERIALIZING    (1U << 2)
-+/* Null Selector Clears Base */
-+#define CPUID_8000_0021_EAX_NULL_SEL_CLR_BASE    (1U << 6)
-+
- #define CPUID_XSAVE_XSAVEOPT   (1U << 0)
- #define CPUID_XSAVE_XSAVEC     (1U << 1)
- #define CPUID_XSAVE_XGETBV1    (1U << 2)
--- 
-2.39.3
-
diff --git a/kvm-target-i386-Add-missing-feature-bits-in-EPYC-Milan-m.patch b/kvm-target-i386-Add-missing-feature-bits-in-EPYC-Milan-m.patch
deleted file mode 100644
index 9bb4bf9..0000000
--- a/kvm-target-i386-Add-missing-feature-bits-in-EPYC-Milan-m.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-From a8180665019d537ee9775614627bf9eb8bd4770e Mon Sep 17 00:00:00 2001
-From: Bandan Das <bsd@redhat.com>
-Date: Wed, 9 Aug 2023 12:35:33 -0400
-Subject: [PATCH 5/7] target/i386: Add missing feature bits in EPYC-Milan model
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Bandan Das <None>
-RH-MergeRequest: 198: Add EPYC-Genoa CPU model in qemu
-RH-Bugzilla: 2094913
-RH-Acked-by: Wei Huang <None>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [5/7] 8f77315c8d7010564423df3e3c594c90fd5f9c00 (bdas1/qemu-kvm)
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2094913
-
-commit 27f03be6f59d04bd5673ba1e1628b2b490f9a9ff
-Author: Babu Moger <babu.moger@amd.com>
-Date:   Thu May 4 15:53:10 2023 -0500
-
-    target/i386: Add missing feature bits in EPYC-Milan model
-
-    Add the following feature bits for EPYC-Milan model and bump the version.
-    vaes            : Vector VAES(ENC|DEC), VAES(ENC|DEC)LAST instruction support
-    vpclmulqdq      : Vector VPCLMULQDQ instruction support
-    stibp-always-on : Single Thread Indirect Branch Prediction Mode has enhanced
-                      performance and may be left Always on
-    amd-psfd        : Predictive Store Forward Disable
-    no-nested-data-bp         : Processor ignores nested data breakpoints
-    lfence-always-serializing : LFENCE instruction is always serializing
-    null-sel-clr-base         : Null Selector Clears Base. When this bit is
-                                set, a null segment load clears the segment base
-
-    These new features will be added in EPYC-Milan-v2. The "-cpu help" output
-    after the change will be.
-
-        x86 EPYC-Milan             (alias configured by machine type)
-        x86 EPYC-Milan-v1          AMD EPYC-Milan Processor
-        x86 EPYC-Milan-v2          AMD EPYC-Milan Processor
-
-    The documentation for the features are available in the links below.
-    a. Processor Programming Reference (PPR) for AMD Family 19h Model 01h,
-       Revision B1 Processors
-    b. SECURITY ANALYSIS OF AMD PREDICTIVE STORE FORWARDING
-    c. AMD64 Architecture Programmer’s Manual Volumes 1–5 Publication No. Revision
-        40332 4.05 Date October 2022
-
-    Signed-off-by: Babu Moger <babu.moger@amd.com>
-    Acked-by: Michael S. Tsirkin <mst@redhat.com>
-    Link: https://www.amd.com/system/files/TechDocs/55898_B1_pub_0.50.zip
-    Link: https://www.amd.com/system/files/documents/security-analysis-predictive-store-forwarding.pdf
-    Link: https://www.amd.com/system/files/TechDocs/40332_4.05.pdf
-    Message-Id: <20230504205313.225073-6-babu.moger@amd.com>
-    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-
-Signed-off-by: Bandan Das <bsd@redhat.com>
----
- target/i386/cpu.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 70 insertions(+)
-
-diff --git a/target/i386/cpu.c b/target/i386/cpu.c
-index 7ddebbaa3c..bbddc682df 100644
---- a/target/i386/cpu.c
-+++ b/target/i386/cpu.c
-@@ -1923,6 +1923,56 @@ static const CPUCaches epyc_milan_cache_info = {
-     },
- };
- 
-+static const CPUCaches epyc_milan_v2_cache_info = {
-+    .l1d_cache = &(CPUCacheInfo) {
-+        .type = DATA_CACHE,
-+        .level = 1,
-+        .size = 32 * KiB,
-+        .line_size = 64,
-+        .associativity = 8,
-+        .partitions = 1,
-+        .sets = 64,
-+        .lines_per_tag = 1,
-+        .self_init = 1,
-+        .no_invd_sharing = true,
-+    },
-+    .l1i_cache = &(CPUCacheInfo) {
-+        .type = INSTRUCTION_CACHE,
-+        .level = 1,
-+        .size = 32 * KiB,
-+        .line_size = 64,
-+        .associativity = 8,
-+        .partitions = 1,
-+        .sets = 64,
-+        .lines_per_tag = 1,
-+        .self_init = 1,
-+        .no_invd_sharing = true,
-+    },
-+    .l2_cache = &(CPUCacheInfo) {
-+        .type = UNIFIED_CACHE,
-+        .level = 2,
-+        .size = 512 * KiB,
-+        .line_size = 64,
-+        .associativity = 8,
-+        .partitions = 1,
-+        .sets = 1024,
-+        .lines_per_tag = 1,
-+    },
-+    .l3_cache = &(CPUCacheInfo) {
-+        .type = UNIFIED_CACHE,
-+        .level = 3,
-+        .size = 32 * MiB,
-+        .line_size = 64,
-+        .associativity = 16,
-+        .partitions = 1,
-+        .sets = 32768,
-+        .lines_per_tag = 1,
-+        .self_init = true,
-+        .inclusive = true,
-+        .complex_indexing = false,
-+    },
-+};
-+
- /* The following VMX features are not supported by KVM and are left out in the
-  * CPU definitions:
-  *
-@@ -4422,6 +4472,26 @@ static const X86CPUDefinition builtin_x86_defs[] = {
-         .xlevel = 0x8000001E,
-         .model_id = "AMD EPYC-Milan Processor",
-         .cache_info = &epyc_milan_cache_info,
-+        .versions = (X86CPUVersionDefinition[]) {
-+            { .version = 1 },
-+            {
-+                .version = 2,
-+                .props = (PropValue[]) {
-+                    { "model-id",
-+                      "AMD EPYC-Milan-v2 Processor" },
-+                    { "vaes", "on" },
-+                    { "vpclmulqdq", "on" },
-+                    { "stibp-always-on", "on" },
-+                    { "amd-psfd", "on" },
-+                    { "no-nested-data-bp", "on" },
-+                    { "lfence-always-serializing", "on" },
-+                    { "null-sel-clr-base", "on" },
-+                    { /* end of list */ }
-+                },
-+                .cache_info = &epyc_milan_v2_cache_info
-+            },
-+            { /* end of list */ }
-+        }
-     },
- };
- 
--- 
-2.39.3
-
diff --git a/kvm-target-i386-Add-new-EPYC-CPU-versions-with-updated-c.patch b/kvm-target-i386-Add-new-EPYC-CPU-versions-with-updated-c.patch
deleted file mode 100644
index 40c289a..0000000
--- a/kvm-target-i386-Add-new-EPYC-CPU-versions-with-updated-c.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From 92f0b5d0c7a841a21cabbc6efc1d7baf0e5a3e0f Mon Sep 17 00:00:00 2001
-From: Bandan Das <bsd@redhat.com>
-Date: Wed, 9 Aug 2023 12:26:12 -0400
-Subject: [PATCH 2/7] target/i386: Add new EPYC CPU versions with updated
- cache_info
-
-RH-Author: Bandan Das <None>
-RH-MergeRequest: 198: Add EPYC-Genoa CPU model in qemu
-RH-Bugzilla: 2094913
-RH-Acked-by: Wei Huang <None>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [2/7] 71a2fd907636733f86729bc9328600f6f9306eaf (bdas1/qemu-kvm)
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2094913
-
-commit d7c72735f618a7ee27ee109d8b1468193734606a
-Author: Michael Roth <michael.roth@amd.com>
-Date:   Thu May 4 15:53:07 2023 -0500
-
-    target/i386: Add new EPYC CPU versions with updated cache_info
-
-    Introduce new EPYC cpu versions: EPYC-v4 and EPYC-Rome-v3.
-    The only difference vs. older models is an updated cache_info with
-    the 'complex_indexing' bit unset, since this bit is not currently
-    defined for AMD and may cause problems should it be used for
-    something else in the future. Setting this bit will also cause
-    CPUID validation failures when running SEV-SNP guests.
-
-    Signed-off-by: Michael Roth <michael.roth@amd.com>
-    Signed-off-by: Babu Moger <babu.moger@amd.com>
-    Acked-by: Michael S. Tsirkin <mst@redhat.com>
-    Message-Id: <20230504205313.225073-3-babu.moger@amd.com>
-    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-
-Signed-off-by: Bandan Das <bsd@redhat.com>
----
- target/i386/cpu.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 118 insertions(+)
-
-diff --git a/target/i386/cpu.c b/target/i386/cpu.c
-index 3558c92ed0..8aa7eb611c 100644
---- a/target/i386/cpu.c
-+++ b/target/i386/cpu.c
-@@ -1707,6 +1707,56 @@ static const CPUCaches epyc_cache_info = {
-     },
- };
- 
-+static CPUCaches epyc_v4_cache_info = {
-+    .l1d_cache = &(CPUCacheInfo) {
-+        .type = DATA_CACHE,
-+        .level = 1,
-+        .size = 32 * KiB,
-+        .line_size = 64,
-+        .associativity = 8,
-+        .partitions = 1,
-+        .sets = 64,
-+        .lines_per_tag = 1,
-+        .self_init = 1,
-+        .no_invd_sharing = true,
-+    },
-+    .l1i_cache = &(CPUCacheInfo) {
-+        .type = INSTRUCTION_CACHE,
-+        .level = 1,
-+        .size = 64 * KiB,
-+        .line_size = 64,
-+        .associativity = 4,
-+        .partitions = 1,
-+        .sets = 256,
-+        .lines_per_tag = 1,
-+        .self_init = 1,
-+        .no_invd_sharing = true,
-+    },
-+    .l2_cache = &(CPUCacheInfo) {
-+        .type = UNIFIED_CACHE,
-+        .level = 2,
-+        .size = 512 * KiB,
-+        .line_size = 64,
-+        .associativity = 8,
-+        .partitions = 1,
-+        .sets = 1024,
-+        .lines_per_tag = 1,
-+    },
-+    .l3_cache = &(CPUCacheInfo) {
-+        .type = UNIFIED_CACHE,
-+        .level = 3,
-+        .size = 8 * MiB,
-+        .line_size = 64,
-+        .associativity = 16,
-+        .partitions = 1,
-+        .sets = 8192,
-+        .lines_per_tag = 1,
-+        .self_init = true,
-+        .inclusive = true,
-+        .complex_indexing = false,
-+    },
-+};
-+
- static const CPUCaches epyc_rome_cache_info = {
-     .l1d_cache = &(CPUCacheInfo) {
-         .type = DATA_CACHE,
-@@ -1757,6 +1807,56 @@ static const CPUCaches epyc_rome_cache_info = {
-     },
- };
- 
-+static const CPUCaches epyc_rome_v3_cache_info = {
-+    .l1d_cache = &(CPUCacheInfo) {
-+        .type = DATA_CACHE,
-+        .level = 1,
-+        .size = 32 * KiB,
-+        .line_size = 64,
-+        .associativity = 8,
-+        .partitions = 1,
-+        .sets = 64,
-+        .lines_per_tag = 1,
-+        .self_init = 1,
-+        .no_invd_sharing = true,
-+    },
-+    .l1i_cache = &(CPUCacheInfo) {
-+        .type = INSTRUCTION_CACHE,
-+        .level = 1,
-+        .size = 32 * KiB,
-+        .line_size = 64,
-+        .associativity = 8,
-+        .partitions = 1,
-+        .sets = 64,
-+        .lines_per_tag = 1,
-+        .self_init = 1,
-+        .no_invd_sharing = true,
-+    },
-+    .l2_cache = &(CPUCacheInfo) {
-+        .type = UNIFIED_CACHE,
-+        .level = 2,
-+        .size = 512 * KiB,
-+        .line_size = 64,
-+        .associativity = 8,
-+        .partitions = 1,
-+        .sets = 1024,
-+        .lines_per_tag = 1,
-+    },
-+    .l3_cache = &(CPUCacheInfo) {
-+        .type = UNIFIED_CACHE,
-+        .level = 3,
-+        .size = 16 * MiB,
-+        .line_size = 64,
-+        .associativity = 16,
-+        .partitions = 1,
-+        .sets = 16384,
-+        .lines_per_tag = 1,
-+        .self_init = true,
-+        .inclusive = true,
-+        .complex_indexing = false,
-+    },
-+};
-+
- static const CPUCaches epyc_milan_cache_info = {
-     .l1d_cache = &(CPUCacheInfo) {
-         .type = DATA_CACHE,
-@@ -4112,6 +4212,15 @@ static const X86CPUDefinition builtin_x86_defs[] = {
-                     { /* end of list */ }
-                 }
-             },
-+            {
-+                .version = 4,
-+                .props = (PropValue[]) {
-+                    { "model-id",
-+                      "AMD EPYC-v4 Processor" },
-+                    { /* end of list */ }
-+                },
-+                .cache_info = &epyc_v4_cache_info
-+            },
-             { /* end of list */ }
-         }
-     },
-@@ -4231,6 +4340,15 @@ static const X86CPUDefinition builtin_x86_defs[] = {
-                     { /* end of list */ }
-                 }
-             },
-+            {
-+                .version = 3,
-+                .props = (PropValue[]) {
-+                    { "model-id",
-+                      "AMD EPYC-Rome-v3 Processor" },
-+                    { /* end of list */ }
-+                },
-+                .cache_info = &epyc_rome_v3_cache_info
-+            },
-             { /* end of list */ }
-         }
-     },
--- 
-2.39.3
-
diff --git a/kvm-target-i386-add-support-for-FB_CLEAR-feature.patch b/kvm-target-i386-add-support-for-FB_CLEAR-feature.patch
deleted file mode 100644
index 2b1cbc9..0000000
--- a/kvm-target-i386-add-support-for-FB_CLEAR-feature.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 0d056d6da9e4147d5965bf3507f6d6d6a413924d Mon Sep 17 00:00:00 2001
-From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-Date: Wed, 24 May 2023 06:52:43 -0400
-Subject: [PATCH 2/5] target/i386: add support for FB_CLEAR feature
-
-RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-MergeRequest: 167: target/i386: add support for FB_CLEAR feature
-RH-Bugzilla: 2216201
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [2/2] 5f191964ba25754107a06ef907f4ac614280aaa1 (eesposit/qemu-kvm)
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2216201
-
-commit 22e1094ca82d5518c1b69aff3e87c550776ae1eb
-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-Date:   Wed Feb 1 08:57:59 2023 -0500
-
-    target/i386: add support for FB_CLEAR feature
-
-    As reported by the Intel's doc:
-    "FB_CLEAR: The processor will overwrite fill buffer values as part of
-    MD_CLEAR operations with the VERW instruction.
-    On these processors, L1D_FLUSH does not overwrite fill buffer values."
-
-    If this cpu feature is present in host, allow QEMU to choose whether to
-    show it to the guest too.
-    One disadvantage of not exposing it is that the guest will report
-    a non existing vulnerability in
-    /sys/devices/system/cpu/vulnerabilities/mmio_stale_data
-    because the mitigation is present only when the cpu has
-            (FLUSH_L1D and MD_CLEAR) or FB_CLEAR
-    features enabled.
-
-    Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-    Message-Id: <20230201135759.555607-3-eesposit@redhat.com>
-    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-
-Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
----
- target/i386/cpu.c | 2 +-
- target/i386/cpu.h | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/target/i386/cpu.c b/target/i386/cpu.c
-index caf6338cc0..839706b430 100644
---- a/target/i386/cpu.c
-+++ b/target/i386/cpu.c
-@@ -1012,7 +1012,7 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] = {
-             "ssb-no", "mds-no", "pschange-mc-no", "tsx-ctrl",
-             "taa-no", NULL, NULL, NULL,
-             NULL, NULL, NULL, NULL,
--            NULL, NULL, NULL, NULL,
-+            NULL, "fb-clear", NULL, NULL,
-             NULL, NULL, NULL, NULL,
-             NULL, NULL, NULL, NULL,
-             NULL, NULL, NULL, NULL,
-diff --git a/target/i386/cpu.h b/target/i386/cpu.h
-index 74fa649b60..c28b9df217 100644
---- a/target/i386/cpu.h
-+++ b/target/i386/cpu.h
-@@ -989,6 +989,7 @@ uint64_t x86_cpu_get_supported_feature_word(FeatureWord w,
- #define MSR_ARCH_CAP_PSCHANGE_MC_NO     (1U << 6)
- #define MSR_ARCH_CAP_TSX_CTRL_MSR       (1U << 7)
- #define MSR_ARCH_CAP_TAA_NO             (1U << 8)
-+#define MSR_ARCH_CAP_FB_CLEAR           (1U << 17)
- 
- #define MSR_CORE_CAP_SPLIT_LOCK_DETECT  (1U << 5)
- 
--- 
-2.39.3
-
diff --git a/kvm-target-i386-add-support-for-FLUSH_L1D-feature.patch b/kvm-target-i386-add-support-for-FLUSH_L1D-feature.patch
deleted file mode 100644
index 39f2542..0000000
--- a/kvm-target-i386-add-support-for-FLUSH_L1D-feature.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 14eae569030805680570d93412100ad26242c7e6 Mon Sep 17 00:00:00 2001
-From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-Date: Wed, 24 May 2023 06:52:34 -0400
-Subject: [PATCH 1/5] target/i386: add support for FLUSH_L1D feature
-
-RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-RH-MergeRequest: 167: target/i386: add support for FB_CLEAR feature
-RH-Bugzilla: 2216201
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [1/2] e296c75c5cd7e1d16d3c70483d52aeba9f9eb2cd (eesposit/qemu-kvm)
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2216201
-
-commit 0e7e3bf1a552c178924867fa7c2f30ccc8a179e0
-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-Date:   Wed Feb 1 08:57:58 2023 -0500
-
-    target/i386: add support for FLUSH_L1D feature
-
-    As reported by Intel's doc:
-    "L1D_FLUSH: Writeback and invalidate the L1 data cache"
-
-    If this cpu feature is present in host, allow QEMU to choose whether to
-    show it to the guest too.
-    One disadvantage of not exposing it is that the guest will report
-    a non existing vulnerability in
-    /sys/devices/system/cpu/vulnerabilities/mmio_stale_data
-    because the mitigation is present only when the cpu has
-            (FLUSH_L1D and MD_CLEAR) or FB_CLEAR
-    features enabled.
-
-    Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
-    Message-Id: <20230201135759.555607-2-eesposit@redhat.com>
-    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-
-Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
----
- target/i386/cpu.c | 2 +-
- target/i386/cpu.h | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/target/i386/cpu.c b/target/i386/cpu.c
-index 0ef2bf1b93..caf6338cc0 100644
---- a/target/i386/cpu.c
-+++ b/target/i386/cpu.c
-@@ -860,7 +860,7 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] = {
-             "tsx-ldtrk", NULL, NULL /* pconfig */, "arch-lbr",
-             NULL, NULL, "amx-bf16", "avx512-fp16",
-             "amx-tile", "amx-int8", "spec-ctrl", "stibp",
--            NULL, "arch-capabilities", "core-capability", "ssbd",
-+            "flush-l1d", "arch-capabilities", "core-capability", "ssbd",
-         },
-         .cpuid = {
-             .eax = 7,
-diff --git a/target/i386/cpu.h b/target/i386/cpu.h
-index d243e290d3..74fa649b60 100644
---- a/target/i386/cpu.h
-+++ b/target/i386/cpu.h
-@@ -896,6 +896,8 @@ uint64_t x86_cpu_get_supported_feature_word(FeatureWord w,
- #define CPUID_7_0_EDX_SPEC_CTRL         (1U << 26)
- /* Single Thread Indirect Branch Predictors */
- #define CPUID_7_0_EDX_STIBP             (1U << 27)
-+/* Flush L1D cache */
-+#define CPUID_7_0_EDX_FLUSH_L1D         (1U << 28)
- /* Arch Capabilities */
- #define CPUID_7_0_EDX_ARCH_CAPABILITIES (1U << 29)
- /* Core Capability */
--- 
-2.39.3
-
diff --git a/kvm-target-i386-allow-versioned-CPUs-to-specify-new-cach.patch b/kvm-target-i386-allow-versioned-CPUs-to-specify-new-cach.patch
deleted file mode 100644
index 2c81c72..0000000
--- a/kvm-target-i386-allow-versioned-CPUs-to-specify-new-cach.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 457e74c076e0fe7b64631dfd4369d167f0762c9a Mon Sep 17 00:00:00 2001
-From: Bandan Das <bsd@redhat.com>
-Date: Wed, 9 Aug 2023 12:22:41 -0400
-Subject: [PATCH 1/7] target/i386: allow versioned CPUs to specify new
- cache_info
-
-RH-Author: Bandan Das <None>
-RH-MergeRequest: 198: Add EPYC-Genoa CPU model in qemu
-RH-Bugzilla: 2094913
-RH-Acked-by: Wei Huang <None>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [1/7] 6070e07a4bb070d1c15a811b2bd3195929c18d61 (bdas1/qemu-kvm)
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2094913
-
-commit cca0a000d06f897411a8af4402e5d0522bbe450b
-Author: Michael Roth <michael.roth@amd.com>
-Date:   Thu May 4 15:53:06 2023 -0500
-
-    target/i386: allow versioned CPUs to specify new cache_info
-
-    New EPYC CPUs versions require small changes to their cache_info's.
-    Because current QEMU x86 CPU definition does not support versioned
-    cach_info, we would have to declare a new CPU type for each such case.
-    To avoid the dup work, add "cache_info" in X86CPUVersionDefinition",
-    to allow new cache_info pointers to be specified for a new CPU version.
-
-    Co-developed-by: Wei Huang <wei.huang2@amd.com>
-    Signed-off-by: Wei Huang <wei.huang2@amd.com>
-    Signed-off-by: Michael Roth <michael.roth@amd.com>
-    Signed-off-by: Babu Moger <babu.moger@amd.com>
-    Acked-by: Michael S. Tsirkin <mst@redhat.com>
-    Message-Id: <20230504205313.225073-2-babu.moger@amd.com>
-    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-
-Signed-off-by: Bandan Das <bsd@redhat.com>
----
- target/i386/cpu.c | 35 ++++++++++++++++++++++++++++++++---
- 1 file changed, 32 insertions(+), 3 deletions(-)
-
-diff --git a/target/i386/cpu.c b/target/i386/cpu.c
-index 4ac3046313..3558c92ed0 100644
---- a/target/i386/cpu.c
-+++ b/target/i386/cpu.c
-@@ -1598,6 +1598,7 @@ typedef struct X86CPUVersionDefinition {
-     const char *alias;
-     const char *note;
-     PropValue *props;
-+    const CPUCaches *const cache_info;
- } X86CPUVersionDefinition;
- 
- /* Base definition for a CPU model */
-@@ -5213,6 +5214,31 @@ static void x86_cpu_apply_version_props(X86CPU *cpu, X86CPUModel *model)
-     assert(vdef->version == version);
- }
- 
-+static const CPUCaches *x86_cpu_get_versioned_cache_info(X86CPU *cpu,
-+                                                         X86CPUModel *model)
-+{
-+    const X86CPUVersionDefinition *vdef;
-+    X86CPUVersion version = x86_cpu_model_resolve_version(model);
-+    const CPUCaches *cache_info = model->cpudef->cache_info;
-+
-+    if (version == CPU_VERSION_LEGACY) {
-+        return cache_info;
-+    }
-+
-+    for (vdef = x86_cpu_def_get_versions(model->cpudef); vdef->version; vdef++) {
-+        if (vdef->cache_info) {
-+            cache_info = vdef->cache_info;
-+        }
-+
-+        if (vdef->version == version) {
-+            break;
-+        }
-+    }
-+
-+    assert(vdef->version == version);
-+    return cache_info;
-+}
-+
- /*
-  * Load data from X86CPUDefinition into a X86CPU object.
-  * Only for builtin_x86_defs models initialized with x86_register_cpudef_types.
-@@ -5245,7 +5271,7 @@ static void x86_cpu_load_model(X86CPU *cpu, X86CPUModel *model)
-     }
- 
-     /* legacy-cache defaults to 'off' if CPU model provides cache info */
--    cpu->legacy_cache = !def->cache_info;
-+    cpu->legacy_cache = !x86_cpu_get_versioned_cache_info(cpu, model);
- 
-     env->features[FEAT_1_ECX] |= CPUID_EXT_HYPERVISOR;
- 
-@@ -6724,14 +6750,17 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
- 
-     /* Cache information initialization */
-     if (!cpu->legacy_cache) {
--        if (!xcc->model || !xcc->model->cpudef->cache_info) {
-+        const CPUCaches *cache_info =
-+            x86_cpu_get_versioned_cache_info(cpu, xcc->model);
-+
-+        if (!xcc->model || !cache_info) {
-             g_autofree char *name = x86_cpu_class_get_model_name(xcc);
-             error_setg(errp,
-                        "CPU model '%s' doesn't support legacy-cache=off", name);
-             return;
-         }
-         env->cache_info_cpuid2 = env->cache_info_cpuid4 = env->cache_info_amd =
--            *xcc->model->cpudef->cache_info;
-+            *cache_info;
-     } else {
-         /* Build legacy cache information */
-         env->cache_info_cpuid2.l1d_cache = &legacy_l1d_cache;
--- 
-2.39.3
-
diff --git a/kvm-ui-Fix-pixel-colour-channel-order-for-PNG-screenshot.patch b/kvm-ui-Fix-pixel-colour-channel-order-for-PNG-screenshot.patch
deleted file mode 100644
index ef99b30..0000000
--- a/kvm-ui-Fix-pixel-colour-channel-order-for-PNG-screenshot.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From b998f8474846886fa1e0428fe79fe2a79231cc05 Mon Sep 17 00:00:00 2001
-From: Peter Maydell <peter.maydell@linaro.org>
-Date: Fri, 12 May 2023 15:43:38 +0100
-Subject: [PATCH 35/37] ui: Fix pixel colour channel order for PNG screenshots
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Marc-André Lureau <marcandre.lureau@redhat.com>
-RH-MergeRequest: 183: ui: Fix pixel colour channel order for PNG screenshots
-RH-Bugzilla: 2222579
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [1/1] 76acd3c5526639e70bc2998f584503c78fc9bc56 (marcandre.lureau-rh/qemu-kvm-centos)
-
-When we take a PNG screenshot the ordering of the colour channels in
-the data is not correct, resulting in the image having weird
-colouring compared to the actual display.  (Specifically, on a
-little-endian host the blue and red channels are swapped; on
-big-endian everything is wrong.)
-
-This happens because the pixman idea of the pixel data and the libpng
-idea differ.  PIXMAN_a8r8g8b8 defines that pixels are 32-bit values,
-with A in bits 24-31, R in bits 16-23, G in bits 8-15 and B in bits
-0-7.  This means that on little-endian systems the bytes in memory
-are
-   B G R A
-and on big-endian systems they are
-   A R G B
-
-libpng, on the other hand, thinks of pixels as being a series of
-values for each channel, so its format PNG_COLOR_TYPE_RGB_ALPHA
-always wants bytes in the order
-   R G B A
-
-This isn't the same as the pixman order for either big or little
-endian hosts.
-
-The alpha channel is also unnecessary bulk in the output PNG file,
-because there is no alpha information in a screenshot.
-
-To handle the endianness issue, we already define in ui/qemu-pixman.h
-various PIXMAN_BE_* and PIXMAN_LE_* values that give consistent
-byte-order pixel channel formats.  So we can use PIXMAN_BE_r8g8b8 and
-PNG_COLOR_TYPE_RGB, which both have an in-memory byte order of
-    R G B
-and 3 bytes per pixel.
-
-(PPM format screenshots get this right; they already use the
-PIXMAN_BE_r8g8b8 format.)
-
-Cc: qemu-stable@nongnu.org
-Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1622
-Fixes: 9a0a119a382867 ("Added parameter to take screenshot with screendump as PNG")
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
-Message-id: 20230502135548.2451309-1-peter.maydell@linaro.org
-
-(cherry picked from commit cd22a0f520f471e3bd33bc19cf3b2fa772cdb2a8)
-Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
----
- ui/console.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ui/console.c b/ui/console.c
-index 6e8a3cdc62..e173731e20 100644
---- a/ui/console.c
-+++ b/ui/console.c
-@@ -311,7 +311,7 @@ static bool png_save(int fd, pixman_image_t *image, Error **errp)
-     png_struct *png_ptr;
-     png_info *info_ptr;
-     g_autoptr(pixman_image_t) linebuf =
--                            qemu_pixman_linebuf_create(PIXMAN_a8r8g8b8, width);
-+        qemu_pixman_linebuf_create(PIXMAN_BE_r8g8b8, width);
-     uint8_t *buf = (uint8_t *)pixman_image_get_data(linebuf);
-     FILE *f = fdopen(fd, "wb");
-     int y;
-@@ -341,7 +341,7 @@ static bool png_save(int fd, pixman_image_t *image, Error **errp)
-     png_init_io(png_ptr, f);
- 
-     png_set_IHDR(png_ptr, info_ptr, width, height, 8,
--                 PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE,
-+                 PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
-                  PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
- 
-     png_write_info(png_ptr, info_ptr);
--- 
-2.39.3
-
diff --git a/kvm-util-async-teardown-wire-up-query-command-line-optio.patch b/kvm-util-async-teardown-wire-up-query-command-line-optio.patch
deleted file mode 100644
index 8c468d8..0000000
--- a/kvm-util-async-teardown-wire-up-query-command-line-optio.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-From c1502b0cd16378d6d5bd4259b90bf81a5fb5aad3 Mon Sep 17 00:00:00 2001
-From: Claudio Imbrenda <imbrenda@linux.ibm.com>
-Date: Fri, 5 May 2023 14:00:51 +0200
-Subject: [PATCH 20/21] util/async-teardown: wire up query-command-line-options
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Thomas Huth <thuth@redhat.com>
-RH-MergeRequest: 173: Improve memory reclaiming for z15 Secure Execution guests
-RH-Bugzilla: 2168500
-RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: Cédric Le Goater <clg@redhat.com>
-RH-Commit: [1/2] 76e5f25df2c02721f5a29f552ee3061be589abb2 (thuth/qemu-kvm-cs9)
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2168500
-
-Add new -run-with option with an async-teardown=on|off parameter. It is
-visible in the output of query-command-line-options QMP command, so it
-can be discovered and used by libvirt.
-
-The option -async-teardown is now redundant, deprecate it.
-
-Reported-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Fixes: c891c24b1a ("os-posix: asynchronous teardown for shutdown on Linux")
-Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
-Message-Id: <20230505120051.36605-2-imbrenda@linux.ibm.com>
-[thuth: Add curly braces to fix error with GCC 8.5, fix bug in deprecated.rst]
-Signed-off-by: Thomas Huth <thuth@redhat.com>
-
-(cherry picked from commit 80bd81cadd127c1e2fc784612a52abe392670ba4)
-Conflicts:
-	docs/about/deprecated.rst (missing context from other patches)
-Signed-off-by: Thomas Huth <thuth@redhat.com>
----
- docs/about/deprecated.rst |  5 +++++
- os-posix.c                | 14 ++++++++++++++
- qemu-options.hx           | 34 +++++++++++++++++++++++-----------
- util/async-teardown.c     | 21 +++++++++++++++++++++
- 4 files changed, 63 insertions(+), 11 deletions(-)
-
-diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
-index 1ca9dc33d6..52893fcf38 100644
---- a/docs/about/deprecated.rst
-+++ b/docs/about/deprecated.rst
-@@ -111,6 +111,11 @@ Use ``-machine acpi=off`` instead.
- The HAXM project has been retired (see https://github.com/intel/haxm#status).
- Use "whpx" (on Windows) or "hvf" (on macOS) instead.
- 
-+``-async-teardown`` (since 8.1)
-+'''''''''''''''''''''''''''''''
-+
-+Use ``-run-with async-teardown=on`` instead.
-+
- 
- QEMU Machine Protocol (QMP) commands
- ------------------------------------
-diff --git a/os-posix.c b/os-posix.c
-index 5adc69f560..90ea71725f 100644
---- a/os-posix.c
-+++ b/os-posix.c
-@@ -36,6 +36,8 @@
- #include "qemu/log.h"
- #include "sysemu/runstate.h"
- #include "qemu/cutils.h"
-+#include "qemu/config-file.h"
-+#include "qemu/option.h"
- 
- #ifdef CONFIG_LINUX
- #include <sys/prctl.h>
-@@ -152,9 +154,21 @@ int os_parse_cmd_args(int index, const char *optarg)
-         daemonize = 1;
-         break;
- #if defined(CONFIG_LINUX)
-+    /* deprecated */
-     case QEMU_OPTION_asyncteardown:
-         init_async_teardown();
-         break;
-+    case QEMU_OPTION_run_with: {
-+        QemuOpts *opts = qemu_opts_parse_noisily(qemu_find_opts("run-with"),
-+                                                 optarg, false);
-+        if (!opts) {
-+            exit(1);
-+        }
-+        if (qemu_opt_get_bool(opts, "async-teardown", false)) {
-+            init_async_teardown();
-+        }
-+        break;
-+    }
- #endif
-     default:
-         return -1;
-diff --git a/qemu-options.hx b/qemu-options.hx
-index 52b49f1f6a..b18f933703 100644
---- a/qemu-options.hx
-+++ b/qemu-options.hx
-@@ -4766,20 +4766,32 @@ DEF("qtest-log", HAS_ARG, QEMU_OPTION_qtest_log, "", QEMU_ARCH_ALL)
- DEF("async-teardown", 0, QEMU_OPTION_asyncteardown,
-     "-async-teardown enable asynchronous teardown\n",
-     QEMU_ARCH_ALL)
--#endif
- SRST
- ``-async-teardown``
--    Enable asynchronous teardown. A new process called "cleanup/<QEMU_PID>"
--    will be created at startup sharing the address space with the main qemu
--    process, using clone. It will wait for the main qemu process to
--    terminate completely, and then exit.
--    This allows qemu to terminate very quickly even if the guest was
--    huge, leaving the teardown of the address space to the cleanup
--    process. Since the cleanup process shares the same cgroups as the
--    main qemu process, accounting is performed correctly. This only
--    works if the cleanup process is not forcefully killed with SIGKILL
--    before the main qemu process has terminated completely.
-+    This option is deprecated and should no longer be used. The new option
-+    ``-run-with async-teardown=on`` is a replacement.
- ERST
-+DEF("run-with", HAS_ARG, QEMU_OPTION_run_with,
-+    "-run-with async-teardown[=on|off]\n"
-+    "                misc QEMU process lifecycle options\n"
-+    "                async-teardown=on enables asynchronous teardown\n",
-+    QEMU_ARCH_ALL)
-+SRST
-+``-run-with``
-+    Set QEMU process lifecycle options.
-+
-+    ``async-teardown=on`` enables asynchronous teardown. A new process called
-+    "cleanup/<QEMU_PID>" will be created at startup sharing the address
-+    space with the main QEMU process, using clone. It will wait for the
-+    main QEMU process to terminate completely, and then exit. This allows
-+    QEMU to terminate very quickly even if the guest was huge, leaving the
-+    teardown of the address space to the cleanup process. Since the cleanup
-+    process shares the same cgroups as the main QEMU process, accounting is
-+    performed correctly. This only works if the cleanup process is not
-+    forcefully killed with SIGKILL before the main QEMU process has
-+    terminated completely.
-+ERST
-+#endif
- 
- DEF("msg", HAS_ARG, QEMU_OPTION_msg,
-     "-msg [timestamp[=on|off]][,guest-name=[on|off]]\n"
-diff --git a/util/async-teardown.c b/util/async-teardown.c
-index 62cdeb0f20..3ab19c8740 100644
---- a/util/async-teardown.c
-+++ b/util/async-teardown.c
-@@ -12,6 +12,9 @@
-  */
- 
- #include "qemu/osdep.h"
-+#include "qemu/config-file.h"
-+#include "qemu/option.h"
-+#include "qemu/module.h"
- #include <dirent.h>
- #include <sys/prctl.h>
- #include <sched.h>
-@@ -144,3 +147,21 @@ void init_async_teardown(void)
-     clone(async_teardown_fn, new_stack_for_clone(), CLONE_VM, NULL);
-     sigprocmask(SIG_SETMASK, &old_signals, NULL);
- }
-+
-+static QemuOptsList qemu_run_with_opts = {
-+    .name = "run-with",
-+    .head = QTAILQ_HEAD_INITIALIZER(qemu_run_with_opts.head),
-+    .desc = {
-+        {
-+            .name = "async-teardown",
-+            .type = QEMU_OPT_BOOL,
-+        },
-+        { /* end of list */ }
-+    },
-+};
-+
-+static void register_teardown(void)
-+{
-+    qemu_add_opts(&qemu_run_with_opts);
-+}
-+opts_init(register_teardown);
--- 
-2.39.3
-
diff --git a/kvm-util-iov-Make-qiov_slice-public.patch b/kvm-util-iov-Make-qiov_slice-public.patch
deleted file mode 100644
index fe68d18..0000000
--- a/kvm-util-iov-Make-qiov_slice-public.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 64652225695c23855cfb1252cea2b55c24da2260 Mon Sep 17 00:00:00 2001
-From: Hanna Czenczek <hreitz@redhat.com>
-Date: Tue, 11 Apr 2023 19:34:15 +0200
-Subject: [PATCH 1/9] util/iov: Make qiov_slice() public
-
-RH-Author: Hanna Czenczek <hreitz@redhat.com>
-RH-MergeRequest: 189: block: Split padded I/O vectors exceeding IOV_MAX
-RH-Bugzilla: 2174676
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [1/5] 9c3cd661f7139ce124ee4f4d5fcbeaf3dbb9c45c (hreitz/qemu-kvm-c-9-s)
-
-We want to inline qemu_iovec_init_extended() in block/io.c for padding
-requests, and having access to qiov_slice() is useful for this.  As a
-public function, it is renamed to qemu_iovec_slice().
-
-(We will need to count the number of I/O vector elements of a slice
-there, and then later process this slice.  Without qiov_slice(), we
-would need to call qemu_iovec_subvec_niov(), and all further
-IOV-processing functions may need to skip prefixing elements to
-accomodate for a qiov_offset.  Because qemu_iovec_subvec_niov()
-internally calls qiov_slice(), we can just have the block/io.c code call
-qiov_slice() itself, thus get the number of elements, and also create an
-iovec array with the superfluous prefixing elements stripped, so the
-following processing functions no longer need to skip them.)
-
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
-Message-Id: <20230411173418.19549-2-hreitz@redhat.com>
-(cherry picked from commit 3d06cea8256d54a6b0238934c31012f7f17100f5)
-Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
----
- include/qemu/iov.h |  3 +++
- util/iov.c         | 14 +++++++-------
- 2 files changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/include/qemu/iov.h b/include/qemu/iov.h
-index 9330746680..46fadfb27a 100644
---- a/include/qemu/iov.h
-+++ b/include/qemu/iov.h
-@@ -229,6 +229,9 @@ int qemu_iovec_init_extended(
-         void *tail_buf, size_t tail_len);
- void qemu_iovec_init_slice(QEMUIOVector *qiov, QEMUIOVector *source,
-                            size_t offset, size_t len);
-+struct iovec *qemu_iovec_slice(QEMUIOVector *qiov,
-+                               size_t offset, size_t len,
-+                               size_t *head, size_t *tail, int *niov);
- int qemu_iovec_subvec_niov(QEMUIOVector *qiov, size_t offset, size_t len);
- void qemu_iovec_add(QEMUIOVector *qiov, void *base, size_t len);
- void qemu_iovec_concat(QEMUIOVector *dst,
-diff --git a/util/iov.c b/util/iov.c
-index b4be580022..65a70449da 100644
---- a/util/iov.c
-+++ b/util/iov.c
-@@ -378,15 +378,15 @@ static struct iovec *iov_skip_offset(struct iovec *iov, size_t offset,
- }
- 
- /*
-- * qiov_slice
-+ * qemu_iovec_slice
-  *
-  * Find subarray of iovec's, containing requested range. @head would
-  * be offset in first iov (returned by the function), @tail would be
-  * count of extra bytes in last iovec (returned iov + @niov - 1).
-  */
--static struct iovec *qiov_slice(QEMUIOVector *qiov,
--                                size_t offset, size_t len,
--                                size_t *head, size_t *tail, int *niov)
-+struct iovec *qemu_iovec_slice(QEMUIOVector *qiov,
-+                               size_t offset, size_t len,
-+                               size_t *head, size_t *tail, int *niov)
- {
-     struct iovec *iov, *end_iov;
- 
-@@ -411,7 +411,7 @@ int qemu_iovec_subvec_niov(QEMUIOVector *qiov, size_t offset, size_t len)
-     size_t head, tail;
-     int niov;
- 
--    qiov_slice(qiov, offset, len, &head, &tail, &niov);
-+    qemu_iovec_slice(qiov, offset, len, &head, &tail, &niov);
- 
-     return niov;
- }
-@@ -439,8 +439,8 @@ int qemu_iovec_init_extended(
-     }
- 
-     if (mid_len) {
--        mid_iov = qiov_slice(mid_qiov, mid_offset, mid_len,
--                             &mid_head, &mid_tail, &mid_niov);
-+        mid_iov = qemu_iovec_slice(mid_qiov, mid_offset, mid_len,
-+                                   &mid_head, &mid_tail, &mid_niov);
-     }
- 
-     total_niov = !!head_len + mid_niov + !!tail_len;
--- 
-2.39.3
-
diff --git a/kvm-util-iov-Remove-qemu_iovec_init_extended.patch b/kvm-util-iov-Remove-qemu_iovec_init_extended.patch
deleted file mode 100644
index fd21880..0000000
--- a/kvm-util-iov-Remove-qemu_iovec_init_extended.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-From 8ff973985a04fec1a3cdf886976a03e0dca7b0ea Mon Sep 17 00:00:00 2001
-From: Hanna Czenczek <hreitz@redhat.com>
-Date: Tue, 11 Apr 2023 19:34:17 +0200
-Subject: [PATCH 3/9] util/iov: Remove qemu_iovec_init_extended()
-
-RH-Author: Hanna Czenczek <hreitz@redhat.com>
-RH-MergeRequest: 189: block: Split padded I/O vectors exceeding IOV_MAX
-RH-Bugzilla: 2174676
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [3/5] 1740d7b15ea4fbfbe71e7adc122741e85e83fb8c (hreitz/qemu-kvm-c-9-s)
-
-bdrv_pad_request() was the main user of qemu_iovec_init_extended().
-HEAD^ has removed that use, so we can remove qemu_iovec_init_extended()
-now.
-
-The only remaining user is qemu_iovec_init_slice(), which can easily
-inline the small part it really needs.
-
-Note that qemu_iovec_init_extended() offered a memcpy() optimization to
-initialize the new I/O vector.  qemu_iovec_concat_iov(), which is used
-to replace its functionality, does not, but calls qemu_iovec_add() for
-every single element.  If we decide this optimization was important, we
-will need to re-implement it in qemu_iovec_concat_iov(), which might
-also benefit its pre-existing users.
-
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
-Message-Id: <20230411173418.19549-4-hreitz@redhat.com>
-(cherry picked from commit cc63f6f6fa1aaa4b6405dd69432c693e9c8d18ca)
-Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
----
- include/qemu/iov.h |  5 ---
- util/iov.c         | 79 +++++++---------------------------------------
- 2 files changed, 11 insertions(+), 73 deletions(-)
-
-diff --git a/include/qemu/iov.h b/include/qemu/iov.h
-index 46fadfb27a..63a1c01965 100644
---- a/include/qemu/iov.h
-+++ b/include/qemu/iov.h
-@@ -222,11 +222,6 @@ static inline void *qemu_iovec_buf(QEMUIOVector *qiov)
- 
- void qemu_iovec_init(QEMUIOVector *qiov, int alloc_hint);
- void qemu_iovec_init_external(QEMUIOVector *qiov, struct iovec *iov, int niov);
--int qemu_iovec_init_extended(
--        QEMUIOVector *qiov,
--        void *head_buf, size_t head_len,
--        QEMUIOVector *mid_qiov, size_t mid_offset, size_t mid_len,
--        void *tail_buf, size_t tail_len);
- void qemu_iovec_init_slice(QEMUIOVector *qiov, QEMUIOVector *source,
-                            size_t offset, size_t len);
- struct iovec *qemu_iovec_slice(QEMUIOVector *qiov,
-diff --git a/util/iov.c b/util/iov.c
-index 65a70449da..866fb577f3 100644
---- a/util/iov.c
-+++ b/util/iov.c
-@@ -416,70 +416,6 @@ int qemu_iovec_subvec_niov(QEMUIOVector *qiov, size_t offset, size_t len)
-     return niov;
- }
- 
--/*
-- * Compile new iovec, combining @head_buf buffer, sub-qiov of @mid_qiov,
-- * and @tail_buf buffer into new qiov.
-- */
--int qemu_iovec_init_extended(
--        QEMUIOVector *qiov,
--        void *head_buf, size_t head_len,
--        QEMUIOVector *mid_qiov, size_t mid_offset, size_t mid_len,
--        void *tail_buf, size_t tail_len)
--{
--    size_t mid_head, mid_tail;
--    int total_niov, mid_niov = 0;
--    struct iovec *p, *mid_iov = NULL;
--
--    assert(mid_qiov->niov <= IOV_MAX);
--
--    if (SIZE_MAX - head_len < mid_len ||
--        SIZE_MAX - head_len - mid_len < tail_len)
--    {
--        return -EINVAL;
--    }
--
--    if (mid_len) {
--        mid_iov = qemu_iovec_slice(mid_qiov, mid_offset, mid_len,
--                                   &mid_head, &mid_tail, &mid_niov);
--    }
--
--    total_niov = !!head_len + mid_niov + !!tail_len;
--    if (total_niov > IOV_MAX) {
--        return -EINVAL;
--    }
--
--    if (total_niov == 1) {
--        qemu_iovec_init_buf(qiov, NULL, 0);
--        p = &qiov->local_iov;
--    } else {
--        qiov->niov = qiov->nalloc = total_niov;
--        qiov->size = head_len + mid_len + tail_len;
--        p = qiov->iov = g_new(struct iovec, qiov->niov);
--    }
--
--    if (head_len) {
--        p->iov_base = head_buf;
--        p->iov_len = head_len;
--        p++;
--    }
--
--    assert(!mid_niov == !mid_len);
--    if (mid_niov) {
--        memcpy(p, mid_iov, mid_niov * sizeof(*p));
--        p[0].iov_base = (uint8_t *)p[0].iov_base + mid_head;
--        p[0].iov_len -= mid_head;
--        p[mid_niov - 1].iov_len -= mid_tail;
--        p += mid_niov;
--    }
--
--    if (tail_len) {
--        p->iov_base = tail_buf;
--        p->iov_len = tail_len;
--    }
--
--    return 0;
--}
--
- /*
-  * Check if the contents of subrange of qiov data is all zeroes.
-  */
-@@ -511,14 +447,21 @@ bool qemu_iovec_is_zero(QEMUIOVector *qiov, size_t offset, size_t bytes)
- void qemu_iovec_init_slice(QEMUIOVector *qiov, QEMUIOVector *source,
-                            size_t offset, size_t len)
- {
--    int ret;
-+    struct iovec *slice_iov;
-+    int slice_niov;
-+    size_t slice_head, slice_tail;
- 
-     assert(source->size >= len);
-     assert(source->size - len >= offset);
- 
--    /* We shrink the request, so we can't overflow neither size_t nor MAX_IOV */
--    ret = qemu_iovec_init_extended(qiov, NULL, 0, source, offset, len, NULL, 0);
--    assert(ret == 0);
-+    slice_iov = qemu_iovec_slice(source, offset, len,
-+                                 &slice_head, &slice_tail, &slice_niov);
-+    if (slice_niov == 1) {
-+        qemu_iovec_init_buf(qiov, slice_iov[0].iov_base + slice_head, len);
-+    } else {
-+        qemu_iovec_init(qiov, slice_niov);
-+        qemu_iovec_concat_iov(qiov, slice_iov, slice_niov, slice_head, len);
-+    }
- }
- 
- void qemu_iovec_destroy(QEMUIOVector *qiov)
--- 
-2.39.3
-
diff --git a/kvm-util-mmap-alloc-qemu_fd_getfs.patch b/kvm-util-mmap-alloc-qemu_fd_getfs.patch
deleted file mode 100644
index b0e66f6..0000000
--- a/kvm-util-mmap-alloc-qemu_fd_getfs.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 439a8cdd010dfd253fc2277ae4ec605b5ba621d9 Mon Sep 17 00:00:00 2001
-From: Peter Xu <peterx@redhat.com>
-Date: Wed, 19 Apr 2023 12:17:36 -0400
-Subject: [PATCH 02/56] util/mmap-alloc: qemu_fd_getfs()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [1/50] 8970b5ae611a933d693e0c90cbf4eda073635494 (peterx/qemu-kvm)
-
-This new helper fetches file system type for a fd.  Only Linux is
-implemented so far.  Currently only tmpfs and hugetlbfs are defined,
-but it can grow as needed.
-
-Signed-off-by: Peter Xu <peterx@redhat.com>
-Reviewed-by: David Hildenbrand <david@redhat.com>
-Reviewed-by: Juan Quintela <quintela@redhat.com>
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-(cherry picked from commit fa45f8dab9613993c042176ea2d25552bfebc955)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- include/qemu/mmap-alloc.h |  7 +++++++
- util/mmap-alloc.c         | 28 ++++++++++++++++++++++++++++
- 2 files changed, 35 insertions(+)
-
-diff --git a/include/qemu/mmap-alloc.h b/include/qemu/mmap-alloc.h
-index 2825e231a7..8344daaa03 100644
---- a/include/qemu/mmap-alloc.h
-+++ b/include/qemu/mmap-alloc.h
-@@ -1,8 +1,15 @@
- #ifndef QEMU_MMAP_ALLOC_H
- #define QEMU_MMAP_ALLOC_H
- 
-+typedef enum {
-+    QEMU_FS_TYPE_UNKNOWN = 0,
-+    QEMU_FS_TYPE_TMPFS,
-+    QEMU_FS_TYPE_HUGETLBFS,
-+    QEMU_FS_TYPE_NUM,
-+} QemuFsType;
- 
- size_t qemu_fd_getpagesize(int fd);
-+QemuFsType qemu_fd_getfs(int fd);
- 
- /**
-  * qemu_ram_mmap: mmap anonymous memory, the specified file or device.
-diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c
-index 5ed7d29183..ed14f9c64d 100644
---- a/util/mmap-alloc.c
-+++ b/util/mmap-alloc.c
-@@ -27,8 +27,36 @@
- 
- #ifdef CONFIG_LINUX
- #include <sys/vfs.h>
-+#include <linux/magic.h>
- #endif
- 
-+QemuFsType qemu_fd_getfs(int fd)
-+{
-+#ifdef CONFIG_LINUX
-+    struct statfs fs;
-+    int ret;
-+
-+    if (fd < 0) {
-+        return QEMU_FS_TYPE_UNKNOWN;
-+    }
-+
-+    do {
-+        ret = fstatfs(fd, &fs);
-+    } while (ret != 0 && errno == EINTR);
-+
-+    switch (fs.f_type) {
-+    case TMPFS_MAGIC:
-+        return QEMU_FS_TYPE_TMPFS;
-+    case HUGETLBFS_MAGIC:
-+        return QEMU_FS_TYPE_HUGETLBFS;
-+    default:
-+        return QEMU_FS_TYPE_UNKNOWN;
-+    }
-+#else
-+    return QEMU_FS_TYPE_UNKNOWN;
-+#endif
-+}
-+
- size_t qemu_fd_getpagesize(int fd)
- {
- #ifdef CONFIG_LINUX
--- 
-2.39.1
-
diff --git a/kvm-util-vfio-helpers-Use-g_file_read_link.patch b/kvm-util-vfio-helpers-Use-g_file_read_link.patch
deleted file mode 100644
index 4e492d9..0000000
--- a/kvm-util-vfio-helpers-Use-g_file_read_link.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From fb2d40cc84f689e46138a81c57ccd1f234dbbb7c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:57 +0200
-Subject: [PATCH 07/37] util/vfio-helpers: Use g_file_read_link()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [5/28] 3545a07c967782dba8dd081415232f91d3f600a9 (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit dbdea0dbfe2c
-Author: Akihiko Odaki <akihiko.odaki@daynix.com>
-Date:   Tue May 23 11:39:12 2023 +0900
-
-    util/vfio-helpers: Use g_file_read_link()
-
-    When _FORTIFY_SOURCE=2, glibc version is 2.35, and GCC version is
-    12.1.0, the compiler complains as follows:
-
-    In file included from /usr/include/features.h:490,
-                     from /usr/include/bits/libc-header-start.h:33,
-                     from /usr/include/stdint.h:26,
-                     from /usr/lib/gcc/aarch64-unknown-linux-gnu/12.1.0/include/stdint.h:9,
-                     from /home/alarm/q/var/qemu/include/qemu/osdep.h:94,
-                     from ../util/vfio-helpers.c:13:
-    In function 'readlink',
-        inlined from 'sysfs_find_group_file' at ../util/vfio-helpers.c:116:9,
-        inlined from 'qemu_vfio_init_pci' at ../util/vfio-helpers.c:326:18,
-        inlined from 'qemu_vfio_open_pci' at ../util/vfio-helpers.c:517:9:
-    /usr/include/bits/unistd.h:119:10: error: argument 2 is null but the corresponding size argument 3 value is 4095 [-Werror=nonnull]
-      119 |   return __glibc_fortify (readlink, __len, sizeof (char),
-          |          ^~~~~~~~~~~~~~~
-
-    This error implies the allocated buffer can be NULL. Use
-    g_file_read_link(), which allocates buffer automatically to avoid the
-    error.
-
-    Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
-    Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-    Reviewed-by: Cédric Le Goater <clg@redhat.com>
-    Signed-off-by: Cédric Le Goater <clg@redhat.com>
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- util/vfio-helpers.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c
-index 2d8af38f88..f8bab46c68 100644
---- a/util/vfio-helpers.c
-+++ b/util/vfio-helpers.c
-@@ -106,15 +106,17 @@ struct QEMUVFIOState {
-  */
- static char *sysfs_find_group_file(const char *device, Error **errp)
- {
-+    g_autoptr(GError) gerr = NULL;
-     char *sysfs_link;
-     char *sysfs_group;
-     char *p;
-     char *path = NULL;
- 
-     sysfs_link = g_strdup_printf("/sys/bus/pci/devices/%s/iommu_group", device);
--    sysfs_group = g_malloc0(PATH_MAX);
--    if (readlink(sysfs_link, sysfs_group, PATH_MAX - 1) == -1) {
--        error_setg_errno(errp, errno, "Failed to find iommu group sysfs path");
-+    sysfs_group = g_file_read_link(sysfs_link, &gerr);
-+    if (gerr) {
-+        error_setg(errp, "Failed to find iommu group sysfs path: %s",
-+                   gerr->message);
-         goto out;
-     }
-     p = strrchr(sysfs_group, '/');
--- 
-2.39.3
-
diff --git a/kvm-vdpa-do-not-block-migration-if-device-has-cvq-and-x-.patch b/kvm-vdpa-do-not-block-migration-if-device-has-cvq-and-x-.patch
deleted file mode 100644
index 56b9aed..0000000
--- a/kvm-vdpa-do-not-block-migration-if-device-has-cvq-and-x-.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 74c2f378bdf278a03c02ae48948b00b4431a3fd6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma@redhat.com>
-Date: Fri, 2 Jun 2023 16:38:52 +0200
-Subject: [PATCH 6/9] vdpa: do not block migration if device has cvq and
- x-svq=on
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Eugenio Pérez <eperezma@redhat.com>
-RH-MergeRequest: 190: vdpa: do not block migration if device has cvq and x-svq=on
-RH-Jira: RHEL-573
-RH-Acked-by: Jason Wang <jasowang@redhat.com>
-RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
-RH-Commit: [1/1] b0e2ec3c9e5c17252cf6a043fe1374ddc3c37de7 (eperezmartin/qemu-kvm)
-
-It was a mistake to forbid in all cases, as SVQ is already able to send
-all the CVQ messages before start forwarding data vqs.  It actually
-caused a regression, making impossible to migrate device previously
-migratable.
-
-Fixes: 36e4647247f2 ("vdpa: add vhost_vdpa_net_valid_svq_features")
-Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
-Message-Id: <20230602143854.1879091-2-eperezma@redhat.com>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-Tested-by: Lei Yang <leiyang@redhat.com>
-(cherry picked from commit 8bc0049eadafb984d305c847cedff550b58e5fc0)
-Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
----
- net/vhost-vdpa.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
-index 8c8900f0f4..1ae839da34 100644
---- a/net/vhost-vdpa.c
-+++ b/net/vhost-vdpa.c
-@@ -844,13 +844,16 @@ static NetClientState *net_vhost_vdpa_init(NetClientState *peer,
-         s->vhost_vdpa.shadow_vq_ops_opaque = s;
- 
-         /*
--         * TODO: We cannot migrate devices with CVQ as there is no way to set
--         * the device state (MAC, MQ, etc) before starting the datapath.
-+         * TODO: We cannot migrate devices with CVQ and no x-svq enabled as
-+         * there is no way to set the device state (MAC, MQ, etc) before
-+         * starting the datapath.
-          *
-          * Migration blocker ownership now belongs to s->vhost_vdpa.
-          */
--        error_setg(&s->vhost_vdpa.migration_blocker,
--                   "net vdpa cannot migrate with CVQ feature");
-+        if (!svq) {
-+            error_setg(&s->vhost_vdpa.migration_blocker,
-+                       "net vdpa cannot migrate with CVQ feature");
-+        }
-     }
-     ret = vhost_vdpa_add(nc, (void *)&s->vhost_vdpa, queue_pair_index, nvqs);
-     if (ret) {
--- 
-2.39.3
-
diff --git a/kvm-vdpa-move-CVQ-isolation-check-to-net_init_vhost_vdpa.patch b/kvm-vdpa-move-CVQ-isolation-check-to-net_init_vhost_vdpa.patch
deleted file mode 100644
index a37612c..0000000
--- a/kvm-vdpa-move-CVQ-isolation-check-to-net_init_vhost_vdpa.patch
+++ /dev/null
@@ -1,286 +0,0 @@
-From 1609e47511c9a02b26e0023ff6e1e999d7cdf179 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma@redhat.com>
-Date: Fri, 26 May 2023 17:31:43 +0200
-Subject: [PATCH 2/7] vdpa: move CVQ isolation check to net_init_vhost_vdpa
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Eugenio Pérez <eperezma@redhat.com>
-RH-MergeRequest: 199: CVQ migration support
-RH-Jira: RHEL-923
-RH-Acked-by: Jason Wang <jasowang@redhat.com>
-RH-Acked-by: Cindy Lu <lulu@redhat.com>
-RH-Commit: [2/7] caed8f81c3e30e6147817e7f43225aa3ee90ff37 (eperezmartin/qemu-kvm)
-
-Evaluating it at start time instead of initialization time may make the
-guest capable of dynamically adding or removing migration blockers.
-
-Also, moving to initialization reduces the number of ioctls in the
-migration, reducing failure possibilities.
-
-As a drawback we need to check for CVQ isolation twice: one time with no
-MQ negotiated and another one acking it, as long as the device supports
-it.  This is because Vring ASID / group management is based on vq
-indexes, but we don't know the index of CVQ before negotiating MQ.
-
-Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
-Message-Id: <20230526153143.470745-3-eperezma@redhat.com>
-Tested-by: Lei Yang <leiyang@redhat.com>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-Acked-by: Jason Wang <jasowang@redhat.com>
----
- net/vhost-vdpa.c | 155 ++++++++++++++++++++++++++++++++++-------------
- 1 file changed, 112 insertions(+), 43 deletions(-)
-
-diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
-index 801d4e0422..ce17e4416a 100644
---- a/net/vhost-vdpa.c
-+++ b/net/vhost-vdpa.c
-@@ -43,6 +43,10 @@ typedef struct VhostVDPAState {
- 
-     /* The device always have SVQ enabled */
-     bool always_svq;
-+
-+    /* The device can isolate CVQ in its own ASID */
-+    bool cvq_isolated;
-+
-     bool started;
- } VhostVDPAState;
- 
-@@ -369,15 +373,8 @@ static NetClientInfo net_vhost_vdpa_info = {
-         .check_peer_type = vhost_vdpa_check_peer_type,
- };
- 
--/**
-- * Get vring virtqueue group
-- *
-- * @device_fd  vdpa device fd
-- * @vq_index   Virtqueue index
-- *
-- * Return -errno in case of error, or vq group if success.
-- */
--static int64_t vhost_vdpa_get_vring_group(int device_fd, unsigned vq_index)
-+static int64_t vhost_vdpa_get_vring_group(int device_fd, unsigned vq_index,
-+                                          Error **errp)
- {
-     struct vhost_vring_state state = {
-         .index = vq_index,
-@@ -386,8 +383,7 @@ static int64_t vhost_vdpa_get_vring_group(int device_fd, unsigned vq_index)
- 
-     if (unlikely(r < 0)) {
-         r = -errno;
--        error_report("Cannot get VQ %u group: %s", vq_index,
--                     g_strerror(errno));
-+        error_setg_errno(errp, errno, "Cannot get VQ %u group", vq_index);
-         return r;
-     }
- 
-@@ -487,9 +483,9 @@ static int vhost_vdpa_net_cvq_start(NetClientState *nc)
- {
-     VhostVDPAState *s, *s0;
-     struct vhost_vdpa *v;
--    uint64_t backend_features;
-     int64_t cvq_group;
--    int cvq_index, r;
-+    int r;
-+    Error *err = NULL;
- 
-     assert(nc->info->type == NET_CLIENT_DRIVER_VHOST_VDPA);
- 
-@@ -509,41 +505,22 @@ static int vhost_vdpa_net_cvq_start(NetClientState *nc)
-     /*
-      * If we early return in these cases SVQ will not be enabled. The migration
-      * will be blocked as long as vhost-vdpa backends will not offer _F_LOG.
--     *
--     * Calling VHOST_GET_BACKEND_FEATURES as they are not available in v->dev
--     * yet.
-      */
--    r = ioctl(v->device_fd, VHOST_GET_BACKEND_FEATURES, &backend_features);
--    if (unlikely(r < 0)) {
--        error_report("Cannot get vdpa backend_features: %s(%d)",
--            g_strerror(errno), errno);
--        return -1;
-+    if (!vhost_vdpa_net_valid_svq_features(v->dev->features, NULL)) {
-+        return 0;
-     }
--    if (!(backend_features & BIT_ULL(VHOST_BACKEND_F_IOTLB_ASID)) ||
--        !vhost_vdpa_net_valid_svq_features(v->dev->features, NULL)) {
-+
-+    if (!s->cvq_isolated) {
-         return 0;
-     }
- 
--    /*
--     * Check if all the virtqueues of the virtio device are in a different vq
--     * than the last vq. VQ group of last group passed in cvq_group.
--     */
--    cvq_index = v->dev->vq_index_end - 1;
--    cvq_group = vhost_vdpa_get_vring_group(v->device_fd, cvq_index);
-+    cvq_group = vhost_vdpa_get_vring_group(v->device_fd,
-+                                           v->dev->vq_index_end - 1,
-+                                           &err);
-     if (unlikely(cvq_group < 0)) {
-+        error_report_err(err);
-         return cvq_group;
-     }
--    for (int i = 0; i < cvq_index; ++i) {
--        int64_t group = vhost_vdpa_get_vring_group(v->device_fd, i);
--
--        if (unlikely(group < 0)) {
--            return group;
--        }
--
--        if (group == cvq_group) {
--            return 0;
--        }
--    }
- 
-     r = vhost_vdpa_set_address_space_id(v, cvq_group, VHOST_VDPA_NET_CVQ_ASID);
-     if (unlikely(r < 0)) {
-@@ -806,6 +783,87 @@ static const VhostShadowVirtqueueOps vhost_vdpa_net_svq_ops = {
-     .avail_handler = vhost_vdpa_net_handle_ctrl_avail,
- };
- 
-+/**
-+ * Probe if CVQ is isolated
-+ *
-+ * @device_fd         The vdpa device fd
-+ * @features          Features offered by the device.
-+ * @cvq_index         The control vq pair index
-+ *
-+ * Returns <0 in case of failure, 0 if false and 1 if true.
-+ */
-+static int vhost_vdpa_probe_cvq_isolation(int device_fd, uint64_t features,
-+                                          int cvq_index, Error **errp)
-+{
-+    uint64_t backend_features;
-+    int64_t cvq_group;
-+    uint8_t status = VIRTIO_CONFIG_S_ACKNOWLEDGE |
-+                     VIRTIO_CONFIG_S_DRIVER |
-+                     VIRTIO_CONFIG_S_FEATURES_OK;
-+    int r;
-+
-+    ERRP_GUARD();
-+
-+    r = ioctl(device_fd, VHOST_GET_BACKEND_FEATURES, &backend_features);
-+    if (unlikely(r < 0)) {
-+        error_setg_errno(errp, errno, "Cannot get vdpa backend_features");
-+        return r;
-+    }
-+
-+    if (!(backend_features & BIT_ULL(VHOST_BACKEND_F_IOTLB_ASID))) {
-+        return 0;
-+    }
-+
-+    r = ioctl(device_fd, VHOST_SET_FEATURES, &features);
-+    if (unlikely(r)) {
-+        error_setg_errno(errp, errno, "Cannot set features");
-+    }
-+
-+    r = ioctl(device_fd, VHOST_VDPA_SET_STATUS, &status);
-+    if (unlikely(r)) {
-+        error_setg_errno(errp, -r, "Cannot set device features");
-+        goto out;
-+    }
-+
-+    cvq_group = vhost_vdpa_get_vring_group(device_fd, cvq_index, errp);
-+    if (unlikely(cvq_group < 0)) {
-+        if (cvq_group != -ENOTSUP) {
-+            r = cvq_group;
-+            goto out;
-+        }
-+
-+        /*
-+         * The kernel report VHOST_BACKEND_F_IOTLB_ASID if the vdpa frontend
-+         * support ASID even if the parent driver does not.  The CVQ cannot be
-+         * isolated in this case.
-+         */
-+        error_free(*errp);
-+        *errp = NULL;
-+        r = 0;
-+        goto out;
-+    }
-+
-+    for (int i = 0; i < cvq_index; ++i) {
-+        int64_t group = vhost_vdpa_get_vring_group(device_fd, i, errp);
-+        if (unlikely(group < 0)) {
-+            r = group;
-+            goto out;
-+        }
-+
-+        if (group == (int64_t)cvq_group) {
-+            r = 0;
-+            goto out;
-+        }
-+    }
-+
-+    r = 1;
-+
-+out:
-+    status = 0;
-+    ioctl(device_fd, VHOST_VDPA_SET_STATUS, &status);
-+    return r;
-+}
-+
- static NetClientState *net_vhost_vdpa_init(NetClientState *peer,
-                                        const char *device,
-                                        const char *name,
-@@ -815,16 +873,26 @@ static NetClientState *net_vhost_vdpa_init(NetClientState *peer,
-                                        bool is_datapath,
-                                        bool svq,
-                                        struct vhost_vdpa_iova_range iova_range,
--                                       uint64_t features)
-+                                       uint64_t features,
-+                                       Error **errp)
- {
-     NetClientState *nc = NULL;
-     VhostVDPAState *s;
-     int ret = 0;
-     assert(name);
-+    int cvq_isolated;
-+
-     if (is_datapath) {
-         nc = qemu_new_net_client(&net_vhost_vdpa_info, peer, device,
-                                  name);
-     } else {
-+        cvq_isolated = vhost_vdpa_probe_cvq_isolation(vdpa_device_fd, features,
-+                                                      queue_pair_index * 2,
-+                                                      errp);
-+        if (unlikely(cvq_isolated < 0)) {
-+            return NULL;
-+        }
-+
-         nc = qemu_new_net_control_client(&net_vhost_vdpa_cvq_info, peer,
-                                          device, name);
-     }
-@@ -851,6 +919,7 @@ static NetClientState *net_vhost_vdpa_init(NetClientState *peer,
- 
-         s->vhost_vdpa.shadow_vq_ops = &vhost_vdpa_net_svq_ops;
-         s->vhost_vdpa.shadow_vq_ops_opaque = s;
-+        s->cvq_isolated = cvq_isolated;
- 
-         /*
-          * TODO: We cannot migrate devices with CVQ and no x-svq enabled as
-@@ -982,7 +1051,7 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name,
-     for (i = 0; i < queue_pairs; i++) {
-         ncs[i] = net_vhost_vdpa_init(peer, TYPE_VHOST_VDPA, name,
-                                      vdpa_device_fd, i, 2, true, opts->x_svq,
--                                     iova_range, features);
-+                                     iova_range, features, errp);
-         if (!ncs[i])
-             goto err;
-     }
-@@ -990,7 +1059,7 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name,
-     if (has_cvq) {
-         nc = net_vhost_vdpa_init(peer, TYPE_VHOST_VDPA, name,
-                                  vdpa_device_fd, i, 1, false,
--                                 opts->x_svq, iova_range, features);
-+                                 opts->x_svq, iova_range, features, errp);
-         if (!nc)
-             goto err;
-     }
--- 
-2.39.3
-
diff --git a/kvm-vdpa-return-errno-in-vhost_vdpa_get_vring_group-erro.patch b/kvm-vdpa-return-errno-in-vhost_vdpa_get_vring_group-erro.patch
deleted file mode 100644
index c8b4913..0000000
--- a/kvm-vdpa-return-errno-in-vhost_vdpa_get_vring_group-erro.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 09583f39d51d16079c9fda32545d7a44b6f5c8c6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= <eperezma@redhat.com>
-Date: Fri, 26 May 2023 17:31:42 +0200
-Subject: [PATCH 1/7] vdpa: return errno in vhost_vdpa_get_vring_group error
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Eugenio Pérez <eperezma@redhat.com>
-RH-MergeRequest: 199: CVQ migration support
-RH-Jira: RHEL-923
-RH-Acked-by: Jason Wang <jasowang@redhat.com>
-RH-Acked-by: Cindy Lu <lulu@redhat.com>
-RH-Commit: [1/7] 89745b1828a1af535c40657022d385250688d11d (eperezmartin/qemu-kvm)
-
-We need to tell in the caller, as some errors are expected in a normal
-workflow.  In particular, parent drivers in recent kernels with
-VHOST_BACKEND_F_IOTLB_ASID may not support vring groups.  In that case,
--ENOTSUP is returned.
-
-This is the case of vp_vdpa in Linux 6.2.
-
-Next patches in this series will use that information to know if it must
-abort or not.  Also, next patches return properly an errp instead of
-printing with error_report.
-
-Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
-Acked-by: Jason Wang <jasowang@redhat.com>
-Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
-Message-Id: <20230526153143.470745-2-eperezma@redhat.com>
-Tested-by: Lei Yang <leiyang@redhat.com>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
----
- net/vhost-vdpa.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
-index 1ae839da34..801d4e0422 100644
---- a/net/vhost-vdpa.c
-+++ b/net/vhost-vdpa.c
-@@ -369,6 +369,14 @@ static NetClientInfo net_vhost_vdpa_info = {
-         .check_peer_type = vhost_vdpa_check_peer_type,
- };
- 
-+/**
-+ * Get vring virtqueue group
-+ *
-+ * @device_fd  vdpa device fd
-+ * @vq_index   Virtqueue index
-+ *
-+ * Return -errno in case of error, or vq group if success.
-+ */
- static int64_t vhost_vdpa_get_vring_group(int device_fd, unsigned vq_index)
- {
-     struct vhost_vring_state state = {
-@@ -377,6 +385,7 @@ static int64_t vhost_vdpa_get_vring_group(int device_fd, unsigned vq_index)
-     int r = ioctl(device_fd, VHOST_VDPA_GET_VRING_GROUP, &state);
- 
-     if (unlikely(r < 0)) {
-+        r = -errno;
-         error_report("Cannot get VQ %u group: %s", vq_index,
-                      g_strerror(errno));
-         return r;
--- 
-2.39.3
-
diff --git a/kvm-vfio-Fix-null-pointer-dereference-bug-in-vfio_bars_f.patch b/kvm-vfio-Fix-null-pointer-dereference-bug-in-vfio_bars_f.patch
deleted file mode 100644
index 1e00427..0000000
--- a/kvm-vfio-Fix-null-pointer-dereference-bug-in-vfio_bars_f.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 97124d4f2afbc8e65a3ecf76096e6b34a9b71541 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:57 +0200
-Subject: [PATCH 30/37] vfio: Fix null pointer dereference bug in
- vfio_bars_finalize()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [28/28] 4bbdf7f9c5595897244c6cc3d88d487dd5f99bf0 (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit 8af87a3ec7e4
-Author: Avihai Horon <avihaih@nvidia.com>
-Date:   Tue Jul 4 16:39:27 2023 +0300
-
-    vfio: Fix null pointer dereference bug in vfio_bars_finalize()
-
-    vfio_realize() has the following flow:
-    1. vfio_bars_prepare() -- sets VFIOBAR->size.
-    2. msix_early_setup().
-    3. vfio_bars_register() -- allocates VFIOBAR->mr.
-
-    After vfio_bars_prepare() is called msix_early_setup() can fail. If it
-    does fail, vfio_bars_register() is never called and VFIOBAR->mr is not
-    allocated.
-
-    In this case, vfio_bars_finalize() is called as part of the error flow
-    to free the bars' resources. However, vfio_bars_finalize() calls
-    object_unparent() for VFIOBAR->mr after checking only VFIOBAR->size, and
-    thus we get a null pointer dereference.
-
-    Fix it by checking VFIOBAR->mr in vfio_bars_finalize().
-
-    Fixes: 89d5202edc50 ("vfio/pci: Allow relocating MSI-X MMIO")
-    Signed-off-by: Avihai Horon <avihaih@nvidia.com>
-    Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-    Reviewed-by: Cédric Le Goater <clg@redhat.com>
-    Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
-    Signed-off-by: Cédric Le Goater <clg@redhat.com>
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- hw/vfio/pci.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
-index ba40ca8784..9189459a38 100644
---- a/hw/vfio/pci.c
-+++ b/hw/vfio/pci.c
-@@ -1755,9 +1755,11 @@ static void vfio_bars_finalize(VFIOPCIDevice *vdev)
- 
-         vfio_bar_quirk_finalize(vdev, i);
-         vfio_region_finalize(&bar->region);
--        if (bar->size) {
-+        if (bar->mr) {
-+            assert(bar->size);
-             object_unparent(OBJECT(bar->mr));
-             g_free(bar->mr);
-+            bar->mr = NULL;
-         }
-     }
- 
--- 
-2.39.3
-
diff --git a/kvm-vfio-Implement-a-common-device-info-helper.patch b/kvm-vfio-Implement-a-common-device-info-helper.patch
deleted file mode 100644
index 78a554d..0000000
--- a/kvm-vfio-Implement-a-common-device-info-helper.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From f68e8c5d841cd7fc785cc3d15b3c280211bfb4c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:57 +0200
-Subject: [PATCH 17/37] vfio: Implement a common device info helper
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [15/28] 9cfd233ab1b95dc7de776e8ef901823bd37c5a6b (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit 634f38f0f73f
-Author: Alex Williamson <alex.williamson@redhat.com>
-Date:   Thu Jun 1 08:45:06 2023 -0600
-
-    vfio: Implement a common device info helper
-
-    A common helper implementing the realloc algorithm for handling
-    capabilities.
-
-    Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-    Reviewed-by: Cédric Le Goater <clg@redhat.com>
-    Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
-    Reviewed-by: Robin Voetter <robin@streamhpc.com>
-    Signed-off-by: Cédric Le Goater <clg@redhat.com>
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- hw/s390x/s390-pci-vfio.c      | 37 ++++------------------------
- hw/vfio/common.c              | 46 ++++++++++++++++++++++++++---------
- include/hw/vfio/vfio-common.h |  1 +
- 3 files changed, 41 insertions(+), 43 deletions(-)
-
-diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c
-index f51190d466..59a2e03873 100644
---- a/hw/s390x/s390-pci-vfio.c
-+++ b/hw/s390x/s390-pci-vfio.c
-@@ -289,38 +289,11 @@ static void s390_pci_read_pfip(S390PCIBusDevice *pbdev,
-     memcpy(pbdev->zpci_fn.pfip, cap->pfip, CLP_PFIP_NR_SEGMENTS);
- }
- 
--static struct vfio_device_info *get_device_info(S390PCIBusDevice *pbdev,
--                                                uint32_t argsz)
-+static struct vfio_device_info *get_device_info(S390PCIBusDevice *pbdev)
- {
--    struct vfio_device_info *info = g_malloc0(argsz);
--    VFIOPCIDevice *vfio_pci;
--    int fd;
-+    VFIOPCIDevice *vfio_pci = container_of(pbdev->pdev, VFIOPCIDevice, pdev);
- 
--    vfio_pci = container_of(pbdev->pdev, VFIOPCIDevice, pdev);
--    fd = vfio_pci->vbasedev.fd;
--
--    /*
--     * If the specified argsz is not large enough to contain all capabilities
--     * it will be updated upon return from the ioctl.  Retry until we have
--     * a big enough buffer to hold the entire capability chain.  On error,
--     * just exit and rely on CLP defaults.
--     */
--retry:
--    info->argsz = argsz;
--
--    if (ioctl(fd, VFIO_DEVICE_GET_INFO, info)) {
--        trace_s390_pci_clp_dev_info(vfio_pci->vbasedev.name);
--        g_free(info);
--        return NULL;
--    }
--
--    if (info->argsz > argsz) {
--        argsz = info->argsz;
--        info = g_realloc(info, argsz);
--        goto retry;
--    }
--
--    return info;
-+    return vfio_get_device_info(vfio_pci->vbasedev.fd);
- }
- 
- /*
-@@ -335,7 +308,7 @@ bool s390_pci_get_host_fh(S390PCIBusDevice *pbdev, uint32_t *fh)
- 
-     assert(fh);
- 
--    info = get_device_info(pbdev, sizeof(*info));
-+    info = get_device_info(pbdev);
-     if (!info) {
-         return false;
-     }
-@@ -356,7 +329,7 @@ void s390_pci_get_clp_info(S390PCIBusDevice *pbdev)
- {
-     g_autofree struct vfio_device_info *info = NULL;
- 
--    info = get_device_info(pbdev, sizeof(*info));
-+    info = get_device_info(pbdev);
-     if (!info) {
-         return;
-     }
-diff --git a/hw/vfio/common.c b/hw/vfio/common.c
-index b73086e17a..3b4ac53f15 100644
---- a/hw/vfio/common.c
-+++ b/hw/vfio/common.c
-@@ -2845,11 +2845,35 @@ void vfio_put_group(VFIOGroup *group)
-     }
- }
- 
-+struct vfio_device_info *vfio_get_device_info(int fd)
-+{
-+    struct vfio_device_info *info;
-+    uint32_t argsz = sizeof(*info);
-+
-+    info = g_malloc0(argsz);
-+
-+retry:
-+    info->argsz = argsz;
-+
-+    if (ioctl(fd, VFIO_DEVICE_GET_INFO, info)) {
-+        g_free(info);
-+        return NULL;
-+    }
-+
-+    if (info->argsz > argsz) {
-+        argsz = info->argsz;
-+        info = g_realloc(info, argsz);
-+        goto retry;
-+    }
-+
-+    return info;
-+}
-+
- int vfio_get_device(VFIOGroup *group, const char *name,
-                     VFIODevice *vbasedev, Error **errp)
- {
--    struct vfio_device_info dev_info = { .argsz = sizeof(dev_info) };
--    int ret, fd;
-+    g_autofree struct vfio_device_info *info = NULL;
-+    int fd;
- 
-     fd = ioctl(group->fd, VFIO_GROUP_GET_DEVICE_FD, name);
-     if (fd < 0) {
-@@ -2861,11 +2885,11 @@ int vfio_get_device(VFIOGroup *group, const char *name,
-         return fd;
-     }
- 
--    ret = ioctl(fd, VFIO_DEVICE_GET_INFO, &dev_info);
--    if (ret) {
-+    info = vfio_get_device_info(fd);
-+    if (!info) {
-         error_setg_errno(errp, errno, "error getting device info");
-         close(fd);
--        return ret;
-+        return -1;
-     }
- 
-     /*
-@@ -2893,14 +2917,14 @@ int vfio_get_device(VFIOGroup *group, const char *name,
-     vbasedev->group = group;
-     QLIST_INSERT_HEAD(&group->device_list, vbasedev, next);
- 
--    vbasedev->num_irqs = dev_info.num_irqs;
--    vbasedev->num_regions = dev_info.num_regions;
--    vbasedev->flags = dev_info.flags;
-+    vbasedev->num_irqs = info->num_irqs;
-+    vbasedev->num_regions = info->num_regions;
-+    vbasedev->flags = info->flags;
-+
-+    trace_vfio_get_device(name, info->flags, info->num_regions, info->num_irqs);
- 
--    trace_vfio_get_device(name, dev_info.flags, dev_info.num_regions,
--                          dev_info.num_irqs);
-+    vbasedev->reset_works = !!(info->flags & VFIO_DEVICE_FLAGS_RESET);
- 
--    vbasedev->reset_works = !!(dev_info.flags & VFIO_DEVICE_FLAGS_RESET);
-     return 0;
- }
- 
-diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
-index 3dc5f2104c..6d1b8487c3 100644
---- a/include/hw/vfio/vfio-common.h
-+++ b/include/hw/vfio/vfio-common.h
-@@ -216,6 +216,7 @@ void vfio_region_finalize(VFIORegion *region);
- void vfio_reset_handler(void *opaque);
- VFIOGroup *vfio_get_group(int groupid, AddressSpace *as, Error **errp);
- void vfio_put_group(VFIOGroup *group);
-+struct vfio_device_info *vfio_get_device_info(int fd);
- int vfio_get_device(VFIOGroup *group, const char *name,
-                     VFIODevice *vbasedev, Error **errp);
- 
--- 
-2.39.3
-
diff --git a/kvm-vfio-migration-Add-VFIO-migration-pre-copy-support.patch b/kvm-vfio-migration-Add-VFIO-migration-pre-copy-support.patch
deleted file mode 100644
index b8e72e6..0000000
--- a/kvm-vfio-migration-Add-VFIO-migration-pre-copy-support.patch
+++ /dev/null
@@ -1,438 +0,0 @@
-From 080d28c191b7d951f1f4596dcaa13d590c07d886 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:57 +0200
-Subject: [PATCH 15/37] vfio/migration: Add VFIO migration pre-copy support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [13/28] 7b2ea1471440d47e5aed1211c96942ca7bface96 (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit eda7362af959
-Author: Avihai Horon <avihaih@nvidia.com>
-Date:   Wed Jun 21 14:12:00 2023 +0300
-
-    vfio/migration: Add VFIO migration pre-copy support
-
-    Pre-copy support allows the VFIO device data to be transferred while the
-    VM is running. This helps to accommodate VFIO devices that have a large
-    amount of data that needs to be transferred, and it can reduce migration
-    downtime.
-
-    Pre-copy support is optional in VFIO migration protocol v2.
-    Implement pre-copy of VFIO migration protocol v2 and use it for devices
-    that support it. Full description of it can be found in the following
-    Linux commit: 4db52602a607 ("vfio: Extend the device migration protocol
-    with PRE_COPY").
-
-    Signed-off-by: Avihai Horon <avihaih@nvidia.com>
-    Reviewed-by: Cédric Le Goater <clg@redhat.com>
-    Tested-by: YangHang Liu <yanghliu@redhat.com>
-    Acked-by: Alex Williamson <alex.williamson@redhat.com>
-    Signed-off-by: Cédric Le Goater <clg@redhat.com>
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- docs/devel/vfio-migration.rst |  35 +++++---
- hw/vfio/common.c              |   6 +-
- hw/vfio/migration.c           | 165 ++++++++++++++++++++++++++++++++--
- hw/vfio/trace-events          |   4 +-
- include/hw/vfio/vfio-common.h |   2 +
- 5 files changed, 190 insertions(+), 22 deletions(-)
-
-diff --git a/docs/devel/vfio-migration.rst b/docs/devel/vfio-migration.rst
-index 1b68ccf115..e896b2a673 100644
---- a/docs/devel/vfio-migration.rst
-+++ b/docs/devel/vfio-migration.rst
-@@ -7,12 +7,14 @@ the guest is running on source host and restoring this saved state on the
- destination host. This document details how saving and restoring of VFIO
- devices is done in QEMU.
- 
--Migration of VFIO devices currently consists of a single stop-and-copy phase.
--During the stop-and-copy phase the guest is stopped and the entire VFIO device
--data is transferred to the destination.
--
--The pre-copy phase of migration is currently not supported for VFIO devices.
--Support for VFIO pre-copy will be added later on.
-+Migration of VFIO devices consists of two phases: the optional pre-copy phase,
-+and the stop-and-copy phase. The pre-copy phase is iterative and allows to
-+accommodate VFIO devices that have a large amount of data that needs to be
-+transferred. The iterative pre-copy phase of migration allows for the guest to
-+continue whilst the VFIO device state is transferred to the destination, this
-+helps to reduce the total downtime of the VM. VFIO devices opt-in to pre-copy
-+support by reporting the VFIO_MIGRATION_PRE_COPY flag in the
-+VFIO_DEVICE_FEATURE_MIGRATION ioctl.
- 
- Note that currently VFIO migration is supported only for a single device. This
- is due to VFIO migration's lack of P2P support. However, P2P support is planned
-@@ -29,10 +31,20 @@ VFIO implements the device hooks for the iterative approach as follows:
- * A ``load_setup`` function that sets the VFIO device on the destination in
-   _RESUMING state.
- 
-+* A ``state_pending_estimate`` function that reports an estimate of the
-+  remaining pre-copy data that the vendor driver has yet to save for the VFIO
-+  device.
-+
- * A ``state_pending_exact`` function that reads pending_bytes from the vendor
-   driver, which indicates the amount of data that the vendor driver has yet to
-   save for the VFIO device.
- 
-+* An ``is_active_iterate`` function that indicates ``save_live_iterate`` is
-+  active only when the VFIO device is in pre-copy states.
-+
-+* A ``save_live_iterate`` function that reads the VFIO device's data from the
-+  vendor driver during iterative pre-copy phase.
-+
- * A ``save_state`` function to save the device config space if it is present.
- 
- * A ``save_live_complete_precopy`` function that sets the VFIO device in
-@@ -111,8 +123,10 @@ Flow of state changes during Live migration
- ===========================================
- 
- Below is the flow of state change during live migration.
--The values in the brackets represent the VM state, the migration state, and
-+The values in the parentheses represent the VM state, the migration state, and
- the VFIO device state, respectively.
-+The text in the square brackets represents the flow if the VFIO device supports
-+pre-copy.
- 
- Live migration save path
- ------------------------
-@@ -124,11 +138,12 @@ Live migration save path
-                                   |
-                      migrate_init spawns migration_thread
-                 Migration thread then calls each device's .save_setup()
--                       (RUNNING, _SETUP, _RUNNING)
-+                  (RUNNING, _SETUP, _RUNNING [_PRE_COPY])
-                                   |
--                      (RUNNING, _ACTIVE, _RUNNING)
--             If device is active, get pending_bytes by .state_pending_exact()
-+                  (RUNNING, _ACTIVE, _RUNNING [_PRE_COPY])
-+      If device is active, get pending_bytes by .state_pending_{estimate,exact}()
-           If total pending_bytes >= threshold_size, call .save_live_iterate()
-+                  [Data of VFIO device for pre-copy phase is copied]
-         Iterate till total pending bytes converge and are less than threshold
-                                   |
-   On migration completion, vCPU stops and calls .save_live_complete_precopy for
-diff --git a/hw/vfio/common.c b/hw/vfio/common.c
-index 78358ede27..b73086e17a 100644
---- a/hw/vfio/common.c
-+++ b/hw/vfio/common.c
-@@ -492,7 +492,8 @@ static bool vfio_devices_all_dirty_tracking(VFIOContainer *container)
-             }
- 
-             if (vbasedev->pre_copy_dirty_page_tracking == ON_OFF_AUTO_OFF &&
--                migration->device_state == VFIO_DEVICE_STATE_RUNNING) {
-+                (migration->device_state == VFIO_DEVICE_STATE_RUNNING ||
-+                 migration->device_state == VFIO_DEVICE_STATE_PRE_COPY)) {
-                 return false;
-             }
-         }
-@@ -537,7 +538,8 @@ static bool vfio_devices_all_running_and_mig_active(VFIOContainer *container)
-                 return false;
-             }
- 
--            if (migration->device_state == VFIO_DEVICE_STATE_RUNNING) {
-+            if (migration->device_state == VFIO_DEVICE_STATE_RUNNING ||
-+                migration->device_state == VFIO_DEVICE_STATE_PRE_COPY) {
-                 continue;
-             } else {
-                 return false;
-diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
-index 8d33414379..d8f6a22ae1 100644
---- a/hw/vfio/migration.c
-+++ b/hw/vfio/migration.c
-@@ -68,6 +68,8 @@ static const char *mig_state_to_str(enum vfio_device_mig_state state)
-         return "STOP_COPY";
-     case VFIO_DEVICE_STATE_RESUMING:
-         return "RESUMING";
-+    case VFIO_DEVICE_STATE_PRE_COPY:
-+        return "PRE_COPY";
-     default:
-         return "UNKNOWN STATE";
-     }
-@@ -241,6 +243,25 @@ static int vfio_query_stop_copy_size(VFIODevice *vbasedev,
-     return 0;
- }
- 
-+static int vfio_query_precopy_size(VFIOMigration *migration)
-+{
-+    struct vfio_precopy_info precopy = {
-+        .argsz = sizeof(precopy),
-+    };
-+
-+    migration->precopy_init_size = 0;
-+    migration->precopy_dirty_size = 0;
-+
-+    if (ioctl(migration->data_fd, VFIO_MIG_GET_PRECOPY_INFO, &precopy)) {
-+        return -errno;
-+    }
-+
-+    migration->precopy_init_size = precopy.initial_bytes;
-+    migration->precopy_dirty_size = precopy.dirty_bytes;
-+
-+    return 0;
-+}
-+
- /* Returns the size of saved data on success and -errno on error */
- static ssize_t vfio_save_block(QEMUFile *f, VFIOMigration *migration)
- {
-@@ -249,6 +270,14 @@ static ssize_t vfio_save_block(QEMUFile *f, VFIOMigration *migration)
-     data_size = read(migration->data_fd, migration->data_buffer,
-                      migration->data_buffer_size);
-     if (data_size < 0) {
-+        /*
-+         * Pre-copy emptied all the device state for now. For more information,
-+         * please refer to the Linux kernel VFIO uAPI.
-+         */
-+        if (errno == ENOMSG) {
-+            return 0;
-+        }
-+
-         return -errno;
-     }
-     if (data_size == 0) {
-@@ -265,6 +294,38 @@ static ssize_t vfio_save_block(QEMUFile *f, VFIOMigration *migration)
-     return qemu_file_get_error(f) ?: data_size;
- }
- 
-+static void vfio_update_estimated_pending_data(VFIOMigration *migration,
-+                                               uint64_t data_size)
-+{
-+    if (!data_size) {
-+        /*
-+         * Pre-copy emptied all the device state for now, update estimated sizes
-+         * accordingly.
-+         */
-+        migration->precopy_init_size = 0;
-+        migration->precopy_dirty_size = 0;
-+
-+        return;
-+    }
-+
-+    if (migration->precopy_init_size) {
-+        uint64_t init_size = MIN(migration->precopy_init_size, data_size);
-+
-+        migration->precopy_init_size -= init_size;
-+        data_size -= init_size;
-+    }
-+
-+    migration->precopy_dirty_size -= MIN(migration->precopy_dirty_size,
-+                                         data_size);
-+}
-+
-+static bool vfio_precopy_supported(VFIODevice *vbasedev)
-+{
-+    VFIOMigration *migration = vbasedev->migration;
-+
-+    return migration->mig_flags & VFIO_MIGRATION_PRE_COPY;
-+}
-+
- /* ---------------------------------------------------------------------- */
- 
- static int vfio_save_setup(QEMUFile *f, void *opaque)
-@@ -285,6 +346,28 @@ static int vfio_save_setup(QEMUFile *f, void *opaque)
-         return -ENOMEM;
-     }
- 
-+    if (vfio_precopy_supported(vbasedev)) {
-+        int ret;
-+
-+        switch (migration->device_state) {
-+        case VFIO_DEVICE_STATE_RUNNING:
-+            ret = vfio_migration_set_state(vbasedev, VFIO_DEVICE_STATE_PRE_COPY,
-+                                           VFIO_DEVICE_STATE_RUNNING);
-+            if (ret) {
-+                return ret;
-+            }
-+
-+            vfio_query_precopy_size(migration);
-+
-+            break;
-+        case VFIO_DEVICE_STATE_STOP:
-+            /* vfio_save_complete_precopy() will go to STOP_COPY */
-+            break;
-+        default:
-+            return -EINVAL;
-+        }
-+    }
-+
-     trace_vfio_save_setup(vbasedev->name, migration->data_buffer_size);
- 
-     qemu_put_be64(f, VFIO_MIG_FLAG_END_OF_STATE);
-@@ -299,26 +382,42 @@ static void vfio_save_cleanup(void *opaque)
- 
-     g_free(migration->data_buffer);
-     migration->data_buffer = NULL;
-+    migration->precopy_init_size = 0;
-+    migration->precopy_dirty_size = 0;
-     vfio_migration_cleanup(vbasedev);
-     trace_vfio_save_cleanup(vbasedev->name);
- }
- 
-+static void vfio_state_pending_estimate(void *opaque, uint64_t *must_precopy,
-+                                        uint64_t *can_postcopy)
-+{
-+    VFIODevice *vbasedev = opaque;
-+    VFIOMigration *migration = vbasedev->migration;
-+
-+    if (migration->device_state != VFIO_DEVICE_STATE_PRE_COPY) {
-+        return;
-+    }
-+
-+    *must_precopy +=
-+        migration->precopy_init_size + migration->precopy_dirty_size;
-+
-+    trace_vfio_state_pending_estimate(vbasedev->name, *must_precopy,
-+                                      *can_postcopy,
-+                                      migration->precopy_init_size,
-+                                      migration->precopy_dirty_size);
-+}
-+
- /*
-  * Migration size of VFIO devices can be as little as a few KBs or as big as
-  * many GBs. This value should be big enough to cover the worst case.
-  */
- #define VFIO_MIG_STOP_COPY_SIZE (100 * GiB)
- 
--/*
-- * Only exact function is implemented and not estimate function. The reason is
-- * that during pre-copy phase of migration the estimate function is called
-- * repeatedly while pending RAM size is over the threshold, thus migration
-- * can't converge and querying the VFIO device pending data size is useless.
-- */
- static void vfio_state_pending_exact(void *opaque, uint64_t *must_precopy,
-                                      uint64_t *can_postcopy)
- {
-     VFIODevice *vbasedev = opaque;
-+    VFIOMigration *migration = vbasedev->migration;
-     uint64_t stop_copy_size = VFIO_MIG_STOP_COPY_SIZE;
- 
-     /*
-@@ -328,8 +427,48 @@ static void vfio_state_pending_exact(void *opaque, uint64_t *must_precopy,
-     vfio_query_stop_copy_size(vbasedev, &stop_copy_size);
-     *must_precopy += stop_copy_size;
- 
-+    if (migration->device_state == VFIO_DEVICE_STATE_PRE_COPY) {
-+        vfio_query_precopy_size(migration);
-+
-+        *must_precopy +=
-+            migration->precopy_init_size + migration->precopy_dirty_size;
-+    }
-+
-     trace_vfio_state_pending_exact(vbasedev->name, *must_precopy, *can_postcopy,
--                                   stop_copy_size);
-+                                   stop_copy_size, migration->precopy_init_size,
-+                                   migration->precopy_dirty_size);
-+}
-+
-+static bool vfio_is_active_iterate(void *opaque)
-+{
-+    VFIODevice *vbasedev = opaque;
-+    VFIOMigration *migration = vbasedev->migration;
-+
-+    return migration->device_state == VFIO_DEVICE_STATE_PRE_COPY;
-+}
-+
-+static int vfio_save_iterate(QEMUFile *f, void *opaque)
-+{
-+    VFIODevice *vbasedev = opaque;
-+    VFIOMigration *migration = vbasedev->migration;
-+    ssize_t data_size;
-+
-+    data_size = vfio_save_block(f, migration);
-+    if (data_size < 0) {
-+        return data_size;
-+    }
-+    qemu_put_be64(f, VFIO_MIG_FLAG_END_OF_STATE);
-+
-+    vfio_update_estimated_pending_data(migration, data_size);
-+
-+    trace_vfio_save_iterate(vbasedev->name, migration->precopy_init_size,
-+                            migration->precopy_dirty_size);
-+
-+    /*
-+     * A VFIO device's pre-copy dirty_bytes is not guaranteed to reach zero.
-+     * Return 1 so following handlers will not be potentially blocked.
-+     */
-+    return 1;
- }
- 
- static int vfio_save_complete_precopy(QEMUFile *f, void *opaque)
-@@ -338,7 +477,7 @@ static int vfio_save_complete_precopy(QEMUFile *f, void *opaque)
-     ssize_t data_size;
-     int ret;
- 
--    /* We reach here with device state STOP only */
-+    /* We reach here with device state STOP or STOP_COPY only */
-     ret = vfio_migration_set_state(vbasedev, VFIO_DEVICE_STATE_STOP_COPY,
-                                    VFIO_DEVICE_STATE_STOP);
-     if (ret) {
-@@ -457,7 +596,10 @@ static int vfio_load_state(QEMUFile *f, void *opaque, int version_id)
- static const SaveVMHandlers savevm_vfio_handlers = {
-     .save_setup = vfio_save_setup,
-     .save_cleanup = vfio_save_cleanup,
-+    .state_pending_estimate = vfio_state_pending_estimate,
-     .state_pending_exact = vfio_state_pending_exact,
-+    .is_active_iterate = vfio_is_active_iterate,
-+    .save_live_iterate = vfio_save_iterate,
-     .save_live_complete_precopy = vfio_save_complete_precopy,
-     .save_state = vfio_save_state,
-     .load_setup = vfio_load_setup,
-@@ -470,13 +612,18 @@ static const SaveVMHandlers savevm_vfio_handlers = {
- static void vfio_vmstate_change(void *opaque, bool running, RunState state)
- {
-     VFIODevice *vbasedev = opaque;
-+    VFIOMigration *migration = vbasedev->migration;
-     enum vfio_device_mig_state new_state;
-     int ret;
- 
-     if (running) {
-         new_state = VFIO_DEVICE_STATE_RUNNING;
-     } else {
--        new_state = VFIO_DEVICE_STATE_STOP;
-+        new_state =
-+            (migration->device_state == VFIO_DEVICE_STATE_PRE_COPY &&
-+             (state == RUN_STATE_FINISH_MIGRATE || state == RUN_STATE_PAUSED)) ?
-+                VFIO_DEVICE_STATE_STOP_COPY :
-+                VFIO_DEVICE_STATE_STOP;
-     }
- 
-     /*
-diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events
-index 646e42fd27..4150b59e58 100644
---- a/hw/vfio/trace-events
-+++ b/hw/vfio/trace-events
-@@ -162,6 +162,8 @@ vfio_save_block(const char *name, int data_size) " (%s) data_size %d"
- vfio_save_cleanup(const char *name) " (%s)"
- vfio_save_complete_precopy(const char *name, int ret) " (%s) ret %d"
- vfio_save_device_config_state(const char *name) " (%s)"
-+vfio_save_iterate(const char *name, uint64_t precopy_init_size, uint64_t precopy_dirty_size) " (%s) precopy initial size 0x%"PRIx64" precopy dirty size 0x%"PRIx64
- vfio_save_setup(const char *name, uint64_t data_buffer_size) " (%s) data buffer size 0x%"PRIx64
--vfio_state_pending_exact(const char *name, uint64_t precopy, uint64_t postcopy, uint64_t stopcopy_size) " (%s) precopy 0x%"PRIx64" postcopy 0x%"PRIx64" stopcopy size 0x%"PRIx64
-+vfio_state_pending_estimate(const char *name, uint64_t precopy, uint64_t postcopy, uint64_t precopy_init_size, uint64_t precopy_dirty_size) " (%s) precopy 0x%"PRIx64" postcopy 0x%"PRIx64" precopy initial size 0x%"PRIx64" precopy dirty size 0x%"PRIx64
-+vfio_state_pending_exact(const char *name, uint64_t precopy, uint64_t postcopy, uint64_t stopcopy_size, uint64_t precopy_init_size, uint64_t precopy_dirty_size) " (%s) precopy 0x%"PRIx64" postcopy 0x%"PRIx64" stopcopy size 0x%"PRIx64" precopy initial size 0x%"PRIx64" precopy dirty size 0x%"PRIx64
- vfio_vmstate_change(const char *name, int running, const char *reason, const char *dev_state) " (%s) running %d reason %s device state %s"
-diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
-index 5f29dab839..1db901c194 100644
---- a/include/hw/vfio/vfio-common.h
-+++ b/include/hw/vfio/vfio-common.h
-@@ -67,6 +67,8 @@ typedef struct VFIOMigration {
-     void *data_buffer;
-     size_t data_buffer_size;
-     uint64_t mig_flags;
-+    uint64_t precopy_init_size;
-+    uint64_t precopy_dirty_size;
- } VFIOMigration;
- 
- typedef struct VFIOAddressSpace {
--- 
-2.39.3
-
diff --git a/kvm-vfio-migration-Add-support-for-switchover-ack-capabi.patch b/kvm-vfio-migration-Add-support-for-switchover-ack-capabi.patch
deleted file mode 100644
index d87680d..0000000
--- a/kvm-vfio-migration-Add-support-for-switchover-ack-capabi.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From 169dc1bb051b3aebc571936d956b49ba0621ae43 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:57 +0200
-Subject: [PATCH 16/37] vfio/migration: Add support for switchover ack
- capability
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [14/28] b3bd2eb2d0ca49ff05a0a82ae5bb956a354aed47 (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit 745c42912a04
-Author: Avihai Horon <avihaih@nvidia.com>
-Date:   Wed Jun 21 14:12:01 2023 +0300
-
-    vfio/migration: Add support for switchover ack capability
-
-    Loading of a VFIO device's data can take a substantial amount of time as
-    the device may need to allocate resources, prepare internal data
-    structures, etc. This can increase migration downtime, especially for
-    VFIO devices with a lot of resources.
-
-    To solve this, VFIO migration uAPI defines "initial bytes" as part of
-    its precopy data stream. Initial bytes can be used in various ways to
-    improve VFIO migration performance. For example, it can be used to
-    transfer device metadata to pre-allocate resources in the destination.
-    However, for this to work we need to make sure that all initial bytes
-    are sent and loaded in the destination before the source VM is stopped.
-
-    Use migration switchover ack capability to make sure a VFIO device's
-    initial bytes are sent and loaded in the destination before the source
-    stops the VM and attempts to complete the migration.
-    This can significantly reduce migration downtime for some devices.
-
-    Signed-off-by: Avihai Horon <avihaih@nvidia.com>
-    Reviewed-by: Cédric Le Goater <clg@redhat.com>
-    Tested-by: YangHang Liu <yanghliu@redhat.com>
-    Acked-by: Alex Williamson <alex.williamson@redhat.com>
-    Signed-off-by: Cédric Le Goater <clg@redhat.com>
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- docs/devel/vfio-migration.rst | 10 +++++++++
- hw/vfio/migration.c           | 39 ++++++++++++++++++++++++++++++++++-
- include/hw/vfio/vfio-common.h |  1 +
- 3 files changed, 49 insertions(+), 1 deletion(-)
-
-diff --git a/docs/devel/vfio-migration.rst b/docs/devel/vfio-migration.rst
-index e896b2a673..b433cb5bb2 100644
---- a/docs/devel/vfio-migration.rst
-+++ b/docs/devel/vfio-migration.rst
-@@ -16,6 +16,13 @@ helps to reduce the total downtime of the VM. VFIO devices opt-in to pre-copy
- support by reporting the VFIO_MIGRATION_PRE_COPY flag in the
- VFIO_DEVICE_FEATURE_MIGRATION ioctl.
- 
-+When pre-copy is supported, it's possible to further reduce downtime by
-+enabling "switchover-ack" migration capability.
-+VFIO migration uAPI defines "initial bytes" as part of its pre-copy data stream
-+and recommends that the initial bytes are sent and loaded in the destination
-+before stopping the source VM. Enabling this migration capability will
-+guarantee that and thus, can potentially reduce downtime even further.
-+
- Note that currently VFIO migration is supported only for a single device. This
- is due to VFIO migration's lack of P2P support. However, P2P support is planned
- to be added later on.
-@@ -45,6 +52,9 @@ VFIO implements the device hooks for the iterative approach as follows:
- * A ``save_live_iterate`` function that reads the VFIO device's data from the
-   vendor driver during iterative pre-copy phase.
- 
-+* A ``switchover_ack_needed`` function that checks if the VFIO device uses
-+  "switchover-ack" migration capability when this capability is enabled.
-+
- * A ``save_state`` function to save the device config space if it is present.
- 
- * A ``save_live_complete_precopy`` function that sets the VFIO device in
-diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
-index d8f6a22ae1..acbf0bb7ab 100644
---- a/hw/vfio/migration.c
-+++ b/hw/vfio/migration.c
-@@ -18,6 +18,8 @@
- #include "sysemu/runstate.h"
- #include "hw/vfio/vfio-common.h"
- #include "migration/migration.h"
-+#include "migration/options.h"
-+#include "migration/savevm.h"
- #include "migration/vmstate.h"
- #include "migration/qemu-file.h"
- #include "migration/register.h"
-@@ -45,6 +47,7 @@
- #define VFIO_MIG_FLAG_DEV_CONFIG_STATE  (0xffffffffef100002ULL)
- #define VFIO_MIG_FLAG_DEV_SETUP_STATE   (0xffffffffef100003ULL)
- #define VFIO_MIG_FLAG_DEV_DATA_STATE    (0xffffffffef100004ULL)
-+#define VFIO_MIG_FLAG_DEV_INIT_DATA_SENT (0xffffffffef100005ULL)
- 
- /*
-  * This is an arbitrary size based on migration of mlx5 devices, where typically
-@@ -384,6 +387,7 @@ static void vfio_save_cleanup(void *opaque)
-     migration->data_buffer = NULL;
-     migration->precopy_init_size = 0;
-     migration->precopy_dirty_size = 0;
-+    migration->initial_data_sent = false;
-     vfio_migration_cleanup(vbasedev);
-     trace_vfio_save_cleanup(vbasedev->name);
- }
-@@ -457,10 +461,17 @@ static int vfio_save_iterate(QEMUFile *f, void *opaque)
-     if (data_size < 0) {
-         return data_size;
-     }
--    qemu_put_be64(f, VFIO_MIG_FLAG_END_OF_STATE);
- 
-     vfio_update_estimated_pending_data(migration, data_size);
- 
-+    if (migrate_switchover_ack() && !migration->precopy_init_size &&
-+        !migration->initial_data_sent) {
-+        qemu_put_be64(f, VFIO_MIG_FLAG_DEV_INIT_DATA_SENT);
-+        migration->initial_data_sent = true;
-+    } else {
-+        qemu_put_be64(f, VFIO_MIG_FLAG_END_OF_STATE);
-+    }
-+
-     trace_vfio_save_iterate(vbasedev->name, migration->precopy_init_size,
-                             migration->precopy_dirty_size);
- 
-@@ -579,6 +590,24 @@ static int vfio_load_state(QEMUFile *f, void *opaque, int version_id)
-             }
-             break;
-         }
-+        case VFIO_MIG_FLAG_DEV_INIT_DATA_SENT:
-+        {
-+            if (!vfio_precopy_supported(vbasedev) ||
-+                !migrate_switchover_ack()) {
-+                error_report("%s: Received INIT_DATA_SENT but switchover ack "
-+                             "is not used", vbasedev->name);
-+                return -EINVAL;
-+            }
-+
-+            ret = qemu_loadvm_approve_switchover();
-+            if (ret) {
-+                error_report(
-+                    "%s: qemu_loadvm_approve_switchover failed, err=%d (%s)",
-+                    vbasedev->name, ret, strerror(-ret));
-+            }
-+
-+            return ret;
-+        }
-         default:
-             error_report("%s: Unknown tag 0x%"PRIx64, vbasedev->name, data);
-             return -EINVAL;
-@@ -593,6 +622,13 @@ static int vfio_load_state(QEMUFile *f, void *opaque, int version_id)
-     return ret;
- }
- 
-+static bool vfio_switchover_ack_needed(void *opaque)
-+{
-+    VFIODevice *vbasedev = opaque;
-+
-+    return vfio_precopy_supported(vbasedev);
-+}
-+
- static const SaveVMHandlers savevm_vfio_handlers = {
-     .save_setup = vfio_save_setup,
-     .save_cleanup = vfio_save_cleanup,
-@@ -605,6 +641,7 @@ static const SaveVMHandlers savevm_vfio_handlers = {
-     .load_setup = vfio_load_setup,
-     .load_cleanup = vfio_load_cleanup,
-     .load_state = vfio_load_state,
-+    .switchover_ack_needed = vfio_switchover_ack_needed,
- };
- 
- /* ---------------------------------------------------------------------- */
-diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
-index 1db901c194..3dc5f2104c 100644
---- a/include/hw/vfio/vfio-common.h
-+++ b/include/hw/vfio/vfio-common.h
-@@ -69,6 +69,7 @@ typedef struct VFIOMigration {
-     uint64_t mig_flags;
-     uint64_t precopy_init_size;
-     uint64_t precopy_dirty_size;
-+    bool initial_data_sent;
- } VFIOMigration;
- 
- typedef struct VFIOAddressSpace {
--- 
-2.39.3
-
diff --git a/kvm-vfio-migration-Change-vIOMMU-blocker-from-global-to-.patch b/kvm-vfio-migration-Change-vIOMMU-blocker-from-global-to-.patch
deleted file mode 100644
index dde2e24..0000000
--- a/kvm-vfio-migration-Change-vIOMMU-blocker-from-global-to-.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-From 35c7d0d3b02d61d6f29afae74bd83edd70a6a1b4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:57 +0200
-Subject: [PATCH 26/37] vfio/migration: Change vIOMMU blocker from global to
- per device
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [24/28] 8fda1c82a81fadd4f38e6a5e878c9228a81c0f6e (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit 3c26c80a0a26
-Author: Zhenzhong Duan <zhenzhong.duan@intel.com>
-Date:   Mon Jul 3 15:15:07 2023 +0800
-
-    vfio/migration: Change vIOMMU blocker from global to per device
-
-    Contrary to multiple device blocker which needs to consider already-attached
-    devices to unblock/block dynamically, the vIOMMU migration blocker is a device
-    specific config. Meaning it only needs to know whether the device is bypassing
-    or not the vIOMMU (via machine property, or per pxb-pcie::bypass_iommu), and
-    does not need the state of currently present devices. For this reason, the
-    vIOMMU global migration blocker can be consolidated into the per-device
-    migration blocker, allowing us to remove some unnecessary code.
-
-    This change also makes vfio_mig_active() more accurate as it doesn't check for
-    global blocker.
-
-    Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
-    Reviewed-by: Joao Martins <joao.m.martins@oracle.com>
-    Reviewed-by: Cédric Le Goater <clg@redhat.com>
-    Signed-off-by: Cédric Le Goater <clg@redhat.com>
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- hw/vfio/common.c              | 51 ++---------------------------------
- hw/vfio/migration.c           |  7 ++---
- hw/vfio/pci.c                 |  1 -
- include/hw/vfio/vfio-common.h |  3 +--
- 4 files changed, 7 insertions(+), 55 deletions(-)
-
-diff --git a/hw/vfio/common.c b/hw/vfio/common.c
-index 136d8243d6..e815f6ba30 100644
---- a/hw/vfio/common.c
-+++ b/hw/vfio/common.c
-@@ -362,7 +362,6 @@ bool vfio_mig_active(void)
- }
- 
- static Error *multiple_devices_migration_blocker;
--static Error *giommu_migration_blocker;
- 
- static unsigned int vfio_migratable_device_num(void)
- {
-@@ -420,55 +419,9 @@ void vfio_unblock_multiple_devices_migration(void)
-     multiple_devices_migration_blocker = NULL;
- }
- 
--static bool vfio_viommu_preset(void)
-+bool vfio_viommu_preset(VFIODevice *vbasedev)
- {
--    VFIOAddressSpace *space;
--
--    QLIST_FOREACH(space, &vfio_address_spaces, list) {
--        if (space->as != &address_space_memory) {
--            return true;
--        }
--    }
--
--    return false;
--}
--
--int vfio_block_giommu_migration(VFIODevice *vbasedev, Error **errp)
--{
--    int ret;
--
--    if (giommu_migration_blocker ||
--        !vfio_viommu_preset()) {
--        return 0;
--    }
--
--    if (vbasedev->enable_migration == ON_OFF_AUTO_ON) {
--        error_setg(errp,
--                   "Migration is currently not supported with vIOMMU enabled");
--        return -EINVAL;
--    }
--
--    error_setg(&giommu_migration_blocker,
--               "Migration is currently not supported with vIOMMU enabled");
--    ret = migrate_add_blocker(giommu_migration_blocker, errp);
--    if (ret < 0) {
--        error_free(giommu_migration_blocker);
--        giommu_migration_blocker = NULL;
--    }
--
--    return ret;
--}
--
--void vfio_migration_finalize(void)
--{
--    if (!giommu_migration_blocker ||
--        vfio_viommu_preset()) {
--        return;
--    }
--
--    migrate_del_blocker(giommu_migration_blocker);
--    error_free(giommu_migration_blocker);
--    giommu_migration_blocker = NULL;
-+    return vbasedev->group->container->space->as != &address_space_memory;
- }
- 
- static void vfio_set_migration_error(int err)
-diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
-index 1db7d52ab2..e6e5e85f75 100644
---- a/hw/vfio/migration.c
-+++ b/hw/vfio/migration.c
-@@ -878,9 +878,10 @@ int vfio_migration_realize(VFIODevice *vbasedev, Error **errp)
-         return ret;
-     }
- 
--    ret = vfio_block_giommu_migration(vbasedev, errp);
--    if (ret) {
--        return ret;
-+    if (vfio_viommu_preset(vbasedev)) {
-+        error_setg(&err, "%s: Migration is currently not supported "
-+                   "with vIOMMU enabled", vbasedev->name);
-+        return vfio_block_migration(vbasedev, err, errp);
-     }
- 
-     trace_vfio_migration_realize(vbasedev->name);
-diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
-index 2d059832a4..922c81872c 100644
---- a/hw/vfio/pci.c
-+++ b/hw/vfio/pci.c
-@@ -3279,7 +3279,6 @@ static void vfio_instance_finalize(Object *obj)
-      */
-     vfio_put_device(vdev);
-     vfio_put_group(group);
--    vfio_migration_finalize();
- }
- 
- static void vfio_exitfn(PCIDevice *pdev)
-diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
-index 93429b9abb..45167c8a8a 100644
---- a/include/hw/vfio/vfio-common.h
-+++ b/include/hw/vfio/vfio-common.h
-@@ -227,7 +227,7 @@ extern VFIOGroupList vfio_group_list;
- bool vfio_mig_active(void);
- int vfio_block_multiple_devices_migration(VFIODevice *vbasedev, Error **errp);
- void vfio_unblock_multiple_devices_migration(void);
--int vfio_block_giommu_migration(VFIODevice *vbasedev, Error **errp);
-+bool vfio_viommu_preset(VFIODevice *vbasedev);
- int64_t vfio_mig_bytes_transferred(void);
- void vfio_reset_bytes_transferred(void);
- 
-@@ -254,6 +254,5 @@ int vfio_spapr_remove_window(VFIOContainer *container,
- 
- int vfio_migration_realize(VFIODevice *vbasedev, Error **errp);
- void vfio_migration_exit(VFIODevice *vbasedev);
--void vfio_migration_finalize(void);
- 
- #endif /* HW_VFIO_VFIO_COMMON_H */
--- 
-2.39.3
-
diff --git a/kvm-vfio-migration-Free-resources-when-vfio_migration_re.patch b/kvm-vfio-migration-Free-resources-when-vfio_migration_re.patch
deleted file mode 100644
index 9deaf1a..0000000
--- a/kvm-vfio-migration-Free-resources-when-vfio_migration_re.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From a36fa46369fe9bf2a2174e9ed6ab83042e904066 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:57 +0200
-Subject: [PATCH 27/37] vfio/migration: Free resources when
- vfio_migration_realize fails
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [25/28] b3ab8d3443d4bc12a689dc7d88a94da315814bb7 (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit 2b43b2995b02
-Author: Zhenzhong Duan <zhenzhong.duan@intel.com>
-Date:   Mon Jul 3 15:15:08 2023 +0800
-
-    vfio/migration: Free resources when vfio_migration_realize fails
-
-    When vfio_realize() succeeds, hot unplug will call vfio_exitfn()
-    to free resources allocated in vfio_realize(); when vfio_realize()
-    fails, vfio_exitfn() is never called and we need to free resources
-    in vfio_realize().
-
-    In the case that vfio_migration_realize() fails,
-    e.g: with -only-migratable & enable-migration=off, we see below:
-
-    (qemu) device_add vfio-pci,host=81:11.1,id=vfio1,bus=root1,enable-migration=off
-    0000:81:11.1: Migration disabled
-    Error: disallowing migration blocker (--only-migratable) for: 0000:81:11.1: Migration is disabled for VFIO device
-
-    If we hotplug again we should see same log as above, but we see:
-    (qemu) device_add vfio-pci,host=81:11.1,id=vfio1,bus=root1,enable-migration=off
-    Error: vfio 0000:81:11.1: device is already attached
-
-    That's because some references to VFIO device isn't released.
-    For resources allocated in vfio_migration_realize(), free them by
-    jumping to out_deinit path with calling a new function
-    vfio_migration_deinit(). For resources allocated in vfio_realize(),
-    free them by jumping to de-register path in vfio_realize().
-
-    Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
-    Fixes: a22651053b59 ("vfio: Make vfio-pci device migration capable")
-    Reviewed-by: Cédric Le Goater <clg@redhat.com>
-    Reviewed-by: Joao Martins <joao.m.martins@oracle.com>
-    Signed-off-by: Cédric Le Goater <clg@redhat.com>
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- hw/vfio/migration.c | 33 +++++++++++++++++++++++----------
- hw/vfio/pci.c       |  1 +
- 2 files changed, 24 insertions(+), 10 deletions(-)
-
-diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
-index e6e5e85f75..e3954570c8 100644
---- a/hw/vfio/migration.c
-+++ b/hw/vfio/migration.c
-@@ -802,6 +802,17 @@ static int vfio_migration_init(VFIODevice *vbasedev)
-     return 0;
- }
- 
-+static void vfio_migration_deinit(VFIODevice *vbasedev)
-+{
-+    VFIOMigration *migration = vbasedev->migration;
-+
-+    remove_migration_state_change_notifier(&migration->migration_state);
-+    qemu_del_vm_change_state_handler(migration->vm_state);
-+    unregister_savevm(VMSTATE_IF(vbasedev->dev), "vfio", vbasedev);
-+    vfio_migration_free(vbasedev);
-+    vfio_unblock_multiple_devices_migration();
-+}
-+
- static int vfio_block_migration(VFIODevice *vbasedev, Error *err, Error **errp)
- {
-     int ret;
-@@ -866,7 +877,7 @@ int vfio_migration_realize(VFIODevice *vbasedev, Error **errp)
-             error_setg(&err,
-                        "%s: VFIO device doesn't support device dirty tracking",
-                        vbasedev->name);
--            return vfio_block_migration(vbasedev, err, errp);
-+            goto add_blocker;
-         }
- 
-         warn_report("%s: VFIO device doesn't support device dirty tracking",
-@@ -875,29 +886,31 @@ int vfio_migration_realize(VFIODevice *vbasedev, Error **errp)
- 
-     ret = vfio_block_multiple_devices_migration(vbasedev, errp);
-     if (ret) {
--        return ret;
-+        goto out_deinit;
-     }
- 
-     if (vfio_viommu_preset(vbasedev)) {
-         error_setg(&err, "%s: Migration is currently not supported "
-                    "with vIOMMU enabled", vbasedev->name);
--        return vfio_block_migration(vbasedev, err, errp);
-+        goto add_blocker;
-     }
- 
-     trace_vfio_migration_realize(vbasedev->name);
-     return 0;
-+
-+add_blocker:
-+    ret = vfio_block_migration(vbasedev, err, errp);
-+out_deinit:
-+    if (ret) {
-+        vfio_migration_deinit(vbasedev);
-+    }
-+    return ret;
- }
- 
- void vfio_migration_exit(VFIODevice *vbasedev)
- {
-     if (vbasedev->migration) {
--        VFIOMigration *migration = vbasedev->migration;
--
--        remove_migration_state_change_notifier(&migration->migration_state);
--        qemu_del_vm_change_state_handler(migration->vm_state);
--        unregister_savevm(VMSTATE_IF(vbasedev->dev), "vfio", vbasedev);
--        vfio_migration_free(vbasedev);
--        vfio_unblock_multiple_devices_migration();
-+        vfio_migration_deinit(vbasedev);
-     }
- 
-     if (vbasedev->migration_blocker) {
-diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
-index 922c81872c..037b7d4176 100644
---- a/hw/vfio/pci.c
-+++ b/hw/vfio/pci.c
-@@ -3234,6 +3234,7 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
-         ret = vfio_migration_realize(vbasedev, errp);
-         if (ret) {
-             error_report("%s: Migration disabled", vbasedev->name);
-+            goto out_deregister;
-         }
-     }
- 
--- 
-2.39.3
-
diff --git a/kvm-vfio-migration-Make-VFIO-migration-non-experimental.patch b/kvm-vfio-migration-Make-VFIO-migration-non-experimental.patch
deleted file mode 100644
index 3258541..0000000
--- a/kvm-vfio-migration-Make-VFIO-migration-non-experimental.patch
+++ /dev/null
@@ -1,283 +0,0 @@
-From 747c34c0a3b8048ebdab387d22f2b922c81d572a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:57 +0200
-Subject: [PATCH 21/37] vfio/migration: Make VFIO migration non-experimental
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [19/28] 2f457c1c0de95a3fced0270f2edbbc5193cc4de9 (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit 8bbcb64a71d8
-Author: Avihai Horon <avihaih@nvidia.com>
-Date:   Wed Jun 28 10:31:12 2023 +0300
-
-    vfio/migration: Make VFIO migration non-experimental
-
-    The major parts of VFIO migration are supported today in QEMU. This
-    includes basic VFIO migration, device dirty page tracking and precopy
-    support.
-
-    Thus, at this point in time, it seems appropriate to make VFIO migration
-    non-experimental: remove the x prefix from enable_migration property,
-    change it to ON_OFF_AUTO and let the default value be AUTO.
-
-    In addition, make the following adjustments:
-    1. When enable_migration is ON and migration is not supported, fail VFIO
-       device realization.
-    2. When enable_migration is AUTO (i.e., not explicitly enabled), require
-       device dirty tracking support. This is because device dirty tracking
-       is currently the only method to do dirty page tracking, which is
-       essential for migrating in a reasonable downtime. Setting
-       enable_migration to ON will not require device dirty tracking.
-    3. Make migration error and blocker messages more elaborate.
-    4. Remove error prints in vfio_migration_query_flags().
-    5. Rename trace_vfio_migration_probe() to
-       trace_vfio_migration_realize().
-
-    Signed-off-by: Avihai Horon <avihaih@nvidia.com>
-    Reviewed-by: Joao Martins <joao.m.martins@oracle.com>
-    Reviewed-by: Cédric Le Goater <clg@redhat.com>
-    Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
-    Signed-off-by: Cédric Le Goater <clg@redhat.com>
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- hw/vfio/common.c              | 16 ++++++-
- hw/vfio/migration.c           | 79 +++++++++++++++++++++++------------
- hw/vfio/pci.c                 |  4 +-
- hw/vfio/trace-events          |  2 +-
- include/hw/vfio/vfio-common.h |  6 +--
- 5 files changed, 73 insertions(+), 34 deletions(-)
-
-diff --git a/hw/vfio/common.c b/hw/vfio/common.c
-index 3b4ac53f15..136d8243d6 100644
---- a/hw/vfio/common.c
-+++ b/hw/vfio/common.c
-@@ -381,7 +381,7 @@ static unsigned int vfio_migratable_device_num(void)
-     return device_num;
- }
- 
--int vfio_block_multiple_devices_migration(Error **errp)
-+int vfio_block_multiple_devices_migration(VFIODevice *vbasedev, Error **errp)
- {
-     int ret;
- 
-@@ -390,6 +390,12 @@ int vfio_block_multiple_devices_migration(Error **errp)
-         return 0;
-     }
- 
-+    if (vbasedev->enable_migration == ON_OFF_AUTO_ON) {
-+        error_setg(errp, "Migration is currently not supported with multiple "
-+                         "VFIO devices");
-+        return -EINVAL;
-+    }
-+
-     error_setg(&multiple_devices_migration_blocker,
-                "Migration is currently not supported with multiple "
-                "VFIO devices");
-@@ -427,7 +433,7 @@ static bool vfio_viommu_preset(void)
-     return false;
- }
- 
--int vfio_block_giommu_migration(Error **errp)
-+int vfio_block_giommu_migration(VFIODevice *vbasedev, Error **errp)
- {
-     int ret;
- 
-@@ -436,6 +442,12 @@ int vfio_block_giommu_migration(Error **errp)
-         return 0;
-     }
- 
-+    if (vbasedev->enable_migration == ON_OFF_AUTO_ON) {
-+        error_setg(errp,
-+                   "Migration is currently not supported with vIOMMU enabled");
-+        return -EINVAL;
-+    }
-+
-     error_setg(&giommu_migration_blocker,
-                "Migration is currently not supported with vIOMMU enabled");
-     ret = migrate_add_blocker(giommu_migration_blocker, errp);
-diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
-index 7cf143926c..1db7d52ab2 100644
---- a/hw/vfio/migration.c
-+++ b/hw/vfio/migration.c
-@@ -724,14 +724,6 @@ static int vfio_migration_query_flags(VFIODevice *vbasedev, uint64_t *mig_flags)
-     feature->argsz = sizeof(buf);
-     feature->flags = VFIO_DEVICE_FEATURE_GET | VFIO_DEVICE_FEATURE_MIGRATION;
-     if (ioctl(vbasedev->fd, VFIO_DEVICE_FEATURE, feature)) {
--        if (errno == ENOTTY) {
--            error_report("%s: VFIO migration is not supported in kernel",
--                         vbasedev->name);
--        } else {
--            error_report("%s: Failed to query VFIO migration support, err: %s",
--                         vbasedev->name, strerror(errno));
--        }
--
-         return -errno;
-     }
- 
-@@ -810,6 +802,27 @@ static int vfio_migration_init(VFIODevice *vbasedev)
-     return 0;
- }
- 
-+static int vfio_block_migration(VFIODevice *vbasedev, Error *err, Error **errp)
-+{
-+    int ret;
-+
-+    if (vbasedev->enable_migration == ON_OFF_AUTO_ON) {
-+        error_propagate(errp, err);
-+        return -EINVAL;
-+    }
-+
-+    vbasedev->migration_blocker = error_copy(err);
-+    error_free(err);
-+
-+    ret = migrate_add_blocker(vbasedev->migration_blocker, errp);
-+    if (ret < 0) {
-+        error_free(vbasedev->migration_blocker);
-+        vbasedev->migration_blocker = NULL;
-+    }
-+
-+    return ret;
-+}
-+
- /* ---------------------------------------------------------------------- */
- 
- int64_t vfio_mig_bytes_transferred(void)
-@@ -824,40 +837,54 @@ void vfio_reset_bytes_transferred(void)
- 
- int vfio_migration_realize(VFIODevice *vbasedev, Error **errp)
- {
--    int ret = -ENOTSUP;
-+    Error *err = NULL;
-+    int ret;
- 
--    if (!vbasedev->enable_migration) {
--        goto add_blocker;
-+    if (vbasedev->enable_migration == ON_OFF_AUTO_OFF) {
-+        error_setg(&err, "%s: Migration is disabled for VFIO device",
-+                   vbasedev->name);
-+        return vfio_block_migration(vbasedev, err, errp);
-     }
- 
-     ret = vfio_migration_init(vbasedev);
-     if (ret) {
--        goto add_blocker;
-+        if (ret == -ENOTTY) {
-+            error_setg(&err, "%s: VFIO migration is not supported in kernel",
-+                       vbasedev->name);
-+        } else {
-+            error_setg(&err,
-+                       "%s: Migration couldn't be initialized for VFIO device, "
-+                       "err: %d (%s)",
-+                       vbasedev->name, ret, strerror(-ret));
-+        }
-+
-+        return vfio_block_migration(vbasedev, err, errp);
-+    }
-+
-+    if (!vbasedev->dirty_pages_supported) {
-+        if (vbasedev->enable_migration == ON_OFF_AUTO_AUTO) {
-+            error_setg(&err,
-+                       "%s: VFIO device doesn't support device dirty tracking",
-+                       vbasedev->name);
-+            return vfio_block_migration(vbasedev, err, errp);
-+        }
-+
-+        warn_report("%s: VFIO device doesn't support device dirty tracking",
-+                    vbasedev->name);
-     }
- 
--    ret = vfio_block_multiple_devices_migration(errp);
-+    ret = vfio_block_multiple_devices_migration(vbasedev, errp);
-     if (ret) {
-         return ret;
-     }
- 
--    ret = vfio_block_giommu_migration(errp);
-+    ret = vfio_block_giommu_migration(vbasedev, errp);
-     if (ret) {
-         return ret;
-     }
- 
--    trace_vfio_migration_probe(vbasedev->name);
-+    trace_vfio_migration_realize(vbasedev->name);
-     return 0;
--
--add_blocker:
--    error_setg(&vbasedev->migration_blocker,
--               "VFIO device doesn't support migration");
--
--    ret = migrate_add_blocker(vbasedev->migration_blocker, errp);
--    if (ret < 0) {
--        error_free(vbasedev->migration_blocker);
--        vbasedev->migration_blocker = NULL;
--    }
--    return ret;
- }
- 
- void vfio_migration_exit(VFIODevice *vbasedev)
-diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
-index 15e7554954..6634945a70 100644
---- a/hw/vfio/pci.c
-+++ b/hw/vfio/pci.c
-@@ -3371,8 +3371,8 @@ static Property vfio_pci_dev_properties[] = {
-                     VFIO_FEATURE_ENABLE_REQ_BIT, true),
-     DEFINE_PROP_BIT("x-igd-opregion", VFIOPCIDevice, features,
-                     VFIO_FEATURE_ENABLE_IGD_OPREGION_BIT, false),
--    DEFINE_PROP_BOOL("x-enable-migration", VFIOPCIDevice,
--                     vbasedev.enable_migration, false),
-+    DEFINE_PROP_ON_OFF_AUTO("enable-migration", VFIOPCIDevice,
-+                            vbasedev.enable_migration, ON_OFF_AUTO_AUTO),
-     DEFINE_PROP_BOOL("x-no-mmap", VFIOPCIDevice, vbasedev.no_mmap, false),
-     DEFINE_PROP_BOOL("x-balloon-allowed", VFIOPCIDevice,
-                      vbasedev.ram_block_discard_allowed, false),
-diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events
-index 4150b59e58..0391bd583b 100644
---- a/hw/vfio/trace-events
-+++ b/hw/vfio/trace-events
-@@ -155,7 +155,7 @@ vfio_load_cleanup(const char *name) " (%s)"
- vfio_load_device_config_state(const char *name) " (%s)"
- vfio_load_state(const char *name, uint64_t data) " (%s) data 0x%"PRIx64
- vfio_load_state_device_data(const char *name, uint64_t data_size, int ret) " (%s) size 0x%"PRIx64" ret %d"
--vfio_migration_probe(const char *name) " (%s)"
-+vfio_migration_realize(const char *name) " (%s)"
- vfio_migration_set_state(const char *name, const char *state) " (%s) state %s"
- vfio_migration_state_notifier(const char *name, const char *state) " (%s) state %s"
- vfio_save_block(const char *name, int data_size) " (%s) data_size %d"
-diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
-index 1d19c6f251..93429b9abb 100644
---- a/include/hw/vfio/vfio-common.h
-+++ b/include/hw/vfio/vfio-common.h
-@@ -139,7 +139,7 @@ typedef struct VFIODevice {
-     bool needs_reset;
-     bool no_mmap;
-     bool ram_block_discard_allowed;
--    bool enable_migration;
-+    OnOffAuto enable_migration;
-     VFIODeviceOps *ops;
-     unsigned int num_irqs;
-     unsigned int num_regions;
-@@ -225,9 +225,9 @@ typedef QLIST_HEAD(VFIOGroupList, VFIOGroup) VFIOGroupList;
- extern VFIOGroupList vfio_group_list;
- 
- bool vfio_mig_active(void);
--int vfio_block_multiple_devices_migration(Error **errp);
-+int vfio_block_multiple_devices_migration(VFIODevice *vbasedev, Error **errp);
- void vfio_unblock_multiple_devices_migration(void);
--int vfio_block_giommu_migration(Error **errp);
-+int vfio_block_giommu_migration(VFIODevice *vbasedev, Error **errp);
- int64_t vfio_mig_bytes_transferred(void);
- void vfio_reset_bytes_transferred(void);
- 
--- 
-2.39.3
-
diff --git a/kvm-vfio-migration-Refactor-vfio_save_block-to-return-sa.patch b/kvm-vfio-migration-Refactor-vfio_save_block-to-return-sa.patch
deleted file mode 100644
index 3b61c5d..0000000
--- a/kvm-vfio-migration-Refactor-vfio_save_block-to-return-sa.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From edcf24a08d66d620a10c746824e31d230c8516ce Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:57 +0200
-Subject: [PATCH 13/37] vfio/migration: Refactor vfio_save_block() to return
- saved data size
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [11/28] b4aed6ddcbde159e98275a0675dcdf45d644673b (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit cf53efbbda2e
-Author: Avihai Horon <avihaih@nvidia.com>
-Date:   Wed Jun 21 14:11:58 2023 +0300
-
-    vfio/migration: Refactor vfio_save_block() to return saved data size
-
-    Refactor vfio_save_block() to return the size of saved data on success
-    and -errno on error.
-
-    This will be used in next patch to implement VFIO migration pre-copy
-    support.
-
-    Signed-off-by: Avihai Horon <avihaih@nvidia.com>
-    Reviewed-by: Cédric Le Goater <clg@redhat.com>
-    Reviewed-by: Juan Quintela <quintela@redhat.com>
-    Tested-by: YangHang Liu <yanghliu@redhat.com>
-    Acked-by: Alex Williamson <alex.williamson@redhat.com>
-    Signed-off-by: Cédric Le Goater <clg@redhat.com>
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- hw/vfio/migration.c | 17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
-
-diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
-index 6b58dddb88..235978fd68 100644
---- a/hw/vfio/migration.c
-+++ b/hw/vfio/migration.c
-@@ -241,8 +241,8 @@ static int vfio_query_stop_copy_size(VFIODevice *vbasedev,
-     return 0;
- }
- 
--/* Returns 1 if end-of-stream is reached, 0 if more data and -errno if error */
--static int vfio_save_block(QEMUFile *f, VFIOMigration *migration)
-+/* Returns the size of saved data on success and -errno on error */
-+static ssize_t vfio_save_block(QEMUFile *f, VFIOMigration *migration)
- {
-     ssize_t data_size;
- 
-@@ -252,7 +252,7 @@ static int vfio_save_block(QEMUFile *f, VFIOMigration *migration)
-         return -errno;
-     }
-     if (data_size == 0) {
--        return 1;
-+        return 0;
-     }
- 
-     qemu_put_be64(f, VFIO_MIG_FLAG_DEV_DATA_STATE);
-@@ -262,7 +262,7 @@ static int vfio_save_block(QEMUFile *f, VFIOMigration *migration)
- 
-     trace_vfio_save_block(migration->vbasedev->name, data_size);
- 
--    return qemu_file_get_error(f);
-+    return qemu_file_get_error(f) ?: data_size;
- }
- 
- /* ---------------------------------------------------------------------- */
-@@ -335,6 +335,7 @@ static void vfio_state_pending_exact(void *opaque, uint64_t *must_precopy,
- static int vfio_save_complete_precopy(QEMUFile *f, void *opaque)
- {
-     VFIODevice *vbasedev = opaque;
-+    ssize_t data_size;
-     int ret;
- 
-     /* We reach here with device state STOP only */
-@@ -345,11 +346,11 @@ static int vfio_save_complete_precopy(QEMUFile *f, void *opaque)
-     }
- 
-     do {
--        ret = vfio_save_block(f, vbasedev->migration);
--        if (ret < 0) {
--            return ret;
-+        data_size = vfio_save_block(f, vbasedev->migration);
-+        if (data_size < 0) {
-+            return data_size;
-         }
--    } while (!ret);
-+    } while (data_size);
- 
-     qemu_put_be64(f, VFIO_MIG_FLAG_END_OF_STATE);
-     ret = qemu_file_get_error(f);
--- 
-2.39.3
-
diff --git a/kvm-vfio-migration-Remove-print-of-Migration-disabled.patch b/kvm-vfio-migration-Remove-print-of-Migration-disabled.patch
deleted file mode 100644
index ad3c6ca..0000000
--- a/kvm-vfio-migration-Remove-print-of-Migration-disabled.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 5bb94c4eaeb94f0b41a57660098a4c12a295b725 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:57 +0200
-Subject: [PATCH 28/37] vfio/migration: Remove print of "Migration disabled"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [26/28] c7ff1f9c90b4cfcb327ef474042ea71ea577a94d (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit 0520d63c7701
-Author: Zhenzhong Duan <zhenzhong.duan@intel.com>
-Date:   Mon Jul 3 15:15:09 2023 +0800
-
-    vfio/migration: Remove print of "Migration disabled"
-
-    Property enable_migration supports [on/off/auto].
-    In ON mode, error pointer is passed to errp and logged.
-    In OFF mode, we doesn't need to log "Migration disabled" as it's intentional.
-    In AUTO mode, we should only ever see errors or warnings if the device
-    supports migration and an error or incompatibility occurs while further
-    probing or configuring it. Lack of support for migration shoundn't
-    generate an error or warning.
-
-    Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
-    Reviewed-by: Joao Martins <joao.m.martins@oracle.com>
-    Reviewed-by: Cédric Le Goater <clg@redhat.com>
-    Signed-off-by: Cédric Le Goater <clg@redhat.com>
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- hw/vfio/pci.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
-index 037b7d4176..a60b868c38 100644
---- a/hw/vfio/pci.c
-+++ b/hw/vfio/pci.c
-@@ -3233,7 +3233,6 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
-     if (!pdev->failover_pair_id) {
-         ret = vfio_migration_realize(vbasedev, errp);
-         if (ret) {
--            error_report("%s: Migration disabled", vbasedev->name);
-             goto out_deregister;
-         }
-     }
--- 
-2.39.3
-
diff --git a/kvm-vfio-migration-Reset-bytes_transferred-properly.patch b/kvm-vfio-migration-Reset-bytes_transferred-properly.patch
deleted file mode 100644
index 2666460..0000000
--- a/kvm-vfio-migration-Reset-bytes_transferred-properly.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From a63b4010ba4f491c9144afff363bebcf35ecf496 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:57 +0200
-Subject: [PATCH 20/37] vfio/migration: Reset bytes_transferred properly
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [18/28] e9a70faeca4fd5aa7ef36502cf76bf0b62f65057 (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit 808642a2f640
-Author: Avihai Horon <avihaih@nvidia.com>
-Date:   Wed Jun 28 10:31:11 2023 +0300
-
-    vfio/migration: Reset bytes_transferred properly
-
-    Currently, VFIO bytes_transferred is not reset properly:
-    1. bytes_transferred is not reset after a VM snapshot (so a migration
-       following a snapshot will report incorrect value).
-    2. bytes_transferred is a single counter for all VFIO devices, however
-       upon migration failure it is reset multiple times, by each VFIO
-       device.
-
-    Fix it by introducing a new function vfio_reset_bytes_transferred() and
-    calling it during migration and snapshot start.
-
-    Remove existing bytes_transferred reset in VFIO migration state
-    notifier, which is not needed anymore.
-
-    Fixes: 3710586caa5d ("qapi: Add VFIO devices migration stats in Migration stats")
-    Signed-off-by: Avihai Horon <avihaih@nvidia.com>
-    Reviewed-by: Cédric Le Goater <clg@redhat.com>
-    Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
-    Signed-off-by: Cédric Le Goater <clg@redhat.com>
-
-Conflicts:
-    - migration/migration.c
-      migration/savevm.c
-      context changes due to commit aff3f6606d14 ("migration: Rename
-      ram_counters to mig_stats")
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- hw/vfio/migration.c           |  6 +++++-
- include/hw/vfio/vfio-common.h |  1 +
- migration/migration.c         |  1 +
- migration/migration.h         |  1 +
- migration/savevm.c            |  1 +
- migration/target.c            | 17 +++++++++++++++--
- 6 files changed, 24 insertions(+), 3 deletions(-)
-
-diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
-index acbf0bb7ab..7cf143926c 100644
---- a/hw/vfio/migration.c
-+++ b/hw/vfio/migration.c
-@@ -697,7 +697,6 @@ static void vfio_migration_state_notifier(Notifier *notifier, void *data)
-     case MIGRATION_STATUS_CANCELLING:
-     case MIGRATION_STATUS_CANCELLED:
-     case MIGRATION_STATUS_FAILED:
--        bytes_transferred = 0;
-         /*
-          * If setting the device in RUNNING state fails, the device should
-          * be reset. To do so, use ERROR state as a recover state.
-@@ -818,6 +817,11 @@ int64_t vfio_mig_bytes_transferred(void)
-     return bytes_transferred;
- }
- 
-+void vfio_reset_bytes_transferred(void)
-+{
-+    bytes_transferred = 0;
-+}
-+
- int vfio_migration_realize(VFIODevice *vbasedev, Error **errp)
- {
-     int ret = -ENOTSUP;
-diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
-index 6d1b8487c3..1d19c6f251 100644
---- a/include/hw/vfio/vfio-common.h
-+++ b/include/hw/vfio/vfio-common.h
-@@ -229,6 +229,7 @@ int vfio_block_multiple_devices_migration(Error **errp);
- void vfio_unblock_multiple_devices_migration(void);
- int vfio_block_giommu_migration(Error **errp);
- int64_t vfio_mig_bytes_transferred(void);
-+void vfio_reset_bytes_transferred(void);
- 
- #ifdef CONFIG_LINUX
- int vfio_get_region_info(VFIODevice *vbasedev, int index,
-diff --git a/migration/migration.c b/migration/migration.c
-index 9bf1caee6c..47ad6c43cb 100644
---- a/migration/migration.c
-+++ b/migration/migration.c
-@@ -1638,6 +1638,7 @@ static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc,
-      */
-     memset(&ram_counters, 0, sizeof(ram_counters));
-     memset(&compression_counters, 0, sizeof(compression_counters));
-+    reset_vfio_bytes_transferred();
- 
-     return true;
- }
-diff --git a/migration/migration.h b/migration/migration.h
-index e9679f8029..7ccf460aa2 100644
---- a/migration/migration.h
-+++ b/migration/migration.h
-@@ -495,6 +495,7 @@ bool migration_rate_limit(void);
- void migration_cancel(const Error *error);
- 
- void populate_vfio_info(MigrationInfo *info);
-+void reset_vfio_bytes_transferred(void);
- void postcopy_temp_page_reset(PostcopyTmpPage *tmp_page);
- 
- #endif
-diff --git a/migration/savevm.c b/migration/savevm.c
-index aff70e6263..83088fc3f8 100644
---- a/migration/savevm.c
-+++ b/migration/savevm.c
-@@ -1620,6 +1620,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
-     migrate_init(ms);
-     memset(&ram_counters, 0, sizeof(ram_counters));
-     memset(&compression_counters, 0, sizeof(compression_counters));
-+    reset_vfio_bytes_transferred();
-     ms->to_dst_file = f;
- 
-     qemu_mutex_unlock_iothread();
-diff --git a/migration/target.c b/migration/target.c
-index 00ca007f97..f39c9a8d88 100644
---- a/migration/target.c
-+++ b/migration/target.c
-@@ -14,12 +14,25 @@
- #include "hw/vfio/vfio-common.h"
- #endif
- 
-+#ifdef CONFIG_VFIO
- void populate_vfio_info(MigrationInfo *info)
- {
--#ifdef CONFIG_VFIO
-     if (vfio_mig_active()) {
-         info->vfio = g_malloc0(sizeof(*info->vfio));
-         info->vfio->transferred = vfio_mig_bytes_transferred();
-     }
--#endif
- }
-+
-+void reset_vfio_bytes_transferred(void)
-+{
-+    vfio_reset_bytes_transferred();
-+}
-+#else
-+void populate_vfio_info(MigrationInfo *info)
-+{
-+}
-+
-+void reset_vfio_bytes_transferred(void)
-+{
-+}
-+#endif
--- 
-2.39.3
-
diff --git a/kvm-vfio-migration-Return-bool-type-for-vfio_migration_r.patch b/kvm-vfio-migration-Return-bool-type-for-vfio_migration_r.patch
deleted file mode 100644
index efd42a9..0000000
--- a/kvm-vfio-migration-Return-bool-type-for-vfio_migration_r.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From 223eef8363c9ba58514b2d4f93e5ff015d111ff2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:57 +0200
-Subject: [PATCH 29/37] vfio/migration: Return bool type for
- vfio_migration_realize()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [27/28] d5aea3ea4c53e4573076cbacbbe3134f9f0f9e53 (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit d4a2af747d5a
-Author: Zhenzhong Duan <zhenzhong.duan@intel.com>
-Date:   Mon Jul 3 15:15:10 2023 +0800
-
-    vfio/migration: Return bool type for vfio_migration_realize()
-
-    Make vfio_migration_realize() adhere to the convention of other realize()
-    callbacks(like qdev_realize) by returning bool instead of int.
-
-    Suggested-by: Cédric Le Goater <clg@redhat.com>
-    Suggested-by: Joao Martins <joao.m.martins@oracle.com>
-    Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
-    Reviewed-by: Joao Martins <joao.m.martins@oracle.com>
-    Reviewed-by: Cédric Le Goater <clg@redhat.com>
-    Signed-off-by: Cédric Le Goater <clg@redhat.com>
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- hw/vfio/migration.c           | 15 ++++++++++-----
- hw/vfio/pci.c                 |  3 +--
- include/hw/vfio/vfio-common.h |  2 +-
- 3 files changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
-index e3954570c8..2674f4bc47 100644
---- a/hw/vfio/migration.c
-+++ b/hw/vfio/migration.c
-@@ -846,7 +846,12 @@ void vfio_reset_bytes_transferred(void)
-     bytes_transferred = 0;
- }
- 
--int vfio_migration_realize(VFIODevice *vbasedev, Error **errp)
-+/*
-+ * Return true when either migration initialized or blocker registered.
-+ * Currently only return false when adding blocker fails which will
-+ * de-register vfio device.
-+ */
-+bool vfio_migration_realize(VFIODevice *vbasedev, Error **errp)
- {
-     Error *err = NULL;
-     int ret;
-@@ -854,7 +859,7 @@ int vfio_migration_realize(VFIODevice *vbasedev, Error **errp)
-     if (vbasedev->enable_migration == ON_OFF_AUTO_OFF) {
-         error_setg(&err, "%s: Migration is disabled for VFIO device",
-                    vbasedev->name);
--        return vfio_block_migration(vbasedev, err, errp);
-+        return !vfio_block_migration(vbasedev, err, errp);
-     }
- 
-     ret = vfio_migration_init(vbasedev);
-@@ -869,7 +874,7 @@ int vfio_migration_realize(VFIODevice *vbasedev, Error **errp)
-                        vbasedev->name, ret, strerror(-ret));
-         }
- 
--        return vfio_block_migration(vbasedev, err, errp);
-+        return !vfio_block_migration(vbasedev, err, errp);
-     }
- 
-     if (!vbasedev->dirty_pages_supported) {
-@@ -896,7 +901,7 @@ int vfio_migration_realize(VFIODevice *vbasedev, Error **errp)
-     }
- 
-     trace_vfio_migration_realize(vbasedev->name);
--    return 0;
-+    return true;
- 
- add_blocker:
-     ret = vfio_block_migration(vbasedev, err, errp);
-@@ -904,7 +909,7 @@ out_deinit:
-     if (ret) {
-         vfio_migration_deinit(vbasedev);
-     }
--    return ret;
-+    return !ret;
- }
- 
- void vfio_migration_exit(VFIODevice *vbasedev)
-diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
-index a60b868c38..ba40ca8784 100644
---- a/hw/vfio/pci.c
-+++ b/hw/vfio/pci.c
-@@ -3231,8 +3231,7 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
-     }
- 
-     if (!pdev->failover_pair_id) {
--        ret = vfio_migration_realize(vbasedev, errp);
--        if (ret) {
-+        if (!vfio_migration_realize(vbasedev, errp)) {
-             goto out_deregister;
-         }
-     }
-diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
-index 45167c8a8a..da43d27352 100644
---- a/include/hw/vfio/vfio-common.h
-+++ b/include/hw/vfio/vfio-common.h
-@@ -252,7 +252,7 @@ int vfio_spapr_create_window(VFIOContainer *container,
- int vfio_spapr_remove_window(VFIOContainer *container,
-                              hwaddr offset_within_address_space);
- 
--int vfio_migration_realize(VFIODevice *vbasedev, Error **errp);
-+bool vfio_migration_realize(VFIODevice *vbasedev, Error **errp);
- void vfio_migration_exit(VFIODevice *vbasedev);
- 
- #endif /* HW_VFIO_VFIO_COMMON_H */
--- 
-2.39.3
-
diff --git a/kvm-vfio-migration-Skip-log_sync-during-migration-SETUP-.patch b/kvm-vfio-migration-Skip-log_sync-during-migration-SETUP-.patch
deleted file mode 100644
index 6211db7..0000000
--- a/kvm-vfio-migration-Skip-log_sync-during-migration-SETUP-.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 76208f7824d5139ac8d86140b0e01031b67638cc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:56 +0200
-Subject: [PATCH 04/37] vfio/migration: Skip log_sync during migration SETUP
- state
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [2/28] 4c340992b472ac4627b57705f4e971f14bbb0846 (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit ff180c6bd7a8
-Author: Avihai Horon <avihaih@nvidia.com>
-Date:   Mon Apr 3 16:00:00 2023 +0300
-
-    vfio/migration: Skip log_sync during migration SETUP state
-
-    Currently, VFIO log_sync can be issued while migration is in SETUP
-    state. However, doing this log_sync is at best redundant and at worst
-    can fail.
-
-    Redundant -- all RAM is marked dirty in migration SETUP state and is
-    transferred only after migration is set to ACTIVE state, so doing
-    log_sync during migration SETUP is pointless.
-
-    Can fail -- there is a time window, between setting migration state to
-    SETUP and starting dirty tracking by RAM save_live_setup handler, during
-    which dirty tracking is still not started. Any VFIO log_sync call that
-    is issued during this time window will fail. For example, this error can
-    be triggered by migrating a VM when a GUI is active, which constantly
-    calls log_sync.
-
-    Fix it by skipping VFIO log_sync while migration is in SETUP state.
-
-    Fixes: 758b96b61d5c ("vfio/migrate: Move switch of dirty tracking into vfio_memory_listener")
-    Signed-off-by: Avihai Horon <avihaih@nvidia.com>
-    Link: https://lore.kernel.org/r/20230403130000.6422-1-avihaih@nvidia.com
-    Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- hw/vfio/common.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/hw/vfio/common.c b/hw/vfio/common.c
-index 4d01ea3515..78358ede27 100644
---- a/hw/vfio/common.c
-+++ b/hw/vfio/common.c
-@@ -478,7 +478,8 @@ static bool vfio_devices_all_dirty_tracking(VFIOContainer *container)
-     VFIODevice *vbasedev;
-     MigrationState *ms = migrate_get_current();
- 
--    if (!migration_is_setup_or_active(ms->state)) {
-+    if (ms->state != MIGRATION_STATUS_ACTIVE &&
-+        ms->state != MIGRATION_STATUS_DEVICE) {
-         return false;
-     }
- 
--- 
-2.39.3
-
diff --git a/kvm-vfio-migration-Store-VFIO-migration-flags-in-VFIOMig.patch b/kvm-vfio-migration-Store-VFIO-migration-flags-in-VFIOMig.patch
deleted file mode 100644
index 2db8511..0000000
--- a/kvm-vfio-migration-Store-VFIO-migration-flags-in-VFIOMig.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 77353cdafd08562dff9c99e9f3984d12224bee52 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:57 +0200
-Subject: [PATCH 14/37] vfio/migration: Store VFIO migration flags in
- VFIOMigration
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [12/28] 31a9c39e6ee6338a35dc08c3e7f5c1a204166249 (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit 6cd1fe11598a
-Author: Avihai Horon <avihaih@nvidia.com>
-Date:   Wed Jun 21 14:11:59 2023 +0300
-
-    vfio/migration: Store VFIO migration flags in VFIOMigration
-
-    VFIO migration flags are queried once in vfio_migration_init(). Store
-    them in VFIOMigration so they can be used later to check the device's
-    migration capabilities without re-querying them.
-
-    This will be used in the next patch to check if the device supports
-    precopy migration.
-
-    Signed-off-by: Avihai Horon <avihaih@nvidia.com>
-    Reviewed-by: Cédric Le Goater <clg@redhat.com>
-    Tested-by: YangHang Liu <yanghliu@redhat.com>
-    Acked-by: Alex Williamson <alex.williamson@redhat.com>
-    Signed-off-by: Cédric Le Goater <clg@redhat.com>
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- hw/vfio/migration.c           | 1 +
- include/hw/vfio/vfio-common.h | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
-index 235978fd68..8d33414379 100644
---- a/hw/vfio/migration.c
-+++ b/hw/vfio/migration.c
-@@ -603,6 +603,7 @@ static int vfio_migration_init(VFIODevice *vbasedev)
-     migration->vbasedev = vbasedev;
-     migration->device_state = VFIO_DEVICE_STATE_RUNNING;
-     migration->data_fd = -1;
-+    migration->mig_flags = mig_flags;
- 
-     vbasedev->dirty_pages_supported = vfio_dma_logging_supported(vbasedev);
- 
-diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
-index eed244f25f..5f29dab839 100644
---- a/include/hw/vfio/vfio-common.h
-+++ b/include/hw/vfio/vfio-common.h
-@@ -66,6 +66,7 @@ typedef struct VFIOMigration {
-     int data_fd;
-     void *data_buffer;
-     size_t data_buffer_size;
-+    uint64_t mig_flags;
- } VFIOMigration;
- 
- typedef struct VFIOAddressSpace {
--- 
-2.39.3
-
diff --git a/kvm-vfio-pci-Call-vfio_prepare_kvm_msi_virq_batch-in-MSI.patch b/kvm-vfio-pci-Call-vfio_prepare_kvm_msi_virq_batch-in-MSI.patch
deleted file mode 100644
index b5d9d37..0000000
--- a/kvm-vfio-pci-Call-vfio_prepare_kvm_msi_virq_batch-in-MSI.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From b5a69101abac153c9c9be7f539d810e3e4af3bdf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:57 +0200
-Subject: [PATCH 19/37] vfio/pci: Call vfio_prepare_kvm_msi_virq_batch() in MSI
- retry path
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [17/28] 2067bb58f3a2c1a793e5566cee3c78a8299c9c1c (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit c17408892319
-Author: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
-Date:   Tue Jun 13 15:09:43 2023 +0100
-
-    vfio/pci: Call vfio_prepare_kvm_msi_virq_batch() in MSI retry path
-
-    When vfio_enable_vectors() returns with less than requested nr_vectors
-    we retry with what kernel reported back. But the retry path doesn't
-    call vfio_prepare_kvm_msi_virq_batch() and this results in,
-
-    qemu-system-aarch64: vfio: Error: Failed to enable 4 MSI vectors, retry with 1
-    qemu-system-aarch64: ../hw/vfio/pci.c:602: vfio_commit_kvm_msi_virq_batch: Assertion `vdev->defer_kvm_irq_routing' failed
-
-    Fixes: dc580d51f7dd ("vfio: defer to commit kvm irq routing when enable msi/msix")
-    Reviewed-by: Longpeng <longpeng2@huawei.com>
-    Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>
-    Reviewed-by: Cédric Le Goater <clg@redhat.com>
-    Signed-off-by: Cédric Le Goater <clg@redhat.com>
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- hw/vfio/pci.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
-index 7c5e2b5996..15e7554954 100644
---- a/hw/vfio/pci.c
-+++ b/hw/vfio/pci.c
-@@ -666,6 +666,8 @@ static void vfio_msi_enable(VFIOPCIDevice *vdev)
- 
-     vfio_disable_interrupts(vdev);
- 
-+    vdev->nr_vectors = msi_nr_vectors_allocated(&vdev->pdev);
-+retry:
-     /*
-      * Setting vector notifiers needs to enable route for each vector.
-      * Deferring to commit the KVM routes once rather than per vector
-@@ -673,8 +675,6 @@ static void vfio_msi_enable(VFIOPCIDevice *vdev)
-      */
-     vfio_prepare_kvm_msi_virq_batch(vdev);
- 
--    vdev->nr_vectors = msi_nr_vectors_allocated(&vdev->pdev);
--retry:
-     vdev->msi_vectors = g_new0(VFIOMSIVector, vdev->nr_vectors);
- 
-     for (i = 0; i < vdev->nr_vectors; i++) {
--- 
-2.39.3
-
diff --git a/kvm-vfio-pci-Disable-INTx-in-vfio_realize-error-path.patch b/kvm-vfio-pci-Disable-INTx-in-vfio_realize-error-path.patch
deleted file mode 100644
index 0aca4ef..0000000
--- a/kvm-vfio-pci-Disable-INTx-in-vfio_realize-error-path.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 816c20b23546d31316c9ca450db8a6668ac6216c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:57 +0200
-Subject: [PATCH 25/37] vfio/pci: Disable INTx in vfio_realize error path
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [23/28] 2fde4bad00c4286e6bbe24947c2bfd6468fc0ff3 (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit adee0da0368f
-Author: Zhenzhong Duan <zhenzhong.duan@intel.com>
-Date:   Mon Jul 3 15:15:06 2023 +0800
-
-    vfio/pci: Disable INTx in vfio_realize error path
-
-    When vfio realize fails, INTx isn't disabled if it has been enabled.
-    This may confuse host side with unhandled interrupt report.
-
-    Fixes: c5478fea27ac ("vfio/pci: Respond to KVM irqchip change notifier")
-    Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
-    Reviewed-by: Joao Martins <joao.m.martins@oracle.com>
-    Reviewed-by: Cédric Le Goater <clg@redhat.com>
-    Signed-off-by: Cédric Le Goater <clg@redhat.com>
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- hw/vfio/pci.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
-index 87bd440504..2d059832a4 100644
---- a/hw/vfio/pci.c
-+++ b/hw/vfio/pci.c
-@@ -3244,6 +3244,9 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
-     return;
- 
- out_deregister:
-+    if (vdev->interrupt == VFIO_INT_INTx) {
-+        vfio_intx_disable(vdev);
-+    }
-     pci_device_set_intx_routing_notifier(&vdev->pdev, NULL);
-     if (vdev->irqchip_change_notifier.notify) {
-         kvm_irqchip_remove_change_notifier(&vdev->irqchip_change_notifier);
--- 
-2.39.3
-
diff --git a/kvm-vfio-pci-Fix-a-segfault-in-vfio_realize.patch b/kvm-vfio-pci-Fix-a-segfault-in-vfio_realize.patch
deleted file mode 100644
index d05d114..0000000
--- a/kvm-vfio-pci-Fix-a-segfault-in-vfio_realize.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 0b1ab3aacc02e70bfe8440236eb9def426bbe10e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:57 +0200
-Subject: [PATCH 22/37] vfio/pci: Fix a segfault in vfio_realize
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [20/28] 48b9c1efe295c2672693d9c99f6d11738d2b98d1 (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit 357bd7932a13
-Author: Zhenzhong Duan <zhenzhong.duan@intel.com>
-Date:   Thu Jun 29 16:40:38 2023 +0800
-
-    vfio/pci: Fix a segfault in vfio_realize
-
-    The kvm irqchip notifier is only registered if the device supports
-    INTx, however it's unconditionally removed in vfio realize error
-    path. If the assigned device does not support INTx, this will cause
-    QEMU to crash when vfio realize fails. Change it to conditionally
-    remove the notifier only if the notify hook is setup.
-
-    Before fix:
-    (qemu) device_add vfio-pci,host=81:11.1,id=vfio1,bus=root1,xres=1
-    Connection closed by foreign host.
-
-    After fix:
-    (qemu) device_add vfio-pci,host=81:11.1,id=vfio1,bus=root1,xres=1
-    Error: vfio 0000:81:11.1: xres and yres properties require display=on
-    (qemu)
-
-    Fixes: c5478fea27ac ("vfio/pci: Respond to KVM irqchip change notifier")
-    Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
-    Reviewed-by: Cédric Le Goater <clg@redhat.com>
-    Reviewed-by: Joao Martins <joao.m.martins@oracle.com>
-    Signed-off-by: Cédric Le Goater <clg@redhat.com>
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- hw/vfio/pci.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
-index 6634945a70..d08e6c1a20 100644
---- a/hw/vfio/pci.c
-+++ b/hw/vfio/pci.c
-@@ -3245,7 +3245,9 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
- 
- out_deregister:
-     pci_device_set_intx_routing_notifier(&vdev->pdev, NULL);
--    kvm_irqchip_remove_change_notifier(&vdev->irqchip_change_notifier);
-+    if (vdev->irqchip_change_notifier.notify) {
-+        kvm_irqchip_remove_change_notifier(&vdev->irqchip_change_notifier);
-+    }
- out_teardown:
-     vfio_teardown_msi(vdev);
-     vfio_bars_exit(vdev);
--- 
-2.39.3
-
diff --git a/kvm-vfio-pci-Fix-a-use-after-free-issue.patch b/kvm-vfio-pci-Fix-a-use-after-free-issue.patch
deleted file mode 100644
index 1fa725f..0000000
--- a/kvm-vfio-pci-Fix-a-use-after-free-issue.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2437a06ff137c4bc856df096e42407c1f50b25b0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:56 +0200
-Subject: [PATCH 06/37] vfio/pci: Fix a use-after-free issue
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [4/28] eca69a7e0a6fb8c1c70be8b91209a53b040e30ba (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit b83b40b61484
-Author: Zhenzhong Duan <zhenzhong.duan@intel.com>
-Date:   Wed May 17 10:46:51 2023 +0800
-
-    vfio/pci: Fix a use-after-free issue
-
-    vbasedev->name is freed wrongly which leads to garbage VFIO trace log.
-    Fix it by allocating a dup of vbasedev->name and then free the dup.
-
-    Fixes: 2dca1b37a760 ("vfio/pci: add support for VF token")
-    Suggested-by: Alex Williamson <alex.williamson@redhat.com>
-    Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
-    Reviewed-by: Cédric Le Goater <clg@redhat.com>
-    Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
-    Acked-by: Alex Williamson <alex.williamson@redhat.com>
-    Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-    Signed-off-by: Cédric Le Goater <clg@redhat.com>
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- hw/vfio/pci.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
-index 6cd3a98c39..7c5e2b5996 100644
---- a/hw/vfio/pci.c
-+++ b/hw/vfio/pci.c
-@@ -3018,7 +3018,7 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
-         qemu_uuid_unparse(&vdev->vf_token, uuid);
-         name = g_strdup_printf("%s vf_token=%s", vbasedev->name, uuid);
-     } else {
--        name = vbasedev->name;
-+        name = g_strdup(vbasedev->name);
-     }
- 
-     ret = vfio_get_device(group, name, vbasedev, errp);
--- 
-2.39.3
-
diff --git a/kvm-vfio-pci-Free-leaked-timer-in-vfio_realize-error-pat.patch b/kvm-vfio-pci-Free-leaked-timer-in-vfio_realize-error-pat.patch
deleted file mode 100644
index 3978b96..0000000
--- a/kvm-vfio-pci-Free-leaked-timer-in-vfio_realize-error-pat.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 9c5016c9b3f9cf66d1b531de829e8b5010962695 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:57 +0200
-Subject: [PATCH 23/37] vfio/pci: Free leaked timer in vfio_realize error path
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [21/28] dbaae4e484de4613f7f7735be519b7357627326e (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit 0cc889c8826c
-Author: Zhenzhong Duan <zhenzhong.duan@intel.com>
-Date:   Thu Jun 29 16:40:39 2023 +0800
-
-    vfio/pci: Free leaked timer in vfio_realize error path
-
-    When vfio_realize fails, the mmap_timer used for INTx optimization
-    isn't freed. As this timer isn't activated yet, the potential impact
-    is just a piece of leaked memory.
-
-    Fixes: ea486926b07d ("vfio-pci: Update slow path INTx algorithm timer related")
-    Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
-    Reviewed-by: Cédric Le Goater <clg@redhat.com>
-    Reviewed-by: Joao Martins <joao.m.martins@oracle.com>
-    Signed-off-by: Cédric Le Goater <clg@redhat.com>
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- hw/vfio/pci.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
-index d08e6c1a20..87bd440504 100644
---- a/hw/vfio/pci.c
-+++ b/hw/vfio/pci.c
-@@ -3248,6 +3248,9 @@ out_deregister:
-     if (vdev->irqchip_change_notifier.notify) {
-         kvm_irqchip_remove_change_notifier(&vdev->irqchip_change_notifier);
-     }
-+    if (vdev->intx.mmap_timer) {
-+        timer_free(vdev->intx.mmap_timer);
-+    }
- out_teardown:
-     vfio_teardown_msi(vdev);
-     vfio_bars_exit(vdev);
--- 
-2.39.3
-
diff --git a/kvm-vfio-pci-Static-Resizable-BAR-capability.patch b/kvm-vfio-pci-Static-Resizable-BAR-capability.patch
deleted file mode 100644
index d937140..0000000
--- a/kvm-vfio-pci-Static-Resizable-BAR-capability.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From db53345dba5682c3ba0bc3fc596b30a98dadb88f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:56 +0200
-Subject: [PATCH 05/37] vfio/pci: Static Resizable BAR capability
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [3/28] 42e9f4b517eb919c77c6fdbe771d9d05a91955bd (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit b5048a4cbfa0
-Author: Alex Williamson <alex.williamson@redhat.com>
-Date:   Thu May 4 14:42:48 2023 -0600
-
-    vfio/pci: Static Resizable BAR capability
-
-    The PCI Resizable BAR (ReBAR) capability is currently hidden from the
-    VM because the protocol for interacting with the capability does not
-    support a mechanism for the device to reject an advertised supported
-    BAR size.  However, when assigned to a VM, the act of resizing the
-    BAR requires adjustment of host resources for the device, which
-    absolutely can fail.  Linux does not currently allow us to reserve
-    resources for the device independent of the current usage.
-
-    The only writable field within the ReBAR capability is the BAR Size
-    register.  The PCIe spec indicates that when written, the device
-    should immediately begin to operate with the provided BAR size.  The
-    spec however also notes that software must only write values
-    corresponding to supported sizes as indicated in the capability and
-    control registers.  Writing unsupported sizes produces undefined
-    results.  Therefore, if the hypervisor were to virtualize the
-    capability and control registers such that the current size is the
-    only indicated available size, then a write of anything other than
-    the current size falls into the category of undefined behavior,
-    where we can essentially expose the modified ReBAR capability as
-    read-only.
-
-    This may seem pointless, but users have reported that virtualizing
-    the capability in this way not only allows guest software to expose
-    related features as available (even if only cosmetic), but in some
-    scenarios can resolve guest driver issues.  Additionally, no
-    regressions in behavior have been reported for this change.
-
-    A caveat here is that the PCIe spec requires for compatibility that
-    devices report support for a size in the range of 1MB to 512GB,
-    therefore if the current BAR size falls outside that range we revert
-    to hiding the capability.
-
-    Reviewed-by: Cédric Le Goater <clg@redhat.com>
-    Link: https://lore.kernel.org/r/20230505232308.2869912-1-alex.williamson@redhat.com
-    Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- hw/vfio/pci.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 53 insertions(+), 1 deletion(-)
-
-diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
-index 579b92a6ed..6cd3a98c39 100644
---- a/hw/vfio/pci.c
-+++ b/hw/vfio/pci.c
-@@ -2069,6 +2069,54 @@ static int vfio_add_std_cap(VFIOPCIDevice *vdev, uint8_t pos, Error **errp)
-     return 0;
- }
- 
-+static int vfio_setup_rebar_ecap(VFIOPCIDevice *vdev, uint16_t pos)
-+{
-+    uint32_t ctrl;
-+    int i, nbar;
-+
-+    ctrl = pci_get_long(vdev->pdev.config + pos + PCI_REBAR_CTRL);
-+    nbar = (ctrl & PCI_REBAR_CTRL_NBAR_MASK) >> PCI_REBAR_CTRL_NBAR_SHIFT;
-+
-+    for (i = 0; i < nbar; i++) {
-+        uint32_t cap;
-+        int size;
-+
-+        ctrl = pci_get_long(vdev->pdev.config + pos + PCI_REBAR_CTRL + (i * 8));
-+        size = (ctrl & PCI_REBAR_CTRL_BAR_SIZE) >> PCI_REBAR_CTRL_BAR_SHIFT;
-+
-+        /* The cap register reports sizes 1MB to 128TB, with 4 reserved bits */
-+        cap = size <= 27 ? 1U << (size + 4) : 0;
-+
-+        /*
-+         * The PCIe spec (v6.0.1, 7.8.6) requires HW to support at least one
-+         * size in the range 1MB to 512GB.  We intend to mask all sizes except
-+         * the one currently enabled in the size field, therefore if it's
-+         * outside the range, hide the whole capability as this virtualization
-+         * trick won't work.  If >512GB resizable BARs start to appear, we
-+         * might need an opt-in or reservation scheme in the kernel.
-+         */
-+        if (!(cap & PCI_REBAR_CAP_SIZES)) {
-+            return -EINVAL;
-+        }
-+
-+        /* Hide all sizes reported in the ctrl reg per above requirement. */
-+        ctrl &= (PCI_REBAR_CTRL_BAR_SIZE |
-+                 PCI_REBAR_CTRL_NBAR_MASK |
-+                 PCI_REBAR_CTRL_BAR_IDX);
-+
-+        /*
-+         * The BAR size field is RW, however we've mangled the capability
-+         * register such that we only report a single size, ie. the current
-+         * BAR size.  A write of an unsupported value is undefined, therefore
-+         * the register field is essentially RO.
-+         */
-+        vfio_add_emulated_long(vdev, pos + PCI_REBAR_CAP + (i * 8), cap, ~0);
-+        vfio_add_emulated_long(vdev, pos + PCI_REBAR_CTRL + (i * 8), ctrl, ~0);
-+    }
-+
-+    return 0;
-+}
-+
- static void vfio_add_ext_cap(VFIOPCIDevice *vdev)
- {
-     PCIDevice *pdev = &vdev->pdev;
-@@ -2142,9 +2190,13 @@ static void vfio_add_ext_cap(VFIOPCIDevice *vdev)
-         case 0: /* kernel masked capability */
-         case PCI_EXT_CAP_ID_SRIOV: /* Read-only VF BARs confuse OVMF */
-         case PCI_EXT_CAP_ID_ARI: /* XXX Needs next function virtualization */
--        case PCI_EXT_CAP_ID_REBAR: /* Can't expose read-only */
-             trace_vfio_add_ext_cap_dropped(vdev->vbasedev.name, cap_id, next);
-             break;
-+        case PCI_EXT_CAP_ID_REBAR:
-+            if (!vfio_setup_rebar_ecap(vdev, next)) {
-+                pcie_add_capability(pdev, cap_id, cap_ver, next, size);
-+            }
-+            break;
-         default:
-             pcie_add_capability(pdev, cap_id, cap_ver, next, size);
-         }
--- 
-2.39.3
-
diff --git a/kvm-vfio-pci-add-support-for-VF-token.patch b/kvm-vfio-pci-add-support-for-VF-token.patch
deleted file mode 100644
index 7b40e5e..0000000
--- a/kvm-vfio-pci-add-support-for-VF-token.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 3022cc31bca5a5441e285c971eaf72b7643b9be0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
-Date: Wed, 12 Jul 2023 17:46:56 +0200
-Subject: [PATCH 03/37] vfio/pci: add support for VF token
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Cédric Le Goater <clg@redhat.com>
-RH-MergeRequest: 179: vfio: live migration support
-RH-Bugzilla: 2192818
-RH-Acked-by: Eric Auger <eric.auger@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [1/28] ff24284ede2806e21f4f6709d8abd4c4029b7d5c (clegoate/qemu-kvm-c9s)
-
-Bugzilla: https://bugzilla.redhat.com/2192818
-
-commit 2dca1b37a760
-Author: Minwoo Im <minwoo.im@samsung.com>
-Date:   Mon Mar 20 16:35:22 2023 +0900
-
-    vfio/pci: add support for VF token
-
-    VF token was introduced [1] to kernel vfio-pci along with SR-IOV
-    support [2].  This patch adds support VF token among PF and VF(s). To
-    passthu PCIe VF to a VM, kernel >= v5.7 needs this.
-
-    It can be configured with UUID like:
-
-      -device vfio-pci,host=DDDD:BB:DD:F,vf-token=<uuid>,...
-
-    [1] https://lore.kernel.org/linux-pci/158396393244.5601.10297430724964025753.stgit@gimli.home/
-    [2] https://lore.kernel.org/linux-pci/158396044753.5601.14804870681174789709.stgit@gimli.home/
-
-    Cc: Alex Williamson <alex.williamson@redhat.com>
-    Signed-off-by: Minwoo Im <minwoo.im@samsung.com>
-    Reviewed-by: Klaus Jensen <k.jensen@samsung.com>
-    Link: https://lore.kernel.org/r/20230320073522epcms2p48f682ecdb73e0ae1a4850ad0712fd780@epcms2p4
-    Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
-
-Conflicts:
-    - hw/vfio/pci.c
-      context changes in vfio_realize () due to redhat commit 267071d16b23
-      ("vfio: cap number of devices that can be assigned")
-
-Signed-off-by: Cédric Le Goater <clg@redhat.com>
----
- hw/vfio/pci.c | 13 ++++++++++++-
- hw/vfio/pci.h |  1 +
- 2 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
-index a779053be3..579b92a6ed 100644
---- a/hw/vfio/pci.c
-+++ b/hw/vfio/pci.c
-@@ -2859,6 +2859,8 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
-     int groupid;
-     int ret, i = 0;
-     bool is_mdev;
-+    char uuid[UUID_FMT_LEN];
-+    char *name;
- 
-     if (device_limit && device_limit != vdev->assigned_device_limit) {
-             error_setg(errp, "Assigned device limit has been redefined. "
-@@ -2960,7 +2962,15 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
-         goto error;
-     }
- 
--    ret = vfio_get_device(group, vbasedev->name, vbasedev, errp);
-+    if (!qemu_uuid_is_null(&vdev->vf_token)) {
-+        qemu_uuid_unparse(&vdev->vf_token, uuid);
-+        name = g_strdup_printf("%s vf_token=%s", vbasedev->name, uuid);
-+    } else {
-+        name = vbasedev->name;
-+    }
-+
-+    ret = vfio_get_device(group, name, vbasedev, errp);
-+    g_free(name);
-     if (ret) {
-         vfio_put_group(group);
-         goto error;
-@@ -3292,6 +3302,7 @@ static void vfio_instance_init(Object *obj)
- 
- static Property vfio_pci_dev_properties[] = {
-     DEFINE_PROP_PCI_HOST_DEVADDR("host", VFIOPCIDevice, host),
-+    DEFINE_PROP_UUID_NODEFAULT("vf-token", VFIOPCIDevice, vf_token),
-     DEFINE_PROP_STRING("sysfsdev", VFIOPCIDevice, vbasedev.sysfsdev),
-     DEFINE_PROP_ON_OFF_AUTO("x-pre-copy-dirty-page-tracking", VFIOPCIDevice,
-                             vbasedev.pre_copy_dirty_page_tracking,
-diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h
-index 45235d38ba..10530743ad 100644
---- a/hw/vfio/pci.h
-+++ b/hw/vfio/pci.h
-@@ -137,6 +137,7 @@ struct VFIOPCIDevice {
-     VFIOVGA *vga; /* 0xa0000, 0x3b0, 0x3c0 */
-     void *igd_opregion;
-     PCIHostDeviceAddress host;
-+    QemuUUID vf_token;
-     EventNotifier err_notifier;
-     EventNotifier req_notifier;
-     int (*resetfn)(struct VFIOPCIDevice *);
--- 
-2.39.3
-
diff --git a/kvm-vhost-fix-vhost_dev_enable_notifiers-error-case.patch b/kvm-vhost-fix-vhost_dev_enable_notifiers-error-case.patch
deleted file mode 100644
index 3282c24..0000000
--- a/kvm-vhost-fix-vhost_dev_enable_notifiers-error-case.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From ac54f5f746782da89ab674733af5622e524b58eb Mon Sep 17 00:00:00 2001
-From: Laurent Vivier <lvivier@redhat.com>
-Date: Fri, 2 Jun 2023 18:27:35 +0200
-Subject: [PATCH 4/6] vhost: fix vhost_dev_enable_notifiers() error case
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Laurent Vivier <lvivier@redhat.com>
-RH-MergeRequest: 176: vhost: fix vhost_dev_enable_notifiers() error case
-RH-Jira: RHEL-330
-RH-Acked-by: MST <mst@redhat.com>
-RH-Acked-by: Cindy Lu <lulu@redhat.com>
-RH-Acked-by: Eugenio Pérez <eperezma@redhat.com>
-RH-Acked-by: Jason Wang <jasowang@redhat.com>
-RH-Commit: [1/1] fd30d7501be59f7e5b9d6fc5ed84efcc4037d08e (lvivier/qemu-kvm-centos)
-
-JIRA: https://issues.redhat.com/browse/RHEL-330
-
-in vhost_dev_enable_notifiers(), if virtio_bus_set_host_notifier(true)
-fails, we call vhost_dev_disable_notifiers() that executes
-virtio_bus_set_host_notifier(false) on all queues, even on queues that
-have failed to be initialized.
-
-This triggers a core dump in memory_region_del_eventfd():
-
- virtio_bus_set_host_notifier: unable to init event notifier: Too many open files (-24)
- vhost VQ 1 notifier binding failed: 24
- .../softmmu/memory.c:2611: memory_region_del_eventfd: Assertion `i != mr->ioeventfd_nb' failed.
-
-Fix the problem by providing to vhost_dev_disable_notifiers() the
-number of queues to disable.
-
-Fixes: 8771589b6f81 ("vhost: simplify vhost_dev_enable_notifiers")
-Cc: longpeng2@huawei.com
-Signed-off-by: Laurent Vivier <lvivier@redhat.com>
-Message-Id: <20230602162735.3670785-1-lvivier@redhat.com>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-(cherry picked from commit 92099aa4e9a3bb6856c290afaf41c76f9e3dd9fd)
----
- hw/virtio/vhost.c | 65 ++++++++++++++++++++++++++---------------------
- 1 file changed, 36 insertions(+), 29 deletions(-)
-
-diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
-index a266396576..ae0a033e60 100644
---- a/hw/virtio/vhost.c
-+++ b/hw/virtio/vhost.c
-@@ -1545,6 +1545,40 @@ void vhost_dev_cleanup(struct vhost_dev *hdev)
-     memset(hdev, 0, sizeof(struct vhost_dev));
- }
- 
-+static void vhost_dev_disable_notifiers_nvqs(struct vhost_dev *hdev,
-+                                             VirtIODevice *vdev,
-+                                             unsigned int nvqs)
-+{
-+    BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
-+    int i, r;
-+
-+    /*
-+     * Batch all the host notifiers in a single transaction to avoid
-+     * quadratic time complexity in address_space_update_ioeventfds().
-+     */
-+    memory_region_transaction_begin();
-+
-+    for (i = 0; i < nvqs; ++i) {
-+        r = virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), hdev->vq_index + i,
-+                                         false);
-+        if (r < 0) {
-+            error_report("vhost VQ %d notifier cleanup failed: %d", i, -r);
-+        }
-+        assert(r >= 0);
-+    }
-+
-+    /*
-+     * The transaction expects the ioeventfds to be open when it
-+     * commits. Do it now, before the cleanup loop.
-+     */
-+    memory_region_transaction_commit();
-+
-+    for (i = 0; i < nvqs; ++i) {
-+        virtio_bus_cleanup_host_notifier(VIRTIO_BUS(qbus), hdev->vq_index + i);
-+    }
-+    virtio_device_release_ioeventfd(vdev);
-+}
-+
- /* Stop processing guest IO notifications in qemu.
-  * Start processing them in vhost in kernel.
-  */
-@@ -1574,7 +1608,7 @@ int vhost_dev_enable_notifiers(struct vhost_dev *hdev, VirtIODevice *vdev)
-         if (r < 0) {
-             error_report("vhost VQ %d notifier binding failed: %d", i, -r);
-             memory_region_transaction_commit();
--            vhost_dev_disable_notifiers(hdev, vdev);
-+            vhost_dev_disable_notifiers_nvqs(hdev, vdev, i);
-             return r;
-         }
-     }
-@@ -1591,34 +1625,7 @@ int vhost_dev_enable_notifiers(struct vhost_dev *hdev, VirtIODevice *vdev)
-  */
- void vhost_dev_disable_notifiers(struct vhost_dev *hdev, VirtIODevice *vdev)
- {
--    BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
--    int i, r;
--
--    /*
--     * Batch all the host notifiers in a single transaction to avoid
--     * quadratic time complexity in address_space_update_ioeventfds().
--     */
--    memory_region_transaction_begin();
--
--    for (i = 0; i < hdev->nvqs; ++i) {
--        r = virtio_bus_set_host_notifier(VIRTIO_BUS(qbus), hdev->vq_index + i,
--                                         false);
--        if (r < 0) {
--            error_report("vhost VQ %d notifier cleanup failed: %d", i, -r);
--        }
--        assert (r >= 0);
--    }
--
--    /*
--     * The transaction expects the ioeventfds to be open when it
--     * commits. Do it now, before the cleanup loop.
--     */
--    memory_region_transaction_commit();
--
--    for (i = 0; i < hdev->nvqs; ++i) {
--        virtio_bus_cleanup_host_notifier(VIRTIO_BUS(qbus), hdev->vq_index + i);
--    }
--    virtio_device_release_ioeventfd(vdev);
-+    vhost_dev_disable_notifiers_nvqs(hdev, vdev, hdev->nvqs);
- }
- 
- /* Test and clear event pending status.
--- 
-2.39.3
-
diff --git a/kvm-vhost-vdpa-do-not-cleanup-the-vdpa-vhost-net-structu.patch b/kvm-vhost-vdpa-do-not-cleanup-the-vdpa-vhost-net-structu.patch
deleted file mode 100644
index fd29eb7..0000000
--- a/kvm-vhost-vdpa-do-not-cleanup-the-vdpa-vhost-net-structu.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 4e30ca551fb3740a428017a0debf0a6aab976639 Mon Sep 17 00:00:00 2001
-From: Ani Sinha <anisinha@redhat.com>
-Date: Mon, 19 Jun 2023 12:22:09 +0530
-Subject: [PATCH 6/6] vhost-vdpa: do not cleanup the vdpa/vhost-net structures
- if peer nic is present
-
-RH-Author: Ani Sinha <None>
-RH-MergeRequest: 174: vhost-vdpa: do not cleanup the vdpa/vhost-net structures if peer nic is present
-RH-Bugzilla: 2128929
-RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Commit: [1/1] c70d4e5fd93256326d318e0b507db6b9eb93ad86 (anisinha/centos-qemu-kvm)
-
-When a peer nic is still attached to the vdpa backend, it is too early to free
-up the vhost-net and vdpa structures. If these structures are freed here, then
-QEMU crashes when the guest is being shut down. The following call chain
-would result in an assertion failure since the pointer returned from
-vhost_vdpa_get_vhost_net() would be NULL:
-
-do_vm_stop() -> vm_state_notify() -> virtio_set_status() ->
-virtio_net_vhost_status() -> get_vhost_net().
-
-Therefore, we defer freeing up the structures until at guest shutdown
-time when qemu_cleanup() calls net_cleanup() which then calls
-qemu_del_net_client() which would eventually call vhost_vdpa_cleanup()
-again to free up the structures. This time, the loop in net_cleanup()
-ensures that vhost_vdpa_cleanup() will be called one last time when
-all the peer nics are detached and freed.
-
-All unit tests pass with this change.
-
-CC: imammedo@redhat.com
-CC: jusual@redhat.com
-CC: mst@redhat.com
-Fixes: CVE-2023-3301
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2128929
-Signed-off-by: Ani Sinha <anisinha@redhat.com>
-Message-Id: <20230619065209.442185-1-anisinha@redhat.com>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-(cherry picked from commit a0d7215e339b61c7d7a7b3fcf754954d80d93eb8)
----
- net/vhost-vdpa.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
-index 99904a0da7..8c8900f0f4 100644
---- a/net/vhost-vdpa.c
-+++ b/net/vhost-vdpa.c
-@@ -184,6 +184,14 @@ static void vhost_vdpa_cleanup(NetClientState *nc)
- {
-     VhostVDPAState *s = DO_UPCAST(VhostVDPAState, nc, nc);
- 
-+    /*
-+     * If a peer NIC is attached, do not cleanup anything.
-+     * Cleanup will happen as a part of qemu_cleanup() -> net_cleanup()
-+     * when the guest is shutting down.
-+     */
-+    if (nc->peer && nc->peer->info->type == NET_CLIENT_DRIVER_NIC) {
-+        return;
-+    }
-     qemu_vfree(s->cvq_cmd_out_buffer);
-     qemu_vfree(s->status);
-     if (s->vhost_net) {
--- 
-2.39.3
-
diff --git a/kvm-vhost-vdpa-mute-unaligned-memory-error-report.patch b/kvm-vhost-vdpa-mute-unaligned-memory-error-report.patch
deleted file mode 100644
index 3711949..0000000
--- a/kvm-vhost-vdpa-mute-unaligned-memory-error-report.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 3b51a7b84ea21360c6d551284aecb8b6f371e888 Mon Sep 17 00:00:00 2001
-From: Laurent Vivier <lvivier@redhat.com>
-Date: Tue, 4 Jul 2023 09:19:31 +0200
-Subject: [PATCH 9/9] vhost-vdpa: mute unaligned memory error report
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Laurent Vivier <lvivier@redhat.com>
-RH-MergeRequest: 193: vhost-vdpa: mute unaligned memory error report
-RH-Bugzilla: 2141965
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: Eugenio Pérez <eperezma@redhat.com>
-RH-Commit: [1/1] 60f5385d41269ce9310e1e8e0a2f1106e3a16ada (lvivier/qemu-kvm-centos)
-
-BZ: https://bugzilla.redhat.com/show_bug.cgi?id=2141965
-
-With TPM CRM device, vhost-vdpa reports an error when it tries
-to register a listener for a non aligned memory region:
-
-  qemu-system-x86_64: vhost_vdpa_listener_region_add received unaligned region
-  qemu-system-x86_64: vhost_vdpa_listener_region_del received unaligned region
-
-This error can be confusing for the user whereas we only need to skip
-the region (as it's already done after the error_report())
-
-Rather than introducing a special case for TPM CRB memory section
-to not display the message in this case, simply replace the
-error_report() by a trace function (with more information, like the
-memory region name).
-
-Signed-off-by: Laurent Vivier <lvivier@redhat.com>
-Message-Id: <20230704071931.575888-2-lvivier@redhat.com>
-Reviewed-by: David Hildenbrand <david@redhat.com>
-Acked-by: Jason Wang <jasowang@redhat.com>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-(cherry picked from commit 77812aa7b1fdf8f547c35a7f9a4eb1cbf3a073db)
----
- hw/virtio/trace-events | 2 ++
- hw/virtio/vhost-vdpa.c | 8 ++++++--
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events
-index 68b752e304..300dec8d3e 100644
---- a/hw/virtio/trace-events
-+++ b/hw/virtio/trace-events
-@@ -34,7 +34,9 @@ vhost_vdpa_dma_map(void *vdpa, int fd, uint32_t msg_type, uint32_t asid, uint64_
- vhost_vdpa_dma_unmap(void *vdpa, int fd, uint32_t msg_type, uint32_t asid, uint64_t iova, uint64_t size, uint8_t type) "vdpa:%p fd: %d msg_type: %"PRIu32" asid: %"PRIu32" iova: 0x%"PRIx64" size: 0x%"PRIx64" type: %"PRIu8
- vhost_vdpa_listener_begin_batch(void *v, int fd, uint32_t msg_type, uint8_t type)  "vdpa:%p fd: %d msg_type: %"PRIu32" type: %"PRIu8
- vhost_vdpa_listener_commit(void *v, int fd, uint32_t msg_type, uint8_t type)  "vdpa:%p fd: %d msg_type: %"PRIu32" type: %"PRIu8
-+vhost_vdpa_listener_region_add_unaligned(void *v, const char *name, uint64_t offset_as, uint64_t offset_page) "vdpa: %p region %s offset_within_address_space %"PRIu64" offset_within_region %"PRIu64
- vhost_vdpa_listener_region_add(void *vdpa, uint64_t iova, uint64_t llend, void *vaddr, bool readonly) "vdpa: %p iova 0x%"PRIx64" llend 0x%"PRIx64" vaddr: %p read-only: %d"
-+vhost_vdpa_listener_region_del_unaligned(void *v, const char *name, uint64_t offset_as, uint64_t offset_page) "vdpa: %p region %s offset_within_address_space %"PRIu64" offset_within_region %"PRIu64
- vhost_vdpa_listener_region_del(void *vdpa, uint64_t iova, uint64_t llend) "vdpa: %p iova 0x%"PRIx64" llend 0x%"PRIx64
- vhost_vdpa_add_status(void *dev, uint8_t status) "dev: %p status: 0x%"PRIx8
- vhost_vdpa_init(void *dev, void *vdpa) "dev: %p vdpa: %p"
-diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
-index bc6bad23d5..c04f14420d 100644
---- a/hw/virtio/vhost-vdpa.c
-+++ b/hw/virtio/vhost-vdpa.c
-@@ -202,7 +202,9 @@ static void vhost_vdpa_listener_region_add(MemoryListener *listener,
- 
-     if (unlikely((section->offset_within_address_space & ~TARGET_PAGE_MASK) !=
-                  (section->offset_within_region & ~TARGET_PAGE_MASK))) {
--        error_report("%s received unaligned region", __func__);
-+        trace_vhost_vdpa_listener_region_add_unaligned(v, section->mr->name,
-+                       section->offset_within_address_space & ~TARGET_PAGE_MASK,
-+                       section->offset_within_region & ~TARGET_PAGE_MASK);
-         return;
-     }
- 
-@@ -281,7 +283,9 @@ static void vhost_vdpa_listener_region_del(MemoryListener *listener,
- 
-     if (unlikely((section->offset_within_address_space & ~TARGET_PAGE_MASK) !=
-                  (section->offset_within_region & ~TARGET_PAGE_MASK))) {
--        error_report("%s received unaligned region", __func__);
-+        trace_vhost_vdpa_listener_region_del_unaligned(v, section->mr->name,
-+                       section->offset_within_address_space & ~TARGET_PAGE_MASK,
-+                       section->offset_within_region & ~TARGET_PAGE_MASK);
-         return;
-     }
- 
--- 
-2.39.3
-
diff --git a/kvm-virtio-iommu-Fix-64kB-host-page-size-VFIO-device-ass.patch b/kvm-virtio-iommu-Fix-64kB-host-page-size-VFIO-device-ass.patch
deleted file mode 100644
index acfb3ae..0000000
--- a/kvm-virtio-iommu-Fix-64kB-host-page-size-VFIO-device-ass.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From 08c8af80dbd03b46a6a8397ef0c41cda3e6de22c Mon Sep 17 00:00:00 2001
-From: Eric Auger <eric.auger@redhat.com>
-Date: Wed, 5 Jul 2023 18:51:17 +0200
-Subject: [PATCH 01/37] virtio-iommu: Fix 64kB host page size VFIO device
- assignment
-
-RH-Author: Eric Auger <eric.auger@redhat.com>
-RH-MergeRequest: 182: VIRTIO-IOMMU/VFIO page size related fixes
-RH-Bugzilla: 2211609 2211634
-RH-Acked-by: Gavin Shan <gshan@redhat.com>
-RH-Acked-by: Sebastian Ott <None>
-RH-Commit: [1/2] b48db1c964559505dda4c6c9a3b79d68207b25eb (eauger1/centos-qemu-kvm)
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2211634
-
-When running on a 64kB page size host and protecting a VFIO device
-with the virtio-iommu, qemu crashes with this kind of message:
-
-qemu-kvm: virtio-iommu page mask 0xfffffffffffff000 is incompatible
-with mask 0x20010000
-qemu: hardware error: vfio: DMA mapping failed, unable to continue
-
-This is due to the fact the IOMMU MR corresponding to the VFIO device
-is enabled very late on domain attach, after the machine init.
-The device reports a minimal 64kB page size but it is too late to be
-applied. virtio_iommu_set_page_size_mask() fails and this causes
-vfio_listener_region_add() to end up with hw_error();
-
-To work around this issue, we transiently enable the IOMMU MR on
-machine init to collect the page size requirements and then restore
-the bypass state.
-
-Fixes: 90519b9053 ("virtio-iommu: Add bypass mode support to assigned device")
-Signed-off-by: Eric Auger <eric.auger@redhat.com>
-
-Message-Id: <20230705165118.28194-2-eric.auger@redhat.com>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
-Tested-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
-Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
-(cherry picked from commit 94df5b2180d61fb2ee2b04cc007981e58b6479a9)
-Signed-off-by: Eric Auger <eric.auger@redhat.com>
----
- hw/virtio/trace-events           |  1 +
- hw/virtio/virtio-iommu.c         | 31 +++++++++++++++++++++++++++++--
- include/hw/virtio/virtio-iommu.h |  2 ++
- 3 files changed, 32 insertions(+), 2 deletions(-)
-
-diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events
-index 8f8d05cf9b..68b752e304 100644
---- a/hw/virtio/trace-events
-+++ b/hw/virtio/trace-events
-@@ -131,6 +131,7 @@ virtio_iommu_set_page_size_mask(const char *name, uint64_t old, uint64_t new) "m
- virtio_iommu_notify_flag_add(const char *name) "add notifier to mr %s"
- virtio_iommu_notify_flag_del(const char *name) "del notifier from mr %s"
- virtio_iommu_switch_address_space(uint8_t bus, uint8_t slot, uint8_t fn, bool on) "Device %02x:%02x.%x switching address space (iommu enabled=%d)"
-+virtio_iommu_freeze_granule(uint64_t page_size_mask) "granule set to 0x%"PRIx64
- 
- # virtio-mem.c
- virtio_mem_send_response(uint16_t type) "type=%" PRIu16
-diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
-index 1cd258135d..542679b321 100644
---- a/hw/virtio/virtio-iommu.c
-+++ b/hw/virtio/virtio-iommu.c
-@@ -24,6 +24,7 @@
- #include "hw/virtio/virtio.h"
- #include "sysemu/kvm.h"
- #include "sysemu/reset.h"
-+#include "sysemu/sysemu.h"
- #include "qapi/error.h"
- #include "qemu/error-report.h"
- #include "trace.h"
-@@ -1106,12 +1107,12 @@ static int virtio_iommu_set_page_size_mask(IOMMUMemoryRegion *mr,
-     }
- 
-     /*
--     * After the machine is finalized, we can't change the mask anymore. If by
-+     * Once the granule is frozen we can't change the mask anymore. If by
-      * chance the hotplugged device supports the same granule, we can still
-      * accept it. Having a different masks is possible but the guest will use
-      * sub-optimal block sizes, so warn about it.
-      */
--    if (phase_check(PHASE_MACHINE_READY)) {
-+    if (s->granule_frozen) {
-         int new_granule = ctz64(new_mask);
-         int cur_granule = ctz64(cur_mask);
- 
-@@ -1146,6 +1147,28 @@ static void virtio_iommu_system_reset(void *opaque)
- 
- }
- 
-+static void virtio_iommu_freeze_granule(Notifier *notifier, void *data)
-+{
-+    VirtIOIOMMU *s = container_of(notifier, VirtIOIOMMU, machine_done);
-+    int granule;
-+
-+    if (likely(s->config.bypass)) {
-+        /*
-+         * Transient IOMMU MR enable to collect page_size_mask requirements
-+         * through memory_region_iommu_set_page_size_mask() called by
-+         * VFIO region_add() callback
-+         */
-+         s->config.bypass = false;
-+         virtio_iommu_switch_address_space_all(s);
-+         /* restore default */
-+         s->config.bypass = true;
-+         virtio_iommu_switch_address_space_all(s);
-+    }
-+    s->granule_frozen = true;
-+    granule = ctz64(s->config.page_size_mask);
-+    trace_virtio_iommu_freeze_granule(BIT(granule));
-+}
-+
- static void virtio_iommu_device_realize(DeviceState *dev, Error **errp)
- {
-     VirtIODevice *vdev = VIRTIO_DEVICE(dev);
-@@ -1189,6 +1212,9 @@ static void virtio_iommu_device_realize(DeviceState *dev, Error **errp)
-         error_setg(errp, "VIRTIO-IOMMU is not attached to any PCI bus!");
-     }
- 
-+    s->machine_done.notify = virtio_iommu_freeze_granule;
-+    qemu_add_machine_init_done_notifier(&s->machine_done);
-+
-     qemu_register_reset(virtio_iommu_system_reset, s);
- }
- 
-@@ -1198,6 +1224,7 @@ static void virtio_iommu_device_unrealize(DeviceState *dev)
-     VirtIOIOMMU *s = VIRTIO_IOMMU(dev);
- 
-     qemu_unregister_reset(virtio_iommu_system_reset, s);
-+    qemu_remove_machine_init_done_notifier(&s->machine_done);
- 
-     g_hash_table_destroy(s->as_by_busptr);
-     if (s->domains) {
-diff --git a/include/hw/virtio/virtio-iommu.h b/include/hw/virtio/virtio-iommu.h
-index 2ad5ee320b..a93fc5383e 100644
---- a/include/hw/virtio/virtio-iommu.h
-+++ b/include/hw/virtio/virtio-iommu.h
-@@ -61,6 +61,8 @@ struct VirtIOIOMMU {
-     QemuRecMutex mutex;
-     GTree *endpoints;
-     bool boot_bypass;
-+    Notifier machine_done;
-+    bool granule_frozen;
- };
- 
- #endif
--- 
-2.39.3
-
diff --git a/kvm-virtio-iommu-Rework-the-traces-in-virtio_iommu_set_p.patch b/kvm-virtio-iommu-Rework-the-traces-in-virtio_iommu_set_p.patch
deleted file mode 100644
index 7934a12..0000000
--- a/kvm-virtio-iommu-Rework-the-traces-in-virtio_iommu_set_p.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 643d93343759a350fe0f6327d308bf6a93c79d25 Mon Sep 17 00:00:00 2001
-From: Eric Auger <eric.auger@redhat.com>
-Date: Wed, 5 Jul 2023 18:51:18 +0200
-Subject: [PATCH 02/37] virtio-iommu: Rework the traces in
- virtio_iommu_set_page_size_mask()
-
-RH-Author: Eric Auger <eric.auger@redhat.com>
-RH-MergeRequest: 182: VIRTIO-IOMMU/VFIO page size related fixes
-RH-Bugzilla: 2211609 2211634
-RH-Acked-by: Gavin Shan <gshan@redhat.com>
-RH-Acked-by: Sebastian Ott <None>
-RH-Commit: [2/2] 0af7078dde158f07c83e2b293adc5d9d475688ae (eauger1/centos-qemu-kvm)
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2211609
-
-The current error messages in virtio_iommu_set_page_size_mask()
-sound quite similar for different situations and miss the IOMMU
-memory region that causes the issue.
-
-Clarify them and rework the comment.
-
-Also remove the trace when the new page_size_mask is not applied as
-the current frozen granule is kept. This message is rather confusing
-for the end user and anyway the current granule would have been used
-by the driver.
-
-Signed-off-by: Eric Auger <eric.auger@redhat.com>
-Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
-Message-Id: <20230705165118.28194-3-eric.auger@redhat.com>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
-Tested-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
-(cherry picked from commit 587a7641d53055054d68d67d94c9408ef808f127)
-Signed-off-by: Eric Auger <eric.auger@redhat.com>
----
- hw/virtio/virtio-iommu.c | 19 +++++++------------
- 1 file changed, 7 insertions(+), 12 deletions(-)
-
-diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
-index 542679b321..421e2a944f 100644
---- a/hw/virtio/virtio-iommu.c
-+++ b/hw/virtio/virtio-iommu.c
-@@ -1101,29 +1101,24 @@ static int virtio_iommu_set_page_size_mask(IOMMUMemoryRegion *mr,
-                                           new_mask);
- 
-     if ((cur_mask & new_mask) == 0) {
--        error_setg(errp, "virtio-iommu page mask 0x%"PRIx64
--                   " is incompatible with mask 0x%"PRIx64, cur_mask, new_mask);
-+        error_setg(errp, "virtio-iommu %s reports a page size mask 0x%"PRIx64
-+                   " incompatible with currently supported mask 0x%"PRIx64,
-+                   mr->parent_obj.name, new_mask, cur_mask);
-         return -1;
-     }
- 
-     /*
-      * Once the granule is frozen we can't change the mask anymore. If by
-      * chance the hotplugged device supports the same granule, we can still
--     * accept it. Having a different masks is possible but the guest will use
--     * sub-optimal block sizes, so warn about it.
-+     * accept it.
-      */
-     if (s->granule_frozen) {
--        int new_granule = ctz64(new_mask);
-         int cur_granule = ctz64(cur_mask);
- 
--        if (new_granule != cur_granule) {
--            error_setg(errp, "virtio-iommu page mask 0x%"PRIx64
--                       " is incompatible with mask 0x%"PRIx64, cur_mask,
--                       new_mask);
-+        if (!(BIT(cur_granule) & new_mask)) {
-+            error_setg(errp, "virtio-iommu %s does not support frozen granule 0x%llx",
-+                       mr->parent_obj.name, BIT_ULL(cur_granule));
-             return -1;
--        } else if (new_mask != cur_mask) {
--            warn_report("virtio-iommu page mask 0x%"PRIx64
--                        " does not match 0x%"PRIx64, cur_mask, new_mask);
-         }
-         return 0;
-     }
--- 
-2.39.3
-
diff --git a/kvm-virtio-iommu-Standardize-granule-extraction-and-form.patch b/kvm-virtio-iommu-Standardize-granule-extraction-and-form.patch
deleted file mode 100644
index 638ae98..0000000
--- a/kvm-virtio-iommu-Standardize-granule-extraction-and-form.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 59cd85621b1b14ada843ea0562cc76b6a7c93df4 Mon Sep 17 00:00:00 2001
-From: Eric Auger <eric.auger@redhat.com>
-Date: Tue, 18 Jul 2023 20:21:36 +0200
-Subject: [PATCH 08/14] virtio-iommu: Standardize granule extraction and
- formatting
-
-RH-Author: Eric Auger <eric.auger@redhat.com>
-RH-MergeRequest: 197: virtio-iommu/smmu: backport some late fixes
-RH-Bugzilla: 2229133
-RH-Acked-by: Thomas Huth <thuth@redhat.com>
-RH-Acked-by: Peter Xu <peterx@redhat.com>
-RH-Commit: [2/3] 48784ef2a19174518f66479dcb532230bffe8bf1 (eauger1/centos-qemu-kvm)
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2229133
-
-At several locations we compute the granule from the config
-page_size_mask using ctz() and then format it in traces using
-BIT(). As the page_size_mask is 64b we should use ctz64 and
-BIT_ULL() for formatting. We failed to be consistent.
-
-Note the page_size_mask is garanteed to be non null. The spec
-mandates the device to set at least one bit, so ctz64 cannot
-return 64. This is garanteed by the fact the device
-initializes the page_size_mask to qemu_target_page_mask()
-and then the page_size_mask is further constrained by
-virtio_iommu_set_page_size_mask() callback which can't
-result in a new mask being null. So if Coverity complains
-round those ctz64/BIT_ULL with CID 1517772 this is a false
-positive
-
-Signed-off-by: Eric Auger <eric.auger@redhat.com>
-Fixes: 94df5b2180 ("virtio-iommu: Fix 64kB host page size VFIO device assignment")
-Message-Id: <20230718182136.40096-1-eric.auger@redhat.com>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
-(cherry picked from commit 1084feddc6a677cdfdde56936bfb97cf32cc4dee)
-Signed-off-by: Eric Auger <eric.auger@redhat.com>
----
- hw/virtio/virtio-iommu.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
-index 17ce630200..17b3dcd158 100644
---- a/hw/virtio/virtio-iommu.c
-+++ b/hw/virtio/virtio-iommu.c
-@@ -854,17 +854,19 @@ static IOMMUTLBEntry virtio_iommu_translate(IOMMUMemoryRegion *mr, hwaddr addr,
-     VirtIOIOMMUEndpoint *ep;
-     uint32_t sid, flags;
-     bool bypass_allowed;
-+    int granule;
-     bool found;
-     int i;
- 
-     interval.low = addr;
-     interval.high = addr + 1;
-+    granule = ctz64(s->config.page_size_mask);
- 
-     IOMMUTLBEntry entry = {
-         .target_as = &address_space_memory,
-         .iova = addr,
-         .translated_addr = addr,
--        .addr_mask = (1 << ctz32(s->config.page_size_mask)) - 1,
-+        .addr_mask = BIT_ULL(granule) - 1,
-         .perm = IOMMU_NONE,
-     };
- 
-@@ -1117,7 +1119,7 @@ static int virtio_iommu_set_page_size_mask(IOMMUMemoryRegion *mr,
-     if (s->granule_frozen) {
-         int cur_granule = ctz64(cur_mask);
- 
--        if (!(BIT(cur_granule) & new_mask)) {
-+        if (!(BIT_ULL(cur_granule) & new_mask)) {
-             error_setg(errp, "virtio-iommu %s does not support frozen granule 0x%llx",
-                        mr->parent_obj.name, BIT_ULL(cur_granule));
-             return -1;
-@@ -1163,7 +1165,7 @@ static void virtio_iommu_freeze_granule(Notifier *notifier, void *data)
-     }
-     s->granule_frozen = true;
-     granule = ctz64(s->config.page_size_mask);
--    trace_virtio_iommu_freeze_granule(BIT(granule));
-+    trace_virtio_iommu_freeze_granule(BIT_ULL(granule));
- }
- 
- static void virtio_iommu_device_realize(DeviceState *dev, Error **errp)
--- 
-2.39.3
-
diff --git a/kvm-virtio-net-correctly-report-maximum-tx_queue_size-va.patch b/kvm-virtio-net-correctly-report-maximum-tx_queue_size-va.patch
deleted file mode 100644
index 119ea84..0000000
--- a/kvm-virtio-net-correctly-report-maximum-tx_queue_size-va.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 4fe096a6fad61ab721fd29324d48383c7f427ac9 Mon Sep 17 00:00:00 2001
-From: Laurent Vivier <lvivier@redhat.com>
-Date: Mon, 5 Jun 2023 16:21:25 +0200
-Subject: [PATCH 7/9] virtio-net: correctly report maximum tx_queue_size value
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Laurent Vivier <lvivier@redhat.com>
-RH-MergeRequest: 191: virtio-net: correctly report maximum tx_queue_size value
-RH-Bugzilla: 2040509
-RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
-RH-Acked-by: Eugenio Pérez <eperezma@redhat.com>
-RH-Commit: [1/1] afb944c6d75fe476ac86fe267b1cca5f272dfbbd (lvivier/qemu-kvm-centos)
-
-BZ: https://bugzilla.redhat.com/show_bug.cgi?id=2040509
-
-Maximum value for tx_queue_size depends on the backend type.
-1024 for vDPA/vhost-user, 256 for all the others.
-
-The value is returned by virtio_net_max_tx_queue_size() to set the
-parameter:
-
-    n->net_conf.tx_queue_size = MIN(virtio_net_max_tx_queue_size(n),
-                                    n->net_conf.tx_queue_size);
-
-But the parameter checking uses VIRTQUEUE_MAX_SIZE (1024).
-
-So the parameter is silently ignored and ethtool reports a different
-value than the one provided by the user.
-
-   ... -netdev tap,... -device virtio-net,tx_queue_size=1024
-
-    # ethtool -g enp0s2
-    Ring parameters for enp0s2:
-    Pre-set maximums:
-    RX:		256
-    RX Mini:	n/a
-    RX Jumbo:	n/a
-    TX:		256
-    Current hardware settings:
-    RX:		256
-    RX Mini:	n/a
-    RX Jumbo:	n/a
-    TX:		256
-
-   ... -netdev vhost-user,... -device virtio-net,tx_queue_size=2048
-
-    Invalid tx_queue_size (= 2048), must be a power of 2 between 256 and 1024
-
-With this patch the correct maximum value is checked and displayed.
-
-For vDPA/vhost-user:
-
-    Invalid tx_queue_size (= 2048), must be a power of 2 between 256 and 1024
-
-For all the others:
-
-    Invalid tx_queue_size (= 512), must be a power of 2 between 256 and 256
-
-Fixes: 2eef278b9e63 ("virtio-net: fix tx queue size for !vhost-user")
-Cc: mst@redhat.com
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Laurent Vivier <lvivier@redhat.com>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
-(cherry picked from commit 4271f4038372f174dbafffacca1a748d058a03ba)
----
- hw/net/virtio-net.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
-index 447f669921..ae1e6a5e3d 100644
---- a/hw/net/virtio-net.c
-+++ b/hw/net/virtio-net.c
-@@ -3628,12 +3628,12 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp)
-     }
- 
-     if (n->net_conf.tx_queue_size < VIRTIO_NET_TX_QUEUE_MIN_SIZE ||
--        n->net_conf.tx_queue_size > VIRTQUEUE_MAX_SIZE ||
-+        n->net_conf.tx_queue_size > virtio_net_max_tx_queue_size(n) ||
-         !is_power_of_2(n->net_conf.tx_queue_size)) {
-         error_setg(errp, "Invalid tx_queue_size (= %" PRIu16 "), "
-                    "must be a power of 2 between %d and %d",
-                    n->net_conf.tx_queue_size, VIRTIO_NET_TX_QUEUE_MIN_SIZE,
--                   VIRTQUEUE_MAX_SIZE);
-+                   virtio_net_max_tx_queue_size(n));
-         virtio_cleanup(vdev);
-         return;
-     }
--- 
-2.39.3
-
diff --git a/kvm-vl.c-Create-late-backends-before-migration-object.patch b/kvm-vl.c-Create-late-backends-before-migration-object.patch
deleted file mode 100644
index e1eef6d..0000000
--- a/kvm-vl.c-Create-late-backends-before-migration-object.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 63e2339a6f38706c6fc5eb251426812520db6a6d Mon Sep 17 00:00:00 2001
-From: Peter Xu <peterx@redhat.com>
-Date: Wed, 19 Apr 2023 12:17:37 -0400
-Subject: [PATCH 03/56] vl.c: Create late backends before migration object
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Author: Peter Xu <peterx@redhat.com>
-RH-MergeRequest: 162: migration: Pretty failures for postcopy on unsupported memory types
-RH-Bugzilla: 2057267
-RH-Acked-by: Leonardo Brás <leobras@redhat.com>
-RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
-RH-Acked-by: quintela1 <quintela@redhat.com>
-RH-Commit: [2/50] 7209bb94faa48650388be8fef08c77afd26517d8 (peterx/qemu-kvm)
-
-The migration object may want to check against different types of memory
-when initialized.  Delay the creation to be after late backends.
-
-Signed-off-by: Peter Xu <peterx@redhat.com>
-Reviewed-by: Juan Quintela <quintela@redhat.com>
-Reviewed-by: David Hildenbrand <david@redhat.com>
-Signed-off-by: Juan Quintela <quintela@redhat.com>
-(cherry picked from commit cb9d8b8ce1aaf38f53295fc59ec1b8b7eb4338d2)
-Signed-off-by: Peter Xu <peterx@redhat.com>
----
- softmmu/vl.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/softmmu/vl.c b/softmmu/vl.c
-index ad4173138d..a44b49430b 100644
---- a/softmmu/vl.c
-+++ b/softmmu/vl.c
-@@ -3592,14 +3592,19 @@ void qemu_init(int argc, char **argv)
-                      machine_class->name, machine_class->deprecation_reason);
-     }
- 
-+    /*
-+     * Create backends before creating migration objects, so that it can
-+     * check against compatibilities on the backend memories (e.g. postcopy
-+     * over memory-backend-file objects).
-+     */
-+    qemu_create_late_backends();
-+
-     /*
-      * Note: creates a QOM object, must run only after global and
-      * compat properties have been set up.
-      */
-     migration_object_init();
- 
--    qemu_create_late_backends();
--
-     /* parse features once if machine provides default cpu_type */
-     current_machine->cpu_type = machine_class->default_cpu_type;
-     if (cpu_option) {
--- 
-2.39.1
-
diff --git a/qemu-kvm.spec b/qemu-kvm.spec
index a85380b..8a0f57c 100644
--- a/qemu-kvm.spec
+++ b/qemu-kvm.spec
@@ -148,8 +148,8 @@ Obsoletes: %{name}-block-ssh <= %{epoch}:%{version}                    \
 
 Summary: QEMU is a machine emulator and virtualizer
 Name: qemu-kvm
-Version: 8.0.0
-Release: 13%{?rcrel}%{?dist}%{?cc_suffix}
+Version: 8.1.0
+Release: 1%{?rcrel}%{?dist}%{?cc_suffix}
 # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
 # Epoch 15 used for RHEL 8
 # Epoch 17 used for RHEL 9 (due to release versioning offset in RHEL 8.5)
@@ -186,366 +186,13 @@ Patch0012: 0012-vfio-cap-number-of-devices-that-can-be-assigned.patch
 Patch0013: 0013-Add-support-statement-to-help-output.patch
 Patch0014: 0014-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch
 Patch0015: 0015-qcow2-Deprecation-warning-when-opening-v2-images-rw.patch
-Patch0016: 0016-qga-linux-add-usb-support-to-guest-get-fsinfo.patch
-Patch0017: 0017-Add-RHEL-9.2.0-compat-structure.patch
-Patch0018: 0018-redhat-hw-i386-pc-Update-x86-machine-type-compatibil.patch
-Patch0019: 0019-Disable-unwanted-new-devices.patch
-# For bz#2087047 - Disk detach is unsuccessful while the guest is still booting
-Patch20: kvm-acpi-pcihp-allow-repeating-hot-unplug-requests.patch
-# For bz#1934134 - ACPI table limits warning when booting guest with 512 VCPUs
-Patch21: kvm-hw-acpi-limit-warning-on-acpi-table-size-to-pc-machi.patch
-# For bz#1934134 - ACPI table limits warning when booting guest with 512 VCPUs
-Patch22: kvm-hw-acpi-Mark-acpi-blobs-as-resizable-on-RHEL-pc-mach.patch
-# For bz#2058982 - Qemu core dump if cut off nfs storage during migration
-Patch23: kvm-migration-Handle-block-device-inactivation-failures-.patch
-# For bz#2058982 - Qemu core dump if cut off nfs storage during migration
-Patch24: kvm-migration-Minor-control-flow-simplification.patch
-# For bz#2058982 - Qemu core dump if cut off nfs storage during migration
-Patch25: kvm-migration-Attempt-disk-reactivation-in-more-failure-.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch26: kvm-util-mmap-alloc-qemu_fd_getfs.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch27: kvm-vl.c-Create-late-backends-before-migration-object.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch28: kvm-migration-postcopy-Detect-file-system-on-dest-host.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch29: kvm-migration-mark-mixed-functions-that-can-suspend.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch30: kvm-postcopy-ram-do-not-use-qatomic_mb_read.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch31: kvm-migration-remove-extra-whitespace-character-for-code.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch32: kvm-migration-Merge-ram_counters-and-ram_atomic_counters.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch33: kvm-migration-Update-atomic-stats-out-of-the-mutex.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch34: kvm-migration-Make-multifd_bytes-atomic.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch35: kvm-migration-Make-dirty_sync_missed_zero_copy-atomic.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch36: kvm-migration-Make-precopy_bytes-atomic.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch37: kvm-migration-Make-downtime_bytes-atomic.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch38: kvm-migration-Make-dirty_sync_count-atomic.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch39: kvm-migration-Make-postcopy_requests-atomic.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch40: kvm-migration-Rename-duplicate-to-zero_pages.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch41: kvm-migration-Rename-normal-to-normal_pages.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch42: kvm-migration-rename-enabled_capabilities-to-capabilitie.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch43: kvm-migration-Pass-migrate_caps_check-the-old-and-new-ca.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch44: kvm-migration-move-migration_global_dump-to-migration-hm.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch45: kvm-spice-move-client_migrate_info-command-to-ui.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch46: kvm-migration-Create-migrate_cap_set.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch47: kvm-migration-Create-options.c.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch48: kvm-migration-Move-migrate_colo_enabled-to-options.c.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch49: kvm-migration-Move-migrate_use_compression-to-options.c.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch50: kvm-migration-Move-migrate_use_events-to-options.c.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch51: kvm-migration-Move-migrate_use_multifd-to-options.c.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch52: kvm-migration-Move-migrate_use_zero_copy_send-to-options.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch53: kvm-migration-Move-migrate_use_xbzrle-to-options.c.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch54: kvm-migration-Move-migrate_use_block-to-options.c.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch55: kvm-migration-Move-migrate_use_return-to-options.c.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch56: kvm-migration-Create-migrate_rdma_pin_all-function.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch57: kvm-migration-Move-migrate_caps_check-to-options.c.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch58: kvm-migration-Move-qmp_query_migrate_capabilities-to-opt.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch59: kvm-migration-Move-qmp_migrate_set_capabilities-to-optio.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch60: kvm-migration-Move-migrate_cap_set-to-options.c.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch61: kvm-migration-Move-parameters-functions-to-option.c.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch62: kvm-migration-Use-migrate_max_postcopy_bandwidth.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch63: kvm-migration-Move-migrate_use_block_incremental-to-opti.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch64: kvm-migration-Create-migrate_throttle_trigger_threshold.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch65: kvm-migration-Create-migrate_checkpoint_delay.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch66: kvm-migration-Create-migrate_max_cpu_throttle.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch67: kvm-migration-Move-migrate_announce_params-to-option.c.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch68: kvm-migration-Create-migrate_cpu_throttle_initial-to-opt.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch69: kvm-migration-Create-migrate_cpu_throttle_increment-func.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch70: kvm-migration-Create-migrate_cpu_throttle_tailslow-funct.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch71: kvm-migration-Move-migrate_postcopy-to-options.c.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch72: kvm-migration-Create-migrate_max_bandwidth-function.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch73: kvm-migration-Move-migrate_use_tls-to-options.c.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch74: kvm-migration-Move-qmp_migrate_set_parameters-to-options.patch
-# For bz#2057267 - Migration with postcopy fail when vm set with shared memory
-Patch75: kvm-migration-Allow-postcopy_ram_supported_by_host-to-re.patch
-# For bz#2185688 - [qemu-kvm] no response with QMP command block_resize
-Patch76: kvm-block-bdrv-blk_co_unref-for-calls-in-coroutine-conte.patch
-# For bz#2185688 - [qemu-kvm] no response with QMP command block_resize
-Patch77: kvm-block-Don-t-call-no_coroutine_fns-in-qmp_block_resiz.patch
-# For bz#2185688 - [qemu-kvm] no response with QMP command block_resize
-Patch78: kvm-iotests-Use-alternative-CPU-type-that-is-not-depreca.patch
-# For bz#2185688 - [qemu-kvm] no response with QMP command block_resize
-Patch79: kvm-iotests-Test-resizing-image-attached-to-an-iothread.patch
-# For bz#2186725 - Qemu hang when commit during fio running(iothread enable)
-Patch80: kvm-block-compile-out-assert_bdrv_graph_readable-by-defa.patch
-# For bz#2186725 - Qemu hang when commit during fio running(iothread enable)
-Patch81: kvm-graph-lock-Disable-locking-for-now.patch
-# For bz#2186725 - Qemu hang when commit during fio running(iothread enable)
-Patch82: kvm-nbd-server-Fix-drained_poll-to-wake-coroutine-in-rig.patch
-# For bz#2186725 - Qemu hang when commit during fio running(iothread enable)
-Patch83: kvm-iotests-Test-commit-with-iothreads-and-ongoing-I-O.patch
-# For RHEL-516 - CVE-2023-2680 qemu-kvm: QEMU: hcd-ehci: DMA reentrancy issue (incomplete fix for CVE-2021-3750) [rhel-9]
-Patch84: kvm-memory-prevent-dma-reentracy-issues.patch
-# For RHEL-516 - CVE-2023-2680 qemu-kvm: QEMU: hcd-ehci: DMA reentrancy issue (incomplete fix for CVE-2021-3750) [rhel-9]
-Patch85: kvm-async-Add-an-optional-reentrancy-guard-to-the-BH-API.patch
-# For RHEL-516 - CVE-2023-2680 qemu-kvm: QEMU: hcd-ehci: DMA reentrancy issue (incomplete fix for CVE-2021-3750) [rhel-9]
-Patch86: kvm-checkpatch-add-qemu_bh_new-aio_bh_new-checks.patch
-# For RHEL-516 - CVE-2023-2680 qemu-kvm: QEMU: hcd-ehci: DMA reentrancy issue (incomplete fix for CVE-2021-3750) [rhel-9]
-Patch87: kvm-hw-replace-most-qemu_bh_new-calls-with-qemu_bh_new_g.patch
-# For RHEL-516 - CVE-2023-2680 qemu-kvm: QEMU: hcd-ehci: DMA reentrancy issue (incomplete fix for CVE-2021-3750) [rhel-9]
-Patch88: kvm-lsi53c895a-disable-reentrancy-detection-for-script-R.patch
-# For RHEL-516 - CVE-2023-2680 qemu-kvm: QEMU: hcd-ehci: DMA reentrancy issue (incomplete fix for CVE-2021-3750) [rhel-9]
-Patch89: kvm-bcm2835_property-disable-reentrancy-detection-for-io.patch
-# For RHEL-516 - CVE-2023-2680 qemu-kvm: QEMU: hcd-ehci: DMA reentrancy issue (incomplete fix for CVE-2021-3750) [rhel-9]
-Patch90: kvm-raven-disable-reentrancy-detection-for-iomem.patch
-# For RHEL-516 - CVE-2023-2680 qemu-kvm: QEMU: hcd-ehci: DMA reentrancy issue (incomplete fix for CVE-2021-3750) [rhel-9]
-Patch91: kvm-apic-disable-reentrancy-detection-for-apic-msi.patch
-# For RHEL-516 - CVE-2023-2680 qemu-kvm: QEMU: hcd-ehci: DMA reentrancy issue (incomplete fix for CVE-2021-3750) [rhel-9]
-Patch92: kvm-async-avoid-use-after-free-on-re-entrancy-guard.patch
-# For RHEL-516 - CVE-2023-2680 qemu-kvm: QEMU: hcd-ehci: DMA reentrancy issue (incomplete fix for CVE-2021-3750) [rhel-9]
-Patch93: kvm-loongarch-mark-loongarch_ipi_iocsr-re-entrnacy-safe.patch
-# For RHEL-516 - CVE-2023-2680 qemu-kvm: QEMU: hcd-ehci: DMA reentrancy issue (incomplete fix for CVE-2021-3750) [rhel-9]
-Patch94: kvm-memory-stricter-checks-prior-to-unsetting-engaged_in.patch
-# For RHEL-516 - CVE-2023-2680 qemu-kvm: QEMU: hcd-ehci: DMA reentrancy issue (incomplete fix for CVE-2021-3750) [rhel-9]
-Patch95: kvm-lsi53c895a-disable-reentrancy-detection-for-MMIO-reg.patch
-# For RHEL-516 - CVE-2023-2680 qemu-kvm: QEMU: hcd-ehci: DMA reentrancy issue (incomplete fix for CVE-2021-3750) [rhel-9]
-Patch96: kvm-hw-scsi-lsi53c895a-Fix-reentrancy-issues-in-the-LSI-.patch
-# For bz#2189423 - Failed to migrate VM from rhel 9.3 to rhel 9.2
-Patch97: kvm-hw-pci-Disable-PCI_ERR_UNCOR_MASK-register-for-machi.patch
-# For bz#2196289 - Fix number of ready channels on multifd
-Patch98: kvm-multifd-Fix-the-number-of-channels-ready.patch
-# For bz#2168500 - [IBM 9.3 FEAT] KVM: Improve memory reclaiming for z15 Secure Execution guests - qemu part
-Patch99: kvm-util-async-teardown-wire-up-query-command-line-optio.patch
-# For bz#2168500 - [IBM 9.3 FEAT] KVM: Improve memory reclaiming for z15 Secure Execution guests - qemu part
-Patch100: kvm-s390x-pv-Fix-spurious-warning-with-asynchronous-tear.patch
-# For bz#2216201 - [qemu-kvm]VM reports vulnerabilty to mmio_stale_data on patched host with microcode
-Patch101: kvm-target-i386-add-support-for-FLUSH_L1D-feature.patch
-# For bz#2216201 - [qemu-kvm]VM reports vulnerabilty to mmio_stale_data on patched host with microcode
-Patch102: kvm-target-i386-add-support-for-FB_CLEAR-feature.patch
-# For bz#2180076 - [qemu-kvm] support fd passing for libblkio QEMU BlockDrivers
-Patch103: kvm-block-blkio-use-qemu_open-to-support-fd-passing-for-.patch
-# For bz#2180076 - [qemu-kvm] support fd passing for libblkio QEMU BlockDrivers
-Patch104: kvm-qapi-add-fdset-feature-for-BlockdevOptionsVirtioBlkV.patch
-# For bz#2171363 - [aarch64] Kernel hits Call trace with irregular CPU-to-NUMA association
-Patch105: kvm-numa-Validate-cluster-and-NUMA-node-boundary-if-requ.patch
-# For bz#2171363 - [aarch64] Kernel hits Call trace with irregular CPU-to-NUMA association
-Patch106: kvm-hw-arm-Validate-cluster-and-NUMA-node-boundary.patch
-# For bz#2171363 - [aarch64] Kernel hits Call trace with irregular CPU-to-NUMA association
-Patch107: kvm-hw-arm-virt-Validate-cluster-and-NUMA-node-boundary-.patch
-# For RHEL-330 - [virtual network][qemu-kvm-8.0.0-rc1]qemu core dump: qemu-kvm: ../softmmu/memory.c:2592: void memory_region_del_eventfd(MemoryRegion *, hwaddr, unsigned int, _Bool, uint64_t, EventNotifier *): Assertion `i != mr->ioeventfd_nb' failed
-Patch108: kvm-vhost-fix-vhost_dev_enable_notifiers-error-case.patch
-# For bz#2218644 - query-stats QMP command interrupts vcpus, the Max Latencies could be more than 100us (rhel 9.3.0 clone)
-Patch109: kvm-kvm-reuse-per-vcpu-stats-fd-to-avoid-vcpu-interrupti.patch
-# For bz#2128929 - [rhel9.2] hotplug/hotunplug mlx vdpa device to the occupied addr port, then qemu core dump occurs after shutdown guest
-Patch110: kvm-vhost-vdpa-do-not-cleanup-the-vdpa-vhost-net-structu.patch
-# For bz#2211609 - With virtio-iommu and vfio-pci, qemu reports "warning: virtio-iommu page mask 0xfffffffffffff000 does not match 0x40201000"
-# For bz#2211634 - [aarch64] With virtio-iommu and vfio-pci, qemu coredump when host using kernel-64k package
-Patch111: kvm-virtio-iommu-Fix-64kB-host-page-size-VFIO-device-ass.patch
-# For bz#2211609 - With virtio-iommu and vfio-pci, qemu reports "warning: virtio-iommu page mask 0xfffffffffffff000 does not match 0x40201000"
-# For bz#2211634 - [aarch64] With virtio-iommu and vfio-pci, qemu coredump when host using kernel-64k package
-Patch112: kvm-virtio-iommu-Rework-the-traces-in-virtio_iommu_set_p.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch113: kvm-vfio-pci-add-support-for-VF-token.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch114: kvm-vfio-migration-Skip-log_sync-during-migration-SETUP-.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch115: kvm-vfio-pci-Static-Resizable-BAR-capability.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch116: kvm-vfio-pci-Fix-a-use-after-free-issue.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch117: kvm-util-vfio-helpers-Use-g_file_read_link.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch118: kvm-migration-Make-all-functions-check-have-the-same-for.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch119: kvm-migration-Move-migration_properties-to-options.c.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch120: kvm-migration-Add-switchover-ack-capability.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch121: kvm-migration-Implement-switchover-ack-logic.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch122: kvm-migration-Enable-switchover-ack-capability.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch123: kvm-vfio-migration-Refactor-vfio_save_block-to-return-sa.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch124: kvm-vfio-migration-Store-VFIO-migration-flags-in-VFIOMig.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch125: kvm-vfio-migration-Add-VFIO-migration-pre-copy-support.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch126: kvm-vfio-migration-Add-support-for-switchover-ack-capabi.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch127: kvm-vfio-Implement-a-common-device-info-helper.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch128: kvm-hw-vfio-pci-quirks-Support-alternate-offset-for-GPUD.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch129: kvm-vfio-pci-Call-vfio_prepare_kvm_msi_virq_batch-in-MSI.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch130: kvm-vfio-migration-Reset-bytes_transferred-properly.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch131: kvm-vfio-migration-Make-VFIO-migration-non-experimental.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch132: kvm-vfio-pci-Fix-a-segfault-in-vfio_realize.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch133: kvm-vfio-pci-Free-leaked-timer-in-vfio_realize-error-pat.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch134: kvm-hw-vfio-pci-quirks-Sanitize-capability-pointer.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch135: kvm-vfio-pci-Disable-INTx-in-vfio_realize-error-path.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch136: kvm-vfio-migration-Change-vIOMMU-blocker-from-global-to-.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch137: kvm-vfio-migration-Free-resources-when-vfio_migration_re.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch138: kvm-vfio-migration-Remove-print-of-Migration-disabled.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch139: kvm-vfio-migration-Return-bool-type-for-vfio_migration_r.patch
-# For bz#2192818 - [VFIO LM] Live migration
-Patch140: kvm-vfio-Fix-null-pointer-dereference-bug-in-vfio_bars_f.patch
-# For bz#2220866 - Misaligned symbol for s390-ccw image during qemu-kvm build
-Patch141: kvm-pc-bios-s390-ccw-Makefile-Use-z-noexecstack-to-silen.patch
-# For bz#2220866 - Misaligned symbol for s390-ccw image during qemu-kvm build
-Patch142: kvm-pc-bios-s390-ccw-Fix-indentation-in-start.S.patch
-# For bz#2220866 - Misaligned symbol for s390-ccw image during qemu-kvm build
-Patch143: kvm-pc-bios-s390-ccw-Provide-space-for-initial-stack-fra.patch
-# For bz#2220866 - Misaligned symbol for s390-ccw image during qemu-kvm build
-Patch144: kvm-pc-bios-s390-ccw-Don-t-use-__bss_start-with-the-larl.patch
-# For bz#2222579 - PNG screendump doesn't save screen correctly
-Patch145: kvm-ui-Fix-pixel-colour-channel-order-for-PNG-screenshot.patch
-# For bz#2213317 - Enable libblkio-based block drivers in QEMU
-Patch146: kvm-block-blkio-fix-module_block.py-parsing.patch
-# For bz#2176702 - [RHEL9][virtio-scsi] scsi-hd cannot hot-plug successfully after hot-plug it repeatly
-Patch147: kvm-scsi-fetch-unit-attention-when-creating-the-request.patch
-# For bz#2176702 - [RHEL9][virtio-scsi] scsi-hd cannot hot-plug successfully after hot-plug it repeatly
-Patch148: kvm-scsi-cleanup-scsi_clear_unit_attention.patch
-# For bz#2176702 - [RHEL9][virtio-scsi] scsi-hd cannot hot-plug successfully after hot-plug it repeatly
-Patch149: kvm-scsi-clear-unit-attention-only-for-REPORT-LUNS-comma.patch
-# For RHEL-794 - Backport s390x fixes from QEMU 8.1
-Patch150: kvm-s390x-ap-Wire-up-the-device-request-notifier-interfa.patch
-# For bz#2196295 - Multifd flushes its channels 10 times per second
-Patch151: kvm-multifd-Create-property-multifd-flush-after-each-sec.patch
-# For bz#2196295 - Multifd flushes its channels 10 times per second
-Patch152: kvm-multifd-Protect-multifd_send_sync_main-calls.patch
-# For bz#2196295 - Multifd flushes its channels 10 times per second
-Patch153: kvm-multifd-Only-flush-once-each-full-round-of-memory.patch
-# For RHEL-582 - [passt][rhel 9.3] qemu core dump occurs when guest is shutdown after hotunplug/hotplug a passt interface
-Patch154: kvm-net-socket-prepare-to-cleanup-net_init_socket.patch
-# For RHEL-582 - [passt][rhel 9.3] qemu core dump occurs when guest is shutdown after hotunplug/hotplug a passt interface
-Patch155: kvm-net-socket-move-fd-type-checking-to-its-own-function.patch
-# For RHEL-582 - [passt][rhel 9.3] qemu core dump occurs when guest is shutdown after hotunplug/hotplug a passt interface
-Patch156: kvm-net-socket-remove-net_init_socket.patch
-# For bz#2215819 - Migration test failed while guest with PCIe devices
-Patch157: kvm-pcie-Add-hotplug-detect-state-register-to-cmask.patch
-# For bz#2174676 - Guest hit EXT4-fs error on host 4K disk  when repeatedly hot-plug/unplug running IO disk [RHEL9]
-Patch158: kvm-util-iov-Make-qiov_slice-public.patch
-# For bz#2174676 - Guest hit EXT4-fs error on host 4K disk  when repeatedly hot-plug/unplug running IO disk [RHEL9]
-Patch159: kvm-block-Collapse-padded-I-O-vecs-exceeding-IOV_MAX.patch
-# For bz#2174676 - Guest hit EXT4-fs error on host 4K disk  when repeatedly hot-plug/unplug running IO disk [RHEL9]
-Patch160: kvm-util-iov-Remove-qemu_iovec_init_extended.patch
-# For bz#2174676 - Guest hit EXT4-fs error on host 4K disk  when repeatedly hot-plug/unplug running IO disk [RHEL9]
-Patch161: kvm-iotests-iov-padding-New-test.patch
-# For bz#2174676 - Guest hit EXT4-fs error on host 4K disk  when repeatedly hot-plug/unplug running IO disk [RHEL9]
-Patch162: kvm-block-Fix-pad_request-s-request-restriction.patch
-# For RHEL-573 - [mlx vhost_vdpa][rhel 9.3]live migration fail with "net vdpa cannot migrate with CVQ feature"
-Patch163: kvm-vdpa-do-not-block-migration-if-device-has-cvq-and-x-.patch
-# For bz#2040509 - [RFE]:Add support for changing "tx_queue_size" to a setable value
-Patch164: kvm-virtio-net-correctly-report-maximum-tx_queue_size-va.patch
-# For bz#2223691 - [machine type 9.2]Failed to migrate VM from RHEL 9.3 to RHEL 9.2
-Patch165: kvm-hw-pci-Disable-PCI_ERR_UNCOR_MASK-reg-for-machine-ty.patch
-# For bz#2141965 - [TPM][vhost-vdpa][rhel9.2]Boot a guest with "vhost-vdpa + TPM emulator", qemu output: qemu-kvm: vhost_vdpa_listener_region_add received unaligned region
-Patch166: kvm-vhost-vdpa-mute-unaligned-memory-error-report.patch
-# For bz#2225354 - [vdpa-blk] The new driver virtio-blk-vhost-user not work in VM booting
-# For bz#2225439 - [vdpa-blk] read-only=on option not work on driver virtio-blk-vhost-vdpa
-Patch167: kvm-block-blkio-enable-the-completion-eventfd.patch
-# For bz#2225354 - [vdpa-blk] The new driver virtio-blk-vhost-user not work in VM booting
-# For bz#2225439 - [vdpa-blk] read-only=on option not work on driver virtio-blk-vhost-vdpa
-Patch168: kvm-block-blkio-do-not-use-open-flags-in-qemu_open.patch
-# For bz#2225354 - [vdpa-blk] The new driver virtio-blk-vhost-user not work in VM booting
-# For bz#2225439 - [vdpa-blk] read-only=on option not work on driver virtio-blk-vhost-vdpa
-Patch169: kvm-block-blkio-move-blkio_connect-in-the-drivers-functi.patch
-# For bz#2225354 - [vdpa-blk] The new driver virtio-blk-vhost-user not work in VM booting
-# For bz#2225439 - [vdpa-blk] read-only=on option not work on driver virtio-blk-vhost-vdpa
-Patch170: kvm-block-blkio-retry-blkio_connect-if-it-fails-using-fd.patch
-# For bz#2225354 - [vdpa-blk] The new driver virtio-blk-vhost-user not work in VM booting
-# For bz#2225439 - [vdpa-blk] read-only=on option not work on driver virtio-blk-vhost-vdpa
-Patch171: kvm-block-blkio-fall-back-on-using-path-when-fd-setting-.patch
-# For bz#2225354 - [vdpa-blk] The new driver virtio-blk-vhost-user not work in VM booting
-# For bz#2225439 - [vdpa-blk] read-only=on option not work on driver virtio-blk-vhost-vdpa
-Patch172: kvm-block-blkio-use-blkio_set_int-fd-to-check-fd-support.patch
-# For bz#2229133 - Backport some virtio-iommu and smmu fixes
-Patch173: kvm-hw-virtio-iommu-Fix-potential-OOB-access-in-virtio_i.patch
-# For bz#2229133 - Backport some virtio-iommu and smmu fixes
-Patch174: kvm-virtio-iommu-Standardize-granule-extraction-and-form.patch
-# For bz#2229133 - Backport some virtio-iommu and smmu fixes
-Patch175: kvm-hw-arm-smmu-Handle-big-endian-hosts-correctly.patch
-# For bz#2214839 - [AMDSERVER 9.3 Bug] Qemu SEV reduced-phys-bits fixes
-Patch176: kvm-qapi-i386-sev-Change-the-reduced-phys-bits-value-fro.patch
-# For bz#2214839 - [AMDSERVER 9.3 Bug] Qemu SEV reduced-phys-bits fixes
-Patch177: kvm-qemu-options.hx-Update-the-reduced-phys-bits-documen.patch
-# For bz#2214839 - [AMDSERVER 9.3 Bug] Qemu SEV reduced-phys-bits fixes
-Patch178: kvm-i386-sev-Update-checks-and-information-related-to-re.patch
-# For bz#2214839 - [AMDSERVER 9.3 Bug] Qemu SEV reduced-phys-bits fixes
-Patch179: kvm-i386-cpu-Update-how-the-EBX-register-of-CPUID-0x8000.patch
-# For bz#2094913 - Add EPYC-Genoa CPU model in qemu
-Patch180: kvm-target-i386-allow-versioned-CPUs-to-specify-new-cach.patch
-# For bz#2094913 - Add EPYC-Genoa CPU model in qemu
-Patch181: kvm-target-i386-Add-new-EPYC-CPU-versions-with-updated-c.patch
-# For bz#2094913 - Add EPYC-Genoa CPU model in qemu
-Patch182: kvm-target-i386-Add-a-couple-of-feature-bits-in-8000_000.patch
-# For bz#2094913 - Add EPYC-Genoa CPU model in qemu
-Patch183: kvm-target-i386-Add-feature-bits-for-CPUID_Fn80000021_EA.patch
-# For bz#2094913 - Add EPYC-Genoa CPU model in qemu
-Patch184: kvm-target-i386-Add-missing-feature-bits-in-EPYC-Milan-m.patch
-# For bz#2094913 - Add EPYC-Genoa CPU model in qemu
-Patch185: kvm-target-i386-Add-VNMI-and-automatic-IBRS-feature-bits.patch
-# For bz#2094913 - Add EPYC-Genoa CPU model in qemu
-Patch186: kvm-target-i386-Add-EPYC-Genoa-model-to-support-Zen-4-pr.patch
-# For RHEL-923 - vhost shadow virtqueue: state restore through CVQ
-Patch187: kvm-vdpa-return-errno-in-vhost_vdpa_get_vring_group-erro.patch
-# For RHEL-923 - vhost shadow virtqueue: state restore through CVQ
-Patch188: kvm-vdpa-move-CVQ-isolation-check-to-net_init_vhost_vdpa.patch
-# For RHEL-923 - vhost shadow virtqueue: state restore through CVQ
-Patch189: kvm-vdpa-use-first-queue-SVQ-state-for-CVQ-default.patch
-# For RHEL-923 - vhost shadow virtqueue: state restore through CVQ
-Patch190: kvm-vdpa-export-vhost_vdpa_set_vring_ready.patch
-# For RHEL-923 - vhost shadow virtqueue: state restore through CVQ
-Patch191: kvm-vdpa-rename-vhost_vdpa_net_load-to-vhost_vdpa_net_cv.patch
-# For RHEL-923 - vhost shadow virtqueue: state restore through CVQ
-Patch192: kvm-vdpa-move-vhost_vdpa_set_vring_ready-to-the-caller.patch
-# For RHEL-923 - vhost shadow virtqueue: state restore through CVQ
-Patch193: kvm-vdpa-remove-net-cvq-migration-blocker.patch
+Patch0016: 0016-vdpa-use-first-queue-SVQ-state-for-CVQ-default.patch
+Patch0017: 0017-vdpa-export-vhost_vdpa_set_vring_ready.patch
+Patch0018: 0018-vdpa-rename-vhost_vdpa_net_load-to-vhost_vdpa_net_cv.patch
+Patch0019: 0019-vdpa-move-vhost_vdpa_set_vring_ready-to-the-caller.patch
+Patch0020: 0020-vdpa-remove-net-cvq-migration-blocker.patch
+Patch0021: 0021-Add-machine-types-compat-bits.patch
+Patch0022: 0022-Fix-x86-machine-type-compatibility-for-qemu-kvm-8.1..patch
 
 %if %{have_clang}
 BuildRequires: clang
@@ -711,8 +358,8 @@ Summary: %{name} documentation
 %package -n qemu-pr-helper
 Summary: qemu-pr-helper utility for %{name}
 %description -n qemu-pr-helper
-This package provides the qemu-pr-helper utility that is required for certain 
-SCSI features. 
+This package provides the qemu-pr-helper utility that is required for certain
+SCSI features.
 
 
 %package -n qemu-img
@@ -851,7 +498,7 @@ Summary: QEMU usbredir support
 Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: usbredir >= 0.7.1
 Provides: %{name}-hw-usbredir
-Obsoletes: %{name}-hw-usbredir <= %{epoch}:%{version} 
+Obsoletes: %{name}-hw-usbredir <= %{epoch}:%{version}
 
 %description device-usb-redirect
 This package provides usbredir support.
@@ -915,6 +562,7 @@ ulimit -n 10240
   --disable-debug-tcg              \\\
   --disable-dmg                    \\\
   --disable-docs                   \\\
+  --disable-download               \\\
   --disable-dsound                 \\\
   --disable-fdt                    \\\
   --disable-fuse                   \\\
@@ -1018,7 +666,6 @@ ulimit -n 10240
   --disable-xen-pci-passthrough    \\\
   --disable-xkbcommon              \\\
   --disable-zstd                   \\\
-  --with-git-submodules=ignore     \\\
   --without-default-devices
 
 
@@ -1039,10 +686,8 @@ run_configure() {
         --with-pkgversion="%{name}-%{version}-%{release}" \
         --with-suffix="%{name}" \
         --firmwarepath=%{firmwaredirs} \
-        --meson="%{__meson}" \
         --enable-trace-backends=dtrace \
         --with-coroutine=ucontext \
-        --with-git=git \
         --tls-priority=@QEMU,SYSTEM \
         %{disable_everything} \
         --with-devices-%{kvm_target}=%{kvm_target}-rh-devices \
@@ -1283,7 +928,7 @@ mkdir -p %{buildroot}%{_datadir}/%{name}/tracetool/format
 install -m 0644 -t %{buildroot}%{_datadir}/%{name}/tracetool/format scripts/tracetool/format/*.py
 
 mkdir -p %{buildroot}%{qemudocdir}
-install -p -m 0644 -t %{buildroot}%{qemudocdir} README.rst README.systemtap COPYING COPYING.LIB LICENSE docs/interop/qmp-spec.txt
+install -p -m 0644 -t %{buildroot}%{qemudocdir} README.rst README.systemtap COPYING COPYING.LIB LICENSE
 
 # Rename man page
 pushd %{buildroot}%{_mandir}/man1/
@@ -1607,6 +1252,11 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
 %endif
 
 %changelog
+* Mon Sep 04 2023 Miroslav Rezanina <mrezanin@redhat.com> - 8.1.0-1
+- Rebase to QEMU 8.1 [RHEL-870]
+- Resolves: RHEL-870
+  (Rebase qemu-kvm to QEMU 8.1.0)
+
 * Thu Aug 24 2023 Miroslav Rezanina <mrezanin@redhat.com> - 8.0.0-13
 - kvm-vdpa-return-errno-in-vhost_vdpa_get_vring_group-erro.patch [RHEL-923]
 - kvm-vdpa-move-CVQ-isolation-check-to-net_init_vhost_vdpa.patch [RHEL-923]
diff --git a/sources b/sources
index b5ace58..6b76115 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qemu-8.0.0.tar.xz) = 1f31d1e653dec2d35f1b7a5468ee3f471553b48eca8c8afafffcf9243c6b2260e78a5b73da3fe567f9b85d4133573eebd397747b3aec501fb24076263eb07b27
+SHA512 (qemu-8.1.0.tar.xz) = c5f5e7ce2d8e3c93a02012b136c866e8577df07da4705a0045916c71caeaa21fa1b2d59a4b22a660789a4159b192e12a443e7cbb0724ee85fea258251731724c