* 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)

.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

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
 

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 ++++++++++++++++++
+ .../x86_64-softmmu/x86_64-rh-devices.mak      | 110 ++++++++++++++++++
- hw/arm/meson.build                            |   2 +-
+ 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
+diff --git a/hw/arm/virt.c b/hw/arm/virt.c
-index b545ba0e4f..a41a16cba7 100644
+index 7d9dbc2663..3fbe942822 100644
---- a/hw/arm/meson.build
+--- a/hw/arm/virt.c
-+++ b/hw/arm/meson.build
++++ b/hw/arm/virt.c
-@@ -29,7 +29,7 @@ arm_ss.add(when: 'CONFIG_VEXPRESS', if_true: files('vexpress.c'))
+@@ -204,6 +204,7 @@ static const int a15irqmap[] = {
- arm_ss.add(when: 'CONFIG_ZYNQ', if_true: files('xilinx_zynq.c'))
+ };
- arm_ss.add(when: 'CONFIG_SABRELITE', if_true: files('sabrelite.c'))
  
--arm_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m.c'))
+ static const char *valid_cpus[] = {
-+#arm_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m.c'))
++#if 0 /* Disabled for Red Hat Enterprise Linux */
- arm_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210.c'))
+ #ifdef CONFIG_TCG
- arm_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx.c', 'pxa2xx_gpio.c', 'pxa2xx_pic.c'))
+     ARM_CPU_TYPE_NAME("cortex-a7"),
- arm_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic.c'))
+     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'))
+-system_ss.add(files('core.c', 'cluster.c'))
-+#softmmu_ss.add(files('core.c', 'cluster.c'))
++#system_ss.add(files('core.c', 'cluster.c'))
-+softmmu_ss.add(files('core.c'))
++system_ss.add(files('core.c'))
  
- softmmu_ss.add(when: 'CONFIG_ARM11MPCORE', if_true: files('arm11mpcore.c'))
+ system_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_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 @@
+@@ -2946,6 +2947,9 @@ static void pci_cirrus_vga_realize(PCIDevice *dev, Error **errp)
- #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)
      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");
 +
-+     /*
+     /*
       * 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
+diff --git a/target/arm/arm-qmp-cmds.c b/target/arm/arm-qmp-cmds.c
-index df0c45e523..c154a4dcf2 100644
+index c8fa524002..3aa089abf3 100644
---- a/target/arm/cpu_tcg.c
+--- a/target/arm/arm-qmp-cmds.c
-+++ b/target/arm/cpu_tcg.c
++++ b/target/arm/arm-qmp-cmds.c
-@@ -155,6 +155,7 @@ void define_cortex_a72_a57_a53_cp_reginfo(ARMCPU *cpu)
+@@ -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)
+@@ -1183,3 +1184,4 @@ static void arm_tcg_cpu_register_types(void)
-     cpu->isar.reset_pmcr_el0 = 0x41093000;
+ type_init(arm_tcg_cpu_register_types)
-     define_arm_cp_regs(cpu, cortexa9_cp_reginfo);
- }
-+#endif /* disabled for RHEL */
  
- #ifndef CONFIG_USER_ONLY
+ #endif /* !CONFIG_USER_ONLY || !TARGET_AARCH64 */
- static uint64_t a15_l2ctlr_read(CPUARMState *env, const ARMCPRegInfo *ri)
++#endif /* disabled for RHEL */
-@@ -532,6 +534,7 @@ static const ARMCPRegInfo cortexa15_cp_reginfo[] = {
+diff --git a/target/arm/tcg/cpu64.c b/target/arm/tcg/cpu64.c
-       .access = PL1_RW, .type = ARM_CP_CONST, .resetvalue = 0 },
+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)
+@@ -106,6 +107,7 @@ static void aarch64_a35_initfn(Object *obj)
-     cpu->isar.reset_pmcr_el0 = 0x41072000;
+     /* These values are the same with A53/A57/A72. */
-     define_arm_cp_regs(cpu, cortexa15_cp_reginfo); /* Same as A15 */
+     define_cortex_a72_a57_a53_cp_reginfo(cpu);
  }
-+#endif /* disabled for RHEL */
++#endif
  
- static void cortex_a15_initfn(Object *obj)
+ static void cpu_max_get_sve_max_vq(Object *obj, Visitor *v, const char *name,
- {
+                                    void *opaque, Error **errp)
-@@ -628,6 +632,7 @@ static void cortex_a15_initfn(Object *obj)
+@@ -195,6 +197,7 @@ static void cpu_max_get_l0gptsz(Object *obj, Visitor *v, const char *name,
-     define_arm_cp_regs(cpu, cortexa15_cp_reginfo);
+ 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)
+@@ -699,6 +702,7 @@ static void aarch64_neoverse_v1_initfn(Object *obj)
- 
+     aarch64_add_pauth_properties(obj);
-     cc->gdb_core_xml_file = "arm-m-profile.xml";
+     aarch64_add_sve_properties(obj);
  }
-+#endif /* disabled for RHEL */
++#endif
  
- #ifndef TARGET_AARCH64
  /*
-@@ -1177,6 +1183,7 @@ static void arm_max_initfn(Object *obj)
+  * -cpu max: a CPU with as many features enabled as our emulation supports.
- #endif /* !TARGET_AARCH64 */
+@@ -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 },
+ static const ARMCPUInfo aarch64_cpus[] = {
-     { .name = "arm946",      .initfn = arm946_initfn },
+     { .name = "cortex-a35",         .initfn = aarch64_a35_initfn },
-     { .name = "arm1026",     .initfn = arm1026_initfn },
+     { .name = "cortex-a55",         .initfn = aarch64_a55_initfn },
-@@ -1192,7 +1199,9 @@ static const ARMCPUInfo arm_tcg_cpus[] = {
+@@ -892,14 +897,17 @@ static const ARMCPUInfo aarch64_cpus[] = {
-     { .name = "cortex-a7",   .initfn = cortex_a7_initfn },
+     { .name = "neoverse-n1",        .initfn = aarch64_neoverse_n1_initfn },
-     { .name = "cortex-a8",   .initfn = cortex_a8_initfn },
+     { .name = "neoverse-v1",        .initfn = aarch64_neoverse_v1_initfn },
-     { .name = "cortex-a9",   .initfn = cortex_a9_initfn },
+ };
-+#endif /* disabled for RHEL */
++#endif
-     { .name = "cortex-a15",  .initfn = cortex_a15_initfn },
+ 
+ static void aarch64_cpu_register_types(void)
+ {
 +#if 0 /* Disabled for Red Hat Enterprise Linux */
-     { .name = "cortex-m0",   .initfn = cortex_m0_initfn,
+     size_t i;
-                              .class_init = arm_v7m_class_init },
+ 
-     { .name = "cortex-m3",   .initfn = cortex_m3_initfn,
+     for (i = 0; i < ARRAY_SIZE(aarch64_cpus); ++i) {
-@@ -1224,6 +1233,7 @@ static const ARMCPUInfo arm_tcg_cpus[] = {
+         aarch64_cpu_register(&aarch64_cpus[i]);
-     { .name = "pxa270-b1",   .initfn = pxa270b1_initfn },
+     }
-     { .name = "pxa270-c0",   .initfn = pxa270c0_initfn },
++#endif
-     { .name = "pxa270-c5",   .initfn = pxa270c5_initfn },
+ }
-+#endif /* disabled for RHEL */
+ 
- #ifndef TARGET_AARCH64
+ type_init(aarch64_cpu_register_types)
-     { .name = "max",         .initfn = arm_max_initfn },
- #endif
 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
-2.39.1
+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.3
 

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/core/machine.c            | 241 +++++++++++++++++++++++++++++++++++
- hw/display/vga-isa.c         |   2 +-
  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,
+@@ -240,6 +240,8 @@ static void pc_init1(MachineState *machine,
-         smbios_set_defaults("QEMU", "Standard PC (i440FX + PIIX, 1996)",
+         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 {
+@@ -110,6 +110,9 @@ struct PCMachineClass {
-     bool smbios_defaults;
      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
 

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 ++++++++++++++++++++++++++++++++-
+ hw/arm/virt.c         | 248 +++++++++++++++++++++++++++++++++++++++++-
  include/hw/arm/virt.h |   8 ++
- target/arm/arm-qmp-cmds.c      |   2 +
+ 2 files changed, 255 insertions(+), 1 deletion(-)
- 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(-)
 
 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[] = {
+@@ -2332,6 +2374,7 @@ static void machvirt_init(MachineState *machine)
- };
- 
- 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)
      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
 

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;
+@@ -89,6 +89,7 @@ static int cap_large_decr;
- 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)
+@@ -2579,6 +2581,16 @@ bool kvmppc_supports_ail_3(void)
-     return cap_rpt_invalidate;
+     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);
+ void *kvmppc_create_spapr_tce(uint32_t liobn, uint32_t page_shift,
- int kvmppc_enable_cap_large_decr(PowerPCCPU *cpu, int enable);
+@@ -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
 

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
 

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.c               | 153 +++++++++++++++++++++-
- hw/i386/pc_piix.c          |  86 ++++++++++++-
+ hw/i386/pc_piix.c          |  91 ++++++++++++-
- hw/i386/pc_q35.c           | 252 ++++++++++++++++++++++++++++++++++++-
+ hw/i386/pc_q35.c           | 257 ++++++++++++++++++++++++++++++++++++-
  include/hw/boards.h        |   2 +
- include/hw/i386/pc.h       |  27 ++++
+ include/hw/i386/pc.h       |  30 +++++
- target/i386/cpu.c          |  21 ++++
+ 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)
+@@ -1865,6 +2014,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data)
-     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;
      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
 

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
 

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
 

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
 

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
 

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
 

0016-qga-linux-add-usb-support-to-guest-get-fsinfo.patch

@@ -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
-

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;

0017-Add-RHEL-9.2.0-compat-structure.patch

@@ -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
-

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);

0018-redhat-hw-i386-pc-Update-x86-machine-type-compatibil.patch

@@ -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
-

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
+Subject: vdpa: rename vhost_vdpa_net_load to vhost_vdpa_net_cvq_load
- 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,
+@@ -965,7 +965,7 @@ static int vhost_vdpa_net_load_rx(VhostVDPAState *s,
-     return *s->status != VIRTIO_NET_OK;
+     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,

0019-Disable-unwanted-new-devices.patch

@@ -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
-

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:
+Rebase notes (8.1.0):
-* Fix subject typo
+- Moved additional upstream calls to conditional block
-* Expand patch message so it explains why
 ---
  hw/virtio/vdpa-dev.c   |  3 +++
  hw/virtio/vhost-vdpa.c |  3 ---
- net/vhost-vdpa.c       | 41 +++++++++++++++++++++++++++++++----------
+ net/vhost-vdpa.c       | 57 +++++++++++++++++++++++++++++-------------
- 3 files changed, 34 insertions(+), 13 deletions(-)
+ 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;
 +

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;

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
+

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
+

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.

kvm-acpi-pcihp-allow-repeating-hot-unplug-requests.patch

@@ -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
-

kvm-apic-disable-reentrancy-detection-for-apic-msi.patch

@@ -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
-

kvm-async-Add-an-optional-reentrancy-guard-to-the-BH-API.patch

@@ -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
-

kvm-async-avoid-use-after-free-on-re-entrancy-guard.patch

@@ -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
-

kvm-bcm2835_property-disable-reentrancy-detection-for-io.patch

@@ -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
-

kvm-block-Collapse-padded-I-O-vecs-exceeding-IOV_MAX.patch

@@ -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
-

kvm-block-Don-t-call-no_coroutine_fns-in-qmp_block_resiz.patch

@@ -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
-

kvm-block-Fix-pad_request-s-request-restriction.patch

@@ -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
-

kvm-block-bdrv-blk_co_unref-for-calls-in-coroutine-conte.patch

@@ -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
-

kvm-block-blkio-do-not-use-open-flags-in-qemu_open.patch

@@ -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
-

kvm-block-blkio-enable-the-completion-eventfd.patch

@@ -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
-

kvm-block-blkio-fall-back-on-using-path-when-fd-setting-.patch

@@ -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
-

kvm-block-blkio-fix-module_block.py-parsing.patch

@@ -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
-

kvm-block-blkio-move-blkio_connect-in-the-drivers-functi.patch

@@ -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
-

kvm-block-blkio-retry-blkio_connect-if-it-fails-using-fd.patch

@@ -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
-

kvm-block-blkio-use-blkio_set_int-fd-to-check-fd-support.patch

@@ -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
-

kvm-block-blkio-use-qemu_open-to-support-fd-passing-for-.patch

@@ -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
-

kvm-block-compile-out-assert_bdrv_graph_readable-by-defa.patch

@@ -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
-

kvm-checkpatch-add-qemu_bh_new-aio_bh_new-checks.patch

@@ -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
-

kvm-graph-lock-Disable-locking-for-now.patch

@@ -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
-

kvm-hw-acpi-Mark-acpi-blobs-as-resizable-on-RHEL-pc-mach.patch

@@ -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
-

kvm-hw-acpi-limit-warning-on-acpi-table-size-to-pc-machi.patch

@@ -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
-

kvm-hw-arm-Validate-cluster-and-NUMA-node-boundary.patch

@@ -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
-

kvm-hw-arm-smmu-Handle-big-endian-hosts-correctly.patch

@@ -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
-

kvm-hw-arm-virt-Validate-cluster-and-NUMA-node-boundary-.patch

@@ -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
-

kvm-hw-pci-Disable-PCI_ERR_UNCOR_MASK-reg-for-machine-ty.patch

@@ -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
-

kvm-hw-pci-Disable-PCI_ERR_UNCOR_MASK-register-for-machi.patch

@@ -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
-

kvm-hw-replace-most-qemu_bh_new-calls-with-qemu_bh_new_g.patch

@@ -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
-

kvm-hw-scsi-lsi53c895a-Fix-reentrancy-issues-in-the-LSI-.patch

@@ -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
-

kvm-hw-vfio-pci-quirks-Sanitize-capability-pointer.patch

@@ -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
-

kvm-hw-vfio-pci-quirks-Support-alternate-offset-for-GPUD.patch

@@ -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
-

kvm-hw-virtio-iommu-Fix-potential-OOB-access-in-virtio_i.patch

@@ -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
-

kvm-i386-cpu-Update-how-the-EBX-register-of-CPUID-0x8000.patch

@@ -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
-

kvm-i386-sev-Update-checks-and-information-related-to-re.patch

@@ -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
-

kvm-iotests-Test-commit-with-iothreads-and-ongoing-I-O.patch

@@ -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
-

kvm-iotests-Test-resizing-image-attached-to-an-iothread.patch

@@ -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
-

kvm-iotests-Use-alternative-CPU-type-that-is-not-depreca.patch

@@ -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
-

kvm-iotests-iov-padding-New-test.patch

@@ -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
-

kvm-kvm-reuse-per-vcpu-stats-fd-to-avoid-vcpu-interrupti.patch

@@ -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
-

kvm-loongarch-mark-loongarch_ipi_iocsr-re-entrnacy-safe.patch

@@ -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
-

kvm-lsi53c895a-disable-reentrancy-detection-for-MMIO-reg.patch

@@ -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
-

kvm-lsi53c895a-disable-reentrancy-detection-for-script-R.patch

@@ -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
-

kvm-memory-prevent-dma-reentracy-issues.patch

@@ -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
-

kvm-memory-stricter-checks-prior-to-unsetting-engaged_in.patch

@@ -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
-

kvm-migration-Add-switchover-ack-capability.patch

@@ -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
-

kvm-migration-Allow-postcopy_ram_supported_by_host-to-re.patch

@@ -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
-

kvm-migration-Attempt-disk-reactivation-in-more-failure-.patch

@@ -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
-

kvm-migration-Create-migrate_cap_set.patch

@@ -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
-

kvm-migration-Create-migrate_checkpoint_delay.patch

@@ -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
-

kvm-migration-Create-migrate_cpu_throttle_increment-func.patch

@@ -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
-

kvm-migration-Create-migrate_cpu_throttle_initial-to-opt.patch

@@ -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
-

kvm-migration-Create-migrate_cpu_throttle_tailslow-funct.patch

@@ -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
-

kvm-migration-Create-migrate_max_bandwidth-function.patch

@@ -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
-

kvm-migration-Create-migrate_max_cpu_throttle.patch

@@ -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
-

kvm-migration-Create-migrate_rdma_pin_all-function.patch

@@ -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
-

kvm-migration-Create-migrate_throttle_trigger_threshold.patch

@@ -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
-

kvm-migration-Create-options.c.patch

@@ -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
-

kvm-migration-Enable-switchover-ack-capability.patch

@@ -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
-

kvm-migration-Handle-block-device-inactivation-failures-.patch

@@ -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
-

kvm-migration-Implement-switchover-ack-logic.patch

@@ -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
-

kvm-migration-Make-all-functions-check-have-the-same-for.patch

@@ -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
-

kvm-migration-Make-dirty_sync_count-atomic.patch

@@ -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
-

kvm-migration-Make-dirty_sync_missed_zero_copy-atomic.patch

@@ -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
-

kvm-migration-Make-downtime_bytes-atomic.patch

@@ -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
-

kvm-migration-Make-multifd_bytes-atomic.patch

@@ -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
-

kvm-migration-Make-postcopy_requests-atomic.patch

@@ -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
-

kvm-migration-Make-precopy_bytes-atomic.patch

@@ -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
-

kvm-migration-Merge-ram_counters-and-ram_atomic_counters.patch

@@ -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
-

kvm-migration-Minor-control-flow-simplification.patch

@@ -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
-

kvm-migration-Move-migrate_announce_params-to-option.c.patch

@@ -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
-

kvm-migration-Move-migrate_cap_set-to-options.c.patch

@@ -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
-

kvm-migration-Move-migrate_caps_check-to-options.c.patch

@@ -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
-

kvm-migration-Move-migrate_colo_enabled-to-options.c.patch

@@ -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
-

kvm-migration-Move-migrate_postcopy-to-options.c.patch

@@ -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
-

kvm-migration-Move-migrate_use_block-to-options.c.patch

@@ -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
-