Fix truncation, add write-back cache support

Improve performance by adding io_uring support, fix iothread compat
Add bdrv_co_block_status
2023-10-27 21:05:44 +03:00 · 2023-07-19 02:27:08 +03:00 · 2023-07-18 18:26:09 +03:00 · 2022-12-15 19:32:46 +03:00
148 changed files with 13541 additions and 8024 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +0,0 @@
-/*.build
-/*.buildinfo
-/*.changes
-/*.deb
-/*.dsc
-/*.tar*
-/pve-qemu-kvm-*.*/
--- a/82
+++ b/82
@@ -1,90 +1,60 @@
-include /usr/share/dpkg/default.mk
+include /usr/share/dpkg/pkg-info.mk
+include /usr/share/dpkg/architecture.mk

 PACKAGE = pve-qemu-kvm

 SRCDIR := qemu
-BUILDDIR ?= $(PACKAGE)-$(DEB_VERSION_UPSTREAM)
-ORIG_SRC_TAR=$(PACKAGE)_$(DEB_VERSION_UPSTREAM).orig.tar.gz
+BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM}

 GITVERSION := $(shell git rev-parse HEAD)

-DSC=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION).dsc
-DEB = $(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb
-DEB_DBG = $(PACKAGE)-dbgsym_$(DEB_VERSION_UPSTREAM_REVISION)_$(DEB_BUILD_ARCH).deb
+DEB = ${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
+DEB_DBG = ${PACKAGE}-dbg_${DEB_VERSION_UPSTREAM_REVISION}_${DEB_BUILD_ARCH}.deb
 DEBS = $(DEB) $(DEB_DBG)

 all: $(DEBS)

 .PHONY: submodule
 submodule:
-ifeq ($(shell test -f "$(SRCDIR)/configure" && echo 1 || echo 0), 0)
-	git submodule update --init --recursive
-	cd $(SRCDIR); meson subprojects download
-endif
+	test -f "${SRCDIR}/configure" || git submodule update --init --recursive

-PC_BIOS_FW_PURGE_LIST_IN = \
-	hppa-firmware.img \
-	hppa-firmware64.img \
-	openbios-ppc \
-	openbios-sparc32 \
-	openbios-sparc64 \
-	palcode-clipper \
-	s390-ccw.img \
-	s390-netboot.img \
-	u-boot.e500 \
-	.*[a-zA-Z0-9]\.dtb \
-	.*[a-zA-Z0-9]\.dts \
-	qemu_vga.ndrv \
-	slof.bin \
-	opensbi-riscv.*-generic-fw_dynamic.bin \
-
-BLOB_PURGE_SED_CMDS = $(foreach FILE,$(PC_BIOS_FW_PURGE_LIST_IN),-e "/$(FILE)/d")
-BLOB_PURGE_FILTER = $(foreach FILE,$(PC_BIOS_FW_PURGE_LIST_IN),-e "$(FILE)")
-
-$(BUILDDIR): submodule
+$(BUILDDIR): keycodemapdb | submodule
 	# check if qemu/ was used for a build
 	# if so, please run 'make distclean' in the submodule and try again
 	test ! -f $(SRCDIR)/build/config.status
-	rm -rf $@.tmp $@
-	cp -a $(SRCDIR) $@.tmp
-	cp -a debian $@.tmp/debian
-	rm -rf $@.tmp/roms/edk2 # packaged separately
-	find $@.tmp/pc-bios -type f | grep $(BLOB_PURGE_FILTER) | xargs rm -f
-	sed -i $(BLOB_PURGE_SED_CMDS) $@.tmp/pc-bios/meson.build
-	echo "git clone git://git.proxmox.com/git/pve-qemu.git\\ngit checkout $(GITVERSION)" > $@.tmp/debian/SOURCE
-	mv $@.tmp $@
+	rm -rf $(BUILDDIR)
+	cp -a $(SRCDIR) $(BUILDDIR)
+	cp -a debian $(BUILDDIR)/debian
+	rm -rf $(BUILDDIR)/ui/keycodemapdb
+	cp -a keycodemapdb $(BUILDDIR)/ui/
+	echo "git clone git://git.proxmox.com/git/pve-qemu.git\\ngit checkout $(GITVERSION)" > $(BUILDDIR)/debian/SOURCE

 .PHONY: deb kvm
 deb kvm: $(DEBS)
 $(DEB_DBG): $(DEB)
 $(DEB): $(BUILDDIR)
-	cd $(BUILDDIR); dpkg-buildpackage -b -us -uc
+	cd $(BUILDDIR); dpkg-buildpackage -b -us -uc -j8
 	lintian $(DEBS)

-sbuild: $(DSC)
-	sbuild $(DSC)
-
-$(ORIG_SRC_TAR): $(BUILDDIR)
-	tar czf $(ORIG_SRC_TAR) --exclude="$(BUILDDIR)/debian" $(BUILDDIR)
-
-.PHONY: dsc
-dsc:
-	rm -rf *.dsc $(BUILDDIR)
-	$(MAKE) $(DSC)
-	lintian $(DSC)
-
-$(DSC): $(ORIG_SRC_TAR) $(BUILDDIR)
-	cd $(BUILDDIR); dpkg-buildpackage -S -us -uc -d
+.PHONY: update
+update:
+	cd $(SRCDIR) && git submodule deinit ui/keycodemapdb || true
+	rm -rf $(SRCDIR)/ui/keycodemapdb
+	mkdir $(SRCDIR)/ui/keycodemapdb
+	cd $(SRCDIR) && git submodule update --init ui/keycodemapdb
+	rm -rf keycodemapdb
+	mkdir keycodemapdb
+	cp -R $(SRCDIR)/ui/keycodemapdb/* keycodemapdb/
+	git add keycodemapdb

 .PHONY: upload
-upload: UPLOAD_DIST ?= $(DEB_DISTRIBUTION)
 upload: $(DEBS)
-	tar cf - $(DEBS) | ssh repoman@repo.proxmox.com upload --product pve --dist $(UPLOAD_DIST)
+	tar cf - ${DEBS} | ssh repoman@repo.proxmox.com upload --product pve --dist bullseye

 .PHONY: distclean clean
 distclean: clean
 clean:
-	rm -rf $(PACKAGE)-[0-9]*/ $(PACKAGE)*.tar* *.deb *.dsc *.build *.buildinfo *.changes
+	rm -rf $(BUILDDIR) $(PACKAGE)*.deb *.buildinfo *.changes

 .PHONY: dinstall
 dinstall: $(DEBS)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,369 +1,28 @@
-pve-qemu-kvm (9.0.2-4) bookworm; urgency=medium
+pve-qemu-kvm (7.1.0-4+vitastor5) bullseye; urgency=medium

-  * async snapshot: ensure any dynamic vCPU-throttling applied for
-    auto-converge gets always disabled again after finishing the snapshot.
+  * Fix truncation
+  * Add write-back cache support

- -- Proxmox Support Team <support@proxmox.com>  Sun, 10 Nov 2024 11:23:09 +0100
+ -- Vitaliy Filippov <vitalif@yourcmc.ru>  Fri, 27 Oct 2023 21:04:05 +0300

-pve-qemu-kvm (9.0.2-3) bookworm; urgency=medium
+pve-qemu-kvm (7.1.0-4+vitastor4) bullseye; urgency=medium

-  * pick up fix for VirtIO PCI regressions
+  * Improve performance by adding io_uring support
+  * Fix compatibility with iothread

-  * pick up stable fixes for 9.0, including fixes for VirtIO-net, ARM and
-    x86(_64) emulation, CVEs to harden NBD server against malicious clients,
-    as well as a few others (VNC, physmem, Intel IOMMU, ...).
+ -- Vitaliy Filippov <vitalif@yourcmc.ru>  Tue, 18 Jul 2023 02:22:28 +0300

- -- Proxmox Support Team <support@proxmox.com>  Fri, 06 Sep 2024 16:21:42 +0200
+pve-qemu-kvm (7.1.0-4+vitastor3) bullseye; urgency=medium

-pve-qemu-kvm (9.0.2-2) bookworm; urgency=medium
+  * Add bdrv_co_block_status implementation for QCOW2 export support

-  * actually update submodule to QEMU 9.0.2. The previous release was still
-    based on 9.0.0 by mistake.
+ -- Vitaliy Filippov <vitalif@yourcmc.ru>  Thu, 12 Jan 2023 02:31:18 +0300

- -- Proxmox Support Team <support@proxmox.com>  Wed, 07 Aug 2024 10:16:01 +0200
+pve-qemu-kvm (7.1.0-4+vitastor2) bullseye; urgency=medium

-pve-qemu-kvm (9.0.2-1) bookworm; urgency=medium
+  * Add Vitastor support

-  * update submodule and patches to QEMU 9.0.2. While our version had most
-    stable fixes included already, there are new fixes for VirtIO and VGA
-    display screen blanking (#4786)
-
-  * backport fix for a regression with the LSI-53c895a controller and one for
-    the boot order getting ignored for USB storage
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 29 Jul 2024 18:59:40 +0200
-
-pve-qemu-kvm (9.0.0-6) bookworm; urgency=medium
-
-  * fix a regression in the zeroinit block driver that prevented importing and
-    cloning disks to RBD storages which are not using the krbd setting
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 08 Jul 2024 16:11:15 +0200
-
-pve-qemu-kvm (9.0.0-5) bookworm; urgency=medium
-
-  * backport fix for CVE-2024-4467 to prevent malicious qcow2 image files from
-    already causing bad effects if being queried via 'qemu-img info'. For
-    Proxmox VE, this is an additional safe guard, as currently it directly
-    creates and manages the qcow2 images used by VMs and does not allow
-    unprivileged users to import them
-
-  * fix #4726: code cleanup: avoid superfluous check in vma backup code
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 03 Jul 2024 13:13:35 +0200
-
-pve-qemu-kvm (9.0.0-4) bookworm; urgency=medium
-
-  * fix crash after saving a snapshot without including VM state when a VirtIO
-    block device with iothread is configured.
-
-  * fix edge case in error handling when opening a block device from PBS fails
-
-  * minor code cleanup in backup code
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 01 Jul 2024 11:26:11 +0200
-
-pve-qemu-kvm (9.0.0-3) bookworm; urgency=medium
-
-  * fix crash when doing resize after hotplugging a disk using io_uring
-
-  * fix some minor issues in software CPU emulation (i.e. non-KVM) for ARM and
-    x86(_64)
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 29 May 2024 15:55:44 +0200
-
-pve-qemu-kvm (9.0.0-2) bookworm; urgency=medium
-
-  * fix #5409: backup: fix copy-before-write timeout
-
-  * backup: improve error when copy-before-write fails for fleecing
-
-  * fix forwards and backwards migration with VirtIO-GPU display
-
-  * fix a regression in pflash device introduced in 8.2
-
-  * revert a commit for VirtIO PCI devices that turned out to cause more
-    potential security issues than what it fixed
-
-  * move compatibility flags for a new VirtIO-net feature to the correct
-    machine type. The feature was introduced in QEMU 8.2, but the
-    compatibility flags got added to machine version 8.0 instead of 8.1. This
-    breaks backwards migration with machine version 8.1 from a 8.2/9.0 binary
-    to an 8.1 binary, in cases where the guest kernel enables the feature
-    (e.g. Ubuntu 23.10).
-    While that breaks migration with machine version 8.1 from an unpatched to
-    a patched binary, Proxmox VE only ever had 8.2 on the test repository and
-    9.0 not yet in any public repository.
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 17 May 2024 17:04:52 +0200
-
-pve-qemu-kvm (9.0.0-1) bookworm; urgency=medium
-
-  * update submodule and patches to QEMU 9.0.0
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 29 Apr 2024 10:51:37 +0200
-
-pve-qemu-kvm (8.2.2-1) bookworm; urgency=medium
-
-  * update submodule and patches to QEMU 8.2.2
-
- -- Proxmox Support Team <support@proxmox.com>  Sat, 27 Apr 2024 12:44:30 +0200
-
-pve-qemu-kvm (8.1.5-5) bookworm; urgency=medium
-
-  * implement support for backup fleecing
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 11 Apr 2024 17:46:48 +0200
-
-pve-qemu-kvm (8.1.5-4) bookworm; urgency=medium
-
-  * fix live-import for certain kinds of VMDK images that rely on padding
-
-  * backup: avoid bubbling up first error if it's an ECANCELED one, as those
-    are often a result of cancling the job due to running into an actual
-    issue.
-
-  * backup: factor out & clean up gathering device info into helper
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 12 Mar 2024 14:08:40 +0100
-
-pve-qemu-kvm (8.1.5-3) bookworm; urgency=medium
-
-  * backport fix for potential deadlock during QMP stop command if the VM has
-    disks attached through VirtIO-Block and IO-Thread enabled
-
-  * fix #4507: add patch to automatically increase NOFILE soft limit
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 21 Feb 2024 20:11:23 +0100
-
-pve-qemu-kvm (8.1.5-2) bookworm; urgency=medium
-
-  * work around for a situation where guest IO might get stuck, if the VM is
-    configure  with iothread and VirtIO block/SCSI
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 02 Feb 2024 19:41:27 +0100
-
-pve-qemu-kvm (8.1.5-1) bookworm; urgency=medium
-
-  * update to 8.1.5 stable release, including more relevant fixes like:
-    - virtio-net: correctly copy vnet header when flushing TX
-    - hw/pflash: implement update buffer for block writes
-    - Fixes to i386 emulation and ARM emulation.
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 02 Feb 2024 19:08:13 +0100
-
-pve-qemu-kvm (8.1.2-6) bookworm; urgency=medium
-
-  * revert attempted fix to avoid rare issue with stuck guest IO when using
-    iothread, because it caused a much more common issue with iothreads
-    consuming too much CPU
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 15 Dec 2023 14:22:06 +0100
-
-pve-qemu-kvm (8.1.2-5) bookworm; urgency=medium
-
-  * backport workaround for stuck guest IO with iothread and VirtIO block/SCSI
-    in some rare edge cases
-
-  * backport fix for potential deadlock when issuing the "resize" QMP command
-    for a disk that is using iothread
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 11 Dec 2023 16:58:27 +0100
-
-pve-qemu-kvm (8.1.2-4) bookworm; urgency=medium
-
-  * fix vnc clipboard in the host to guest direction
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 22 Nov 2023 14:28:21 +0100
-
-pve-qemu-kvm (8.1.2-3) bookworm; urgency=medium
-
-  * fix #5054: backport fix for software reset with SATA, avoiding breakage
-    with, e.g., some FreeBSD VMs
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 20 Nov 2023 10:24:50 +0100
-
-pve-qemu-kvm (8.1.2-2) bookworm; urgency=medium
-
-  * revert "x86: acpi: workaround Windows not handling name references in
-    Package properly" as that seems to have broken networking (and possibly
-    other things) one some localized variants of Windows (e.g., the German
-    versions).
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 17 Nov 2023 11:55:23 +0100
-
-pve-qemu-kvm (8.1.2-1) bookworm; urgency=medium
-
-  * update submodule and patches to QEMU 8.1.2
-
-  * use QEMU's keycode-map-db again instead of our static copy from QEMU 6.0
-
-  * disable graph locking, newly introduced in the 8.1 release, as it has
-    still various deadlock issuess, e.g., during canceling backup jobs.
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 24 Oct 2023 13:42:45 +0200
-
-pve-qemu-kvm (8.0.2-7) bookworm; urgency=medium
-
-  * fix #2874: SATA: avoid unsolicited write to sector 0 during reset
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 04 Oct 2023 08:33:35 +0200
-
-pve-qemu-kvm (8.0.2-6) bookworm; urgency=medium
-
-  * fix #1534: vma: add extract-filter for disk images allowing users to pass
-    a comma separated list of the disks they want to extract from an archive.
-
-  * backup: create jobs in a drained section to avoid subtle bugs where
-    something interferes with the block-copy-state bitmap on initialization
-
-  * backup: drop experimental, and since a while also fully broken, directory
-    backup format (BACKUP_FORMAT_DIR). This format was never exposed via the
-    Proxmox VE API, but only available via QMP, as its broken since QEMU 8 and
-    we got zero reports about that, it's safe to assume that there are no
-    public users, so just remove it completely.
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 06 Sep 2023 17:03:59 +0200
-
-pve-qemu-kvm (8.0.2-5) bookworm; urgency=medium
-
-  * improve memory footprint after backup by not keeping as much memory
-    resident.
-
-  * fix file descriptor leak for vhost (used by default by vNICs).
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 16 Aug 2023 11:52:24 +0200
-
-pve-qemu-kvm (8.0.2-4) bookworm; urgency=medium
-
-  * fix resume for snapshot and hibernate in combination with iothread and
-    dirty bitmap
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 28 Jul 2023 12:58:22 +0200
-
-pve-qemu-kvm (8.0.2-3) bookworm; urgency=medium
-
-  * fix regression in QEMU 8.0 for drive mirror with bitmap
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 15 Jun 2023 13:57:46 +0200
-
-pve-qemu-kvm (8.0.2-2) bookworm; urgency=medium
-
-  * drop custom get_link_status QMP command, was never really used.
-
-  * drop custom & deprecated drive snapshot QMP commands, we use a better
-    alternative since a while.
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 09 Jun 2023 07:57:56 +0200
-
-pve-qemu-kvm (8.0.2-1) bookworm; urgency=medium
-
-  * update to QEMU stable release 8.0.2
-
-  * update patches for avoiding issues with DMA reentrancy to current,
-    slightly optimized version.
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 06 Jun 2023 16:34:50 +0200
-
-pve-qemu-kvm (8.0.0-1) bookworm; urgency=medium
-
-  * update to QEMU stable release 8.0.0
-
-  * re-build for Proxmox VE 8 / Debian 12 Bookworm
-
-  * adapt to the local virtiofsd C variant being dropped, it has been
-    rewritten in Rust and is now hosted in a separate source repository.
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 22 May 2023 13:45:49 +0200
-
-pve-qemu-kvm (7.2.0-8) bullseye; urgency=medium
-
-  * backport fix for ACPI CPU hotplug issue with TCG
-
-  * cherry-pick TCG-related stable fixes for 7.2 for users that turned off KVM
-    HW acceleration
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 17 Mar 2023 15:47:08 +0100
-
-pve-qemu-kvm (7.2.0-7) bullseye; urgency=medium
-
-  * improve fix for potential deadlock with trim for IDE/SATA and draining
-
-  * backport stable fixes:
-    - hw/nvme: fix missing endian conversions for doorbell buffers
-    - hw/smbios: fix field corruption in type 4 table
-    - virtio-rng-pci: fix transitional migration compat for vectors
-    - hw/timer/hpet: Fix expiration time overflow
-    - vhost/vdpa: stop all svq on device deletion
-    - vhost: avoid a potential use of an uninitialized variable in the call to
-      vhost_svq_poll
-    - chardev/char-socket: set s->listener = NULL in char_socket_finalize to
-      fix a potential crash after live-migration
-    - intel-iommu: fail MAP notifier without caching mode
-    - intel-iommu: fail DEVIOTLB_UNMAP without dt mode
-
-  * fix a regression for when the LSI SCSI controller is used
-
- -- Proxmox Support Team <support@proxmox.com>  Mon, 13 Mar 2023 17:42:49 +0100
-
-pve-qemu-kvm (7.2.0-6) bullseye; urgency=medium
-
-  * fix 7.2 regression for Linux boot failures with megasas SCSI
-
-  * fix 7.0 regression for a potential deadlock with trim for IDE/SATA and
-    draining
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 08 Mar 2023 14:32:17 +0100
-
-pve-qemu-kvm (7.2.0-5) bullseye; urgency=medium
-
-  * fix #4476: savevm-async: avoid looping without progress
-
-  * savevm-async: decrease the boundary for free space for (memory) state left
-    on target from 30 MiB to 100 MiB, improving the heuristic for when to
-    enter the final "pause and sync" stage.
-
-  * QMP backup: use correct error number when getting blockdrive length fails
-
-  * backport fix for some DMA reentrancy issues, better protecting against
-    malicious guests
-
-  * backport fix for iSCSI double free issue leading to crashes
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 21 Feb 2023 13:49:43 +0100
-
-pve-qemu-kvm (7.2.0-4) bullseye; urgency=medium
-
-  * backport fix for a 7.2 regression when using VirtIO disk with
-    detect-zeroes=unmap
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 27 Jan 2023 09:37:49 +0100
-
-pve-qemu-kvm (7.2.0-3) bullseye; urgency=medium
-
-  * add fix for live-migration with virtio-rng devices, which regressed in
-    QEMU 7.2.0.
-
- -- Proxmox Support Team <support@proxmox.com>  Thu, 12 Jan 2023 13:13:14 +0100
-
-pve-qemu-kvm (7.2.0-2) bullseye; urgency=medium
-
-  * enable slirp again for now, as in qemu-server, user networking is
-    supported (via CLI/API) when no bridge is set on a virtual NIC
-
-  * cherry-pick stable fixes for 7.2. Two for virtio-mem and one for vIOMMU.
-    Both features are not yet exposed in PVE's qemu-server, but there's work
-    going on to change that.
-
- -- Proxmox Support Team <support@proxmox.com>  Tue, 10 Jan 2023 15:47:48 +0100
-
-pve-qemu-kvm (7.2.0-1) bullseye; urgency=medium
-
-  * update to QEMU stable release 7.2.0
-
-  * drop 'slirp' networking
-
- -- Proxmox Support Team <support@proxmox.com>  Fri, 16 Dec 2022 13:18:21 +0100
+ -- Vitaliy Filippov <vitalif@yourcmc.ru>  Thu, 15 Dec 2022 19:32:28 +0300

 pve-qemu-kvm (7.1.0-4) bullseye; urgency=medium

--- a/debian/compat
+++ b/debian/compat
@@ -0,0 +1 @@
+10
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,9 @@ Source: pve-qemu-kvm
 Section: admin
 Priority: optional
 Maintainer: Proxmox Support Team <support@proxmox.com>
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: autotools-dev,
               check,
+               debhelper (>= 9),
               libacl1-dev,
               libaio-dev,
               libattr1-dev,
@@ -15,21 +16,21 @@ Build-Depends: debhelper-compat (= 13),
               libglusterfs-dev (>= 5.2-2),
               libgnutls28-dev,
               libiscsi-dev (>= 1.12.0),
+               libjemalloc-dev,
               libjpeg-dev,
               libjson-perl,
               libnuma-dev,
               libpci-dev,
               libpixman-1-dev,
-               libproxmox-backup-qemu0-dev (>= 1.3.0),
+               libproxmox-backup-qemu0-dev (>= 1.3.0-1),
               librbd-dev (>= 0.48),
               libsdl1.2-dev,
               libseccomp-dev,
-               libslirp-dev,
               libspice-protocol-dev (>= 0.12.14~),
               libspice-server-dev (>= 0.14.0~),
               libsystemd-dev,
               liburing-dev,
-               libusb-1.0-0-dev (>= 1.0.17),
+               libusb-1.0-0-dev (>= 1.0.17-1),
               libusbredirparser-dev (>= 0.6-2),
               libvirglrenderer-dev,
               libzstd-dev,
@@ -37,8 +38,9 @@ Build-Depends: debhelper-compat (= 13),
               python3-minimal,
               python3-sphinx,
               python3-sphinx-rtd-theme,
-               python3-venv,
               quilt,
+               texi2html,
+               texinfo,
               uuid-dev,
               xfslibs-dev,
 Standards-Version: 3.7.2
@@ -55,15 +57,17 @@ Depends: ceph-common (>= 0.48),
         libglusterfs-dev | glusterfs-common (>= 5.6),
         libglusterfs0 | glusterfs-common (>= 5.6),
         libiscsi4 (>= 1.12.0) | libiscsi7,
+         libjemalloc2,
         libjpeg62-turbo,
         libspice-server1 (>= 0.14.0~),
         libusb-1.0-0 (>= 1.0.17-1),
         libusbredirparser1 (>= 0.6-2),
+         vitastor-client (>= 0.9.4),
         libuuid1,
         ${misc:Depends},
         ${shlibs:Depends},
-Recommends: numactl,
-Suggests: libgl1,
+Recommends: numactl
+Suggests: libgl1
 Conflicts: kvm,
           pve-kvm,
           pve-qemu-kvm-2.6.18,
@@ -71,17 +75,22 @@ Conflicts: kvm,
           qemu-kvm,
           qemu-system-arm,
           qemu-system-common,
-           qemu-system-data,
           qemu-system-x86,
           qemu-utils,
-Provides: qemu-system-arm, qemu-system-x86, qemu-utils,
+Provides: qemu-system-arm, qemu-system-x86, qemu-utils
 Replaces: pve-kvm,
          pve-qemu-kvm-2.6.18,
          qemu-system-arm,
          qemu-system-x86,
          qemu-utils,
-Breaks: qemu-server (<= 8.0.6)
 Description: Full virtualization on x86 hardware
 Using KVM, one can run multiple virtual PCs, each running unmodified Linux or
 Windows images. Each virtual machine has private virtualized hardware: a
 network card, disk, graphics adapter, etc.
+
+Package: pve-qemu-kvm-dbg
+Architecture: any
+Section: debug
+Depends: pve-qemu-kvm (= ${binary:Version})
+Description: pve qemu debugging symbols
+ This package contains the debugging symbols for pve-qemu-kvm.
--- a/debian/parse-machines.pl
+++ b/debian/parse-machines.pl
@@ -24,5 +24,4 @@ while (<STDIN>) {

 die "no QEMU machine types detected from STDIN input" if scalar (@$machines) <= 0;

-print to_json($machines, { utf8 => 1, canonical => 1 })
-    or die "failed to encode detected machines as JSON - $!\n";
+print to_json($machines, { utf8 => 1 }) or die "$!\n";
--- a/debian/patches/bitmap-mirror/0001-drive-mirror-add-support-for-sync-bitmap-mode-never.patch
+++ b/debian/patches/bitmap-mirror/0001-drive-mirror-add-support-for-sync-bitmap-mode-never.patch
@@ -27,18 +27,16 @@ Signed-off-by: Ma Haocong <mahaocong@didichuxing.com>
 Signed-off-by: John Snow <jsnow@redhat.com>
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
-[FE: rebased for 8.2.2]
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 ---
- block/mirror.c                         | 99 ++++++++++++++++++++------
- blockdev.c                             | 38 +++++++++-
+ block/mirror.c                         | 98 +++++++++++++++++++++-----
+ blockdev.c                             | 39 +++++++++-
 include/block/block_int-global-state.h |  4 +-
- qapi/block-core.json                   | 25 ++++++-
+ qapi/block-core.json                   | 29 ++++++--
 tests/unit/test-block-iothread.c       |  4 +-
- 5 files changed, 142 insertions(+), 28 deletions(-)
+ 5 files changed, 145 insertions(+), 29 deletions(-)

 diff --git a/block/mirror.c b/block/mirror.c
-index 1bdce3b657..0c5c72df2e 100644
+index 3c4ab1159d..f2eca983f1 100644
 --- a/block/mirror.c
 +++ b/block/mirror.c
@@ -51,7 +51,7 @@ typedef struct MirrorBlockJob {
@@ -50,7 +48,7 @@ index 1bdce3b657..0c5c72df2e 100644
     BlockMirrorBackingMode backing_mode;
     /* Whether the target image requires explicit zero-initialization */
     bool zero_target;
-@@ -73,6 +73,8 @@ typedef struct MirrorBlockJob {
+@@ -65,6 +65,8 @@ typedef struct MirrorBlockJob {
     size_t buf_size;
     int64_t bdev_length;
     unsigned long *cow_bitmap;
@@ -59,9 +57,9 @@ index 1bdce3b657..0c5c72df2e 100644
     BdrvDirtyBitmap *dirty_bitmap;
     BdrvDirtyBitmapIter *dbi;
     uint8_t *buf;
-@@ -722,7 +724,8 @@ static int mirror_exit_common(Job *job)
+@@ -696,7 +698,8 @@ static int mirror_exit_common(Job *job)
+     bdrv_child_refresh_perms(mirror_top_bs, mirror_top_bs->backing,
                              &error_abort);
- 
     if (!abort && s->backing_mode == MIRROR_SOURCE_BACKING_CHAIN) {
 -        BlockDriverState *backing = s->is_none_mode ? src : s->base;
 +        BlockDriverState *backing;
@@ -69,7 +67,7 @@ index 1bdce3b657..0c5c72df2e 100644
         BlockDriverState *unfiltered_target = bdrv_skip_filters(target_bs);
 
         if (bdrv_cow_bs(unfiltered_target) != backing) {
-@@ -819,6 +822,16 @@ static void mirror_abort(Job *job)
+@@ -794,6 +797,16 @@ static void mirror_abort(Job *job)
     assert(ret == 0);
 }
 
@@ -86,7 +84,7 @@ index 1bdce3b657..0c5c72df2e 100644
 static void coroutine_fn mirror_throttle(MirrorBlockJob *s)
 {
     int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
-@@ -1015,7 +1028,8 @@ static int coroutine_fn mirror_run(Job *job, Error **errp)
+@@ -973,7 +986,8 @@ static int coroutine_fn mirror_run(Job *job, Error **errp)
     mirror_free_init(s);
 
     s->last_pause_ns = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
@@ -96,7 +94,7 @@ index 1bdce3b657..0c5c72df2e 100644
         ret = mirror_dirty_init(s);
         if (ret < 0 || job_is_cancelled(&s->common.job)) {
             goto immediate_exit;
-@@ -1304,6 +1318,7 @@ static const BlockJobDriver mirror_job_driver = {
+@@ -1212,6 +1226,7 @@ static const BlockJobDriver mirror_job_driver = {
         .run                    = mirror_run,
         .prepare                = mirror_prepare,
         .abort                  = mirror_abort,
@@ -104,7 +102,7 @@ index 1bdce3b657..0c5c72df2e 100644
         .pause                  = mirror_pause,
         .complete               = mirror_complete,
         .cancel                 = mirror_cancel,
-@@ -1322,6 +1337,7 @@ static const BlockJobDriver commit_active_job_driver = {
+@@ -1228,6 +1243,7 @@ static const BlockJobDriver commit_active_job_driver = {
         .run                    = mirror_run,
         .prepare                = mirror_prepare,
         .abort                  = mirror_abort,
@@ -112,7 +110,7 @@ index 1bdce3b657..0c5c72df2e 100644
         .pause                  = mirror_pause,
         .complete               = mirror_complete,
         .cancel                 = commit_active_cancel,
-@@ -1714,7 +1730,10 @@ static BlockJob *mirror_start_job(
+@@ -1593,7 +1609,10 @@ static BlockJob *mirror_start_job(
                              BlockCompletionFunc *cb,
                              void *opaque,
                              const BlockJobDriver *driver,
@@ -124,9 +122,9 @@ index 1bdce3b657..0c5c72df2e 100644
                              bool auto_complete, const char *filter_node_name,
                              bool is_mirror, MirrorCopyMode copy_mode,
                              Error **errp)
-@@ -1728,10 +1747,39 @@ static BlockJob *mirror_start_job(
- 
-     GLOBAL_STATE_CODE();
+@@ -1605,10 +1624,39 @@ static BlockJob *mirror_start_job(
+     uint64_t target_perms, target_shared_perms;
+     int ret;
 
 -    if (granularity == 0) {
 -        granularity = bdrv_get_default_bitmap_granularity(target);
@@ -166,7 +164,7 @@ index 1bdce3b657..0c5c72df2e 100644
     assert(is_power_of_2(granularity));
 
     if (buf_size < 0) {
-@@ -1871,7 +1919,9 @@ static BlockJob *mirror_start_job(
+@@ -1740,7 +1788,9 @@ static BlockJob *mirror_start_job(
     s->replaces = g_strdup(replaces);
     s->on_source_error = on_source_error;
     s->on_target_error = on_target_error;
@@ -176,10 +174,10 @@ index 1bdce3b657..0c5c72df2e 100644
 +    s->bitmap_mode = bitmap_mode;
     s->backing_mode = backing_mode;
     s->zero_target = zero_target;
-     qatomic_set(&s->copy_mode, copy_mode);
-@@ -1897,6 +1947,18 @@ static BlockJob *mirror_start_job(
-      */
-     bdrv_disable_dirty_bitmap(s->dirty_bitmap);
+     s->copy_mode = copy_mode;
+@@ -1761,6 +1811,18 @@ static BlockJob *mirror_start_job(
+         bdrv_disable_dirty_bitmap(s->dirty_bitmap);
+     }
 
 +    if (s->sync_bitmap) {
 +        bdrv_dirty_bitmap_set_busy(s->sync_bitmap, true);
@@ -193,10 +191,10 @@ index 1bdce3b657..0c5c72df2e 100644
 +        }
 +    }
 +
-     bdrv_graph_wrlock();
     ret = block_job_add_bdrv(&s->common, "source", bs, 0,
                              BLK_PERM_WRITE_UNCHANGED | BLK_PERM_WRITE |
-@@ -1979,6 +2041,9 @@ fail:
+                              BLK_PERM_CONSISTENT_READ,
+@@ -1838,6 +1900,9 @@ fail:
         if (s->dirty_bitmap) {
             bdrv_release_dirty_bitmap(s->dirty_bitmap);
         }
@@ -206,7 +204,7 @@ index 1bdce3b657..0c5c72df2e 100644
         job_early_fail(&s->common.job);
     }
 
-@@ -2001,35 +2066,28 @@ void mirror_start(const char *job_id, BlockDriverState *bs,
+@@ -1855,31 +1920,25 @@ void mirror_start(const char *job_id, BlockDriverState *bs,
                   BlockDriverState *target, const char *replaces,
                   int creation_flags, int64_t speed,
                   uint32_t granularity, int64_t buf_size,
@@ -231,12 +229,8 @@ index 1bdce3b657..0c5c72df2e 100644
 -                   MirrorSyncMode_str(mode));
 -        return;
 -    }
-
-     bdrv_graph_rdlock_main_loop();
 -    is_none_mode = mode == MIRROR_SYNC_MODE_NONE;
     base = mode == MIRROR_SYNC_MODE_TOP ? bdrv_backing_chain_next(bs) : NULL;
-     bdrv_graph_rdunlock_main_loop();
- 
     mirror_start_job(job_id, bs, creation_flags, target, replaces,
                      speed, granularity, buf_size, backing_mode, zero_target,
                      on_source_error, on_target_error, unmap, NULL, NULL,
@@ -247,7 +241,7 @@ index 1bdce3b657..0c5c72df2e 100644
 }
 
 BlockJob *commit_active_start(const char *job_id, BlockDriverState *bs,
-@@ -2056,7 +2114,8 @@ BlockJob *commit_active_start(const char *job_id, BlockDriverState *bs,
+@@ -1906,7 +1965,8 @@ BlockJob *commit_active_start(const char *job_id, BlockDriverState *bs,
                      job_id, bs, creation_flags, base, NULL, speed, 0, 0,
                      MIRROR_LEAVE_BACKING_CHAIN, false,
                      on_error, on_error, true, cb, opaque,
@@ -258,32 +252,33 @@ index 1bdce3b657..0c5c72df2e 100644
                      errp);
     if (!job) {
 diff --git a/blockdev.c b/blockdev.c
-index 4c33c3f5f0..f3e508a6a7 100644
+index 9230888e34..9a1a3118ed 100644
 --- a/blockdev.c
 +++ b/blockdev.c
-@@ -2776,6 +2776,9 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
+@@ -2951,6 +2951,10 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
                                    BlockDriverState *target,
-                                    const char *replaces,
+                                    bool has_replaces, const char *replaces,
                                    enum MirrorSyncMode sync,
+                                   bool has_bitmap,
 +                                   const char *bitmap_name,
 +                                   bool has_bitmap_mode,
 +                                   BitmapSyncMode bitmap_mode,
                                    BlockMirrorBackingMode backing_mode,
                                    bool zero_target,
                                    bool has_speed, int64_t speed,
-@@ -2794,6 +2797,7 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
+@@ -2970,6 +2974,7 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
 {
     BlockDriverState *unfiltered_bs;
     int job_flags = JOB_DEFAULT;
 +    BdrvDirtyBitmap *bitmap = NULL;
 
-     GLOBAL_STATE_CODE();
-     GRAPH_RDLOCK_GUARD_MAINLOOP();
-@@ -2848,6 +2852,29 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
+     if (!has_speed) {
+         speed = 0;
+@@ -3024,6 +3029,29 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
         sync = MIRROR_SYNC_MODE_FULL;
     }
 
-+    if (bitmap_name) {
+    if (has_bitmap) {
 +        if (granularity) {
 +            error_setg(errp, "Granularity and bitmap cannot both be set");
 +            return;
@@ -306,53 +301,53 @@ index 4c33c3f5f0..f3e508a6a7 100644
 +        }
 +    }
 +
-     if (!replaces) {
+     if (!has_replaces) {
         /* We want to mirror from @bs, but keep implicit filters on top */
         unfiltered_bs = bdrv_skip_implicit_filters(bs);
-@@ -2889,8 +2916,8 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
+@@ -3070,8 +3098,8 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
      * and will allow to check whether the node still exist at mirror completion
      */
     mirror_start(job_id, bs, target,
-                 replaces, job_flags,
+-                 has_replaces ? replaces : NULL, job_flags,
 -                 speed, granularity, buf_size, sync, backing_mode, zero_target,
-+                 replaces, job_flags, speed, granularity, buf_size, sync,
-+                 bitmap, bitmap_mode, backing_mode, zero_target,
+                 has_replaces ? replaces : NULL, job_flags, speed, granularity,
+                 buf_size, sync, bitmap, bitmap_mode, backing_mode, zero_target,
                  on_source_error, on_target_error, unmap, filter_node_name,
                  copy_mode, errp);
 }
-@@ -3034,6 +3061,8 @@ void qmp_drive_mirror(DriveMirror *arg, Error **errp)
+@@ -3216,6 +3244,8 @@ void qmp_drive_mirror(DriveMirror *arg, Error **errp)
 
-     blockdev_mirror_common(arg->job_id, bs, target_bs,
-                            arg->replaces, arg->sync,
-+                           arg->bitmap,
+     blockdev_mirror_common(arg->has_job_id ? arg->job_id : NULL, bs, target_bs,
+                            arg->has_replaces, arg->replaces, arg->sync,
+                           arg->has_bitmap, arg->bitmap,
 +                           arg->has_bitmap_mode, arg->bitmap_mode,
                            backing_mode, zero_target,
                            arg->has_speed, arg->speed,
                            arg->has_granularity, arg->granularity,
-@@ -3053,6 +3082,8 @@ void qmp_blockdev_mirror(const char *job_id,
+@@ -3237,6 +3267,8 @@ void qmp_blockdev_mirror(bool has_job_id, const char *job_id,
                          const char *device, const char *target,
-                          const char *replaces,
+                          bool has_replaces, const char *replaces,
                          MirrorSyncMode sync,
-+                         const char *bitmap,
+                         bool has_bitmap, const char *bitmap,
 +                         bool has_bitmap_mode, BitmapSyncMode bitmap_mode,
                          bool has_speed, int64_t speed,
                          bool has_granularity, uint32_t granularity,
                          bool has_buf_size, int64_t buf_size,
-@@ -3093,7 +3124,8 @@ void qmp_blockdev_mirror(const char *job_id,
+@@ -3286,7 +3318,8 @@ void qmp_blockdev_mirror(bool has_job_id, const char *job_id,
     }
 
-     blockdev_mirror_common(job_id, bs, target_bs,
-                           replaces, sync, backing_mode,
-+                           replaces, sync,
+     blockdev_mirror_common(has_job_id ? job_id : NULL, bs, target_bs,
+-                           has_replaces, replaces, sync, backing_mode,
+                           has_replaces, replaces, sync, has_bitmap,
 +                           bitmap, has_bitmap_mode, bitmap_mode, backing_mode,
                            zero_target, has_speed, speed,
                            has_granularity, granularity,
                            has_buf_size, buf_size,
 diff --git a/include/block/block_int-global-state.h b/include/block/block_int-global-state.h
-index eb2d92a226..f0c642b194 100644
+index b49f4eb35b..9d744db618 100644
 --- a/include/block/block_int-global-state.h
 +++ b/include/block/block_int-global-state.h
-@@ -158,7 +158,9 @@ void mirror_start(const char *job_id, BlockDriverState *bs,
+@@ -149,7 +149,9 @@ void mirror_start(const char *job_id, BlockDriverState *bs,
                   BlockDriverState *target, const char *replaces,
                   int creation_flags, int64_t speed,
                   uint32_t granularity, int64_t buf_size,
@@ -364,26 +359,31 @@ index eb2d92a226..f0c642b194 100644
                   BlockdevOnError on_source_error,
                   BlockdevOnError on_target_error,
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index b179d65520..905da8be72 100644
+index 2173e7734a..e1857e7094 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
-@@ -2174,6 +2174,15 @@
- #     destination (all the disk, only the sectors allocated in the
- #     topmost image, or only new I/O).
+@@ -2000,10 +2000,19 @@
+ #        (all the disk, only the sectors allocated in the topmost image, or
+ #        only new I/O).
 #
-+# @bitmap: The name of a bitmap to use for sync=bitmap mode. This
-+#     argument must be present for bitmap mode and absent otherwise.
-+#     The bitmap's granularity is used instead of @granularity (Since
-+#     4.1).
+# @bitmap: The name of a bitmap to use for sync=bitmap mode. This argument must
+#          be present for bitmap mode and absent otherwise. The bitmap's
+#          granularity is used instead of @granularity (since 4.1).
 +#
-+# @bitmap-mode: Specifies the type of data the bitmap should contain
-+#     after the operation concludes. Must be present if sync is
-+#     "bitmap". Must NOT be present otherwise. (Since 4.1)
+# @bitmap-mode: Specifies the type of data the bitmap should contain after
+#               the operation concludes. Must be present if sync is "bitmap".
+#               Must NOT be present otherwise. (Since 4.1)
 +#
- # @granularity: granularity of the dirty bitmap, default is 64K if the
- #     image format doesn't have clusters, 4K if the clusters are
- #     smaller than that, else the cluster size.  Must be a power of 2
-@@ -2216,7 +2225,9 @@
+ # @granularity: granularity of the dirty bitmap, default is 64K
+ #               if the image format doesn't have clusters, 4K if the clusters
+ #               are smaller than that, else the cluster size.  Must be a
+-#               power of 2 between 512 and 64M (since 1.4).
+#               power of 2 between 512 and 64M. Must not be specified if
+#               @bitmap is present (since 1.4).
+ #
+ # @buf-size: maximum amount of data in flight from source to
+ #            target (since 1.4).
+@@ -2043,7 +2052,9 @@
 { 'struct': 'DriveMirror',
   'data': { '*job-id': 'str', 'device': 'str', 'target': 'str',
             '*format': 'str', '*node-name': 'str', '*replaces': 'str',
@@ -394,23 +394,28 @@ index b179d65520..905da8be72 100644
             '*speed': 'int', '*granularity': 'uint32',
             '*buf-size': 'int', '*on-source-error': 'BlockdevOnError',
             '*on-target-error': 'BlockdevOnError',
-@@ -2496,6 +2507,15 @@
- #     destination (all the disk, only the sectors allocated in the
- #     topmost image, or only new I/O).
+@@ -2322,10 +2333,19 @@
+ #        (all the disk, only the sectors allocated in the topmost image, or
+ #        only new I/O).
 #
-+# @bitmap: The name of a bitmap to use for sync=bitmap mode. This
-+#     argument must be present for bitmap mode and absent otherwise.
-+#     The bitmap's granularity is used instead of @granularity (since
-+#     4.1).
+# @bitmap: The name of a bitmap to use for sync=bitmap mode. This argument must
+#          be present for bitmap mode and absent otherwise. The bitmap's
+#          granularity is used instead of @granularity (since 4.1).
 +#
-+# @bitmap-mode: Specifies the type of data the bitmap should contain
-+#     after the operation concludes. Must be present if sync is
-+#     "bitmap". Must NOT be present otherwise. (Since 4.1)
+# @bitmap-mode: Specifies the type of data the bitmap should contain after
+#               the operation concludes. Must be present if sync is "bitmap".
+#               Must NOT be present otherwise. (Since 4.1)
 +#
- # @granularity: granularity of the dirty bitmap, default is 64K if the
- #     image format doesn't have clusters, 4K if the clusters are
- #     smaller than that, else the cluster size.  Must be a power of 2
-@@ -2544,7 +2564,8 @@
+ # @granularity: granularity of the dirty bitmap, default is 64K
+ #               if the image format doesn't have clusters, 4K if the clusters
+ #               are smaller than that, else the cluster size.  Must be a
+-#               power of 2 between 512 and 64M
+#               power of 2 between 512 and 64M . Must not be specified if
+#               @bitmap is present.
+ #
+ # @buf-size: maximum amount of data in flight from source to
+ #            target
+@@ -2375,7 +2395,8 @@
 { 'command': 'blockdev-mirror',
   'data': { '*job-id': 'str', 'device': 'str', 'target': 'str',
             '*replaces': 'str',
@@ -421,10 +426,10 @@ index b179d65520..905da8be72 100644
             '*buf-size': 'int', '*on-source-error': 'BlockdevOnError',
             '*on-target-error': 'BlockdevOnError',
 diff --git a/tests/unit/test-block-iothread.c b/tests/unit/test-block-iothread.c
-index 3766d5de6b..afa44cbd34 100644
+index 8b55eccc89..f4650be8e5 100644
 --- a/tests/unit/test-block-iothread.c
 +++ b/tests/unit/test-block-iothread.c
-@@ -755,8 +755,8 @@ static void test_propagate_mirror(void)
+@@ -753,8 +753,8 @@ static void test_propagate_mirror(void)
 
     /* Start a mirror job */
     mirror_start("job0", src, target, NULL, JOB_DEFAULT, 0, 0, 0,
@@ -434,4 +439,4 @@ index 3766d5de6b..afa44cbd34 100644
 +                 false, BLOCKDEV_ON_ERROR_REPORT, BLOCKDEV_ON_ERROR_REPORT,
                  false, "filter_node", MIRROR_COPY_MODE_BACKGROUND,
                  &error_abort);
- 
+     job = job_get("job0");
--- a/debian/patches/bitmap-mirror/0002-drive-mirror-add-support-for-conditional-and-always-.patch
+++ b/debian/patches/bitmap-mirror/0002-drive-mirror-add-support-for-conditional-and-always-.patch
@@ -24,10 +24,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 18 insertions(+), 6 deletions(-)

 diff --git a/block/mirror.c b/block/mirror.c
-index 0c5c72df2e..37fee3fa25 100644
+index f2eca983f1..b6475d50ad 100644
 --- a/block/mirror.c
 +++ b/block/mirror.c
-@@ -693,8 +693,6 @@ static int mirror_exit_common(Job *job)
+@@ -673,8 +673,6 @@ static int mirror_exit_common(Job *job)
         bdrv_unfreeze_backing_chain(mirror_top_bs, target_bs);
     }
 
@@ -36,9 +36,9 @@ index 0c5c72df2e..37fee3fa25 100644
     /* Make sure that the source BDS doesn't go away during bdrv_replace_node,
      * before we can call bdrv_drained_end */
     bdrv_ref(src);
-@@ -800,6 +798,18 @@ static int mirror_exit_common(Job *job)
-     bdrv_drained_end(target_bs);
-     bdrv_unref(target_bs);
+@@ -775,6 +773,18 @@ static int mirror_exit_common(Job *job)
+     block_job_remove_all_bdrv(bjob);
+     bdrv_replace_node(mirror_top_bs, mirror_top_bs->backing->bs, &error_abort);
 
 +    if (s->sync_bitmap) {
 +        if (s->bitmap_mode == BITMAP_SYNC_MODE_ALWAYS ||
@@ -55,7 +55,7 @@ index 0c5c72df2e..37fee3fa25 100644
     bs_opaque->job = NULL;
 
     bdrv_drained_end(src);
-@@ -1757,10 +1767,6 @@ static BlockJob *mirror_start_job(
+@@ -1634,10 +1644,6 @@ static BlockJob *mirror_start_job(
                        " sync mode",
                        MirrorSyncMode_str(sync_mode));
             return NULL;
@@ -66,7 +66,7 @@ index 0c5c72df2e..37fee3fa25 100644
         }
     } else if (bitmap) {
         error_setg(errp,
-@@ -1777,6 +1783,12 @@ static BlockJob *mirror_start_job(
+@@ -1654,6 +1660,12 @@ static BlockJob *mirror_start_job(
             return NULL;
         }
         granularity = bdrv_dirty_bitmap_granularity(bitmap);
--- a/debian/patches/bitmap-mirror/0003-mirror-add-check-for-bitmap-mode-without-bitmap.patch
+++ b/debian/patches/bitmap-mirror/0003-mirror-add-check-for-bitmap-mode-without-bitmap.patch
@@ -16,10 +16,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 3 insertions(+)

 diff --git a/blockdev.c b/blockdev.c
-index f3e508a6a7..37b8437f3e 100644
+index 9a1a3118ed..a57b0af2e7 100644
 --- a/blockdev.c
 +++ b/blockdev.c
-@@ -2873,6 +2873,9 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
+@@ -3050,6 +3050,9 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
         if (bdrv_dirty_bitmap_check(bitmap, BDRV_BITMAP_ALLOW_RO, errp)) {
             return;
         }
@@ -28,4 +28,4 @@ index f3e508a6a7..37b8437f3e 100644
 +        return;
     }
 
-     if (!replaces) {
+     if (!has_replaces) {
--- a/debian/patches/bitmap-mirror/0004-mirror-switch-to-bdrv_dirty_bitmap_merge_internal.patch
+++ b/debian/patches/bitmap-mirror/0004-mirror-switch-to-bdrv_dirty_bitmap_merge_internal.patch
@@ -16,10 +16,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 4 insertions(+), 7 deletions(-)

 diff --git a/block/mirror.c b/block/mirror.c
-index 37fee3fa25..6b3cce1007 100644
+index b6475d50ad..8b3342f9ec 100644
 --- a/block/mirror.c
 +++ b/block/mirror.c
-@@ -804,8 +804,8 @@ static int mirror_exit_common(Job *job)
+@@ -779,8 +779,8 @@ static int mirror_exit_common(Job *job)
              job->ret == 0 && ret == 0)) {
             /* Success; synchronize copy back to sync. */
             bdrv_clear_dirty_bitmap(s->sync_bitmap, NULL);
@@ -30,7 +30,7 @@ index 37fee3fa25..6b3cce1007 100644
         }
     }
     bdrv_release_dirty_bitmap(s->dirty_bitmap);
-@@ -1964,11 +1964,8 @@ static BlockJob *mirror_start_job(
+@@ -1828,11 +1828,8 @@ static BlockJob *mirror_start_job(
     }
 
     if (s->sync_mode == MIRROR_SYNC_MODE_BITMAP) {
@@ -43,4 +43,4 @@ index 37fee3fa25..6b3cce1007 100644
 +                                         NULL, true);
     }
 
-     bdrv_graph_wrlock();
+     ret = block_job_add_bdrv(&s->common, "source", bs, 0,
--- a/debian/patches/bitmap-mirror/0006-mirror-move-some-checks-to-qmp.patch
+++ b/debian/patches/bitmap-mirror/0006-mirror-move-some-checks-to-qmp.patch
@@ -12,8 +12,6 @@ uniform w.r.t. backup block jobs.

 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
-[FE: rebase for 8.2.2]
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 ---
 block/mirror.c             | 28 +++------------
 blockdev.c                 | 29 +++++++++++++++
@@ -21,12 +19,12 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 3 files changed, 70 insertions(+), 59 deletions(-)

 diff --git a/block/mirror.c b/block/mirror.c
-index 6b3cce1007..2f1223852b 100644
+index 8b3342f9ec..1d4ff0efad 100644
 --- a/block/mirror.c
 +++ b/block/mirror.c
-@@ -1757,31 +1757,13 @@ static BlockJob *mirror_start_job(
- 
-     GLOBAL_STATE_CODE();
+@@ -1634,31 +1634,13 @@ static BlockJob *mirror_start_job(
+     uint64_t target_perms, target_shared_perms;
+     int ret;
 
 -    if (sync_mode == MIRROR_SYNC_MODE_INCREMENTAL) {
 -        error_setg(errp, "Sync mode '%s' not supported",
@@ -62,17 +60,17 @@ index 6b3cce1007..2f1223852b 100644
 
         if (bitmap_mode != BITMAP_SYNC_MODE_NEVER) {
 diff --git a/blockdev.c b/blockdev.c
-index 37b8437f3e..ed8198f351 100644
+index a57b0af2e7..ce62a9b439 100644
 --- a/blockdev.c
 +++ b/blockdev.c
-@@ -2852,7 +2852,36 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
+@@ -3029,7 +3029,36 @@ static void blockdev_mirror_common(const char *job_id, BlockDriverState *bs,
         sync = MIRROR_SYNC_MODE_FULL;
     }
 
 +    if ((sync == MIRROR_SYNC_MODE_BITMAP) ||
 +        (sync == MIRROR_SYNC_MODE_INCREMENTAL)) {
 +        /* done before desugaring 'incremental' to print the right message */
-+        if (!bitmap_name) {
+        if (!has_bitmap) {
 +            error_setg(errp, "Must provide a valid bitmap name for "
 +                       "'%s' sync mode", MirrorSyncMode_str(sync));
 +            return;
@@ -93,7 +91,7 @@ index 37b8437f3e..ed8198f351 100644
 +        bitmap_mode = BITMAP_SYNC_MODE_ON_SUCCESS;
 +    }
 +
-     if (bitmap_name) {
+     if (has_bitmap) {
 +        if (sync != MIRROR_SYNC_MODE_BITMAP) {
 +            error_setg(errp, "Sync mode '%s' not supported with bitmap.",
 +                       MirrorSyncMode_str(sync));
--- a/debian/patches/extra/0001-monitor-qmp-fix-race-with-clients-disconnecting-earl.patch
+++ b/debian/patches/extra/0001-monitor-qmp-fix-race-with-clients-disconnecting-earl.patch
@@ -48,7 +48,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 6 files changed, 59 insertions(+), 5 deletions(-)

 diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
-index 965f5d5450..e04bd059b6 100644
+index a4b40e8391..d64ae8f34e 100644
 --- a/include/monitor/monitor.h
 +++ b/include/monitor/monitor.h
@@ -16,6 +16,7 @@ extern QemuOptsList qemu_mon_opts;
@@ -60,10 +60,10 @@ index 965f5d5450..e04bd059b6 100644
 void monitor_init_globals(void);
 void monitor_init_globals_core(void);
 diff --git a/monitor/monitor-internal.h b/monitor/monitor-internal.h
-index 252de85681..8db28f9272 100644
+index caa2e90ef2..e1596f79ab 100644
 --- a/monitor/monitor-internal.h
 +++ b/monitor/monitor-internal.h
-@@ -151,6 +151,13 @@ typedef struct {
+@@ -152,6 +152,13 @@ typedef struct {
     QemuMutex qmp_queue_lock;
     /* Input queue that holds all the parsed QMP requests */
     GQueue *qmp_requests;
@@ -78,10 +78,10 @@ index 252de85681..8db28f9272 100644
 
 /**
 diff --git a/monitor/monitor.c b/monitor/monitor.c
-index 01ede1babd..5681bca346 100644
+index 86949024f6..c306cadcf4 100644
 --- a/monitor/monitor.c
 +++ b/monitor/monitor.c
-@@ -117,6 +117,21 @@ bool monitor_cur_is_qmp(void)
+@@ -135,6 +135,21 @@ bool monitor_cur_is_qmp(void)
     return cur_mon && monitor_is_qmp(cur_mon);
 }
 
@@ -104,10 +104,10 @@ index 01ede1babd..5681bca346 100644
  * Is @mon is using readline?
  * Note: not all HMP monitors use readline, e.g., gdbserver has a
 diff --git a/monitor/qmp.c b/monitor/qmp.c
-index a239945e8d..589c9524f8 100644
+index 092c527b6f..6b8cfcf6d8 100644
 --- a/monitor/qmp.c
 +++ b/monitor/qmp.c
-@@ -165,6 +165,8 @@ static void monitor_qmp_dispatch(MonitorQMP *mon, QObject *req)
+@@ -141,6 +141,8 @@ static void monitor_qmp_dispatch(MonitorQMP *mon, QObject *req)
     QDict *rsp;
     QDict *error;
 
@@ -116,7 +116,7 @@ index a239945e8d..589c9524f8 100644
     rsp = qmp_dispatch(mon->commands, req, qmp_oob_enabled(mon),
                        &mon->common);
 
-@@ -180,7 +182,17 @@ static void monitor_qmp_dispatch(MonitorQMP *mon, QObject *req)
+@@ -156,7 +158,17 @@ static void monitor_qmp_dispatch(MonitorQMP *mon, QObject *req)
         }
     }
 
@@ -135,7 +135,7 @@ index a239945e8d..589c9524f8 100644
     qobject_unref(rsp);
 }
 
-@@ -461,6 +473,7 @@ static void monitor_qmp_event(void *opaque, QEMUChrEvent event)
+@@ -444,6 +456,7 @@ static void monitor_qmp_event(void *opaque, QEMUChrEvent event)
 
     switch (event) {
     case CHR_EVENT_OPENED:
@@ -144,7 +144,7 @@ index a239945e8d..589c9524f8 100644
         monitor_qmp_caps_reset(mon);
         data = qmp_greeting(mon);
 diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
-index 176b549473..790bb7d1da 100644
+index 0990873ec8..e605003771 100644
 --- a/qapi/qmp-dispatch.c
 +++ b/qapi/qmp-dispatch.c
@@ -117,16 +117,28 @@ typedef struct QmpDispatchBH {
@@ -180,13 +180,13 @@ index 176b549473..790bb7d1da 100644
     aio_co_wake(data->co);
 }
 
-@@ -253,6 +265,7 @@ QDict *coroutine_mixed_fn qmp_dispatch(const QmpCommandList *cmds, QObject *requ
+@@ -231,6 +243,7 @@ QDict *qmp_dispatch(const QmpCommandList *cmds, QObject *request,
             .ret        = &ret,
             .errp       = &err,
             .co         = qemu_coroutine_self(),
 +            .conn_nr    = monitor_get_connection_nr(cur_mon),
         };
-         aio_bh_schedule_oneshot(iohandler_get_aio_context(), do_qmp_dispatch_bh,
+         aio_bh_schedule_oneshot(qemu_get_aio_context(), do_qmp_dispatch_bh,
                                 &data);
 diff --git a/stubs/monitor-core.c b/stubs/monitor-core.c
 index afa477aae6..d3ff124bf3 100644
--- a/debian/patches/extra/0002-block-io_uring-revert-Use-io_uring_register_ring_fd-.patch
+++ b/debian/patches/extra/0002-block-io_uring-revert-Use-io_uring_register_ring_fd-.patch
@@ -0,0 +1,76 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Sam Li <faithilikerun@gmail.com>
+Date: Sat, 24 Sep 2022 22:48:15 +0800
+Subject: [PATCH] block/io_uring: revert "Use io_uring_register_ring_fd() to
+ skip fd operations"
+
+Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1193
+
+The commit "Use io_uring_register_ring_fd() to skip fd operations" broke
+when booting a guest with iothread and io_uring. That is because the
+io_uring_register_ring_fd() call is made from the main thread instead of
+IOThread where io_uring_submit() is called. It can not be guaranteed
+to register the ring fd in the correct thread or unregister the same ring
+fd if the IOThread is disabled. This optimization is not critical so we
+will revert previous commit.
+
+This reverts commit e2848bc574fe2715c694bf8fe9a1ba7f78a1125a
+and 77e3f038af1764983087e3551a0fde9951952c4d.
+
+Signed-off-by: Sam Li <faithilikerun@gmail.com>
+---
+ block/io_uring.c | 13 +------------
+ meson.build      |  1 -
+ 2 files changed, 1 insertion(+), 13 deletions(-)
+
+diff --git a/block/io_uring.c b/block/io_uring.c
+index a1760152e0..973e15d876 100644
+--- a/block/io_uring.c
+++ b/block/io_uring.c
+@@ -11,7 +11,6 @@
+ #include "qemu/osdep.h"
+ #include <liburing.h>
+ #include "block/aio.h"
+-#include "qemu/error-report.h"
+ #include "qemu/queue.h"
+ #include "block/block.h"
+ #include "block/raw-aio.h"
+@@ -19,7 +18,6 @@
+ #include "qapi/error.h"
+ #include "trace.h"
+ 
+-
+ /* io_uring ring size */
+ #define MAX_ENTRIES 128
+ 
+@@ -432,17 +430,8 @@ LuringState *luring_init(Error **errp)
+     }
+ 
+     ioq_init(&s->io_q);
+-#ifdef CONFIG_LIBURING_REGISTER_RING_FD
+-    if (io_uring_register_ring_fd(&s->ring) < 0) {
+-        /*
+-         * Only warn about this error: we will fallback to the non-optimized
+-         * io_uring operations.
+-         */
+-        warn_report("failed to register linux io_uring ring file descriptor");
+-    }
+-#endif
+-
+     return s;
+
+ }
+ 
+ void luring_cleanup(LuringState *s)
+diff --git a/meson.build b/meson.build
+index 20fddbd707..d5230eadd6 100644
+--- a/meson.build
+++ b/meson.build
+@@ -1793,7 +1793,6 @@ config_host_data.set('CONFIG_LIBNFS', libnfs.found())
+ config_host_data.set('CONFIG_LIBSSH', libssh.found())
+ config_host_data.set('CONFIG_LINUX_AIO', libaio.found())
+ config_host_data.set('CONFIG_LINUX_IO_URING', linux_io_uring.found())
+-config_host_data.set('CONFIG_LIBURING_REGISTER_RING_FD', cc.has_function('io_uring_register_ring_fd', prefix: '#include <liburing.h>', dependencies:linux_io_uring))
+ config_host_data.set('CONFIG_LIBPMEM', libpmem.found())
+ config_host_data.set('CONFIG_NUMA', numa.found())
+ config_host_data.set('CONFIG_OPENGL', opengl.found())
--- a/debian/patches/extra/0002-scsi-megasas-Internal-cdbs-have-16-byte-length.patch
+++ b/debian/patches/extra/0002-scsi-megasas-Internal-cdbs-have-16-byte-length.patch
@@ -1,69 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Guenter Roeck <linux@roeck-us.net>
-Date: Tue, 28 Feb 2023 09:11:29 -0800
-Subject: [PATCH] scsi: megasas: Internal cdbs have 16-byte length
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Host drivers do not necessarily set cdb_len in megasas io commands.
-With commits 6d1511cea0 ("scsi: Reject commands if the CDB length
-exceeds buf_len") and fe9d8927e2 ("scsi: Add buf_len parameter to
-scsi_req_new()"), this results in failures to boot Linux from affected
-SCSI drives because cdb_len is set to 0 by the host driver.
-Set the cdb length to its actual size to solve the problem.
-
-Signed-off-by: Guenter Roeck <linux@roeck-us.net>
-Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-(picked-up from https://lists.nongnu.org/archive/html/qemu-devel/2023-02/msg08653.html)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- hw/scsi/megasas.c | 14 ++------------
- 1 file changed, 2 insertions(+), 12 deletions(-)
-
-diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
-index 2d0c607177..97e51733af 100644
--- a/hw/scsi/megasas.c
-+++ b/hw/scsi/megasas.c
-@@ -1781,7 +1781,7 @@ static int megasas_handle_io(MegasasState *s, MegasasCmd *cmd, int frame_cmd)
-     uint8_t cdb[16];
-     int len;
-     struct SCSIDevice *sdev = NULL;
-    int target_id, lun_id, cdb_len;
-+    int target_id, lun_id;
- 
-     lba_count = le32_to_cpu(cmd->frame->io.header.data_len);
-     lba_start_lo = le32_to_cpu(cmd->frame->io.lba_lo);
-@@ -1790,7 +1790,6 @@ static int megasas_handle_io(MegasasState *s, MegasasCmd *cmd, int frame_cmd)
- 
-     target_id = cmd->frame->header.target_id;
-     lun_id = cmd->frame->header.lun_id;
-    cdb_len = cmd->frame->header.cdb_len;
- 
-     if (target_id < MFI_MAX_LD && lun_id == 0) {
-         sdev = scsi_device_find(&s->bus, 0, target_id, lun_id);
-@@ -1805,15 +1804,6 @@ static int megasas_handle_io(MegasasState *s, MegasasCmd *cmd, int frame_cmd)
-         return MFI_STAT_DEVICE_NOT_FOUND;
-     }
- 
-    if (cdb_len > 16) {
-        trace_megasas_scsi_invalid_cdb_len(
-            mfi_frame_desc(frame_cmd), 1, target_id, lun_id, cdb_len);
-        megasas_write_sense(cmd, SENSE_CODE(INVALID_OPCODE));
-        cmd->frame->header.scsi_status = CHECK_CONDITION;
-        s->event_count++;
-        return MFI_STAT_SCSI_DONE_WITH_ERROR;
-    }
-
-     cmd->iov_size = lba_count * sdev->blocksize;
-     if (megasas_map_sgl(s, cmd, &cmd->frame->io.sgl)) {
-         megasas_write_sense(cmd, SENSE_CODE(TARGET_FAILURE));
-@@ -1824,7 +1814,7 @@ static int megasas_handle_io(MegasasState *s, MegasasCmd *cmd, int frame_cmd)
- 
-     megasas_encode_lba(cdb, lba_start, lba_count, is_write);
-     cmd->req = scsi_req_new(sdev, cmd->index,
-                            lun_id, cdb, cdb_len, cmd);
-+                            lun_id, cdb, sizeof(cdb), cmd);
-     if (!cmd->req) {
-         trace_megasas_scsi_req_alloc_failed(
-             mfi_frame_desc(frame_cmd), target_id, lun_id);
--- a/debian/patches/extra/0003-ide-avoid-potential-deadlock-when-draining-during-tr.patch
+++ b/debian/patches/extra/0003-ide-avoid-potential-deadlock-when-draining-during-tr.patch
@@ -1,100 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Tue, 7 Mar 2023 15:03:02 +0100
-Subject: [PATCH] ide: avoid potential deadlock when draining during trim
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The deadlock can happen as follows:
-1. ide_issue_trim is called, and increments the in_flight counter.
-2. ide_issue_trim_cb calls blk_aio_pdiscard.
-3. Somebody else starts draining (e.g. backup to insert the cbw node).
-4. ide_issue_trim_cb is called as the completion callback for
-   blk_aio_pdiscard.
-5. ide_issue_trim_cb issues yet another blk_aio_pdiscard request.
-6. The request is added to the wait queue via blk_wait_while_drained,
-   because draining has been started.
-7. Nobody ever decrements the in_flight counter and draining can't
-   finish. This would be done by ide_trim_bh_cb, which is called after
-   ide_issue_trim_cb has issued its last request, but
-   ide_issue_trim_cb is not called anymore, because it's the
-   completion callback of blk_aio_pdiscard, which waits on draining.
-
-Quoting Hanna Czenczek:
-> The point of 7e5cdb345f was that we need any in-flight count to
-> accompany a set s->bus->dma->aiocb. While blk_aio_pdiscard() is
-> happening, we don’t necessarily need another count. But we do need
-> it while there is no blk_aio_pdiscard().
-> ide_issue_trim_cb() returns in two cases (and, recursively through
-> its callers, leaves s->bus->dma->aiocb set):
-> 1. After calling blk_aio_pdiscard(), which will keep an in-flight
->    count,
-> 2. After calling replay_bh_schedule_event() (i.e.
->    qemu_bh_schedule()), which does not keep an in-flight count.
-
-Thus, even after moving the blk_inc_in_flight to above the
-replay_bh_schedule_event call, the invariant "ide_issue_trim_cb
-returns with an accompanying in-flight count" is still satisfied.
-
-However, the issue 7e5cdb345f fixed for canceling resurfaces, because
-ide_cancel_dma_sync assumes that it just needs to drain once. But now
-the in_flight count is not consistently > 0 during the trim operation.
-So, change it to drain until !s->bus->dma->aiocb, which means that the
-operation finished (s->bus->dma->aiocb is cleared by ide_set_inactive
-via the ide_dma_cb when the end of the transfer is reached).
-
-Discussion here:
-https://lists.nongnu.org/archive/html/qemu-devel/2023-03/msg02506.html
-
-Fixes: 7e5cdb345f ("ide: Increment BB in-flight counter for TRIM BH")
-Suggested-by: Hanna Czenczek <hreitz@redhat.com>
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- hw/ide/core.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/hw/ide/core.c b/hw/ide/core.c
-index e8cb2dac92..3b21acf651 100644
--- a/hw/ide/core.c
-+++ b/hw/ide/core.c
-@@ -456,7 +456,7 @@ static void ide_trim_bh_cb(void *opaque)
-     iocb->bh = NULL;
-     qemu_aio_unref(iocb);
- 
-    /* Paired with an increment in ide_issue_trim() */
-+    /* Paired with an increment in ide_issue_trim_cb() */
-     blk_dec_in_flight(blk);
- }
- 
-@@ -516,6 +516,8 @@ static void ide_issue_trim_cb(void *opaque, int ret)
- done:
-     iocb->aiocb = NULL;
-     if (iocb->bh) {
-+        /* Paired with a decrement in ide_trim_bh_cb() */
-+        blk_inc_in_flight(s->blk);
-         replay_bh_schedule_event(iocb->bh);
-     }
- }
-@@ -528,9 +530,6 @@ BlockAIOCB *ide_issue_trim(
-     IDEDevice *dev = s->unit ? s->bus->slave : s->bus->master;
-     TrimAIOCB *iocb;
- 
-    /* Paired with a decrement in ide_trim_bh_cb() */
-    blk_inc_in_flight(s->blk);
-
-     iocb = blk_aio_get(&trim_aiocb_info, s->blk, cb, cb_opaque);
-     iocb->s = s;
-     iocb->bh = qemu_bh_new_guarded(ide_trim_bh_cb, iocb,
-@@ -754,8 +753,9 @@ void ide_cancel_dma_sync(IDEState *s)
-      */
-     if (s->bus->dma->aiocb) {
-         trace_ide_cancel_dma_sync_remaining();
-        blk_drain(s->blk);
-        assert(s->bus->dma->aiocb == NULL);
-+        while (s->bus->dma->aiocb) {
-+            blk_drain(s->blk);
-+        }
-     }
- }
- 
--- a/debian/patches/extra/0003-virtiofsd-use-g_date_time_get_microsecond-to-get-sub.patch
+++ b/debian/patches/extra/0003-virtiofsd-use-g_date_time_get_microsecond-to-get-sub.patch
@@ -0,0 +1,51 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Yusuke Okada <okada.yusuke@jp.fujitsu.com>
+Date: Thu, 18 Aug 2022 14:46:19 -0400
+Subject: [PATCH] virtiofsd: use g_date_time_get_microsecond to get subsecond
+
+The "%f" specifier in g_date_time_format() is only available in glib
+2.65.2 or later. If combined with older glib, the function returns null
+and the timestamp displayed as "(null)".
+
+For backward compatibility, g_date_time_get_microsecond should be used
+to retrieve subsecond.
+
+In this patch the g_date_time_format() leaves subsecond field as "%06d"
+and let next snprintf to format with g_date_time_get_microsecond.
+
+Signed-off-by: Yusuke Okada <okada.yusuke@jp.fujitsu.com>
+Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
+Message-id: 20220818184618.2205172-1-yokada.996@gmail.com
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+(cherry-picked from commit f16d15c9276bd8f501f861c39cbd4adc812d0c1d)
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+---
+ tools/virtiofsd/passthrough_ll.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
+index 371a7bead6..20f0f41f99 100644
+--- a/tools/virtiofsd/passthrough_ll.c
+++ b/tools/virtiofsd/passthrough_ll.c
+@@ -4185,6 +4185,7 @@ static void setup_nofile_rlimit(unsigned long rlimit_nofile)
+ static void log_func(enum fuse_log_level level, const char *fmt, va_list ap)
+ {
+     g_autofree char *localfmt = NULL;
+    char buf[64];
+ 
+     if (current_log_level < level) {
+         return;
+@@ -4197,9 +4198,11 @@ static void log_func(enum fuse_log_level level, const char *fmt, va_list ap)
+                                        fmt);
+         } else {
+             g_autoptr(GDateTime) now = g_date_time_new_now_utc();
+-            g_autofree char *nowstr = g_date_time_format(now, "%Y-%m-%d %H:%M:%S.%f%z");
+            g_autofree char *nowstr = g_date_time_format(now,
+                                       "%Y-%m-%d %H:%M:%S.%%06d%z");
+            snprintf(buf, 64, nowstr, g_date_time_get_microsecond(now));
+             localfmt = g_strdup_printf("[%s] [ID: %08ld] %s",
+-                                       nowstr, syscall(__NR_gettid), fmt);
+                                       buf, syscall(__NR_gettid), fmt);
+         }
+         fmt = localfmt;
+     }
--- a/debian/patches/extra/0004-Revert-x86-acpi-workaround-Windows-not-handling-name.patch
+++ b/debian/patches/extra/0004-Revert-x86-acpi-workaround-Windows-not-handling-name.patch
@@ -1,45 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Fri, 17 Nov 2023 11:18:06 +0100
-Subject: [PATCH] Revert "x86: acpi: workaround Windows not handling name
- references in Package properly"
-
-This reverts commit 44d975ef340e2f21f236f9520c53e1b30d2213a4.
-
-As reported in the community forum [0] and reproduced locally this
-breaks VirtIO network adapters in (at least) the German ISO of Windows
-Server 2022. The fix itself was for
-
-> Issue is not fatal but as result acpi-index/"PCI Label ID" property
-> is either not shown in device details page or shows incorrect value.
-
-so revert and tolerate that as a stop-gap, rather than have the
-devices not working at all.
-
-[0]: https://forum.proxmox.com/threads/92094/post-605684
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- hw/i386/acpi-build.c | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
-index 53f804ac16..9b1b9f0412 100644
--- a/hw/i386/acpi-build.c
-+++ b/hw/i386/acpi-build.c
-@@ -347,13 +347,9 @@ Aml *aml_pci_device_dsm(void)
-     {
-         Aml *params = aml_local(0);
-         Aml *pkg = aml_package(2);
-        aml_append(pkg, aml_int(0));
-        aml_append(pkg, aml_int(0));
-+        aml_append(pkg, aml_name("BSEL"));
-+        aml_append(pkg, aml_name("ASUN"));
-         aml_append(method, aml_store(pkg, params));
-        aml_append(method,
-            aml_store(aml_name("BSEL"), aml_index(params, aml_int(0))));
-        aml_append(method,
-            aml_store(aml_name("ASUN"), aml_index(params, aml_int(1))));
-         aml_append(method,
-             aml_return(aml_call5("PDSM", aml_arg(0), aml_arg(1),
-                                  aml_arg(2), aml_arg(3), params))
--- a/debian/patches/extra/0004-chardev-fix-segfault-in-finalize.patch
+++ b/debian/patches/extra/0004-chardev-fix-segfault-in-finalize.patch
@@ -0,0 +1,56 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Maksim Davydov <davydov-max@yandex-team.ru>
+Date: Thu, 25 Aug 2022 19:52:47 +0300
+Subject: [PATCH] chardev: fix segfault in finalize
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If finalize chardev-msmouse or chardev-wctable is called immediately after
+init it cases QEMU to crash with segfault. This happens because of
+QTAILQ_REMOVE in qemu_input_handler_unregister tries to dereference
+NULL pointer.
+For instance, this error can be reproduced via `qom-list-properties`
+command.
+
+Signed-off-by: Maksim Davydov <davydov-max@yandex-team.ru>
+Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
+Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
+Message-Id: <20220825165247.33704-1-davydov-max@yandex-team.ru>
+(trivial backport from fc0c128531ed55f058bfbad4f1348ebd9a0187f2)
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+---
+ chardev/msmouse.c  | 4 +++-
+ chardev/wctablet.c | 4 +++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/chardev/msmouse.c b/chardev/msmouse.c
+index eb9231dcdb..2cc1b16561 100644
+--- a/chardev/msmouse.c
+++ b/chardev/msmouse.c
+@@ -146,7 +146,9 @@ static void char_msmouse_finalize(Object *obj)
+ {
+     MouseChardev *mouse = MOUSE_CHARDEV(obj);
+ 
+-    qemu_input_handler_unregister(mouse->hs);
+    if (mouse->hs) {
+        qemu_input_handler_unregister(mouse->hs);
+    }
+ }
+ 
+ static QemuInputHandler msmouse_handler = {
+diff --git a/chardev/wctablet.c b/chardev/wctablet.c
+index e8b292c43c..43bdf6b608 100644
+--- a/chardev/wctablet.c
+++ b/chardev/wctablet.c
+@@ -319,7 +319,9 @@ static void wctablet_chr_finalize(Object *obj)
+ {
+     TabletChardev *tablet = WCTABLET_CHARDEV(obj);
+ 
+-    qemu_input_handler_unregister(tablet->hs);
+    if (tablet->hs) {
+        qemu_input_handler_unregister(tablet->hs);
+    }
+ }
+ 
+ static void wctablet_chr_open(Chardev *chr,
--- a/debian/patches/extra/0005-block-copy-before-write-use-uint64_t-for-timeout-in-.patch
+++ b/debian/patches/extra/0005-block-copy-before-write-use-uint64_t-for-timeout-in-.patch
@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Mon, 29 Apr 2024 15:41:11 +0200
-Subject: [PATCH] block/copy-before-write: use uint64_t for timeout in
- nanoseconds
-
-rather than the uint32_t for which the maximum is slightly more than 4
-seconds and larger values would overflow. The QAPI interface allows
-specifying the number of seconds, so only values 0 to 4 are safe right
-now, other values lead to a much lower timeout than a user expects.
-
-The block_copy() call where this is used already takes a uint64_t for
-the timeout, so no change required there.
-
-Fixes: 6db7fd1ca9 ("block/copy-before-write: implement cbw-timeout option")
-Reported-by: Friedrich Weber <f.weber@proxmox.com>
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
-Tested-by: Friedrich Weber <f.weber@proxmox.com>
---
- block/copy-before-write.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/block/copy-before-write.c b/block/copy-before-write.c
-index 8aba27a71d..026fa9840f 100644
--- a/block/copy-before-write.c
-+++ b/block/copy-before-write.c
-@@ -43,7 +43,7 @@ typedef struct BDRVCopyBeforeWriteState {
-     BlockCopyState *bcs;
-     BdrvChild *target;
-     OnCbwError on_cbw_error;
-    uint32_t cbw_timeout_ns;
-+    uint64_t cbw_timeout_ns;
- 
-     /*
-      * @lock: protects access to @access_bitmap, @done_bitmap and
--- a/debian/patches/extra/0005-init-daemonize-defuse-PID-file-resolve-error.patch
+++ b/debian/patches/extra/0005-init-daemonize-defuse-PID-file-resolve-error.patch
@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Fiona Ebner <f.ebner@proxmox.com>
+Date: Fri, 28 Oct 2022 10:09:46 +0200
+Subject: [PATCH] init: daemonize: defuse PID file resolve error
+
+When proxmox-file-restore invokes QEMU, the PID file is a (temporary)
+file that's already unlinked, so resolving the absolute path here
+failed.
+
+It should not be a critical error when the PID file unlink handler
+can't be registered, because the path can't be resolved for whatever
+reason. If the file is already gone from QEMU's perspective (i.e.
+errno is ENOENT), silently ignore the error. Otherwise, print a
+warning.
+
+Reported-by: Dominik Csapak <d.csapak@proxmox.com>
+Suggested-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+---
+ softmmu/vl.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/softmmu/vl.c b/softmmu/vl.c
+index 706bd7cff7..3381c56af7 100644
+--- a/softmmu/vl.c
+++ b/softmmu/vl.c
+@@ -2438,10 +2438,11 @@ static void qemu_maybe_daemonize(const char *pid_file)
+ 
+         pid_file_realpath = g_malloc0(PATH_MAX);
+         if (!realpath(pid_file, pid_file_realpath)) {
+-            error_report("cannot resolve PID file path: %s: %s",
+-                         pid_file, strerror(errno));
+-            unlink(pid_file);
+-            exit(1);
+            if (errno != ENOENT) {
+                warn_report("not removing PID file on exit: cannot resolve PID "
+                            "file path: %s: %s", pid_file, strerror(errno));
+            }
+            return;
+         }
+ 
+         qemu_unlink_pidfile_notifier = (struct UnlinkPidfileNotifier) {
--- a/debian/patches/extra/0006-block-block-backend-blk_set_enable_write_cache-is-IO.patch
+++ b/debian/patches/extra/0006-block-block-backend-blk_set_enable_write_cache-is-IO.patch
@@ -0,0 +1,77 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Thu, 27 Oct 2022 03:27:26 -0400
+Subject: [PATCH] block/block-backend: blk_set_enable_write_cache is IO_CODE
+
+blk_set_enable_write_cache() is defined as GLOBAL_STATE_CODE
+but can be invoked from iothreads when handling scsi requests.
+This triggers an assertion failure:
+
+ 0x00007fd6c3515ce1 in raise () from /lib/x86_64-linux-gnu/libc.so.6
+ 0x00007fd6c34ff537 in abort () from /lib/x86_64-linux-gnu/libc.so.6
+ 0x00007fd6c34ff40f in ?? () from /lib/x86_64-linux-gnu/libc.so.6
+ 0x00007fd6c350e662 in __assert_fail () from /lib/x86_64-linux-gnu/libc.so.6
+ 0x000056149e2cea03 in blk_set_enable_write_cache (wce=true, blk=0x5614a01c27f0)
+   at ../src/block/block-backend.c:1949
+ 0x000056149e2d0a67 in blk_set_enable_write_cache (blk=0x5614a01c27f0,
+   wce=<optimized out>) at ../src/block/block-backend.c:1951
+ 0x000056149dfe9c59 in scsi_disk_apply_mode_select (p=0x7fd6b400c00e "\004",
+   page=<optimized out>, s=<optimized out>) at ../src/hw/scsi/scsi-disk.c:1520
+ mode_select_pages (change=true, len=18, p=0x7fd6b400c00e "\004", r=0x7fd6b4001ff0)
+   at ../src/hw/scsi/scsi-disk.c:1570
+ scsi_disk_emulate_mode_select (inbuf=<optimized out>, r=0x7fd6b4001ff0) at
+   ../src/hw/scsi/scsi-disk.c:1640
+ scsi_disk_emulate_write_data (req=0x7fd6b4001ff0) at ../src/hw/scsi/scsi-disk.c:1934
+ 0x000056149e18ff16 in virtio_scsi_handle_cmd_req_submit (req=<optimized out>,
+   req=<optimized out>, s=0x5614a12f16b0) at ../src/hw/scsi/virtio-scsi.c:719
+ virtio_scsi_handle_cmd_vq (vq=0x7fd6bab92140, s=0x5614a12f16b0) at
+   ../src/hw/scsi/virtio-scsi.c:761
+ virtio_scsi_handle_cmd (vq=<optimized out>, vdev=<optimized out>) at
+   ../src/hw/scsi/virtio-scsi.c:775
+ virtio_scsi_handle_cmd (vdev=0x5614a12f16b0, vq=0x7fd6bab92140) at
+   ../src/hw/scsi/virtio-scsi.c:765
+ 0x000056149e1a8aa6 in virtio_queue_notify_vq (vq=0x7fd6bab92140) at
+   ../src/hw/virtio/virtio.c:2365
+ 0x000056149e3ccea5 in aio_dispatch_handler (ctx=ctx@entry=0x5614a01babe0,
+   node=<optimized out>) at ../src/util/aio-posix.c:369
+ 0x000056149e3cd868 in aio_dispatch_ready_handlers (ready_list=0x7fd6c09b2680,
+   ctx=0x5614a01babe0) at ../src/util/aio-posix.c:399
+ aio_poll (ctx=0x5614a01babe0, blocking=blocking@entry=true) at
+   ../src/util/aio-posix.c:713
+ 0x000056149e2a7796 in iothread_run (opaque=opaque@entry=0x56149ffde500) at
+   ../src/iothread.c:67
+ 0x000056149e3d0859 in qemu_thread_start (args=0x7fd6c09b26f0) at
+   ../src/util/qemu-thread-posix.c:504
+ 0x00007fd6c36b9ea7 in start_thread () from /lib/x86_64-linux-gnu/libpthread.so.0
+ 0x00007fd6c35d9aef in clone () from /lib/x86_64-linux-gnu/libc.so.6
+
+Changing GLOBAL_STATE_CODE in IO_CODE is allowed, since GSC callers are
+allowed to call IO_CODE.
+
+Resolves: #1272
+
+Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Message-Id: <20221027072726.2681500-1-eesposit@redhat.com>
+Reviewed-by: Kevin Wolf <kwolf@redhat.com>
+Reviewed-by: Hanna Reitz <hreitz@redhat.com>
+Tested-by: Antoine Damhet <antoine.damhet@shadow.tech>
+Signed-off-by: Kevin Wolf <kwolf@redhat.com>
+(cherry picked from commit be8da05b5ed8fb546731b9edb997f303f272bad8)
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ block/block-backend.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/block/block-backend.c b/block/block-backend.c
+index d4a5df2ac2..1b563e628b 100644
+--- a/block/block-backend.c
+++ b/block/block-backend.c
+@@ -1946,7 +1946,7 @@ bool blk_enable_write_cache(BlockBackend *blk)
+ 
+ void blk_set_enable_write_cache(BlockBackend *blk, bool wce)
+ {
+-    GLOBAL_STATE_CODE();
+    IO_CODE();
+     blk->enable_write_cache = wce;
+ }
+ 
--- a/debian/patches/extra/0006-block-copy-before-write-fix-permission.patch
+++ b/debian/patches/extra/0006-block-copy-before-write-fix-permission.patch
@@ -1,55 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-Date: Thu, 11 Apr 2024 11:29:22 +0200
-Subject: [PATCH] block/copy-before-write: fix permission
-
-In case when source node does not have any parents, the condition still
-works as required: backup job do create the parent by
-
-  block_job_create -> block_job_add_bdrv -> bdrv_root_attach_child
-
-Still, in this case checking @perm variable doesn't work, as backup job
-creates the root blk with empty permissions (as it rely on CBW filter
-to require correct permissions and don't want to create extra
-conflicts).
-
-So, we should not check @perm.
-
-The hack may be dropped entirely when transactional insertion of
-filter (when we don't try to recalculate permissions in intermediate
-state, when filter does conflict with original parent of the source
-node) merged (old big series
-"[PATCH v5 00/45] Transactional block-graph modifying API"[1] and it's
-current in-flight part is "[PATCH v8 0/7] blockdev-replace"[2])
-
-[1] https://patchew.org/QEMU/20220330212902.590099-1-vsementsov@openvz.org/
-[2] https://patchew.org/QEMU/20231017184444.932733-1-vsementsov@yandex-team.ru/
-
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
- block/copy-before-write.c | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/block/copy-before-write.c b/block/copy-before-write.c
-index 026fa9840f..5a9456d426 100644
--- a/block/copy-before-write.c
-+++ b/block/copy-before-write.c
-@@ -364,9 +364,13 @@ cbw_child_perm(BlockDriverState *bs, BdrvChild *c, BdrvChildRole role,
-                            perm, shared, nperm, nshared);
- 
-         if (!QLIST_EMPTY(&bs->parents)) {
-            if (perm & BLK_PERM_WRITE) {
-                *nperm = *nperm | BLK_PERM_CONSISTENT_READ;
-            }
-+            /*
-+             * Note, that source child may be shared with backup job. Backup job
-+             * does create own blk parent on copy-before-write node, so this
-+             * works even if source node does not have any parents before backup
-+             * start
-+             */
-+            *nperm = *nperm | BLK_PERM_CONSISTENT_READ;
-             *nshared &= ~(BLK_PERM_WRITE | BLK_PERM_RESIZE);
-         }
-     }
--- a/debian/patches/extra/0007-block-copy-before-write-support-unligned-snapshot-di.patch
+++ b/debian/patches/extra/0007-block-copy-before-write-support-unligned-snapshot-di.patch
@@ -1,48 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-Date: Thu, 11 Apr 2024 11:29:23 +0200
-Subject: [PATCH] block/copy-before-write: support unligned snapshot-discard
-
-First thing that crashes on unligned access here is
-bdrv_reset_dirty_bitmap(). Correct way is to align-down the
-snapshot-discard request.
-
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
- block/copy-before-write.c | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/block/copy-before-write.c b/block/copy-before-write.c
-index 5a9456d426..c0e70669a2 100644
--- a/block/copy-before-write.c
-+++ b/block/copy-before-write.c
-@@ -325,14 +325,24 @@ static int coroutine_fn GRAPH_RDLOCK
- cbw_co_pdiscard_snapshot(BlockDriverState *bs, int64_t offset, int64_t bytes)
- {
-     BDRVCopyBeforeWriteState *s = bs->opaque;
-+    uint32_t cluster_size = block_copy_cluster_size(s->bcs);
-+    int64_t aligned_offset = QEMU_ALIGN_UP(offset, cluster_size);
-+    int64_t aligned_end = QEMU_ALIGN_DOWN(offset + bytes, cluster_size);
-+    int64_t aligned_bytes;
-+
-+    if (aligned_end <= aligned_offset) {
-+        return 0;
-+    }
-+    aligned_bytes = aligned_end - aligned_offset;
- 
-     WITH_QEMU_LOCK_GUARD(&s->lock) {
-        bdrv_reset_dirty_bitmap(s->access_bitmap, offset, bytes);
-+        bdrv_reset_dirty_bitmap(s->access_bitmap, aligned_offset,
-+                                aligned_bytes);
-     }
- 
-    block_copy_reset(s->bcs, offset, bytes);
-+    block_copy_reset(s->bcs, aligned_offset, aligned_bytes);
- 
-    return bdrv_co_pdiscard(s->target, offset, bytes);
-+    return bdrv_co_pdiscard(s->target, aligned_offset, aligned_bytes);
- }
- 
- static void GRAPH_RDLOCK cbw_refresh_filename(BlockDriverState *bs)
--- a/debian/patches/extra/0008-block-copy-before-write-create-block_copy-bitmap-in-.patch
+++ b/debian/patches/extra/0008-block-copy-before-write-create-block_copy-bitmap-in-.patch
@@ -1,373 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-Date: Thu, 11 Apr 2024 11:29:24 +0200
-Subject: [PATCH] block/copy-before-write: create block_copy bitmap in filter
- node
-
-Currently block_copy creates copy_bitmap in source node. But that is in
-bad relation with .independent_close=true of copy-before-write filter:
-source node may be detached and removed before .bdrv_close() handler
-called, which should call block_copy_state_free(), which in turn should
-remove copy_bitmap.
-
-That's all not ideal: it would be better if internal bitmap of
-block-copy object is not attached to any node. But that is not possible
-now.
-
-The simplest solution is just create copy_bitmap in filter node, where
-anyway two other bitmaps are created.
-
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
- block/block-copy.c         |   3 +-
- block/copy-before-write.c  |   2 +-
- include/block/block-copy.h |   1 +
- tests/qemu-iotests/257.out | 112 ++++++++++++++++++-------------------
- 4 files changed, 60 insertions(+), 58 deletions(-)
-
-diff --git a/block/block-copy.c b/block/block-copy.c
-index 9ee3dd7ef5..8fca2c3698 100644
--- a/block/block-copy.c
-+++ b/block/block-copy.c
-@@ -351,6 +351,7 @@ static int64_t block_copy_calculate_cluster_size(BlockDriverState *target,
- }
- 
- BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
-+                                     BlockDriverState *copy_bitmap_bs,
-                                      const BdrvDirtyBitmap *bitmap,
-                                      Error **errp)
- {
-@@ -367,7 +368,7 @@ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
-         return NULL;
-     }
- 
-    copy_bitmap = bdrv_create_dirty_bitmap(source->bs, cluster_size, NULL,
-+    copy_bitmap = bdrv_create_dirty_bitmap(copy_bitmap_bs, cluster_size, NULL,
-                                            errp);
-     if (!copy_bitmap) {
-         return NULL;
-diff --git a/block/copy-before-write.c b/block/copy-before-write.c
-index c0e70669a2..94db31512d 100644
--- a/block/copy-before-write.c
-+++ b/block/copy-before-write.c
-@@ -468,7 +468,7 @@ static int cbw_open(BlockDriverState *bs, QDict *options, int flags,
-             ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) &
-              bs->file->bs->supported_zero_flags);
- 
-    s->bcs = block_copy_state_new(bs->file, s->target, bitmap, errp);
-+    s->bcs = block_copy_state_new(bs->file, s->target, bs, bitmap, errp);
-     if (!s->bcs) {
-         error_prepend(errp, "Cannot create block-copy-state: ");
-         return -EINVAL;
-diff --git a/include/block/block-copy.h b/include/block/block-copy.h
-index 0700953ab8..8b41643bfa 100644
--- a/include/block/block-copy.h
-+++ b/include/block/block-copy.h
-@@ -25,6 +25,7 @@ typedef struct BlockCopyState BlockCopyState;
- typedef struct BlockCopyCallState BlockCopyCallState;
- 
- BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
-+                                     BlockDriverState *copy_bitmap_bs,
-                                      const BdrvDirtyBitmap *bitmap,
-                                      Error **errp);
- 
-diff --git a/tests/qemu-iotests/257.out b/tests/qemu-iotests/257.out
-index aa76131ca9..c33dd7f3a9 100644
--- a/tests/qemu-iotests/257.out
-+++ b/tests/qemu-iotests/257.out
-@@ -120,16 +120,16 @@ write -P0x67 0x3fe0000 0x20000
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      }
-    ],
-    "drive0": [
-+      },
-       {
-         "busy": false,
-         "count": 0,
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      },
-+      }
-+    ],
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 458752,
-@@ -596,16 +596,16 @@ write -P0x67 0x3fe0000 0x20000
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      }
-    ],
-    "drive0": [
-+      },
-       {
-         "busy": false,
-         "count": 0,
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      },
-+      }
-+    ],
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 458752,
-@@ -865,16 +865,16 @@ write -P0x67 0x3fe0000 0x20000
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      }
-    ],
-    "drive0": [
-+      },
-       {
-         "busy": false,
-         "count": 0,
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      },
-+      }
-+    ],
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 458752,
-@@ -1341,16 +1341,16 @@ write -P0x67 0x3fe0000 0x20000
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      }
-    ],
-    "drive0": [
-+      },
-       {
-         "busy": false,
-         "count": 0,
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      },
-+      }
-+    ],
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 458752,
-@@ -1610,16 +1610,16 @@ write -P0x67 0x3fe0000 0x20000
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      }
-    ],
-    "drive0": [
-+      },
-       {
-         "busy": false,
-         "count": 0,
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      },
-+      }
-+    ],
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 458752,
-@@ -2086,16 +2086,16 @@ write -P0x67 0x3fe0000 0x20000
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      }
-    ],
-    "drive0": [
-+      },
-       {
-         "busy": false,
-         "count": 0,
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      },
-+      }
-+    ],
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 458752,
-@@ -2355,16 +2355,16 @@ write -P0x67 0x3fe0000 0x20000
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      }
-    ],
-    "drive0": [
-+      },
-       {
-         "busy": false,
-         "count": 0,
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      },
-+      }
-+    ],
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 458752,
-@@ -2831,16 +2831,16 @@ write -P0x67 0x3fe0000 0x20000
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      }
-    ],
-    "drive0": [
-+      },
-       {
-         "busy": false,
-         "count": 0,
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      },
-+      }
-+    ],
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 458752,
-@@ -3100,16 +3100,16 @@ write -P0x67 0x3fe0000 0x20000
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      }
-    ],
-    "drive0": [
-+      },
-       {
-         "busy": false,
-         "count": 0,
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      },
-+      }
-+    ],
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 458752,
-@@ -3576,16 +3576,16 @@ write -P0x67 0x3fe0000 0x20000
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      }
-    ],
-    "drive0": [
-+      },
-       {
-         "busy": false,
-         "count": 0,
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      },
-+      }
-+    ],
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 458752,
-@@ -3845,16 +3845,16 @@ write -P0x67 0x3fe0000 0x20000
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      }
-    ],
-    "drive0": [
-+      },
-       {
-         "busy": false,
-         "count": 0,
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      },
-+      }
-+    ],
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 458752,
-@@ -4321,16 +4321,16 @@ write -P0x67 0x3fe0000 0x20000
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      }
-    ],
-    "drive0": [
-+      },
-       {
-         "busy": false,
-         "count": 0,
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      },
-+      }
-+    ],
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 458752,
-@@ -4590,16 +4590,16 @@ write -P0x67 0x3fe0000 0x20000
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      }
-    ],
-    "drive0": [
-+      },
-       {
-         "busy": false,
-         "count": 0,
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      },
-+      }
-+    ],
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 458752,
-@@ -5066,16 +5066,16 @@ write -P0x67 0x3fe0000 0x20000
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      }
-    ],
-    "drive0": [
-+      },
-       {
-         "busy": false,
-         "count": 0,
-         "granularity": 65536,
-         "persistent": false,
-         "recording": false
-      },
-+      }
-+    ],
-+    "drive0": [
-       {
-         "busy": false,
-         "count": 458752,
--- a/debian/patches/extra/0009-qapi-blockdev-backup-add-discard-source-parameter.patch
+++ b/debian/patches/extra/0009-qapi-blockdev-backup-add-discard-source-parameter.patch
@@ -1,277 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-Date: Thu, 11 Apr 2024 11:29:25 +0200
-Subject: [PATCH] qapi: blockdev-backup: add discard-source parameter
-
-Add a parameter that enables discard-after-copy. That is mostly useful
-in "push backup with fleecing" scheme, when source is snapshot-access
-format driver node, based on copy-before-write filter snapshot-access
-API:
-
-[guest]      [snapshot-access] ~~ blockdev-backup ~~> [backup target]
-   |            |
-   | root       | file
-   v            v
-[copy-before-write]
-   |             |
-   | file        | target
-   v             v
-[active disk]   [temp.img]
-
-In this case discard-after-copy does two things:
-
- - discard data in temp.img to save disk space
- - avoid further copy-before-write operation in discarded area
-
-Note that we have to declare WRITE permission on source in
-copy-before-write filter, for discard to work. Still we can't take it
-unconditionally, as it will break normal backup from RO source. So, we
-have to add a parameter and pass it thorough bdrv_open flags.
-
-Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
- block/backup.c                         |  5 +++--
- block/block-copy.c                     |  9 +++++++++
- block/copy-before-write.c              | 15 +++++++++++++--
- block/copy-before-write.h              |  1 +
- block/replication.c                    |  4 ++--
- blockdev.c                             |  2 +-
- include/block/block-common.h           |  2 ++
- include/block/block-copy.h             |  1 +
- include/block/block_int-global-state.h |  2 +-
- qapi/block-core.json                   |  4 ++++
- 10 files changed, 37 insertions(+), 8 deletions(-)
-
-diff --git a/block/backup.c b/block/backup.c
-index ec29d6b810..3dd2e229d2 100644
--- a/block/backup.c
-+++ b/block/backup.c
-@@ -356,7 +356,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
-                   BlockDriverState *target, int64_t speed,
-                   MirrorSyncMode sync_mode, BdrvDirtyBitmap *sync_bitmap,
-                   BitmapSyncMode bitmap_mode,
-                  bool compress,
-+                  bool compress, bool discard_source,
-                   const char *filter_node_name,
-                   BackupPerf *perf,
-                   BlockdevOnError on_source_error,
-@@ -457,7 +457,8 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
-         goto error;
-     }
- 
-    cbw = bdrv_cbw_append(bs, target, filter_node_name, &bcs, errp);
-+    cbw = bdrv_cbw_append(bs, target, filter_node_name, discard_source,
-+                          &bcs, errp);
-     if (!cbw) {
-         goto error;
-     }
-diff --git a/block/block-copy.c b/block/block-copy.c
-index 8fca2c3698..7e3b378528 100644
--- a/block/block-copy.c
-+++ b/block/block-copy.c
-@@ -137,6 +137,7 @@ typedef struct BlockCopyState {
-     CoMutex lock;
-     int64_t in_flight_bytes;
-     BlockCopyMethod method;
-+    bool discard_source;
-     BlockReqList reqs;
-     QLIST_HEAD(, BlockCopyCallState) calls;
-     /*
-@@ -353,6 +354,7 @@ static int64_t block_copy_calculate_cluster_size(BlockDriverState *target,
- BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
-                                      BlockDriverState *copy_bitmap_bs,
-                                      const BdrvDirtyBitmap *bitmap,
-+                                     bool discard_source,
-                                      Error **errp)
- {
-     ERRP_GUARD();
-@@ -418,6 +420,7 @@ BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
-                                     cluster_size),
-     };
- 
-+    s->discard_source = discard_source;
-     block_copy_set_copy_opts(s, false, false);
- 
-     ratelimit_init(&s->rate_limit);
-@@ -589,6 +592,12 @@ static coroutine_fn int block_copy_task_entry(AioTask *task)
-     co_put_to_shres(s->mem, t->req.bytes);
-     block_copy_task_end(t, ret);
- 
-+    if (s->discard_source && ret == 0) {
-+        int64_t nbytes =
-+            MIN(t->req.offset + t->req.bytes, s->len) - t->req.offset;
-+        bdrv_co_pdiscard(s->source, t->req.offset, nbytes);
-+    }
-+
-     return ret;
- }
- 
-diff --git a/block/copy-before-write.c b/block/copy-before-write.c
-index 94db31512d..853e01a1eb 100644
--- a/block/copy-before-write.c
-+++ b/block/copy-before-write.c
-@@ -44,6 +44,7 @@ typedef struct BDRVCopyBeforeWriteState {
-     BdrvChild *target;
-     OnCbwError on_cbw_error;
-     uint64_t cbw_timeout_ns;
-+    bool discard_source;
- 
-     /*
-      * @lock: protects access to @access_bitmap, @done_bitmap and
-@@ -357,6 +358,8 @@ cbw_child_perm(BlockDriverState *bs, BdrvChild *c, BdrvChildRole role,
-                uint64_t perm, uint64_t shared,
-                uint64_t *nperm, uint64_t *nshared)
- {
-+    BDRVCopyBeforeWriteState *s = bs->opaque;
-+
-     if (!(role & BDRV_CHILD_FILTERED)) {
-         /*
-          * Target child
-@@ -381,6 +384,10 @@ cbw_child_perm(BlockDriverState *bs, BdrvChild *c, BdrvChildRole role,
-              * start
-              */
-             *nperm = *nperm | BLK_PERM_CONSISTENT_READ;
-+            if (s->discard_source) {
-+                *nperm = *nperm | BLK_PERM_WRITE;
-+            }
-+
-             *nshared &= ~(BLK_PERM_WRITE | BLK_PERM_RESIZE);
-         }
-     }
-@@ -468,7 +475,9 @@ static int cbw_open(BlockDriverState *bs, QDict *options, int flags,
-             ((BDRV_REQ_FUA | BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK) &
-              bs->file->bs->supported_zero_flags);
- 
-    s->bcs = block_copy_state_new(bs->file, s->target, bs, bitmap, errp);
-+    s->discard_source = flags & BDRV_O_CBW_DISCARD_SOURCE;
-+    s->bcs = block_copy_state_new(bs->file, s->target, bs, bitmap,
-+                                  flags & BDRV_O_CBW_DISCARD_SOURCE, errp);
-     if (!s->bcs) {
-         error_prepend(errp, "Cannot create block-copy-state: ");
-         return -EINVAL;
-@@ -535,12 +544,14 @@ static BlockDriver bdrv_cbw_filter = {
- BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
-                                   BlockDriverState *target,
-                                   const char *filter_node_name,
-+                                  bool discard_source,
-                                   BlockCopyState **bcs,
-                                   Error **errp)
- {
-     BDRVCopyBeforeWriteState *state;
-     BlockDriverState *top;
-     QDict *opts;
-+    int flags = BDRV_O_RDWR | (discard_source ? BDRV_O_CBW_DISCARD_SOURCE : 0);
- 
-     assert(source->total_sectors == target->total_sectors);
-     GLOBAL_STATE_CODE();
-@@ -553,7 +564,7 @@ BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
-     qdict_put_str(opts, "file", bdrv_get_node_name(source));
-     qdict_put_str(opts, "target", bdrv_get_node_name(target));
- 
-    top = bdrv_insert_node(source, opts, BDRV_O_RDWR, errp);
-+    top = bdrv_insert_node(source, opts, flags, errp);
-     if (!top) {
-         return NULL;
-     }
-diff --git a/block/copy-before-write.h b/block/copy-before-write.h
-index 6e72bb25e9..01af0cd3c4 100644
--- a/block/copy-before-write.h
-+++ b/block/copy-before-write.h
-@@ -39,6 +39,7 @@
- BlockDriverState *bdrv_cbw_append(BlockDriverState *source,
-                                   BlockDriverState *target,
-                                   const char *filter_node_name,
-+                                  bool discard_source,
-                                   BlockCopyState **bcs,
-                                   Error **errp);
- void bdrv_cbw_drop(BlockDriverState *bs);
-diff --git a/block/replication.c b/block/replication.c
-index ca6bd0a720..0415a5e8b7 100644
--- a/block/replication.c
-+++ b/block/replication.c
-@@ -582,8 +582,8 @@ static void replication_start(ReplicationState *rs, ReplicationMode mode,
- 
-         s->backup_job = backup_job_create(
-                                 NULL, s->secondary_disk->bs, s->hidden_disk->bs,
-                                0, MIRROR_SYNC_MODE_NONE, NULL, 0, false, NULL,
-                                &perf,
-+                                0, MIRROR_SYNC_MODE_NONE, NULL, 0, false, false,
-+                                NULL, &perf,
-                                 BLOCKDEV_ON_ERROR_REPORT,
-                                 BLOCKDEV_ON_ERROR_REPORT, JOB_INTERNAL,
-                                 backup_job_completed, bs, NULL, &local_err);
-diff --git a/blockdev.c b/blockdev.c
-index 057601dcf0..4c33c3f5f0 100644
--- a/blockdev.c
-+++ b/blockdev.c
-@@ -2726,7 +2726,7 @@ static BlockJob *do_backup_common(BackupCommon *backup,
- 
-     job = backup_job_create(backup->job_id, bs, target_bs, backup->speed,
-                             backup->sync, bmap, backup->bitmap_mode,
-                            backup->compress,
-+                            backup->compress, backup->discard_source,
-                             backup->filter_node_name,
-                             &perf,
-                             backup->on_source_error,
-diff --git a/include/block/block-common.h b/include/block/block-common.h
-index a846023a09..338fe5ff7a 100644
--- a/include/block/block-common.h
-+++ b/include/block/block-common.h
-@@ -243,6 +243,8 @@ typedef enum {
-                                       read-write fails */
- #define BDRV_O_IO_URING    0x40000 /* use io_uring instead of the thread pool */
- 
-+#define BDRV_O_CBW_DISCARD_SOURCE 0x80000 /* for copy-before-write filter */
-+
- #define BDRV_O_CACHE_MASK  (BDRV_O_NOCACHE | BDRV_O_NO_FLUSH)
- 
- 
-diff --git a/include/block/block-copy.h b/include/block/block-copy.h
-index 8b41643bfa..bdc703bacd 100644
--- a/include/block/block-copy.h
-+++ b/include/block/block-copy.h
-@@ -27,6 +27,7 @@ typedef struct BlockCopyCallState BlockCopyCallState;
- BlockCopyState *block_copy_state_new(BdrvChild *source, BdrvChild *target,
-                                      BlockDriverState *copy_bitmap_bs,
-                                      const BdrvDirtyBitmap *bitmap,
-+                                     bool discard_source,
-                                      Error **errp);
- 
- /* Function should be called prior any actual copy request */
-diff --git a/include/block/block_int-global-state.h b/include/block/block_int-global-state.h
-index d2201e27f4..eb2d92a226 100644
--- a/include/block/block_int-global-state.h
-+++ b/include/block/block_int-global-state.h
-@@ -193,7 +193,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
-                             MirrorSyncMode sync_mode,
-                             BdrvDirtyBitmap *sync_bitmap,
-                             BitmapSyncMode bitmap_mode,
-                            bool compress,
-+                            bool compress, bool discard_source,
-                             const char *filter_node_name,
-                             BackupPerf *perf,
-                             BlockdevOnError on_source_error,
-diff --git a/qapi/block-core.json b/qapi/block-core.json
-index 4b18e01b85..b179d65520 100644
--- a/qapi/block-core.json
-+++ b/qapi/block-core.json
-@@ -1610,6 +1610,9 @@
- #     node specified by @drive.  If this option is not given, a node
- #     name is autogenerated.  (Since: 4.2)
- #
-+# @discard-source: Discard blocks on source which are already copied
-+#     to the target.  (Since 9.0)
-+#
- # @x-perf: Performance options.  (Since 6.0)
- #
- # Features:
-@@ -1631,6 +1634,7 @@
-             '*on-target-error': 'BlockdevOnError',
-             '*auto-finalize': 'bool', '*auto-dismiss': 'bool',
-             '*filter-node-name': 'str',
-+            '*discard-source': 'bool',
-             '*x-perf': { 'type': 'BackupPerf',
-                          'features': [ 'unstable' ] } } }
- 
--- a/debian/patches/extra/0010-hw-virtio-Fix-the-de-initialization-of-vhost-user-de.patch
+++ b/debian/patches/extra/0010-hw-virtio-Fix-the-de-initialization-of-vhost-user-de.patch
@@ -1,92 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Thomas Huth <thuth@redhat.com>
-Date: Tue, 18 Jun 2024 14:19:58 +0200
-Subject: [PATCH] hw/virtio: Fix the de-initialization of vhost-user devices
-
-The unrealize functions of the various vhost-user devices are
-calling the corresponding vhost_*_set_status() functions with a
-status of 0 to shut down the device correctly.
-
-Now these vhost_*_set_status() functions all follow this scheme:
-
-    bool should_start = virtio_device_should_start(vdev, status);
-
-    if (vhost_dev_is_started(&vvc->vhost_dev) == should_start) {
-        return;
-    }
-
-    if (should_start) {
-        /* ... do the initialization stuff ... */
-    } else {
-        /* ... do the cleanup stuff ... */
-    }
-
-The problem here is virtio_device_should_start(vdev, 0) currently
-always returns "true" since it internally only looks at vdev->started
-instead of looking at the "status" parameter. Thus once the device
-got started once, virtio_device_should_start() always returns true
-and thus the vhost_*_set_status() functions return early, without
-ever doing any clean-up when being called with status == 0. This
-causes e.g. problems when trying to hot-plug and hot-unplug a vhost
-user devices multiple times since the de-initialization step is
-completely skipped during the unplug operation.
-
-This bug has been introduced in commit 9f6bcfd99f ("hw/virtio: move
-vm_running check to virtio_device_started") which replaced
-
- should_start = status & VIRTIO_CONFIG_S_DRIVER_OK;
-
-with
-
- should_start = virtio_device_started(vdev, status);
-
-which later got replaced by virtio_device_should_start(). This blocked
-the possibility to set should_start to false in case the status flag
-VIRTIO_CONFIG_S_DRIVER_OK was not set.
-
-Fix it by adjusting the virtio_device_should_start() function to
-only consider the status flag instead of vdev->started. Since this
-function is only used in the various vhost_*_set_status() functions
-for exactly the same purpose, it should be fine to fix it in this
-central place there without any risk to change the behavior of other
-code.
-
-Fixes: 9f6bcfd99f ("hw/virtio: move vm_running check to virtio_device_started")
-Buglink: https://issues.redhat.com/browse/RHEL-40708
-Signed-off-by: Thomas Huth <thuth@redhat.com>
-Message-Id: <20240618121958.88673-1-thuth@redhat.com>
-Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-(cherry picked from commit d72479b11797c28893e1e3fc565497a9cae5ca16)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- include/hw/virtio/virtio.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
-index 7d5ffdc145..2eafad17b8 100644
--- a/include/hw/virtio/virtio.h
-+++ b/include/hw/virtio/virtio.h
-@@ -470,9 +470,9 @@ static inline bool virtio_device_started(VirtIODevice *vdev, uint8_t status)
-  * @vdev - the VirtIO device
-  * @status - the devices status bits
-  *
- * This is similar to virtio_device_started() but also encapsulates a
- * check on the VM status which would prevent a device starting
- * anyway.
-+ * This is similar to virtio_device_started() but ignores vdev->started
-+ * and also encapsulates a check on the VM status which would prevent a
-+ * device from starting anyway.
-  */
- static inline bool virtio_device_should_start(VirtIODevice *vdev, uint8_t status)
- {
-@@ -480,7 +480,7 @@ static inline bool virtio_device_should_start(VirtIODevice *vdev, uint8_t status
-         return false;
-     }
- 
-    return virtio_device_started(vdev, status);
-+    return status & VIRTIO_CONFIG_S_DRIVER_OK;
- }
- 
- static inline void virtio_set_started(VirtIODevice *vdev, bool started)
--- a/debian/patches/extra/0011-target-arm-Use-float_status-copy-in-sme_fmopa_s.patch
+++ b/debian/patches/extra/0011-target-arm-Use-float_status-copy-in-sme_fmopa_s.patch
@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Daniyal Khan <danikhan632@gmail.com>
-Date: Wed, 17 Jul 2024 16:01:47 +1000
-Subject: [PATCH] target/arm: Use float_status copy in sme_fmopa_s
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We made a copy above because the fp exception flags
-are not propagated back to the FPST register, but
-then failed to use the copy.
-
-Cc: qemu-stable@nongnu.org
-Fixes: 558e956c719 ("target/arm: Implement FMOPA, FMOPS (non-widening)")
-Signed-off-by: Daniyal Khan <danikhan632@gmail.com>
-Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
-Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
-Message-id: 20240717060149.204788-2-richard.henderson@linaro.org
-[rth: Split from a larger patch]
-Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
-Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
-Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-(cherry picked from commit 31d93fedf41c24b0badb38cd9317590d1ef74e37)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- target/arm/tcg/sme_helper.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/target/arm/tcg/sme_helper.c b/target/arm/tcg/sme_helper.c
-index e2e0575039..5a6dd76489 100644
--- a/target/arm/tcg/sme_helper.c
-+++ b/target/arm/tcg/sme_helper.c
-@@ -916,7 +916,7 @@ void HELPER(sme_fmopa_s)(void *vza, void *vzn, void *vzm, void *vpn,
-                         if (pb & 1) {
-                             uint32_t *a = vza_row + H1_4(col);
-                             uint32_t *m = vzm + H1_4(col);
-                            *a = float32_muladd(n, *m, *a, 0, vst);
-+                            *a = float32_muladd(n, *m, *a, 0, &fpst);
-                         }
-                         col += 4;
-                         pb >>= 4;
--- a/debian/patches/extra/0012-target-arm-Use-FPST_F16-for-SME-FMOPA-widening.patch
+++ b/debian/patches/extra/0012-target-arm-Use-FPST_F16-for-SME-FMOPA-widening.patch
@@ -1,62 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Richard Henderson <richard.henderson@linaro.org>
-Date: Wed, 17 Jul 2024 16:01:48 +1000
-Subject: [PATCH] target/arm: Use FPST_F16 for SME FMOPA (widening)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This operation has float16 inputs and thus must use
-the FZ16 control not the FZ control.
-
-Cc: qemu-stable@nongnu.org
-Fixes: 3916841ac75 ("target/arm: Implement FMOPA, FMOPS (widening)")
-Reported-by: Daniyal Khan <danikhan632@gmail.com>
-Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
-Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
-Message-id: 20240717060149.204788-3-richard.henderson@linaro.org
-Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2374
-Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
-Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-(cherry picked from commit 207d30b5fdb5b45a36f26eefcf52fe2c1714dd4f)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- target/arm/tcg/translate-sme.c | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/target/arm/tcg/translate-sme.c b/target/arm/tcg/translate-sme.c
-index 46c7fce8b4..185a8a917b 100644
--- a/target/arm/tcg/translate-sme.c
-+++ b/target/arm/tcg/translate-sme.c
-@@ -304,6 +304,7 @@ static bool do_outprod(DisasContext *s, arg_op *a, MemOp esz,
- }
- 
- static bool do_outprod_fpst(DisasContext *s, arg_op *a, MemOp esz,
-+                            ARMFPStatusFlavour e_fpst,
-                             gen_helper_gvec_5_ptr *fn)
- {
-     int svl = streaming_vec_reg_size(s);
-@@ -319,15 +320,18 @@ static bool do_outprod_fpst(DisasContext *s, arg_op *a, MemOp esz,
-     zm = vec_full_reg_ptr(s, a->zm);
-     pn = pred_full_reg_ptr(s, a->pn);
-     pm = pred_full_reg_ptr(s, a->pm);
-    fpst = fpstatus_ptr(FPST_FPCR);
-+    fpst = fpstatus_ptr(e_fpst);
- 
-     fn(za, zn, zm, pn, pm, fpst, tcg_constant_i32(desc));
-     return true;
- }
- 
-TRANS_FEAT(FMOPA_h, aa64_sme, do_outprod_fpst, a, MO_32, gen_helper_sme_fmopa_h)
-TRANS_FEAT(FMOPA_s, aa64_sme, do_outprod_fpst, a, MO_32, gen_helper_sme_fmopa_s)
-TRANS_FEAT(FMOPA_d, aa64_sme_f64f64, do_outprod_fpst, a, MO_64, gen_helper_sme_fmopa_d)
-+TRANS_FEAT(FMOPA_h, aa64_sme, do_outprod_fpst, a,
-+           MO_32, FPST_FPCR_F16, gen_helper_sme_fmopa_h)
-+TRANS_FEAT(FMOPA_s, aa64_sme, do_outprod_fpst, a,
-+           MO_32, FPST_FPCR, gen_helper_sme_fmopa_s)
-+TRANS_FEAT(FMOPA_d, aa64_sme_f64f64, do_outprod_fpst, a,
-+           MO_64, FPST_FPCR, gen_helper_sme_fmopa_d)
- 
- /* TODO: FEAT_EBF16 */
- TRANS_FEAT(BFMOPA, aa64_sme, do_outprod, a, MO_32, gen_helper_sme_bfmopa)
--- a/debian/patches/extra/0013-scsi-fix-regression-and-honor-bootindex-again-for-le.patch
+++ b/debian/patches/extra/0013-scsi-fix-regression-and-honor-bootindex-again-for-le.patch
@@ -1,60 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Wed, 10 Jul 2024 17:25:29 +0200
-Subject: [PATCH] scsi: fix regression and honor bootindex again for legacy
- drives
-
-Commit 3089637461 ("scsi: Don't ignore most usb-storage properties")
-removed the call to object_property_set_int() and thus the 'set'
-method for the bootindex property was also not called anymore. Here
-that method is device_set_bootindex() (as configured by
-scsi_dev_instance_init() -> device_add_bootindex_property()) which as
-a side effect registers the device via add_boot_device_path().
-
-As reported by a downstream user [0], the bootindex property did not
-have the desired effect anymore for legacy drives. Fix the regression
-by explicitly calling the add_boot_device_path() function after
-checking that the bootindex is not yet used (to avoid
-add_boot_device_path() calling exit()).
-
-[0]: https://forum.proxmox.com/threads/149772/post-679433
-
-Cc: qemu-stable@nongnu.org
-Fixes: 3089637461 ("scsi: Don't ignore most usb-storage properties")
-Suggested-by: Kevin Wolf <kwolf@redhat.com>
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
-Link: https://lore.kernel.org/r/20240710152529.1737407-1-f.ebner@proxmox.com
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-(cherry picked from commit 57a8a80d1a5b28797b21d30bfc60601945820e51)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- hw/scsi/scsi-bus.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
-index 9e40b0c920..53eff5dd3d 100644
--- a/hw/scsi/scsi-bus.c
-+++ b/hw/scsi/scsi-bus.c
-@@ -384,6 +384,7 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend *blk,
-     DeviceState *dev;
-     SCSIDevice *s;
-     DriveInfo *dinfo;
-+    Error *local_err = NULL;
- 
-     if (blk_is_sg(blk)) {
-         driver = "scsi-generic";
-@@ -403,6 +404,14 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend *blk,
-     s = SCSI_DEVICE(dev);
-     s->conf = *conf;
- 
-+    check_boot_index(conf->bootindex, &local_err);
-+    if (local_err) {
-+        object_unparent(OBJECT(dev));
-+        error_propagate(errp, local_err);
-+        return NULL;
-+    }
-+    add_boot_device_path(conf->bootindex, dev, NULL);
-+
-     qdev_prop_set_uint32(dev, "scsi-id", unit);
-     if (object_property_find(OBJECT(dev), "removable")) {
-         qdev_prop_set_bit(dev, "removable", removable);
--- a/debian/patches/extra/0014-hw-scsi-lsi53c895a-bump-instruction-limit-in-scripts.patch
+++ b/debian/patches/extra/0014-hw-scsi-lsi53c895a-bump-instruction-limit-in-scripts.patch
@@ -1,48 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Mon, 15 Jul 2024 15:14:03 +0200
-Subject: [PATCH] hw/scsi/lsi53c895a: bump instruction limit in scripts
- processing to fix regression
-
-Commit 9876359990 ("hw/scsi/lsi53c895a: add timer to scripts
-processing") reduced the maximum allowed instruction count by
-a factor of 100 all the way down to 100.
-
-This causes the "Check Point R81.20 Gaia" appliance [0] to fail to
-boot after fully finishing the installation via the appliance's web
-interface (there is already one reboot before that).
-
-With a limit of 150, the appliance still fails to boot, while with a
-limit of 200, it works. Bump to 500 to fix the regression and be on
-the safe side.
-
-Originally reported in the Proxmox community forum[1].
-
-[0]: https://support.checkpoint.com/results/download/124397
-[1]: https://forum.proxmox.com/threads/149772/post-683459
-
-Cc: qemu-stable@nongnu.org
-Fixes: 9876359990 ("hw/scsi/lsi53c895a: add timer to scripts processing")
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
-Acked-by: Sven Schnelle <svens@stackframe.org>
-Link: https://lore.kernel.org/r/20240715131403.223239-1-f.ebner@proxmox.com
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-(cherry picked from commit a4975023fb13cf229bd59c9ceec1b8cbdc5b9a20)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- hw/scsi/lsi53c895a.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c
-index eb9828dd5e..f1935e5328 100644
--- a/hw/scsi/lsi53c895a.c
-+++ b/hw/scsi/lsi53c895a.c
-@@ -188,7 +188,7 @@ static const char *names[] = {
- #define LSI_TAG_VALID     (1 << 16)
- 
- /* Maximum instructions to process. */
-#define LSI_MAX_INSN    100
-+#define LSI_MAX_INSN    500
- 
- typedef struct lsi_request {
-     SCSIRequest *req;
--- a/debian/patches/extra/0015-block-copy-Fix-missing-graph-lock.patch
+++ b/debian/patches/extra/0015-block-copy-Fix-missing-graph-lock.patch
@@ -1,38 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Kevin Wolf <kwolf@redhat.com>
-Date: Thu, 27 Jun 2024 20:12:44 +0200
-Subject: [PATCH] block-copy: Fix missing graph lock
-
-The graph lock needs to be held when calling bdrv_co_pdiscard(). Fix
-block_copy_task_entry() to take it for the call.
-
-WITH_GRAPH_RDLOCK_GUARD() was implemented in a weak way because of
-limitations in clang's Thread Safety Analysis at the time, so that it
-only asserts that the lock is held (which allows calling functions that
-require the lock), but we never deal with the unlocking (so even after
-the scope of the guard, the compiler assumes that the lock is still
-held). This is why the compiler didn't catch this locking error.
-
-Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-(picked from https://lore.kernel.org/qemu-devel/20240627181245.281403-2-kwolf@redhat.com/)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- block/block-copy.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/block/block-copy.c b/block/block-copy.c
-index 7e3b378528..cc618e4561 100644
--- a/block/block-copy.c
-+++ b/block/block-copy.c
-@@ -595,7 +595,9 @@ static coroutine_fn int block_copy_task_entry(AioTask *task)
-     if (s->discard_source && ret == 0) {
-         int64_t nbytes =
-             MIN(t->req.offset + t->req.bytes, s->len) - t->req.offset;
-        bdrv_co_pdiscard(s->source, t->req.offset, nbytes);
-+        WITH_GRAPH_RDLOCK_GUARD() {
-+            bdrv_co_pdiscard(s->source, t->req.offset, nbytes);
-+        }
-     }
- 
-     return ret;
--- a/debian/patches/extra/0016-Revert-qemu-char-do-not-operate-on-sources-from-fina.patch
+++ b/debian/patches/extra/0016-Revert-qemu-char-do-not-operate-on-sources-from-fina.patch
@@ -1,93 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Sergey Dyasli <sergey.dyasli@nutanix.com>
-Date: Fri, 12 Jul 2024 09:26:59 +0000
-Subject: [PATCH] Revert "qemu-char: do not operate on sources from finalize
- callbacks"
-
-This reverts commit 2b316774f60291f57ca9ecb6a9f0712c532cae34.
-
-After 038b4217884c ("Revert "chardev: use a child source for qio input
-source"") we've been observing the "iwp->src == NULL" assertion
-triggering periodically during the initial capabilities querying by
-libvirtd. One of possible backtraces:
-
-Thread 1 (Thread 0x7f16cd4f0700 (LWP 43858)):
-0  __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50
-1  0x00007f16c6c21e65 in __GI_abort () at abort.c:79
-2  0x00007f16c6c21d39 in __assert_fail_base  at assert.c:92
-3  0x00007f16c6c46e86 in __GI___assert_fail (assertion=assertion@entry=0x562e9bcdaadd "iwp->src == NULL", file=file@entry=0x562e9bcdaac8 "../chardev/char-io.c", line=line@entry=99, function=function@entry=0x562e9bcdab10 <__PRETTY_FUNCTION__.20549> "io_watch_poll_finalize") at assert.c:101
-4  0x0000562e9ba20c2c in io_watch_poll_finalize (source=<optimized out>) at ../chardev/char-io.c:99
-5  io_watch_poll_finalize (source=<optimized out>) at ../chardev/char-io.c:88
-6  0x00007f16c904aae0 in g_source_unref_internal () from /lib64/libglib-2.0.so.0
-7  0x00007f16c904baf9 in g_source_destroy_internal () from /lib64/libglib-2.0.so.0
-8  0x0000562e9ba20db0 in io_remove_watch_poll (source=0x562e9d6720b0) at ../chardev/char-io.c:147
-9  remove_fd_in_watch (chr=chr@entry=0x562e9d5f3800) at ../chardev/char-io.c:153
-10 0x0000562e9ba23ffb in update_ioc_handlers (s=0x562e9d5f3800) at ../chardev/char-socket.c:592
-11 0x0000562e9ba2072f in qemu_chr_fe_set_handlers_full at ../chardev/char-fe.c:279
-12 0x0000562e9ba207a9 in qemu_chr_fe_set_handlers at ../chardev/char-fe.c:304
-13 0x0000562e9ba2ca75 in monitor_qmp_setup_handlers_bh (opaque=0x562e9d4c2c60) at ../monitor/qmp.c:509
-14 0x0000562e9bb6222e in aio_bh_poll (ctx=ctx@entry=0x562e9d4c2f20) at ../util/async.c:216
-15 0x0000562e9bb4de0a in aio_poll (ctx=0x562e9d4c2f20, blocking=blocking@entry=true) at ../util/aio-posix.c:722
-16 0x0000562e9b99dfaa in iothread_run (opaque=0x562e9d4c26f0) at ../iothread.c:63
-17 0x0000562e9bb505a4 in qemu_thread_start (args=0x562e9d4c7ea0) at ../util/qemu-thread-posix.c:543
-18 0x00007f16c70081ca in start_thread (arg=<optimized out>) at pthread_create.c:479
-19 0x00007f16c6c398d3 in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:95
-
-io_remove_watch_poll(), which makes sure that iwp->src is NULL, calls
-g_source_destroy() which finds that iwp->src is not NULL in the finalize
-callback. This can only happen if another thread has managed to trigger
-io_watch_poll_prepare() callback in the meantime.
-
-Move iwp->src destruction back to the finalize callback to prevent the
-described race, and also remove the stale comment. The deadlock glib bug
-was fixed back in 2010 by b35820285668 ("gmain: move finalization of
-GSource outside of context lock").
-
-Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
-Signed-off-by: Sergey Dyasli <sergey.dyasli@nutanix.com>
-Link: https://lore.kernel.org/r/20240712092659.216206-1-sergey.dyasli@nutanix.com
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-(cherry picked from commit e0bf95443ee9326d44031373420cf9f3513ee255)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- chardev/char-io.c | 19 +++++--------------
- 1 file changed, 5 insertions(+), 14 deletions(-)
-
-diff --git a/chardev/char-io.c b/chardev/char-io.c
-index dab77b112e..3be17b51ca 100644
--- a/chardev/char-io.c
-+++ b/chardev/char-io.c
-@@ -87,16 +87,12 @@ static gboolean io_watch_poll_dispatch(GSource *source, GSourceFunc callback,
- 
- static void io_watch_poll_finalize(GSource *source)
- {
-    /*
-     * Due to a glib bug, removing the last reference to a source
-     * inside a finalize callback causes recursive locking (and a
-     * deadlock).  This is not a problem inside other callbacks,
-     * including dispatch callbacks, so we call io_remove_watch_poll
-     * to remove this source.  At this point, iwp->src must
-     * be NULL, or we would leak it.
-     */
-     IOWatchPoll *iwp = io_watch_poll_from_source(source);
-    assert(iwp->src == NULL);
-+    if (iwp->src) {
-+        g_source_destroy(iwp->src);
-+        g_source_unref(iwp->src);
-+        iwp->src = NULL;
-+    }
- }
- 
- static GSourceFuncs io_watch_poll_funcs = {
-@@ -139,11 +135,6 @@ static void io_remove_watch_poll(GSource *source)
-     IOWatchPoll *iwp;
- 
-     iwp = io_watch_poll_from_source(source);
-    if (iwp->src) {
-        g_source_destroy(iwp->src);
-        g_source_unref(iwp->src);
-        iwp->src = NULL;
-    }
-     g_source_destroy(&iwp->parent);
- }
- 
--- a/debian/patches/extra/0017-virtio-pci-Fix-the-use-of-an-uninitialized-irqfd.patch
+++ b/debian/patches/extra/0017-virtio-pci-Fix-the-use-of-an-uninitialized-irqfd.patch
@@ -1,77 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Cindy Lu <lulu@redhat.com>
-Date: Tue, 6 Aug 2024 17:37:12 +0800
-Subject: [PATCH] virtio-pci: Fix the use of an uninitialized irqfd
-
-The crash was reported in MAC OS and NixOS, here is the link for this bug
-https://gitlab.com/qemu-project/qemu/-/issues/2334
-https://gitlab.com/qemu-project/qemu/-/issues/2321
-
-In this bug, they are using the virtio_input device. The guest notifier was
-not supported for this device, The function virtio_pci_set_guest_notifiers()
-was not called, and the vector_irqfd was not initialized.
-
-So the fix is adding the check for vector_irqfd in virtio_pci_get_notifier()
-
-The function virtio_pci_get_notifier() can be used in various devices.
-It could also be called when VIRTIO_CONFIG_S_DRIVER_OK is not set. In this situation,
-the vector_irqfd being NULL is acceptable. We can allow the device continue to boot
-
-If the vector_irqfd still hasn't been initialized after VIRTIO_CONFIG_S_DRIVER_OK
-is set, it means that the function set_guest_notifiers was not called before the
-driver started. This indicates that the device is not using the notifier.
-At this point, we will let the check fail.
-
-This fix is verified in vyatta,MacOS,NixOS,fedora system.
-
-The bt tree for this bug is:
-Thread 6 "CPU 0/KVM" received signal SIGSEGV, Segmentation fault.
-[Switching to Thread 0x7c817be006c0 (LWP 1269146)]
-kvm_virtio_pci_vq_vector_use () at ../qemu-9.0.0/hw/virtio/virtio-pci.c:817
-817         if (irqfd->users == 0) {
-(gdb) thread apply all bt
-...
-Thread 6 (Thread 0x7c817be006c0 (LWP 1269146) "CPU 0/KVM"):
-0  kvm_virtio_pci_vq_vector_use () at ../qemu-9.0.0/hw/virtio/virtio-pci.c:817
-1  kvm_virtio_pci_vector_use_one () at ../qemu-9.0.0/hw/virtio/virtio-pci.c:893
-2  0x00005983657045e2 in memory_region_write_accessor () at ../qemu-9.0.0/system/memory.c:497
-3  0x0000598365704ba6 in access_with_adjusted_size () at ../qemu-9.0.0/system/memory.c:573
-4  0x0000598365705059 in memory_region_dispatch_write () at ../qemu-9.0.0/system/memory.c:1528
-5  0x00005983659b8e1f in flatview_write_continue_step.isra.0 () at ../qemu-9.0.0/system/physmem.c:2713
-6  0x000059836570ba7d in flatview_write_continue () at ../qemu-9.0.0/system/physmem.c:2743
-7  flatview_write () at ../qemu-9.0.0/system/physmem.c:2774
-8  0x000059836570bb76 in address_space_write () at ../qemu-9.0.0/system/physmem.c:2894
-9  0x0000598365763afe in address_space_rw () at ../qemu-9.0.0/system/physmem.c:2904
-10 kvm_cpu_exec () at ../qemu-9.0.0/accel/kvm/kvm-all.c:2917
-11 0x000059836576656e in kvm_vcpu_thread_fn () at ../qemu-9.0.0/accel/kvm/kvm-accel-ops.c:50
-12 0x0000598365926ca8 in qemu_thread_start () at ../qemu-9.0.0/util/qemu-thread-posix.c:541
-13 0x00007c8185bcd1cf in ??? () at /usr/lib/libc.so.6
-14 0x00007c8185c4e504 in clone () at /usr/lib/libc.so.6
-
-Fixes: 2ce6cff94d ("virtio-pci: fix use of a released vector")
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Cindy Lu <lulu@redhat.com>
-Message-Id: <20240806093715.65105-1-lulu@redhat.com>
-Acked-by: Jason Wang <jasowang@redhat.com>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-(cherry picked from commit a8e63ff289d137197ad7a701a587cc432872d798)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- hw/virtio/virtio-pci.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
-index e04218a9fb..389bab003f 100644
--- a/hw/virtio/virtio-pci.c
-+++ b/hw/virtio/virtio-pci.c
-@@ -860,6 +860,9 @@ static int virtio_pci_get_notifier(VirtIOPCIProxy *proxy, int queue_no,
-     VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
-     VirtQueue *vq;
- 
-+    if (!proxy->vector_irqfd && vdev->status & VIRTIO_CONFIG_S_DRIVER_OK)
-+        return -1;
-+
-     if (queue_no == VIRTIO_CONFIG_IRQ_IDX) {
-         *n = virtio_config_get_guest_notifier(vdev);
-         *vector = vdev->config_vector;
--- a/debian/patches/extra/0018-virtio-net-Ensure-queue-index-fits-with-RSS.patch
+++ b/debian/patches/extra/0018-virtio-net-Ensure-queue-index-fits-with-RSS.patch
@@ -1,35 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Akihiko Odaki <akihiko.odaki@daynix.com>
-Date: Mon, 1 Jul 2024 20:58:04 +0900
-Subject: [PATCH] virtio-net: Ensure queue index fits with RSS
-
-Ensure the queue index points to a valid queue when software RSS
-enabled. The new calculation matches with the behavior of Linux's TAP
-device with the RSS eBPF program.
-
-Fixes: 4474e37a5b3a ("virtio-net: implement RX RSS processing")
-Reported-by: Zhibin Hu <huzhibin5@huawei.com>
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
-(cherry picked from commit f1595ceb9aad36a6c1da95bcb77ab9509b38822d)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- hw/net/virtio-net.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
-index 3644bfd91b..f48588638d 100644
--- a/hw/net/virtio-net.c
-+++ b/hw/net/virtio-net.c
-@@ -1949,7 +1949,8 @@ static ssize_t virtio_net_receive_rcu(NetClientState *nc, const uint8_t *buf,
-     if (!no_rss && n->rss_data.enabled && n->rss_data.enabled_software_rss) {
-         int index = virtio_net_process_rss(nc, buf, size);
-         if (index >= 0) {
-            NetClientState *nc2 = qemu_get_subqueue(n->nic, index);
-+            NetClientState *nc2 =
-+                qemu_get_subqueue(n->nic, index % n->curr_queue_pairs);
-             return virtio_net_receive_rcu(nc2, buf, size, true);
-         }
-     }
--- a/debian/patches/extra/0019-virtio-net-Fix-network-stall-at-the-host-side-waitin.patch
+++ b/debian/patches/extra/0019-virtio-net-Fix-network-stall-at-the-host-side-waitin.patch
@@ -1,338 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: thomas <east.moutain.yang@gmail.com>
-Date: Fri, 12 Jul 2024 11:10:53 +0800
-Subject: [PATCH] virtio-net: Fix network stall at the host side waiting for
- kick
-
-Patch 06b12970174 ("virtio-net: fix network stall under load")
-added double-check to test whether the available buffer size
-can satisfy the request or not, in case the guest has added
-some buffers to the avail ring simultaneously after the first
-check. It will be lucky if the available buffer size becomes
-okay after the double-check, then the host can send the packet
-to the guest. If the buffer size still can't satisfy the request,
-even if the guest has added some buffers, viritio-net would
-stall at the host side forever.
-
-The patch enables notification and checks whether the guest has
-added some buffers since last check of available buffers when
-the available buffers are insufficient. If no buffer is added,
-return false, else recheck the available buffers in the loop.
-If the available buffers are sufficient, disable notification
-and return true.
-
-Changes:
-1. Change the return type of virtqueue_get_avail_bytes() from void
-   to int, it returns an opaque that represents the shadow_avail_idx
-   of the virtqueue on success, else -1 on error.
-2. Add a new API: virtio_queue_enable_notification_and_check(),
-   it takes an opaque as input arg which is returned from
-   virtqueue_get_avail_bytes(). It enables notification firstly,
-   then checks whether the guest has added some buffers since
-   last check of available buffers or not by virtio_queue_poll(),
-   return ture if yes.
-
-The patch also reverts patch "06b12970174".
-
-The case below can reproduce the stall.
-
-                                       Guest 0
-                                     +--------+
-                                     | iperf  |
-                    ---------------> | server |
-         Host       |                +--------+
-       +--------+   |                    ...
-       | iperf  |----
-       | client |----                  Guest n
-       +--------+   |                +--------+
-                    |                | iperf  |
-                    ---------------> | server |
-                                     +--------+
-
-Boot many guests from qemu with virtio network:
- qemu ... -netdev tap,id=net_x \
-    -device virtio-net-pci-non-transitional,\
-    iommu_platform=on,mac=xx:xx:xx:xx:xx:xx,netdev=net_x
-
-Each guest acts as iperf server with commands below:
- iperf3 -s -D -i 10 -p 8001
- iperf3 -s -D -i 10 -p 8002
-
-The host as iperf client:
- iperf3 -c guest_IP -p 8001 -i 30 -w 256k -P 20 -t 40000
- iperf3 -c guest_IP -p 8002 -i 30 -w 256k -P 20 -t 40000
-
-After some time, the host loses connection to the guest,
-the guest can send packet to the host, but can't receive
-packet from the host.
-
-It's more likely to happen if SWIOTLB is enabled in the guest,
-allocating and freeing bounce buffer takes some CPU ticks,
-copying from/to bounce buffer takes more CPU ticks, compared
-with that there is no bounce buffer in the guest.
-Once the rate of producing packets from the host approximates
-the rate of receiveing packets in the guest, the guest would
-loop in NAPI.
-
-         receive packets    ---
-               |             |
-               v             |
-           free buf      virtnet_poll
-               |             |
-               v             |
-     add buf to avail ring  ---
-               |
-               |  need kick the host?
-               |  NAPI continues
-               v
-         receive packets    ---
-               |             |
-               v             |
-           free buf      virtnet_poll
-               |             |
-               v             |
-     add buf to avail ring  ---
-               |
-               v
-              ...           ...
-
-On the other hand, the host fetches free buf from avail
-ring, if the buf in the avail ring is not enough, the
-host notifies the guest the event by writing the avail
-idx read from avail ring to the event idx of used ring,
-then the host goes to sleep, waiting for the kick signal
-from the guest.
-
-Once the guest finds the host is waiting for kick singal
-(in virtqueue_kick_prepare_split()), it kicks the host.
-
-The host may stall forever at the sequences below:
-
-         Host                        Guest
-     ------------                 -----------
- fetch buf, send packet           receive packet ---
-         ...                          ...         |
- fetch buf, send packet             add buf       |
-         ...                        add buf   virtnet_poll
-    buf not enough      avail idx-> add buf       |
-    read avail idx                  add buf       |
-                                    add buf      ---
-                                  receive packet ---
-    write event idx                   ...         |
-    wait for kick                   add buf   virtnet_poll
-                                      ...         |
-                                                 ---
-                                 no more packet, exit NAPI
-
-In the first loop of NAPI above, indicated in the range of
-virtnet_poll above, the host is sending packets while the
-guest is receiving packets and adding buffers.
- step 1: The buf is not enough, for example, a big packet
-         needs 5 buf, but the available buf count is 3.
-         The host read current avail idx.
- step 2: The guest adds some buf, then checks whether the
-         host is waiting for kick signal, not at this time.
-         The used ring is not empty, the guest continues
-         the second loop of NAPI.
- step 3: The host writes the avail idx read from avail
-         ring to used ring as event idx via
-         virtio_queue_set_notification(q->rx_vq, 1).
- step 4: At the end of the second loop of NAPI, recheck
-         whether kick is needed, as the event idx in the
-         used ring written by the host is beyound the
-         range of kick condition, the guest will not
-         send kick signal to the host.
-
-Fixes: 06b12970174 ("virtio-net: fix network stall under load")
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Wencheng Yang <east.moutain.yang@gmail.com>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
-(cherry picked from commit f937309fbdbb48c354220a3e7110c202ae4aa7fa)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- hw/net/virtio-net.c        | 28 ++++++++++-------
- hw/virtio/virtio.c         | 64 +++++++++++++++++++++++++++++++++++---
- include/hw/virtio/virtio.h | 21 +++++++++++--
- 3 files changed, 94 insertions(+), 19 deletions(-)
-
-diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
-index f48588638d..d4b979d343 100644
--- a/hw/net/virtio-net.c
-+++ b/hw/net/virtio-net.c
-@@ -1680,24 +1680,28 @@ static bool virtio_net_can_receive(NetClientState *nc)
- 
- static int virtio_net_has_buffers(VirtIONetQueue *q, int bufsize)
- {
-+    int opaque;
-+    unsigned int in_bytes;
-     VirtIONet *n = q->n;
-    if (virtio_queue_empty(q->rx_vq) ||
-        (n->mergeable_rx_bufs &&
-         !virtqueue_avail_bytes(q->rx_vq, bufsize, 0))) {
-        virtio_queue_set_notification(q->rx_vq, 1);
-
-        /* To avoid a race condition where the guest has made some buffers
-         * available after the above check but before notification was
-         * enabled, check for available buffers again.
-         */
-        if (virtio_queue_empty(q->rx_vq) ||
-            (n->mergeable_rx_bufs &&
-             !virtqueue_avail_bytes(q->rx_vq, bufsize, 0))) {
-+
-+    while (virtio_queue_empty(q->rx_vq) || n->mergeable_rx_bufs) {
-+        opaque = virtqueue_get_avail_bytes(q->rx_vq, &in_bytes, NULL,
-+                                           bufsize, 0);
-+        /* Buffer is enough, disable notifiaction */
-+        if (bufsize <= in_bytes) {
-+            break;
-+        }
-+
-+        if (virtio_queue_enable_notification_and_check(q->rx_vq, opaque)) {
-+            /* Guest has added some buffers, try again */
-+            continue;
-+        } else {
-             return 0;
-         }
-     }
- 
-     virtio_queue_set_notification(q->rx_vq, 0);
-+
-     return 1;
- }
- 
-diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
-index fd2dfe3a6b..08fba6b2d8 100644
--- a/hw/virtio/virtio.c
-+++ b/hw/virtio/virtio.c
-@@ -743,6 +743,60 @@ int virtio_queue_empty(VirtQueue *vq)
-     }
- }
- 
-+static bool virtio_queue_split_poll(VirtQueue *vq, unsigned shadow_idx)
-+{
-+    if (unlikely(!vq->vring.avail)) {
-+        return false;
-+    }
-+
-+    return (uint16_t)shadow_idx != vring_avail_idx(vq);
-+}
-+
-+static bool virtio_queue_packed_poll(VirtQueue *vq, unsigned shadow_idx)
-+{
-+    VRingPackedDesc desc;
-+    VRingMemoryRegionCaches *caches;
-+
-+    if (unlikely(!vq->vring.desc)) {
-+        return false;
-+    }
-+
-+    caches = vring_get_region_caches(vq);
-+    if (!caches) {
-+        return false;
-+    }
-+
-+    vring_packed_desc_read(vq->vdev, &desc, &caches->desc,
-+                           shadow_idx, true);
-+
-+    return is_desc_avail(desc.flags, vq->shadow_avail_wrap_counter);
-+}
-+
-+static bool virtio_queue_poll(VirtQueue *vq, unsigned shadow_idx)
-+{
-+    if (virtio_device_disabled(vq->vdev)) {
-+        return false;
-+    }
-+
-+    if (virtio_vdev_has_feature(vq->vdev, VIRTIO_F_RING_PACKED)) {
-+        return virtio_queue_packed_poll(vq, shadow_idx);
-+    } else {
-+        return virtio_queue_split_poll(vq, shadow_idx);
-+    }
-+}
-+
-+bool virtio_queue_enable_notification_and_check(VirtQueue *vq,
-+                                                int opaque)
-+{
-+    virtio_queue_set_notification(vq, 1);
-+
-+    if (opaque >= 0) {
-+        return virtio_queue_poll(vq, (unsigned)opaque);
-+    } else {
-+        return false;
-+    }
-+}
-+
- static void virtqueue_unmap_sg(VirtQueue *vq, const VirtQueueElement *elem,
-                                unsigned int len)
- {
-@@ -1330,9 +1384,9 @@ err:
-     goto done;
- }
- 
-void virtqueue_get_avail_bytes(VirtQueue *vq, unsigned int *in_bytes,
-                               unsigned int *out_bytes,
-                               unsigned max_in_bytes, unsigned max_out_bytes)
-+int virtqueue_get_avail_bytes(VirtQueue *vq, unsigned int *in_bytes,
-+                              unsigned int *out_bytes, unsigned max_in_bytes,
-+                              unsigned max_out_bytes)
- {
-     uint16_t desc_size;
-     VRingMemoryRegionCaches *caches;
-@@ -1365,7 +1419,7 @@ void virtqueue_get_avail_bytes(VirtQueue *vq, unsigned int *in_bytes,
-                                         caches);
-     }
- 
-    return;
-+    return (int)vq->shadow_avail_idx;
- err:
-     if (in_bytes) {
-         *in_bytes = 0;
-@@ -1373,6 +1427,8 @@ err:
-     if (out_bytes) {
-         *out_bytes = 0;
-     }
-+
-+    return -1;
- }
- 
- int virtqueue_avail_bytes(VirtQueue *vq, unsigned int in_bytes,
-diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
-index 2eafad17b8..8b4da92889 100644
--- a/include/hw/virtio/virtio.h
-+++ b/include/hw/virtio/virtio.h
-@@ -271,9 +271,13 @@ void qemu_put_virtqueue_element(VirtIODevice *vdev, QEMUFile *f,
-                                 VirtQueueElement *elem);
- int virtqueue_avail_bytes(VirtQueue *vq, unsigned int in_bytes,
-                           unsigned int out_bytes);
-void virtqueue_get_avail_bytes(VirtQueue *vq, unsigned int *in_bytes,
-                               unsigned int *out_bytes,
-                               unsigned max_in_bytes, unsigned max_out_bytes);
-+/**
-+ * Return <0 on error or an opaque >=0 to pass to
-+ * virtio_queue_enable_notification_and_check on success.
-+ */
-+int virtqueue_get_avail_bytes(VirtQueue *vq, unsigned int *in_bytes,
-+                              unsigned int *out_bytes, unsigned max_in_bytes,
-+                              unsigned max_out_bytes);
- 
- void virtio_notify_irqfd(VirtIODevice *vdev, VirtQueue *vq);
- void virtio_notify(VirtIODevice *vdev, VirtQueue *vq);
-@@ -307,6 +311,17 @@ int virtio_queue_ready(VirtQueue *vq);
- 
- int virtio_queue_empty(VirtQueue *vq);
- 
-+/**
-+ * Enable notification and check whether guest has added some
-+ * buffers since last call to virtqueue_get_avail_bytes.
-+ *
-+ * @opaque: value returned from virtqueue_get_avail_bytes
-+ */
-+bool virtio_queue_enable_notification_and_check(VirtQueue *vq,
-+                                                int opaque);
-+
-+void virtio_queue_set_shadow_avail_idx(VirtQueue *vq, uint16_t idx);
-+
- /* Host binding interface.  */
- 
- uint32_t virtio_config_readb(VirtIODevice *vdev, uint32_t addr);
--- a/debian/patches/extra/0020-net-Reinstate-net-nic-model-help-output-as-documente.patch
+++ b/debian/patches/extra/0020-net-Reinstate-net-nic-model-help-output-as-documente.patch
@@ -1,70 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: David Woodhouse <dwmw@amazon.co.uk>
-Date: Tue, 9 Jul 2024 13:34:44 +0100
-Subject: [PATCH] net: Reinstate '-net nic, model=help' output as documented in
- man page
-
-While refactoring the NIC initialization code, I broke '-net nic,model=help'
-which no longer outputs a list of available NIC models.
-
-Fixes: 2cdeca04adab ("net: report list of available models according to platform")
-Cc: qemu-stable@nongnu.org
-Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
-Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
-(cherry picked from commit 64f75f57f9d2c8c12ac6d9355fa5d3a2af5879ca)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- net/net.c | 25 ++++++++++++++++++++++---
- 1 file changed, 22 insertions(+), 3 deletions(-)
-
-diff --git a/net/net.c b/net/net.c
-index a2f0c828bb..e6ca2529bb 100644
--- a/net/net.c
-+++ b/net/net.c
-@@ -1150,6 +1150,21 @@ NICInfo *qemu_find_nic_info(const char *typename, bool match_default,
-     return NULL;
- }
- 
-+static bool is_nic_model_help_option(const char *model)
-+{
-+    if (model && is_help_option(model)) {
-+        /*
-+         * Trigger the help output by instantiating the hash table which
-+         * will gather tha available models as they get registered.
-+         */
-+        if (!nic_model_help) {
-+            nic_model_help = g_hash_table_new_full(g_str_hash, g_str_equal,
-+                                                   g_free, NULL);
-+        }
-+        return true;
-+    }
-+    return false;
-+}
- 
- /* "I have created a device. Please configure it if you can" */
- bool qemu_configure_nic_device(DeviceState *dev, bool match_default,
-@@ -1733,6 +1748,12 @@ void net_check_clients(void)
- 
- static int net_init_client(void *dummy, QemuOpts *opts, Error **errp)
- {
-+    const char *model = qemu_opt_get_del(opts, "model");
-+
-+    if (is_nic_model_help_option(model)) {
-+        return 0;
-+    }
-+
-     return net_client_init(opts, false, errp);
- }
- 
-@@ -1789,9 +1810,7 @@ static int net_param_nic(void *dummy, QemuOpts *opts, Error **errp)
-     memset(ni, 0, sizeof(*ni));
-     ni->model = qemu_opt_get_del(opts, "model");
- 
-    if (!nic_model_help && !g_strcmp0(ni->model, "help")) {
-        nic_model_help = g_hash_table_new_full(g_str_hash, g_str_equal,
-                                               g_free, NULL);
-+    if (is_nic_model_help_option(ni->model)) {
-         return 0;
-     }
- 
--- a/debian/patches/extra/0021-net-Fix-net-nic-model-for-non-help-arguments.patch
+++ b/debian/patches/extra/0021-net-Fix-net-nic-model-for-non-help-arguments.patch
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: David Woodhouse <dwmw@amazon.co.uk>
-Date: Tue, 6 Aug 2024 18:21:37 +0100
-Subject: [PATCH] net: Fix '-net nic,model=' for non-help arguments
-
-Oops, don't *delete* the model option when checking for 'help'.
-
-Fixes: 64f75f57f9d2 ("net: Reinstate '-net nic, model=help' output as documented in man page")
-Reported-by: Hans <sungdgdhtryrt@gmail.com>
-Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
-Cc: qemu-stable@nongnu.org
-Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
-Signed-off-by: Jason Wang <jasowang@redhat.com>
-(cherry picked from commit fa62cb989a9146c82f8f172715042852f5d36200)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- net/net.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/net/net.c b/net/net.c
-index e6ca2529bb..897bb936cf 100644
--- a/net/net.c
-+++ b/net/net.c
-@@ -1748,7 +1748,7 @@ void net_check_clients(void)
- 
- static int net_init_client(void *dummy, QemuOpts *opts, Error **errp)
- {
-    const char *model = qemu_opt_get_del(opts, "model");
-+    const char *model = qemu_opt_get(opts, "model");
- 
-     if (is_nic_model_help_option(model)) {
-         return 0;
--- a/debian/patches/extra/0022-target-arm-Don-t-assert-for-128-bit-tile-accesses-wh.patch
+++ b/debian/patches/extra/0022-target-arm-Don-t-assert-for-128-bit-tile-accesses-wh.patch
@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Maydell <peter.maydell@linaro.org>
-Date: Mon, 22 Jul 2024 18:29:54 +0100
-Subject: [PATCH] target/arm: Don't assert for 128-bit tile accesses when SVL
- is 128
-
-For an instruction which accesses a 128-bit element tile when
-the SVL is also 128 (for example MOV z0.Q, p0/M, ZA0H.Q[w0,0]),
-we will assert in get_tile_rowcol():
-
-qemu-system-aarch64: ../../tcg/tcg-op.c:926: tcg_gen_deposit_z_i32: Assertion `len > 0' failed.
-
-This happens because we calculate
-    len = ctz32(streaming_vec_reg_size(s)) - esz;$
-but if the SVL and the element size are the same len is 0, and
-the deposit operation asserts.
-
-In this case the ZA storage contains exactly one 128 bit
-element ZA tile, and the horizontal or vertical slice is just
-that tile. This means that regardless of the index value in
-the Ws register, we always access that tile. (In pseudocode terms,
-we calculate (index + offset) MOD 1, which is 0.)
-
-Special case the len == 0 case to avoid hitting the assertion
-in tcg_gen_deposit_z_i32().
-
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Message-id: 20240722172957.1041231-2-peter.maydell@linaro.org
-(cherry picked from commit 56f1c0db928aae0b83fd91c89ddb226b137e2b21)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- target/arm/tcg/translate-sme.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/target/arm/tcg/translate-sme.c b/target/arm/tcg/translate-sme.c
-index 185a8a917b..a50a419af2 100644
--- a/target/arm/tcg/translate-sme.c
-+++ b/target/arm/tcg/translate-sme.c
-@@ -49,7 +49,15 @@ static TCGv_ptr get_tile_rowcol(DisasContext *s, int esz, int rs,
-     /* Prepare a power-of-two modulo via extraction of @len bits. */
-     len = ctz32(streaming_vec_reg_size(s)) - esz;
- 
-    if (vertical) {
-+    if (!len) {
-+        /*
-+         * SVL is 128 and the element size is 128. There is exactly
-+         * one 128x128 tile in the ZA storage, and so we calculate
-+         * (Rs + imm) MOD 1, which is always 0. We need to special case
-+         * this because TCG doesn't allow deposit ops with len 0.
-+         */
-+        tcg_gen_movi_i32(tmp, 0);
-+    } else if (vertical) {
-         /*
-          * Compute the byte offset of the index within the tile:
-          *     (index % (svl / size)) * size
--- a/debian/patches/extra/0023-target-arm-Fix-UMOPA-UMOPS-of-16-bit-values.patch
+++ b/debian/patches/extra/0023-target-arm-Fix-UMOPA-UMOPS-of-16-bit-values.patch
@@ -1,59 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Maydell <peter.maydell@linaro.org>
-Date: Mon, 22 Jul 2024 18:29:55 +0100
-Subject: [PATCH] target/arm: Fix UMOPA/UMOPS of 16-bit values
-
-The UMOPA/UMOPS instructions are supposed to multiply unsigned 8 or
-16 bit elements and accumulate the products into a 64-bit element.
-In the Arm ARM pseudocode, this is done with the usual
-infinite-precision signed arithmetic.  However our implementation
-doesn't quite get it right, because in the DEF_IMOP_64() macro we do:
-  sum += (NTYPE)(n >> 0) * (MTYPE)(m >> 0);
-
-where NTYPE and MTYPE are uint16_t or int16_t.  In the uint16_t case,
-the C usual arithmetic conversions mean the values are converted to
-"int" type and the multiply is done as a 32-bit multiply.  This means
-that if the inputs are, for example, 0xffff and 0xffff then the
-result is 0xFFFE0001 as an int, which is then promoted to uint64_t
-for the accumulation into sum; this promotion incorrectly sign
-extends the multiply.
-
-Avoid the incorrect sign extension by casting to int64_t before
-the multiply, so we do the multiply as 64-bit signed arithmetic,
-which is a type large enough that the multiply can never
-overflow into the sign bit.
-
-(The equivalent 8-bit operations in DEF_IMOP_32() are fine, because
-the 8-bit multiplies can never overflow into the sign bit of a
-32-bit integer.)
-
-Cc: qemu-stable@nongnu.org
-Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2372
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Message-id: 20240722172957.1041231-3-peter.maydell@linaro.org
-(cherry picked from commit ea3f5a90f036734522e9af3bffd77e69e9f47355)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- target/arm/tcg/sme_helper.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/target/arm/tcg/sme_helper.c b/target/arm/tcg/sme_helper.c
-index 5a6dd76489..f9001f5213 100644
--- a/target/arm/tcg/sme_helper.c
-+++ b/target/arm/tcg/sme_helper.c
-@@ -1146,10 +1146,10 @@ static uint64_t NAME(uint64_t n, uint64_t m, uint64_t a, uint8_t p, bool neg) \
-     uint64_t sum = 0;                                                       \
-     /* Apply P to N as a mask, making the inactive elements 0. */           \
-     n &= expand_pred_h(p);                                                  \
-    sum += (NTYPE)(n >> 0) * (MTYPE)(m >> 0);                               \
-    sum += (NTYPE)(n >> 16) * (MTYPE)(m >> 16);                             \
-    sum += (NTYPE)(n >> 32) * (MTYPE)(m >> 32);                             \
-    sum += (NTYPE)(n >> 48) * (MTYPE)(m >> 48);                             \
-+    sum += (int64_t)(NTYPE)(n >> 0) * (MTYPE)(m >> 0);                      \
-+    sum += (int64_t)(NTYPE)(n >> 16) * (MTYPE)(m >> 16);                    \
-+    sum += (int64_t)(NTYPE)(n >> 32) * (MTYPE)(m >> 32);                    \
-+    sum += (int64_t)(NTYPE)(n >> 48) * (MTYPE)(m >> 48);                    \
-     return neg ? a - sum : a + sum;                                         \
- }
- 
--- a/debian/patches/extra/0024-target-arm-Avoid-shifts-by-1-in-tszimm_shr-and-tszim.patch
+++ b/debian/patches/extra/0024-target-arm-Avoid-shifts-by-1-in-tszimm_shr-and-tszim.patch
@@ -1,62 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Maydell <peter.maydell@linaro.org>
-Date: Mon, 22 Jul 2024 18:29:56 +0100
-Subject: [PATCH] target/arm: Avoid shifts by -1 in tszimm_shr() and
- tszimm_shl()
-
-The function tszimm_esz() returns a shift amount, or possibly -1 in
-certain cases that correspond to unallocated encodings in the
-instruction set.  We catch these later in the trans_ functions
-(generally with an "a-esz < 0" check), but before we do the
-decodetree-generated code will also call tszimm_shr() or tszimm_sl(),
-which will use the tszimm_esz() return value as a shift count without
-checking that it is not negative, which is undefined behaviour.
-
-Avoid the UB by checking the return value in tszimm_shr() and
-tszimm_shl().
-
-Cc: qemu-stable@nongnu.org
-Resolves: Coverity CID 1547617, 1547694
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Message-id: 20240722172957.1041231-4-peter.maydell@linaro.org
-(cherry picked from commit 76916dfa89e8900639c1055c07a295c06628a0bc)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- target/arm/tcg/translate-sve.c | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/target/arm/tcg/translate-sve.c b/target/arm/tcg/translate-sve.c
-index ada05aa530..466a19c25a 100644
--- a/target/arm/tcg/translate-sve.c
-+++ b/target/arm/tcg/translate-sve.c
-@@ -50,13 +50,27 @@ static int tszimm_esz(DisasContext *s, int x)
- 
- static int tszimm_shr(DisasContext *s, int x)
- {
-    return (16 << tszimm_esz(s, x)) - x;
-+    /*
-+     * We won't use the tszimm_shr() value if tszimm_esz() returns -1 (the
-+     * trans function will check for esz < 0), so we can return any
-+     * value we like from here in that case as long as we avoid UB.
-+     */
-+    int esz = tszimm_esz(s, x);
-+    if (esz < 0) {
-+        return esz;
-+    }
-+    return (16 << esz) - x;
- }
- 
- /* See e.g. LSL (immediate, predicated).  */
- static int tszimm_shl(DisasContext *s, int x)
- {
-    return x - (8 << tszimm_esz(s, x));
-+    /* As with tszimm_shr(), value will be unused if esz < 0 */
-+    int esz = tszimm_esz(s, x);
-+    if (esz < 0) {
-+        return esz;
-+    }
-+    return x - (8 << esz);
- }
- 
- /* The SH bit is in bit 8.  Extract the low 8 and shift.  */
--- a/debian/patches/extra/0025-target-arm-Ignore-SMCR_EL2.LEN-and-SVCR_EL2.LEN-if-E.patch
+++ b/debian/patches/extra/0025-target-arm-Ignore-SMCR_EL2.LEN-and-SVCR_EL2.LEN-if-E.patch
@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Maydell <peter.maydell@linaro.org>
-Date: Mon, 22 Jul 2024 18:29:57 +0100
-Subject: [PATCH] target/arm: Ignore SMCR_EL2.LEN and SVCR_EL2.LEN if EL2 is
- not enabled
-
-When determining the current vector length, the SMCR_EL2.LEN and
-SVCR_EL2.LEN settings should only be considered if EL2 is enabled
-(compare the pseudocode CurrentSVL and CurrentNSVL which call
-EL2Enabled()).
-
-We were checking against ARM_FEATURE_EL2 rather than calling
-arm_is_el2_enabled(), which meant that we would look at
-SMCR_EL2/SVCR_EL2 when in Secure EL1 or Secure EL0 even if Secure EL2
-was not enabled.
-
-Use the correct check in sve_vqm1_for_el_sm().
-
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-Message-id: 20240722172957.1041231-5-peter.maydell@linaro.org
-(cherry picked from commit f573ac059ed060234fcef4299fae9e500d357c33)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- target/arm/helper.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/target/arm/helper.c b/target/arm/helper.c
-index a620481d7c..42044ae14b 100644
--- a/target/arm/helper.c
-+++ b/target/arm/helper.c
-@@ -7191,7 +7191,7 @@ uint32_t sve_vqm1_for_el_sm(CPUARMState *env, int el, bool sm)
-     if (el <= 1 && !el_is_in_host(env, el)) {
-         len = MIN(len, 0xf & (uint32_t)cr[1]);
-     }
-    if (el <= 2 && arm_feature(env, ARM_FEATURE_EL2)) {
-+    if (el <= 2 && arm_is_el2_enabled(env)) {
-         len = MIN(len, 0xf & (uint32_t)cr[2]);
-     }
-     if (arm_feature(env, ARM_FEATURE_EL3)) {
--- a/debian/patches/extra/0026-target-arm-Handle-denormals-correctly-for-FMOPA-wide.patch
+++ b/debian/patches/extra/0026-target-arm-Handle-denormals-correctly-for-FMOPA-wide.patch
@@ -1,164 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Maydell <peter.maydell@linaro.org>
-Date: Thu, 1 Aug 2024 10:15:03 +0100
-Subject: [PATCH] target/arm: Handle denormals correctly for FMOPA (widening)
-
-The FMOPA (widening) SME instruction takes pairs of half-precision
-floating point values, widens them to single-precision, does a
-two-way dot product and accumulates the results into a
-single-precision destination.  We don't quite correctly handle the
-FPCR bits FZ and FZ16 which control flushing of denormal inputs and
-outputs.  This is because at the moment we pass a single float_status
-value to the helper function, which then uses that configuration for
-all the fp operations it does.  However, because the inputs to this
-operation are float16 and the outputs are float32 we need to use the
-fp_status_f16 for the float16 input widening but the normal fp_status
-for everything else.  Otherwise we will apply the flushing control
-FPCR.FZ16 to the 32-bit output rather than the FPCR.FZ control, and
-incorrectly flush a denormal output to zero when we should not (or
-vice-versa).
-
-(In commit 207d30b5fdb5b we tried to fix the FZ handling but
-didn't get it right, switching from "use FPCR.FZ for everything" to
-"use FPCR.FZ16 for everything".)
-
-Pass the CPU env to the sme_fmopa_h helper instead of an fp_status
-pointer, and have the helper pass an extra fp_status into the
-f16_dotadd() function so that we can use the right status for the
-right parts of this operation.
-
-Cc: qemu-stable@nongnu.org
-Fixes: 207d30b5fdb5 ("target/arm: Use FPST_F16 for SME FMOPA (widening)")
-Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2373
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-(cherry picked from commit 55f9f4ee018c5ccea81d8c8c586756d7711ae46f)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- target/arm/tcg/helper-sme.h    |  2 +-
- target/arm/tcg/sme_helper.c    | 39 +++++++++++++++++++++++-----------
- target/arm/tcg/translate-sme.c | 25 ++++++++++++++++++++--
- 3 files changed, 51 insertions(+), 15 deletions(-)
-
-diff --git a/target/arm/tcg/helper-sme.h b/target/arm/tcg/helper-sme.h
-index 27eef49a11..d22bf9d21b 100644
--- a/target/arm/tcg/helper-sme.h
-+++ b/target/arm/tcg/helper-sme.h
-@@ -121,7 +121,7 @@ DEF_HELPER_FLAGS_5(sme_addha_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32)
- DEF_HELPER_FLAGS_5(sme_addva_d, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32)
- 
- DEF_HELPER_FLAGS_7(sme_fmopa_h, TCG_CALL_NO_RWG,
-                   void, ptr, ptr, ptr, ptr, ptr, ptr, i32)
-+                   void, ptr, ptr, ptr, ptr, ptr, env, i32)
- DEF_HELPER_FLAGS_7(sme_fmopa_s, TCG_CALL_NO_RWG,
-                    void, ptr, ptr, ptr, ptr, ptr, ptr, i32)
- DEF_HELPER_FLAGS_7(sme_fmopa_d, TCG_CALL_NO_RWG,
-diff --git a/target/arm/tcg/sme_helper.c b/target/arm/tcg/sme_helper.c
-index f9001f5213..3906bb51c0 100644
--- a/target/arm/tcg/sme_helper.c
-+++ b/target/arm/tcg/sme_helper.c
-@@ -976,12 +976,23 @@ static inline uint32_t f16mop_adj_pair(uint32_t pair, uint32_t pg, uint32_t neg)
- }
- 
- static float32 f16_dotadd(float32 sum, uint32_t e1, uint32_t e2,
-                          float_status *s_std, float_status *s_odd)
-+                          float_status *s_f16, float_status *s_std,
-+                          float_status *s_odd)
- {
-    float64 e1r = float16_to_float64(e1 & 0xffff, true, s_std);
-    float64 e1c = float16_to_float64(e1 >> 16, true, s_std);
-    float64 e2r = float16_to_float64(e2 & 0xffff, true, s_std);
-    float64 e2c = float16_to_float64(e2 >> 16, true, s_std);
-+    /*
-+     * We need three different float_status for different parts of this
-+     * operation:
-+     *  - the input conversion of the float16 values must use the
-+     *    f16-specific float_status, so that the FPCR.FZ16 control is applied
-+     *  - operations on float32 including the final accumulation must use
-+     *    the normal float_status, so that FPCR.FZ is applied
-+     *  - we have pre-set-up copy of s_std which is set to round-to-odd,
-+     *    for the multiply (see below)
-+     */
-+    float64 e1r = float16_to_float64(e1 & 0xffff, true, s_f16);
-+    float64 e1c = float16_to_float64(e1 >> 16, true, s_f16);
-+    float64 e2r = float16_to_float64(e2 & 0xffff, true, s_f16);
-+    float64 e2c = float16_to_float64(e2 >> 16, true, s_f16);
-     float64 t64;
-     float32 t32;
- 
-@@ -1003,20 +1014,23 @@ static float32 f16_dotadd(float32 sum, uint32_t e1, uint32_t e2,
- }
- 
- void HELPER(sme_fmopa_h)(void *vza, void *vzn, void *vzm, void *vpn,
-                         void *vpm, void *vst, uint32_t desc)
-+                         void *vpm, CPUARMState *env, uint32_t desc)
- {
-     intptr_t row, col, oprsz = simd_maxsz(desc);
-     uint32_t neg = simd_data(desc) * 0x80008000u;
-     uint16_t *pn = vpn, *pm = vpm;
-    float_status fpst_odd, fpst_std;
-+    float_status fpst_odd, fpst_std, fpst_f16;
- 
-     /*
-     * Make a copy of float_status because this operation does not
-     * update the cumulative fp exception status.  It also produces
-     * default nans.  Make a second copy with round-to-odd -- see above.
-+     * Make copies of fp_status and fp_status_f16, because this operation
-+     * does not update the cumulative fp exception status.  It also
-+     * produces default NaNs. We also need a second copy of fp_status with
-+     * round-to-odd -- see above.
-      */
-    fpst_std = *(float_status *)vst;
-+    fpst_f16 = env->vfp.fp_status_f16;
-+    fpst_std = env->vfp.fp_status;
-     set_default_nan_mode(true, &fpst_std);
-+    set_default_nan_mode(true, &fpst_f16);
-     fpst_odd = fpst_std;
-     set_float_rounding_mode(float_round_to_odd, &fpst_odd);
- 
-@@ -1036,7 +1050,8 @@ void HELPER(sme_fmopa_h)(void *vza, void *vzn, void *vzm, void *vpn,
-                         uint32_t m = *(uint32_t *)(vzm + H1_4(col));
- 
-                         m = f16mop_adj_pair(m, pcol, 0);
-                        *a = f16_dotadd(*a, n, m, &fpst_std, &fpst_odd);
-+                        *a = f16_dotadd(*a, n, m,
-+                                        &fpst_f16, &fpst_std, &fpst_odd);
-                     }
-                     col += 4;
-                     pcol >>= 4;
-diff --git a/target/arm/tcg/translate-sme.c b/target/arm/tcg/translate-sme.c
-index a50a419af2..ae42ddef7b 100644
--- a/target/arm/tcg/translate-sme.c
-+++ b/target/arm/tcg/translate-sme.c
-@@ -334,8 +334,29 @@ static bool do_outprod_fpst(DisasContext *s, arg_op *a, MemOp esz,
-     return true;
- }
- 
-TRANS_FEAT(FMOPA_h, aa64_sme, do_outprod_fpst, a,
-           MO_32, FPST_FPCR_F16, gen_helper_sme_fmopa_h)
-+static bool do_outprod_env(DisasContext *s, arg_op *a, MemOp esz,
-+                           gen_helper_gvec_5_ptr *fn)
-+{
-+    int svl = streaming_vec_reg_size(s);
-+    uint32_t desc = simd_desc(svl, svl, a->sub);
-+    TCGv_ptr za, zn, zm, pn, pm;
-+
-+    if (!sme_smza_enabled_check(s)) {
-+        return true;
-+    }
-+
-+    za = get_tile(s, esz, a->zad);
-+    zn = vec_full_reg_ptr(s, a->zn);
-+    zm = vec_full_reg_ptr(s, a->zm);
-+    pn = pred_full_reg_ptr(s, a->pn);
-+    pm = pred_full_reg_ptr(s, a->pm);
-+
-+    fn(za, zn, zm, pn, pm, tcg_env, tcg_constant_i32(desc));
-+    return true;
-+}
-+
-+TRANS_FEAT(FMOPA_h, aa64_sme, do_outprod_env, a,
-+           MO_32, gen_helper_sme_fmopa_h)
- TRANS_FEAT(FMOPA_s, aa64_sme, do_outprod_fpst, a,
-            MO_32, FPST_FPCR, gen_helper_sme_fmopa_s)
- TRANS_FEAT(FMOPA_d, aa64_sme_f64f64, do_outprod_fpst, a,
--- a/debian/patches/extra/0027-intel_iommu-fix-FRCD-construction-macro.patch
+++ b/debian/patches/extra/0027-intel_iommu-fix-FRCD-construction-macro.patch
@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Cl=C3=A9ment=20Mathieu--Drif?=
- <clement.mathieu--drif@eviden.com>
-Date: Tue, 9 Jul 2024 14:26:08 +0000
-Subject: [PATCH] intel_iommu: fix FRCD construction macro
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The constant must be unsigned, otherwise the two's complement
-overrides the other fields when a PASID is present.
-
-Fixes: 1b2b12376c8a ("intel-iommu: PASID support")
-Signed-off-by: Clément Mathieu--Drif <clement.mathieu--drif@eviden.com>
-Reviewed-by: Yi Liu <yi.l.liu@intel.com>
-Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
-Reviewed-by: Minwoo Im <minwoo.im@samsung.com>
-Message-Id: <20240709142557.317271-2-clement.mathieu--drif@eviden.com>
-Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-(cherry picked from commit a3c8d7e38550c3d5a46e6fa94ffadfa625a4861d)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- hw/i386/intel_iommu_internal.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hw/i386/intel_iommu_internal.h b/hw/i386/intel_iommu_internal.h
-index f8cf99bddf..cbc4030031 100644
--- a/hw/i386/intel_iommu_internal.h
-+++ b/hw/i386/intel_iommu_internal.h
-@@ -267,7 +267,7 @@
- /* For the low 64-bit of 128-bit */
- #define VTD_FRCD_FI(val)        ((val) & ~0xfffULL)
- #define VTD_FRCD_PV(val)        (((val) & 0xffffULL) << 40)
-#define VTD_FRCD_PP(val)        (((val) & 0x1) << 31)
-+#define VTD_FRCD_PP(val)        (((val) & 0x1ULL) << 31)
- #define VTD_FRCD_IR_IDX(val)    (((val) & 0xffffULL) << 48)
- 
- /* DMA Remapping Fault Conditions */
--- a/debian/patches/extra/0028-target-i386-Do-not-apply-REX-to-MMX-operands.patch
+++ b/debian/patches/extra/0028-target-i386-Do-not-apply-REX-to-MMX-operands.patch
@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Richard Henderson <richard.henderson@linaro.org>
-Date: Mon, 12 Aug 2024 12:58:42 +1000
-Subject: [PATCH] target/i386: Do not apply REX to MMX operands
-
-Cc: qemu-stable@nongnu.org
-Fixes: b3e22b2318a ("target/i386: add core of new i386 decoder")
-Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2495
-Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
-Link: https://lore.kernel.org/r/20240812025844.58956-2-richard.henderson@linaro.org
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-(cherry picked from commit 416f2b16c02c618c0f233372ebfe343f9ee667d4)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- target/i386/tcg/decode-new.c.inc | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/target/i386/tcg/decode-new.c.inc b/target/i386/tcg/decode-new.c.inc
-index 4209d59ca8..09b8d2314a 100644
--- a/target/i386/tcg/decode-new.c.inc
-+++ b/target/i386/tcg/decode-new.c.inc
-@@ -1271,7 +1271,10 @@ static bool decode_op(DisasContext *s, CPUX86State *env, X86DecodedInsn *decode,
-             op->unit = X86_OP_SSE;
-         }
-     get_reg:
-        op->n = ((get_modrm(s, env) >> 3) & 7) | REX_R(s);
-+        op->n = ((get_modrm(s, env) >> 3) & 7);
-+        if (op->unit != X86_OP_MMX) {
-+            op->n |= REX_R(s);
-+        }
-         break;
- 
-     case X86_TYPE_E:  /* ALU modrm operand */
--- a/debian/patches/extra/0029-module-Prevent-crash-by-resetting-local_err-in-modul.patch
+++ b/debian/patches/extra/0029-module-Prevent-crash-by-resetting-local_err-in-modul.patch
@@ -1,42 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
-Date: Fri, 9 Aug 2024 14:13:40 +0200
-Subject: [PATCH] module: Prevent crash by resetting local_err in
- module_load_qom_all()
-
-Set local_err to NULL after it has been freed in error_report_err(). This
-avoids triggering assert(*errp == NULL) failure in error_setv() when
-local_err is reused in the loop.
-
-Signed-off-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
-Reviewed-by: Claudio Fontana <cfontana@suse.de>
-Reviewed-by: Denis V. Lunev <den@openvz.org>
-Link: https://lore.kernel.org/r/20240809121340.992049-2-alexander.ivanov@virtuozzo.com
-[Do the same by moving the declaration instead. - Paolo]
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-(cherry picked from commit 940d802b24e63650e0eacad3714e2ce171cba17c)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- util/module.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/util/module.c b/util/module.c
-index 32e263163c..3eb0f06df1 100644
--- a/util/module.c
-+++ b/util/module.c
-@@ -354,13 +354,13 @@ int module_load_qom(const char *type, Error **errp)
- void module_load_qom_all(void)
- {
-     const QemuModinfo *modinfo;
-    Error *local_err = NULL;
- 
-     if (module_loaded_qom_all) {
-         return;
-     }
- 
-     for (modinfo = module_info; modinfo->name != NULL; modinfo++) {
-+        Error *local_err = NULL;
-         if (!modinfo->objs) {
-             continue;
-         }
--- a/debian/patches/extra/0030-nbd-server-Plumb-in-new-args-to-nbd_client_add.patch
+++ b/debian/patches/extra/0030-nbd-server-Plumb-in-new-args-to-nbd_client_add.patch
@@ -1,164 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Wed, 7 Aug 2024 08:50:01 -0500
-Subject: [PATCH] nbd/server: Plumb in new args to nbd_client_add()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upcoming patches to fix a CVE need to track an opaque pointer passed
-in by the owner of a client object, as well as request for a time
-limit on how fast negotiation must complete.  Prepare for that by
-changing the signature of nbd_client_new() and adding an accessor to
-get at the opaque pointer, although for now the two servers
-(qemu-nbd.c and blockdev-nbd.c) do not change behavior even though
-they pass in a new default timeout value.
-
-Suggested-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
-Signed-off-by: Eric Blake <eblake@redhat.com>
-Message-ID: <20240807174943.771624-11-eblake@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-[eblake: s/LIMIT/MAX_SECS/ as suggested by Dan]
-Signed-off-by: Eric Blake <eblake@redhat.com>
-(cherry picked from commit fb1c2aaa981e0a2fa6362c9985f1296b74f055ac)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- blockdev-nbd.c      |  6 ++++--
- include/block/nbd.h | 11 ++++++++++-
- nbd/server.c        | 20 +++++++++++++++++---
- qemu-nbd.c          |  4 +++-
- 4 files changed, 34 insertions(+), 7 deletions(-)
-
-diff --git a/blockdev-nbd.c b/blockdev-nbd.c
-index 213012435f..267a1de903 100644
--- a/blockdev-nbd.c
-+++ b/blockdev-nbd.c
-@@ -64,8 +64,10 @@ static void nbd_accept(QIONetListener *listener, QIOChannelSocket *cioc,
-     nbd_update_server_watch(nbd_server);
- 
-     qio_channel_set_name(QIO_CHANNEL(cioc), "nbd-server");
-    nbd_client_new(cioc, nbd_server->tlscreds, nbd_server->tlsauthz,
-                   nbd_blockdev_client_closed);
-+    /* TODO - expose handshake timeout as QMP option */
-+    nbd_client_new(cioc, NBD_DEFAULT_HANDSHAKE_MAX_SECS,
-+                   nbd_server->tlscreds, nbd_server->tlsauthz,
-+                   nbd_blockdev_client_closed, NULL);
- }
- 
- static void nbd_update_server_watch(NBDServerData *s)
-diff --git a/include/block/nbd.h b/include/block/nbd.h
-index 4e7bd6342f..1d4d65922d 100644
--- a/include/block/nbd.h
-+++ b/include/block/nbd.h
-@@ -33,6 +33,12 @@ typedef struct NBDMetaContexts NBDMetaContexts;
- 
- extern const BlockExportDriver blk_exp_nbd;
- 
-+/*
-+ * NBD_DEFAULT_HANDSHAKE_MAX_SECS: Number of seconds in which client must
-+ * succeed at NBD_OPT_GO before being forcefully dropped as too slow.
-+ */
-+#define NBD_DEFAULT_HANDSHAKE_MAX_SECS 10
-+
- /* Handshake phase structs - this struct is passed on the wire */
- 
- typedef struct NBDOption {
-@@ -403,9 +409,12 @@ AioContext *nbd_export_aio_context(NBDExport *exp);
- NBDExport *nbd_export_find(const char *name);
- 
- void nbd_client_new(QIOChannelSocket *sioc,
-+                    uint32_t handshake_max_secs,
-                     QCryptoTLSCreds *tlscreds,
-                     const char *tlsauthz,
-                    void (*close_fn)(NBDClient *, bool));
-+                    void (*close_fn)(NBDClient *, bool),
-+                    void *owner);
-+void *nbd_client_owner(NBDClient *client);
- void nbd_client_get(NBDClient *client);
- void nbd_client_put(NBDClient *client);
- 
-diff --git a/nbd/server.c b/nbd/server.c
-index 892797bb11..e50012499f 100644
--- a/nbd/server.c
-+++ b/nbd/server.c
-@@ -124,12 +124,14 @@ struct NBDMetaContexts {
- struct NBDClient {
-     int refcount; /* atomic */
-     void (*close_fn)(NBDClient *client, bool negotiated);
-+    void *owner;
- 
-     QemuMutex lock;
- 
-     NBDExport *exp;
-     QCryptoTLSCreds *tlscreds;
-     char *tlsauthz;
-+    uint32_t handshake_max_secs;
-     QIOChannelSocket *sioc; /* The underlying data channel */
-     QIOChannel *ioc; /* The current I/O channel which may differ (eg TLS) */
- 
-@@ -3191,6 +3193,7 @@ static coroutine_fn void nbd_co_client_start(void *opaque)
- 
-     qemu_co_mutex_init(&client->send_lock);
- 
-+    /* TODO - utilize client->handshake_max_secs */
-     if (nbd_negotiate(client, &local_err)) {
-         if (local_err) {
-             error_report_err(local_err);
-@@ -3205,14 +3208,17 @@ static coroutine_fn void nbd_co_client_start(void *opaque)
- }
- 
- /*
- * Create a new client listener using the given channel @sioc.
-+ * Create a new client listener using the given channel @sioc and @owner.
-  * Begin servicing it in a coroutine.  When the connection closes, call
- * @close_fn with an indication of whether the client completed negotiation.
-+ * @close_fn with an indication of whether the client completed negotiation
-+ * within @handshake_max_secs seconds (0 for unbounded).
-  */
- void nbd_client_new(QIOChannelSocket *sioc,
-+                    uint32_t handshake_max_secs,
-                     QCryptoTLSCreds *tlscreds,
-                     const char *tlsauthz,
-                    void (*close_fn)(NBDClient *, bool))
-+                    void (*close_fn)(NBDClient *, bool),
-+                    void *owner)
- {
-     NBDClient *client;
-     Coroutine *co;
-@@ -3225,13 +3231,21 @@ void nbd_client_new(QIOChannelSocket *sioc,
-         object_ref(OBJECT(client->tlscreds));
-     }
-     client->tlsauthz = g_strdup(tlsauthz);
-+    client->handshake_max_secs = handshake_max_secs;
-     client->sioc = sioc;
-     qio_channel_set_delay(QIO_CHANNEL(sioc), false);
-     object_ref(OBJECT(client->sioc));
-     client->ioc = QIO_CHANNEL(sioc);
-     object_ref(OBJECT(client->ioc));
-     client->close_fn = close_fn;
-+    client->owner = owner;
- 
-     co = qemu_coroutine_create(nbd_co_client_start, client);
-     qemu_coroutine_enter(co);
- }
-+
-+void *
-+nbd_client_owner(NBDClient *client)
-+{
-+    return client->owner;
-+}
-diff --git a/qemu-nbd.c b/qemu-nbd.c
-index d7b3ccab21..48e2fa5858 100644
--- a/qemu-nbd.c
-+++ b/qemu-nbd.c
-@@ -390,7 +390,9 @@ static void nbd_accept(QIONetListener *listener, QIOChannelSocket *cioc,
- 
-     nb_fds++;
-     nbd_update_server_watch();
-    nbd_client_new(cioc, tlscreds, tlsauthz, nbd_client_closed);
-+    /* TODO - expose handshake timeout as command line option */
-+    nbd_client_new(cioc, NBD_DEFAULT_HANDSHAKE_MAX_SECS,
-+                   tlscreds, tlsauthz, nbd_client_closed, NULL);
- }
- 
- static void nbd_update_server_watch(void)
--- a/debian/patches/extra/0031-nbd-server-CVE-2024-7409-Cap-default-max-connections.patch
+++ b/debian/patches/extra/0031-nbd-server-CVE-2024-7409-Cap-default-max-connections.patch
@@ -1,172 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Tue, 6 Aug 2024 13:53:00 -0500
-Subject: [PATCH] nbd/server: CVE-2024-7409: Cap default max-connections to 100
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Allowing an unlimited number of clients to any web service is a recipe
-for a rudimentary denial of service attack: the client merely needs to
-open lots of sockets without closing them, until qemu no longer has
-any more fds available to allocate.
-
-For qemu-nbd, we default to allowing only 1 connection unless more are
-explicitly asked for (-e or --shared); this was historically picked as
-a nice default (without an explicit -t, a non-persistent qemu-nbd goes
-away after a client disconnects, without needing any additional
-follow-up commands), and we are not going to change that interface now
-(besides, someday we want to point people towards qemu-storage-daemon
-instead of qemu-nbd).
-
-But for qemu proper, and the newer qemu-storage-daemon, the QMP
-nbd-server-start command has historically had a default of unlimited
-number of connections, in part because unlike qemu-nbd it is
-inherently persistent until nbd-server-stop.  Allowing multiple client
-sockets is particularly useful for clients that can take advantage of
-MULTI_CONN (creating parallel sockets to increase throughput),
-although known clients that do so (such as libnbd's nbdcopy) typically
-use only 8 or 16 connections (the benefits of scaling diminish once
-more sockets are competing for kernel attention).  Picking a number
-large enough for typical use cases, but not unlimited, makes it
-slightly harder for a malicious client to perform a denial of service
-merely by opening lots of connections withot progressing through the
-handshake.
-
-This change does not eliminate CVE-2024-7409 on its own, but reduces
-the chance for fd exhaustion or unlimited memory usage as an attack
-surface.  On the other hand, by itself, it makes it more obvious that
-with a finite limit, we have the problem of an unauthenticated client
-holding 100 fds opened as a way to block out a legitimate client from
-being able to connect; thus, later patches will further add timeouts
-to reject clients that are not making progress.
-
-This is an INTENTIONAL change in behavior, and will break any client
-of nbd-server-start that was not passing an explicit max-connections
-parameter, yet expects more than 100 simultaneous connections.  We are
-not aware of any such client (as stated above, most clients aware of
-MULTI_CONN get by just fine on 8 or 16 connections, and probably cope
-with later connections failing by relying on the earlier connections;
-libvirt has not yet been passing max-connections, but generally
-creates NBD servers with the intent for a single client for the sake
-of live storage migration; meanwhile, the KubeSAN project anticipates
-a large cluster sharing multiple clients [up to 8 per node, and up to
-100 nodes in a cluster], but it currently uses qemu-nbd with an
-explicit --shared=0 rather than qemu-storage-daemon with
-nbd-server-start).
-
-We considered using a deprecation period (declare that omitting
-max-parameters is deprecated, and make it mandatory in 3 releases -
-then we don't need to pick an arbitrary default); that has zero risk
-of breaking any apps that accidentally depended on more than 100
-connections, and where such breakage might not be noticed under unit
-testing but only under the larger loads of production usage.  But it
-does not close the denial-of-service hole until far into the future,
-and requires all apps to change to add the parameter even if 100 was
-good enough.  It also has a drawback that any app (like libvirt) that
-is accidentally relying on an unlimited default should seriously
-consider their own CVE now, at which point they are going to change to
-pass explicit max-connections sooner than waiting for 3 qemu releases.
-Finally, if our changed default breaks an app, that app can always
-pass in an explicit max-parameters with a larger value.
-
-It is also intentional that the HMP interface to nbd-server-start is
-not changed to expose max-connections (any client needing to fine-tune
-things should be using QMP).
-
-Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
-Signed-off-by: Eric Blake <eblake@redhat.com>
-Message-ID: <20240807174943.771624-12-eblake@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-[ericb: Expand commit message to summarize Dan's argument for why we
-break corner-case back-compat behavior without a deprecation period]
-Signed-off-by: Eric Blake <eblake@redhat.com>
-(cherry picked from commit c8a76dbd90c2f48df89b75bef74917f90a59b623)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- block/monitor/block-hmp-cmds.c | 3 ++-
- blockdev-nbd.c                 | 8 ++++++++
- include/block/nbd.h            | 7 +++++++
- qapi/block-export.json         | 4 ++--
- 4 files changed, 19 insertions(+), 3 deletions(-)
-
-diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c
-index d954bec6f1..bdf2eb50b6 100644
--- a/block/monitor/block-hmp-cmds.c
-+++ b/block/monitor/block-hmp-cmds.c
-@@ -402,7 +402,8 @@ void hmp_nbd_server_start(Monitor *mon, const QDict *qdict)
-         goto exit;
-     }
- 
-    nbd_server_start(addr, NULL, NULL, 0, &local_err);
-+    nbd_server_start(addr, NULL, NULL, NBD_DEFAULT_MAX_CONNECTIONS,
-+                     &local_err);
-     qapi_free_SocketAddress(addr);
-     if (local_err != NULL) {
-         goto exit;
-diff --git a/blockdev-nbd.c b/blockdev-nbd.c
-index 267a1de903..24ba5382db 100644
--- a/blockdev-nbd.c
-+++ b/blockdev-nbd.c
-@@ -170,6 +170,10 @@ void nbd_server_start(SocketAddress *addr, const char *tls_creds,
- 
- void nbd_server_start_options(NbdServerOptions *arg, Error **errp)
- {
-+    if (!arg->has_max_connections) {
-+        arg->max_connections = NBD_DEFAULT_MAX_CONNECTIONS;
-+    }
-+
-     nbd_server_start(arg->addr, arg->tls_creds, arg->tls_authz,
-                      arg->max_connections, errp);
- }
-@@ -182,6 +186,10 @@ void qmp_nbd_server_start(SocketAddressLegacy *addr,
- {
-     SocketAddress *addr_flat = socket_address_flatten(addr);
- 
-+    if (!has_max_connections) {
-+        max_connections = NBD_DEFAULT_MAX_CONNECTIONS;
-+    }
-+
-     nbd_server_start(addr_flat, tls_creds, tls_authz, max_connections, errp);
-     qapi_free_SocketAddress(addr_flat);
- }
-diff --git a/include/block/nbd.h b/include/block/nbd.h
-index 1d4d65922d..d4f8b21aec 100644
--- a/include/block/nbd.h
-+++ b/include/block/nbd.h
-@@ -39,6 +39,13 @@ extern const BlockExportDriver blk_exp_nbd;
-  */
- #define NBD_DEFAULT_HANDSHAKE_MAX_SECS 10
- 
-+/*
-+ * NBD_DEFAULT_MAX_CONNECTIONS: Number of client sockets to allow at
-+ * once; must be large enough to allow a MULTI_CONN-aware client like
-+ * nbdcopy to create its typical number of 8-16 sockets.
-+ */
-+#define NBD_DEFAULT_MAX_CONNECTIONS 100
-+
- /* Handshake phase structs - this struct is passed on the wire */
- 
- typedef struct NBDOption {
-diff --git a/qapi/block-export.json b/qapi/block-export.json
-index 3919a2d5b9..f45e4fd481 100644
--- a/qapi/block-export.json
-+++ b/qapi/block-export.json
-@@ -28,7 +28,7 @@
- # @max-connections: The maximum number of connections to allow at the
- #     same time, 0 for unlimited.  Setting this to 1 also stops the
- #     server from advertising multiple client support (since 5.2;
-#     default: 0)
-+#     default: 100)
- #
- # Since: 4.2
- ##
-@@ -63,7 +63,7 @@
- # @max-connections: The maximum number of connections to allow at the
- #     same time, 0 for unlimited.  Setting this to 1 also stops the
- #     server from advertising multiple client support (since 5.2;
-#     default: 0).
-+#     default: 100).
- #
- # Errors:
- #     - if the server is already running
--- a/debian/patches/extra/0032-nbd-server-CVE-2024-7409-Drop-non-negotiating-client.patch
+++ b/debian/patches/extra/0032-nbd-server-CVE-2024-7409-Drop-non-negotiating-client.patch
@@ -1,123 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Thu, 8 Aug 2024 16:05:08 -0500
-Subject: [PATCH] nbd/server: CVE-2024-7409: Drop non-negotiating clients
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-A client that opens a socket but does not negotiate is merely hogging
-qemu's resources (an open fd and a small amount of memory); and a
-malicious client that can access the port where NBD is listening can
-attempt a denial of service attack by intentionally opening and
-abandoning lots of unfinished connections.  The previous patch put a
-default bound on the number of such ongoing connections, but once that
-limit is hit, no more clients can connect (including legitimate ones).
-The solution is to insist that clients complete handshake within a
-reasonable time limit, defaulting to 10 seconds.  A client that has
-not successfully completed NBD_OPT_GO by then (including the case of
-where the client didn't know TLS credentials to even reach the point
-of NBD_OPT_GO) is wasting our time and does not deserve to stay
-connected.  Later patches will allow fine-tuning the limit away from
-the default value (including disabling it for doing integration
-testing of the handshake process itself).
-
-Note that this patch in isolation actually makes it more likely to see
-qemu SEGV after nbd-server-stop, as any client socket still connected
-when the server shuts down will now be closed after 10 seconds rather
-than at the client's whims.  That will be addressed in the next patch.
-
-For a demo of this patch in action:
-$ qemu-nbd -f raw -r -t -e 10 file &
-$ nbdsh --opt-mode -c '
-H = list()
-for i in range(20):
-  print(i)
-  H.insert(i, nbd.NBD())
-  H[i].set_opt_mode(True)
-  H[i].connect_uri("nbd://localhost")
-'
-$ kill $!
-
-where later connections get to start progressing once earlier ones are
-forcefully dropped for taking too long, rather than hanging.
-
-Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
-Signed-off-by: Eric Blake <eblake@redhat.com>
-Message-ID: <20240807174943.771624-13-eblake@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-[eblake: rebase to changes earlier in series, reduce scope of timer]
-Signed-off-by: Eric Blake <eblake@redhat.com>
-(cherry picked from commit b9b72cb3ce15b693148bd09cef7e50110566d8a0)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- nbd/server.c     | 28 +++++++++++++++++++++++++++-
- nbd/trace-events |  1 +
- 2 files changed, 28 insertions(+), 1 deletion(-)
-
-diff --git a/nbd/server.c b/nbd/server.c
-index e50012499f..39285cc971 100644
--- a/nbd/server.c
-+++ b/nbd/server.c
-@@ -3186,22 +3186,48 @@ static void nbd_client_receive_next_request(NBDClient *client)
-     }
- }
- 
-+static void nbd_handshake_timer_cb(void *opaque)
-+{
-+    QIOChannel *ioc = opaque;
-+
-+    trace_nbd_handshake_timer_cb();
-+    qio_channel_shutdown(ioc, QIO_CHANNEL_SHUTDOWN_BOTH, NULL);
-+}
-+
- static coroutine_fn void nbd_co_client_start(void *opaque)
- {
-     NBDClient *client = opaque;
-     Error *local_err = NULL;
-+    QEMUTimer *handshake_timer = NULL;
- 
-     qemu_co_mutex_init(&client->send_lock);
- 
-    /* TODO - utilize client->handshake_max_secs */
-+    /*
-+     * Create a timer to bound the time spent in negotiation. If the
-+     * timer expires, it is likely nbd_negotiate will fail because the
-+     * socket was shutdown.
-+     */
-+    if (client->handshake_max_secs > 0) {
-+        handshake_timer = aio_timer_new(qemu_get_aio_context(),
-+                                        QEMU_CLOCK_REALTIME,
-+                                        SCALE_NS,
-+                                        nbd_handshake_timer_cb,
-+                                        client->sioc);
-+        timer_mod(handshake_timer,
-+                  qemu_clock_get_ns(QEMU_CLOCK_REALTIME) +
-+                  client->handshake_max_secs * NANOSECONDS_PER_SECOND);
-+    }
-+
-     if (nbd_negotiate(client, &local_err)) {
-         if (local_err) {
-             error_report_err(local_err);
-         }
-+        timer_free(handshake_timer);
-         client_close(client, false);
-         return;
-     }
- 
-+    timer_free(handshake_timer);
-     WITH_QEMU_LOCK_GUARD(&client->lock) {
-         nbd_client_receive_next_request(client);
-     }
-diff --git a/nbd/trace-events b/nbd/trace-events
-index 00ae3216a1..cbd0a4ab7e 100644
--- a/nbd/trace-events
-+++ b/nbd/trace-events
-@@ -76,6 +76,7 @@ nbd_co_receive_request_payload_received(uint64_t cookie, uint64_t len) "Payload
- nbd_co_receive_ext_payload_compliance(uint64_t from, uint64_t len) "client sent non-compliant write without payload flag: from=0x%" PRIx64 ", len=0x%" PRIx64
- nbd_co_receive_align_compliance(const char *op, uint64_t from, uint64_t len, uint32_t align) "client sent non-compliant unaligned %s request: from=0x%" PRIx64 ", len=0x%" PRIx64 ", align=0x%" PRIx32
- nbd_trip(void) "Reading request"
-+nbd_handshake_timer_cb(void) "client took too long to negotiate"
- 
- # client-connection.c
- nbd_connect_thread_sleep(uint64_t timeout) "timeout %" PRIu64
--- a/debian/patches/extra/0033-nbd-server-CVE-2024-7409-Close-stray-clients-at-serv.patch
+++ b/debian/patches/extra/0033-nbd-server-CVE-2024-7409-Close-stray-clients-at-serv.patch
@@ -1,161 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Wed, 7 Aug 2024 12:23:13 -0500
-Subject: [PATCH] nbd/server: CVE-2024-7409: Close stray clients at server-stop
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-A malicious client can attempt to connect to an NBD server, and then
-intentionally delay progress in the handshake, including if it does
-not know the TLS secrets.  Although the previous two patches reduce
-this behavior by capping the default max-connections parameter and
-killing slow clients, they did not eliminate the possibility of a
-client waiting to close the socket until after the QMP nbd-server-stop
-command is executed, at which point qemu would SEGV when trying to
-dereference the NULL nbd_server global which is no longer present.
-This amounts to a denial of service attack.  Worse, if another NBD
-server is started before the malicious client disconnects, I cannot
-rule out additional adverse effects when the old client interferes
-with the connection count of the new server (although the most likely
-is a crash due to an assertion failure when checking
-nbd_server->connections > 0).
-
-For environments without this patch, the CVE can be mitigated by
-ensuring (such as via a firewall) that only trusted clients can
-connect to an NBD server.  Note that using frameworks like libvirt
-that ensure that TLS is used and that nbd-server-stop is not executed
-while any trusted clients are still connected will only help if there
-is also no possibility for an untrusted client to open a connection
-but then stall on the NBD handshake.
-
-Given the previous patches, it would be possible to guarantee that no
-clients remain connected by having nbd-server-stop sleep for longer
-than the default handshake deadline before finally freeing the global
-nbd_server object, but that could make QMP non-responsive for a long
-time.  So intead, this patch fixes the problem by tracking all client
-sockets opened while the server is running, and forcefully closing any
-such sockets remaining without a completed handshake at the time of
-nbd-server-stop, then waiting until the coroutines servicing those
-sockets notice the state change.  nbd-server-stop now has a second
-AIO_WAIT_WHILE_UNLOCKED (the first is indirectly through the
-blk_exp_close_all_type() that disconnects all clients that completed
-handshakes), but forced socket shutdown is enough to progress the
-coroutines and quickly tear down all clients before the server is
-freed, thus finally fixing the CVE.
-
-This patch relies heavily on the fact that nbd/server.c guarantees
-that it only calls nbd_blockdev_client_closed() from the main loop
-(see the assertion in nbd_client_put() and the hoops used in
-nbd_client_put_nonzero() to achieve that); if we did not have that
-guarantee, we would also need a mutex protecting our accesses of the
-list of connections to survive re-entrancy from independent iothreads.
-
-Although I did not actually try to test old builds, it looks like this
-problem has existed since at least commit 862172f45c (v2.12.0, 2017) -
-even back when that patch started using a QIONetListener to handle
-listening on multiple sockets, nbd_server_free() was already unaware
-that the nbd_blockdev_client_closed callback can be reached later by a
-client thread that has not completed handshakes (and therefore the
-client's socket never got added to the list closed in
-nbd_export_close_all), despite that patch intentionally tearing down
-the QIONetListener to prevent new clients.
-
-Reported-by: Alexander Ivanov <alexander.ivanov@virtuozzo.com>
-Fixes: CVE-2024-7409
-CC: qemu-stable@nongnu.org
-Signed-off-by: Eric Blake <eblake@redhat.com>
-Message-ID: <20240807174943.771624-14-eblake@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 3e7ef738c8462c45043a1d39f702a0990406a3b3)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- blockdev-nbd.c | 35 ++++++++++++++++++++++++++++++++++-
- 1 file changed, 34 insertions(+), 1 deletion(-)
-
-diff --git a/blockdev-nbd.c b/blockdev-nbd.c
-index 24ba5382db..f73409ae49 100644
--- a/blockdev-nbd.c
-+++ b/blockdev-nbd.c
-@@ -21,12 +21,18 @@
- #include "io/channel-socket.h"
- #include "io/net-listener.h"
- 
-+typedef struct NBDConn {
-+    QIOChannelSocket *cioc;
-+    QLIST_ENTRY(NBDConn) next;
-+} NBDConn;
-+
- typedef struct NBDServerData {
-     QIONetListener *listener;
-     QCryptoTLSCreds *tlscreds;
-     char *tlsauthz;
-     uint32_t max_connections;
-     uint32_t connections;
-+    QLIST_HEAD(, NBDConn) conns;
- } NBDServerData;
- 
- static NBDServerData *nbd_server;
-@@ -51,6 +57,14 @@ int nbd_server_max_connections(void)
- 
- static void nbd_blockdev_client_closed(NBDClient *client, bool ignored)
- {
-+    NBDConn *conn = nbd_client_owner(client);
-+
-+    assert(qemu_in_main_thread() && nbd_server);
-+
-+    object_unref(OBJECT(conn->cioc));
-+    QLIST_REMOVE(conn, next);
-+    g_free(conn);
-+
-     nbd_client_put(client);
-     assert(nbd_server->connections > 0);
-     nbd_server->connections--;
-@@ -60,14 +74,20 @@ static void nbd_blockdev_client_closed(NBDClient *client, bool ignored)
- static void nbd_accept(QIONetListener *listener, QIOChannelSocket *cioc,
-                        gpointer opaque)
- {
-+    NBDConn *conn = g_new0(NBDConn, 1);
-+
-+    assert(qemu_in_main_thread() && nbd_server);
-     nbd_server->connections++;
-+    object_ref(OBJECT(cioc));
-+    conn->cioc = cioc;
-+    QLIST_INSERT_HEAD(&nbd_server->conns, conn, next);
-     nbd_update_server_watch(nbd_server);
- 
-     qio_channel_set_name(QIO_CHANNEL(cioc), "nbd-server");
-     /* TODO - expose handshake timeout as QMP option */
-     nbd_client_new(cioc, NBD_DEFAULT_HANDSHAKE_MAX_SECS,
-                    nbd_server->tlscreds, nbd_server->tlsauthz,
-                   nbd_blockdev_client_closed, NULL);
-+                   nbd_blockdev_client_closed, conn);
- }
- 
- static void nbd_update_server_watch(NBDServerData *s)
-@@ -81,12 +101,25 @@ static void nbd_update_server_watch(NBDServerData *s)
- 
- static void nbd_server_free(NBDServerData *server)
- {
-+    NBDConn *conn, *tmp;
-+
-     if (!server) {
-         return;
-     }
- 
-+    /*
-+     * Forcefully close the listener socket, and any clients that have
-+     * not yet disconnected on their own.
-+     */
-     qio_net_listener_disconnect(server->listener);
-     object_unref(OBJECT(server->listener));
-+    QLIST_FOREACH_SAFE(conn, &server->conns, next, tmp) {
-+        qio_channel_shutdown(QIO_CHANNEL(conn->cioc), QIO_CHANNEL_SHUTDOWN_BOTH,
-+                             NULL);
-+    }
-+
-+    AIO_WAIT_WHILE_UNLOCKED(NULL, server->connections > 0);
-+
-     if (server->tlscreds) {
-         object_unref(OBJECT(server->tlscreds));
-     }
--- a/debian/patches/extra/0034-vnc-fix-crash-when-no-console-attached.patch
+++ b/debian/patches/extra/0034-vnc-fix-crash-when-no-console-attached.patch
@@ -1,47 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
-Date: Tue, 20 Aug 2024 17:11:12 +0400
-Subject: [PATCH] vnc: fix crash when no console attached
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Since commit e99441a3793b5 ("ui/curses: Do not use console_select()")
-qemu_text_console_put_keysym() no longer checks for NULL console
-argument, which leads to a later crash:
-
-Thread 1 "qemu-system-x86" received signal SIGSEGV, Segmentation fault.
-0x00005555559ee186 in qemu_text_console_handle_keysym (s=0x0, keysym=31) at ../ui/console-vc.c:332
-332	        } else if (s->echo && (keysym == '\r' || keysym == '\n')) {
-(gdb) bt
- #0  0x00005555559ee186 in qemu_text_console_handle_keysym (s=0x0, keysym=31) at ../ui/console-vc.c:332
- #1  0x00005555559e18e5 in qemu_text_console_put_keysym (s=<optimized out>, keysym=<optimized out>) at ../ui/console.c:303
- #2  0x00005555559f2e88 in do_key_event (vs=vs@entry=0x5555579045c0, down=down@entry=1, keycode=keycode@entry=60, sym=sym@entry=65471) at ../ui/vnc.c:2034
- #3  0x00005555559f845c in ext_key_event (vs=0x5555579045c0, down=1, sym=65471, keycode=<optimized out>) at ../ui/vnc.c:2070
- #4  protocol_client_msg (vs=0x5555579045c0, data=<optimized out>, len=<optimized out>) at ../ui/vnc.c:2514
- #5  0x00005555559f515c in vnc_client_read (vs=0x5555579045c0) at ../ui/vnc.c:1607
-
-Fixes: e99441a3793b5 ("ui/curses: Do not use console_select()")
-Fixes: https://issues.redhat.com/browse/RHEL-50529
-Cc: qemu-stable@nongnu.org
-Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
-Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com>
-(picked from https://lore.kernel.org/qemu-devel/20240820131112.1267954-1-marcandre.lureau@redhat.com/)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- ui/vnc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ui/vnc.c b/ui/vnc.c
-index b3fd78022b..953ea38318 100644
--- a/ui/vnc.c
-+++ b/ui/vnc.c
-@@ -1935,7 +1935,7 @@ static void do_key_event(VncState *vs, int down, int keycode, int sym)
-     }
- 
-     qkbd_state_key_event(vs->vd->kbd, qcode, down);
-    if (!qemu_console_is_graphic(vs->vd->dcl.con)) {
-+    if (QEMU_IS_TEXT_CONSOLE(vs->vd->dcl.con)) {
-         QemuTextConsole *con = QEMU_TEXT_CONSOLE(vs->vd->dcl.con);
-         bool numlock = qkbd_state_modifier_get(vs->vd->kbd, QKBD_MOD_NUMLOCK);
-         bool control = qkbd_state_modifier_get(vs->vd->kbd, QKBD_MOD_CTRL);
--- a/debian/patches/extra/0035-nbd-server-CVE-2024-7409-Avoid-use-after-free-when-c.patch
+++ b/debian/patches/extra/0035-nbd-server-CVE-2024-7409-Avoid-use-after-free-when-c.patch
@@ -1,89 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Thu, 22 Aug 2024 09:35:29 -0500
-Subject: [PATCH] nbd/server: CVE-2024-7409: Avoid use-after-free when closing
- server
-
-Commit 3e7ef738 plugged the use-after-free of the global nbd_server
-object, but overlooked a use-after-free of nbd_server->listener.
-Although this race is harder to hit, notice that our shutdown path
-first drops the reference count of nbd_server->listener, then triggers
-actions that can result in a pending client reaching the
-nbd_blockdev_client_closed() callback, which in turn calls
-qio_net_listener_set_client_func on a potentially stale object.
-
-If we know we don't want any more clients to connect, and have already
-told the listener socket to shut down, then we should not be trying to
-update the listener socket's associated function.
-
-Reproducer:
-
-> #!/usr/bin/python3
->
-> import os
-> from threading import Thread
->
-> def start_stop():
->     while 1:
->         os.system('virsh qemu-monitor-command VM \'{"execute": "nbd-server-start",
-+"arguments":{"addr":{"type":"unix","data":{"path":"/tmp/nbd-sock"}}}}\'')
->         os.system('virsh qemu-monitor-command VM \'{"execute": "nbd-server-stop"}\'')
->
-> def nbd_list():
->     while 1:
->         os.system('/path/to/build/qemu-nbd -L -k /tmp/nbd-sock')
->
-> def test():
->     sst = Thread(target=start_stop)
->     sst.start()
->     nlt = Thread(target=nbd_list)
->     nlt.start()
->
->     sst.join()
->     nlt.join()
->
-> test()
-
-Fixes: CVE-2024-7409
-Fixes: 3e7ef738c8 ("nbd/server: CVE-2024-7409: Close stray clients at server-stop")
-CC: qemu-stable@nongnu.org
-Reported-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com>
-Signed-off-by: Eric Blake <eblake@redhat.com>
-Message-ID: <20240822143617.800419-2-eblake@redhat.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-(cherry picked from commit 3874f5f73c441c52f1c699c848d463b0eda01e4c)
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- blockdev-nbd.c | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/blockdev-nbd.c b/blockdev-nbd.c
-index f73409ae49..b36f41b7c5 100644
--- a/blockdev-nbd.c
-+++ b/blockdev-nbd.c
-@@ -92,10 +92,13 @@ static void nbd_accept(QIONetListener *listener, QIOChannelSocket *cioc,
- 
- static void nbd_update_server_watch(NBDServerData *s)
- {
-    if (!s->max_connections || s->connections < s->max_connections) {
-        qio_net_listener_set_client_func(s->listener, nbd_accept, NULL, NULL);
-    } else {
-        qio_net_listener_set_client_func(s->listener, NULL, NULL, NULL);
-+    if (s->listener) {
-+        if (!s->max_connections || s->connections < s->max_connections) {
-+            qio_net_listener_set_client_func(s->listener, nbd_accept, NULL,
-+                                             NULL);
-+        } else {
-+            qio_net_listener_set_client_func(s->listener, NULL, NULL, NULL);
-+        }
-     }
- }
- 
-@@ -113,6 +116,7 @@ static void nbd_server_free(NBDServerData *server)
-      */
-     qio_net_listener_disconnect(server->listener);
-     object_unref(OBJECT(server->listener));
-+    server->listener = NULL;
-     QLIST_FOREACH_SAFE(conn, &server->conns, next, tmp) {
-         qio_channel_shutdown(QIO_CHANNEL(conn->cioc), QIO_CHANNEL_SHUTDOWN_BOTH,
-                              NULL);
--- a/debian/patches/extra/0036-softmmu-physmem-fix-memory-leak-in-dirty_memory_exte.patch
+++ b/debian/patches/extra/0036-softmmu-physmem-fix-memory-leak-in-dirty_memory_exte.patch
@@ -1,134 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: David Hildenbrand <david@redhat.com>
-Date: Wed, 28 Aug 2024 11:07:43 +0200
-Subject: [PATCH] softmmu/physmem: fix memory leak in dirty_memory_extend()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-As reported by Peter, we might be leaking memory when removing the
-highest RAMBlock (in the weird ram_addr_t space), and adding a new one.
-
-We will fail to realize that we already allocated bitmaps for more
-dirty memory blocks, and effectively discard the pointers to them.
-
-Fix it by getting rid of last_ram_page() and by remembering the number
-of dirty memory blocks that have been allocated already.
-
-While at it, let's use "unsigned int" for the number of blocks, which
-should be sufficient until we reach ~32 exabytes.
-
-Looks like this leak was introduced as we switched from using a single
-bitmap_zero_extend() to allocating multiple bitmaps:
-bitmap_zero_extend() relies on g_renew() which should have taken care of
-this.
-
-Resolves: https://lkml.kernel.org/r/CAFEAcA-k7a+VObGAfCFNygQNfCKL=AfX6A4kScq=VSSK0peqPg@mail.gmail.com
-Reported-by: Peter Maydell <peter.maydell@linaro.org>
-Fixes: 5b82b703b69a ("memory: RCU ram_list.dirty_memory[] for safe RAM hotplug")
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Peter Xu <peterx@redhat.com>
-Tested-by: Peter Maydell <peter.maydell@linaro.org>
-Cc: qemu-stable@nongnu.org
-Cc: Stefan Hajnoczi <stefanha@redhat.com>
-Cc: Paolo Bonzini <pbonzini@redhat.com>
-Cc: Peter Xu <peterx@redhat.com>
-Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>
-Signed-off-by: David Hildenbrand <david@redhat.com>
-(picked from https://lore.kernel.org/qemu-devel/20240828090743.128647-1-david@redhat.com/)
-[FE: backport - remove not-yet-existing variable in context of hunk touching ram_block_add()]
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- include/exec/ramlist.h |  1 +
- system/physmem.c       | 35 +++++++++--------------------------
- 2 files changed, 10 insertions(+), 26 deletions(-)
-
-diff --git a/include/exec/ramlist.h b/include/exec/ramlist.h
-index 2ad2a81acc..d9cfe530be 100644
--- a/include/exec/ramlist.h
-+++ b/include/exec/ramlist.h
-@@ -50,6 +50,7 @@ typedef struct RAMList {
-     /* RCU-enabled, writes protected by the ramlist lock. */
-     QLIST_HEAD(, RAMBlock) blocks;
-     DirtyMemoryBlocks *dirty_memory[DIRTY_MEMORY_NUM];
-+    unsigned int num_dirty_blocks;
-     uint32_t version;
-     QLIST_HEAD(, RAMBlockNotifier) ramblock_notifiers;
- } RAMList;
-diff --git a/system/physmem.c b/system/physmem.c
-index a4fe3d2bf8..78f7db1121 100644
--- a/system/physmem.c
-+++ b/system/physmem.c
-@@ -1497,18 +1497,6 @@ static ram_addr_t find_ram_offset(ram_addr_t size)
-     return offset;
- }
- 
-static unsigned long last_ram_page(void)
-{
-    RAMBlock *block;
-    ram_addr_t last = 0;
-
-    RCU_READ_LOCK_GUARD();
-    RAMBLOCK_FOREACH(block) {
-        last = MAX(last, block->offset + block->max_length);
-    }
-    return last >> TARGET_PAGE_BITS;
-}
-
- static void qemu_ram_setup_dump(void *addr, ram_addr_t size)
- {
-     int ret;
-@@ -1762,13 +1750,11 @@ void qemu_ram_msync(RAMBlock *block, ram_addr_t start, ram_addr_t length)
- }
- 
- /* Called with ram_list.mutex held */
-static void dirty_memory_extend(ram_addr_t old_ram_size,
-                                ram_addr_t new_ram_size)
-+static void dirty_memory_extend(ram_addr_t new_ram_size)
- {
-    ram_addr_t old_num_blocks = DIV_ROUND_UP(old_ram_size,
-                                             DIRTY_MEMORY_BLOCK_SIZE);
-    ram_addr_t new_num_blocks = DIV_ROUND_UP(new_ram_size,
-                                             DIRTY_MEMORY_BLOCK_SIZE);
-+    unsigned int old_num_blocks = ram_list.num_dirty_blocks;
-+    unsigned int new_num_blocks = DIV_ROUND_UP(new_ram_size,
-+                                               DIRTY_MEMORY_BLOCK_SIZE);
-     int i;
- 
-     /* Only need to extend if block count increased */
-@@ -1800,6 +1786,8 @@ static void dirty_memory_extend(ram_addr_t old_ram_size,
-             g_free_rcu(old_blocks, rcu);
-         }
-     }
-+
-+    ram_list.num_dirty_blocks = new_num_blocks;
- }
- 
- static void ram_block_add(RAMBlock *new_block, Error **errp)
-@@ -1808,11 +1796,9 @@ static void ram_block_add(RAMBlock *new_block, Error **errp)
-     const bool shared = qemu_ram_is_shared(new_block);
-     RAMBlock *block;
-     RAMBlock *last_block = NULL;
-    ram_addr_t old_ram_size, new_ram_size;
-+    ram_addr_t ram_size;
-     Error *err = NULL;
- 
-    old_ram_size = last_ram_page();
-
-     qemu_mutex_lock_ramlist();
-     new_block->offset = find_ram_offset(new_block->max_length);
- 
-@@ -1840,11 +1826,8 @@ static void ram_block_add(RAMBlock *new_block, Error **errp)
-         }
-     }
- 
-    new_ram_size = MAX(old_ram_size,
-              (new_block->offset + new_block->max_length) >> TARGET_PAGE_BITS);
-    if (new_ram_size > old_ram_size) {
-        dirty_memory_extend(old_ram_size, new_ram_size);
-    }
-+    ram_size = (new_block->offset + new_block->max_length) >> TARGET_PAGE_BITS;
-+    dirty_memory_extend(ram_size);
-     /* Keep the list sorted from biggest to smallest block.  Unlike QTAILQ,
-      * QLIST (which has an RCU-friendly variant) does not have insertion at
-      * tail, so save the last element in last_block.
--- a/debian/patches/pve-qemu-7.1-vitastor.patch
+++ b/debian/patches/pve-qemu-7.1-vitastor.patch
--- a/debian/patches/pve/0001-PVE-Config-block-file-change-locking-default-to-off.patch
+++ b/debian/patches/pve/0001-PVE-Config-block-file-change-locking-default-to-off.patch
@@ -14,10 +14,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/block/file-posix.c b/block/file-posix.c
-index 35684f7e21..43bc0bd520 100644
+index 48cd096624..3d60b80286 100644
 --- a/block/file-posix.c
 +++ b/block/file-posix.c
-@@ -563,7 +563,7 @@ static QemuOptsList raw_runtime_opts = {
+@@ -553,7 +553,7 @@ static QemuOptsList raw_runtime_opts = {
         {
             .name = "locking",
             .type = QEMU_OPT_STRING,
@@ -26,7 +26,7 @@ index 35684f7e21..43bc0bd520 100644
         },
         {
             .name = "pr-manager",
-@@ -663,7 +663,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
+@@ -653,7 +653,7 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
         s->use_lock = false;
         break;
     case ON_OFF_AUTO_AUTO:
--- a/debian/patches/pve/0002-PVE-Config-Adjust-network-script-path-to-etc-kvm.patch
+++ b/debian/patches/pve/0002-PVE-Config-Adjust-network-script-path-to-etc-kvm.patch
@@ -9,10 +9,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/include/net/net.h b/include/net/net.h
-index b1f9b35fcc..096c0d52e4 100644
+index 523136c7ac..c27859b4f6 100644
 --- a/include/net/net.h
 +++ b/include/net/net.h
-@@ -317,8 +317,8 @@ void netdev_add(QemuOpts *opts, Error **errp);
+@@ -226,8 +226,8 @@ void netdev_add(QemuOpts *opts, Error **errp);
 int net_hub_id_for_client(NetClientState *nc, int *id);
 NetClientState *net_hub_port_find(int hub_id);
 
--- a/debian/patches/pve/0003-PVE-Config-set-the-CPU-model-to-kvm64-32-instead-of-.patch
+++ b/debian/patches/pve/0003-PVE-Config-set-the-CPU-model-to-kvm64-32-instead-of-.patch
@@ -10,10 +10,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/target/i386/cpu.h b/target/i386/cpu.h
-index 6b05738079..d82869900a 100644
+index 82004b65b9..4868db8f94 100644
 --- a/target/i386/cpu.h
 +++ b/target/i386/cpu.h
-@@ -2291,9 +2291,9 @@ uint64_t cpu_get_tsc(CPUX86State *env);
+@@ -2133,9 +2133,9 @@ uint64_t cpu_get_tsc(CPUX86State *env);
 #define CPU_RESOLVING_TYPE TYPE_X86_CPU
 
 #ifdef TARGET_X86_64
--- a/debian/patches/pve/0004-PVE-Config-ui-spice-default-to-pve-certificates.patch
+++ b/debian/patches/pve/0004-PVE-Config-ui-spice-default-to-pve-certificates.patch
@@ -9,10 +9,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 9 insertions(+), 6 deletions(-)

 diff --git a/ui/spice-core.c b/ui/spice-core.c
-index 15be640286..ea20e6153c 100644
+index c3ac20ad43..37774f1c0a 100644
 --- a/ui/spice-core.c
 +++ b/ui/spice-core.c
-@@ -690,32 +690,35 @@ static void qemu_spice_init(void)
+@@ -689,32 +689,35 @@ static void qemu_spice_init(void)
 
     if (tls_port) {
         x509_dir = qemu_opt_get(opts, "x509-dir");
--- a/debian/patches/pve/0005-PVE-Config-glusterfs-no-default-logfile-if-daemonize.patch
+++ b/debian/patches/pve/0005-PVE-Config-glusterfs-no-default-logfile-if-daemonize.patch
@@ -9,10 +9,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 11 insertions(+), 4 deletions(-)

 diff --git a/block/gluster.c b/block/gluster.c
-index cc74af06dc..3ba9bbfa5e 100644
+index b60213ab80..93da76bc31 100644
 --- a/block/gluster.c
 +++ b/block/gluster.c
-@@ -43,7 +43,7 @@
+@@ -42,7 +42,7 @@
 #define GLUSTER_DEBUG_DEFAULT       4
 #define GLUSTER_DEBUG_MAX           9
 #define GLUSTER_OPT_LOGFILE         "logfile"
@@ -21,15 +21,15 @@ index cc74af06dc..3ba9bbfa5e 100644
 /*
  * Several versions of GlusterFS (3.12? -> 6.0.1) fail when the transfer size
  * is greater or equal to 1024 MiB, so we are limiting the transfer size to 512
-@@ -425,6 +425,7 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf,
+@@ -424,6 +424,7 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf,
     int old_errno;
     SocketAddressList *server;
-     uint64_t port;
+     unsigned long long port;
 +    const char *logfile;
 
     glfs = glfs_find_preopened(gconf->volume);
     if (glfs) {
-@@ -467,9 +468,15 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf,
+@@ -466,9 +467,15 @@ static struct glfs *qemu_gluster_glfs_init(BlockdevOptionsGluster *gconf,
         }
     }
 
--- a/debian/patches/pve/0006-PVE-Config-rbd-block-rbd-disable-rbd_cache_writethro.patch
+++ b/debian/patches/pve/0006-PVE-Config-rbd-block-rbd-disable-rbd_cache_writethro.patch
@@ -18,10 +18,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 2 insertions(+)

 diff --git a/block/rbd.c b/block/rbd.c
-index 84bb2fa5d7..63f60d41be 100644
+index f826410f40..64a8d7d48b 100644
 --- a/block/rbd.c
 +++ b/block/rbd.c
-@@ -963,6 +963,8 @@ static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx,
+@@ -820,6 +820,8 @@ static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx,
         rados_conf_set(*cluster, "rbd_cache", "false");
     }
 
--- a/debian/patches/pve/0007-PVE-Up-qmp-add-get_link_status.patch
+++ b/debian/patches/pve/0007-PVE-Up-qmp-add-get_link_status.patch
@@ -0,0 +1,88 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Wolfgang Bumiller <w.bumiller@proxmox.com>
+Date: Mon, 6 Apr 2020 12:16:37 +0200
+Subject: [PATCH] PVE: [Up] qmp: add get_link_status
+
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ net/net.c        | 27 +++++++++++++++++++++++++++
+ qapi/net.json    | 15 +++++++++++++++
+ qapi/pragma.json |  1 +
+ 3 files changed, 43 insertions(+)
+
+diff --git a/net/net.c b/net/net.c
+index 2db160e063..8329347891 100644
+--- a/net/net.c
+++ b/net/net.c
+@@ -1343,6 +1343,33 @@ void hmp_info_network(Monitor *mon, const QDict *qdict)
+     }
+ }
+ 
+int64_t qmp_get_link_status(const char *name, Error **errp)
+{
+    NetClientState *ncs[MAX_QUEUE_NUM];
+    NetClientState *nc;
+    int queues;
+    bool ret;
+
+    queues = qemu_find_net_clients_except(name, ncs,
+                                          NET_CLIENT_DRIVER__MAX,
+                                          MAX_QUEUE_NUM);
+
+    if (queues == 0) {
+        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
+                  "Device '%s' not found", name);
+        return (int64_t) -1;
+    }
+
+    nc = ncs[0];
+    ret = ncs[0]->link_down;
+
+    if (nc->peer->info->type == NET_CLIENT_DRIVER_NIC) {
+      ret = ncs[0]->peer->link_down;
+    }
+
+    return (int64_t) ret ? 0 : 1;
+}
+
+ void colo_notify_filters_event(int event, Error **errp)
+ {
+     NetClientState *nc;
+diff --git a/qapi/net.json b/qapi/net.json
+index 75ba2cb989..a3c93ab88f 100644
+--- a/qapi/net.json
+++ b/qapi/net.json
+@@ -35,6 +35,21 @@
+ ##
+ { 'command': 'set_link', 'data': {'name': 'str', 'up': 'bool'} }
+ 
+##
+# @get_link_status:
+#
+# Get the current link state of the nics or nic.
+#
+# @name: name of the nic you get the state of
+#
+# Return: If link is up 1
+#         If link is down 0
+#         If an error occure an empty string.
+#
+# Notes: this is an Proxmox VE extension and not offical part of Qemu.
+##
+{ 'command': 'get_link_status', 'data': {'name': 'str'} , 'returns': 'int' }
+
+ ##
+ # @netdev_add:
+ #
+diff --git a/qapi/pragma.json b/qapi/pragma.json
+index 7f810b0e97..a2358e303a 100644
+--- a/qapi/pragma.json
+++ b/qapi/pragma.json
+@@ -26,6 +26,7 @@
+         'system_wakeup' ],
+     # Commands allowed to return a non-dictionary
+     'command-returns-exceptions': [
+        'get_link_status',
+         'human-monitor-command',
+         'qom-get',
+         'query-tpm-models',
--- a/debian/patches/pve/0008-PVE-Up-glusterfs-allow-partial-reads.patch
+++ b/debian/patches/pve/0008-PVE-Up-glusterfs-allow-partial-reads.patch
@@ -16,10 +16,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 9 insertions(+), 1 deletion(-)

 diff --git a/block/gluster.c b/block/gluster.c
-index 3ba9bbfa5e..34936eb855 100644
+index 93da76bc31..1079b6186b 100644
 --- a/block/gluster.c
 +++ b/block/gluster.c
-@@ -58,6 +58,7 @@ typedef struct GlusterAIOCB {
+@@ -57,6 +57,7 @@ typedef struct GlusterAIOCB {
     int ret;
     Coroutine *coroutine;
     AioContext *aio_context;
@@ -27,7 +27,7 @@ index 3ba9bbfa5e..34936eb855 100644
 } GlusterAIOCB;
 
 typedef struct BDRVGlusterState {
-@@ -753,8 +754,10 @@ static void gluster_finish_aiocb(struct glfs_fd *fd, ssize_t ret,
+@@ -752,8 +753,10 @@ static void gluster_finish_aiocb(struct glfs_fd *fd, ssize_t ret,
         acb->ret = 0; /* Success */
     } else if (ret < 0) {
         acb->ret = -errno; /* Read/Write failed */
@@ -39,7 +39,7 @@ index 3ba9bbfa5e..34936eb855 100644
     }
 
     aio_co_schedule(acb->aio_context, acb->coroutine);
-@@ -1023,6 +1026,7 @@ static coroutine_fn int qemu_gluster_co_pwrite_zeroes(BlockDriverState *bs,
+@@ -1022,6 +1025,7 @@ static coroutine_fn int qemu_gluster_co_pwrite_zeroes(BlockDriverState *bs,
     acb.ret = 0;
     acb.coroutine = qemu_coroutine_self();
     acb.aio_context = bdrv_get_aio_context(bs);
@@ -59,7 +59,7 @@ index 3ba9bbfa5e..34936eb855 100644
         ret = glfs_preadv_async(s->fd, qiov->iov, qiov->niov, offset, 0,
                                 gluster_finish_aiocb, &acb);
     }
-@@ -1268,6 +1274,7 @@ static coroutine_fn int qemu_gluster_co_flush_to_disk(BlockDriverState *bs)
+@@ -1269,6 +1275,7 @@ static coroutine_fn int qemu_gluster_co_flush_to_disk(BlockDriverState *bs)
     acb.ret = 0;
     acb.coroutine = qemu_coroutine_self();
     acb.aio_context = bdrv_get_aio_context(bs);
@@ -67,7 +67,7 @@ index 3ba9bbfa5e..34936eb855 100644
 
     ret = glfs_fsync_async(s->fd, gluster_finish_aiocb, &acb);
     if (ret < 0) {
-@@ -1316,6 +1323,7 @@ static coroutine_fn int qemu_gluster_co_pdiscard(BlockDriverState *bs,
+@@ -1317,6 +1324,7 @@ static coroutine_fn int qemu_gluster_co_pdiscard(BlockDriverState *bs,
     acb.ret = 0;
     acb.coroutine = qemu_coroutine_self();
     acb.aio_context = bdrv_get_aio_context(bs);
--- a/debian/patches/pve/0009-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch
+++ b/debian/patches/pve/0009-PVE-Up-qemu-img-return-success-on-info-without-snaps.patch
@@ -9,10 +9,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 2 insertions(+), 1 deletion(-)

 diff --git a/qemu-img.c b/qemu-img.c
-index 7668f86769..2575e97b43 100644
+index 7d4b33b3da..bb36f42dd2 100644
 --- a/qemu-img.c
 +++ b/qemu-img.c
-@@ -3075,7 +3075,8 @@ static int img_info(int argc, char **argv)
+@@ -3010,7 +3010,8 @@ static int img_info(int argc, char **argv)
     list = collect_image_info_list(image_opts, filename, fmt, chain,
                                    force_share);
     if (!list) {
--- a/debian/patches/pve/0010-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch
+++ b/debian/patches/pve/0010-PVE-Up-qemu-img-dd-add-osize-and-read-from-to-stdin-.patch
@@ -38,10 +38,10 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 2 files changed, 133 insertions(+), 73 deletions(-)

 diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx
-index c9dd70a892..048788b23d 100644
+index 1b1dab5b17..d1616c045a 100644
 --- a/qemu-img-cmds.hx
 +++ b/qemu-img-cmds.hx
-@@ -60,9 +60,9 @@ SRST
+@@ -58,9 +58,9 @@ SRST
 ERST
 
 DEF("dd", img_dd,
@@ -54,10 +54,10 @@ index c9dd70a892..048788b23d 100644
 
 DEF("info", img_info,
 diff --git a/qemu-img.c b/qemu-img.c
-index 2575e97b43..8ec68b346f 100644
+index bb36f42dd2..74afcb79ef 100644
 --- a/qemu-img.c
 +++ b/qemu-img.c
-@@ -4993,10 +4993,12 @@ static int img_bitmap(int argc, char **argv)
+@@ -4826,10 +4826,12 @@ static int img_bitmap(int argc, char **argv)
 #define C_IF      04
 #define C_OF      010
 #define C_SKIP    020
@@ -70,7 +70,7 @@ index 2575e97b43..8ec68b346f 100644
 };
 
 struct DdIo {
-@@ -5072,6 +5074,19 @@ static int img_dd_skip(const char *arg,
+@@ -4905,6 +4907,19 @@ static int img_dd_skip(const char *arg,
     return 0;
 }
 
@@ -90,7 +90,7 @@ index 2575e97b43..8ec68b346f 100644
 static int img_dd(int argc, char **argv)
 {
     int ret = 0;
-@@ -5112,6 +5127,7 @@ static int img_dd(int argc, char **argv)
+@@ -4945,6 +4960,7 @@ static int img_dd(int argc, char **argv)
         { "if", img_dd_if, C_IF },
         { "of", img_dd_of, C_OF },
         { "skip", img_dd_skip, C_SKIP },
@@ -98,7 +98,7 @@ index 2575e97b43..8ec68b346f 100644
         { NULL, NULL, 0 }
     };
     const struct option long_options[] = {
-@@ -5187,91 +5203,112 @@ static int img_dd(int argc, char **argv)
+@@ -5020,91 +5036,112 @@ static int img_dd(int argc, char **argv)
         arg = NULL;
     }
 
@@ -275,10 +275,10 @@ index 2575e97b43..8ec68b346f 100644
     }
 
     if (dd.flags & C_SKIP && (in.offset > INT64_MAX / in.bsz ||
-@@ -5288,20 +5325,43 @@ static int img_dd(int argc, char **argv)
+@@ -5121,20 +5158,43 @@ static int img_dd(int argc, char **argv)
     in.buf = g_new(uint8_t, in.bsz);
 
-     for (out_pos = 0; in_pos < size; ) {
+     for (out_pos = 0; in_pos < size; block_count++) {
 +        int in_ret, out_ret;
         int bytes = (in_pos + in.bsz > size) ? size - in_pos : in.bsz;
 -
--- a/debian/patches/pve/0011-PVE-Up-qemu-img-dd-add-isize-parameter.patch
+++ b/debian/patches/pve/0011-PVE-Up-qemu-img-dd-add-isize-parameter.patch
@@ -16,10 +16,10 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 1 file changed, 25 insertions(+), 3 deletions(-)

 diff --git a/qemu-img.c b/qemu-img.c
-index 8ec68b346f..b98184bba1 100644
+index 74afcb79ef..14594d44b6 100644
 --- a/qemu-img.c
 +++ b/qemu-img.c
-@@ -4994,11 +4994,13 @@ static int img_bitmap(int argc, char **argv)
+@@ -4827,11 +4827,13 @@ static int img_bitmap(int argc, char **argv)
 #define C_OF      010
 #define C_SKIP    020
 #define C_OSIZE   040
@@ -33,7 +33,7 @@ index 8ec68b346f..b98184bba1 100644
 };
 
 struct DdIo {
-@@ -5087,6 +5089,19 @@ static int img_dd_osize(const char *arg,
+@@ -4920,6 +4922,19 @@ static int img_dd_osize(const char *arg,
     return 0;
 }
 
@@ -53,13 +53,13 @@ index 8ec68b346f..b98184bba1 100644
 static int img_dd(int argc, char **argv)
 {
     int ret = 0;
-@@ -5101,12 +5116,14 @@ static int img_dd(int argc, char **argv)
+@@ -4934,12 +4949,14 @@ static int img_dd(int argc, char **argv)
     int c, i;
     const char *out_fmt = "raw";
     const char *fmt = NULL;
 -    int64_t size = 0;
 +    int64_t size = 0, readsize = 0;
-     int64_t out_pos, in_pos;
+     int64_t block_count = 0, out_pos, in_pos;
     bool force_share = false;
     struct DdInfo dd = {
         .flags = 0,
@@ -69,7 +69,7 @@ index 8ec68b346f..b98184bba1 100644
     };
     struct DdIo in = {
         .bsz = 512, /* Block size is by default 512 bytes */
-@@ -5128,6 +5145,7 @@ static int img_dd(int argc, char **argv)
+@@ -4961,6 +4978,7 @@ static int img_dd(int argc, char **argv)
         { "of", img_dd_of, C_OF },
         { "skip", img_dd_skip, C_SKIP },
         { "osize", img_dd_osize, C_OSIZE },
@@ -77,20 +77,20 @@ index 8ec68b346f..b98184bba1 100644
         { NULL, NULL, 0 }
     };
     const struct option long_options[] = {
-@@ -5324,9 +5342,10 @@ static int img_dd(int argc, char **argv)
+@@ -5157,9 +5175,10 @@ static int img_dd(int argc, char **argv)
 
     in.buf = g_new(uint8_t, in.bsz);
 
-    for (out_pos = 0; in_pos < size; ) {
+-    for (out_pos = 0; in_pos < size; block_count++) {
 +    readsize = (dd.isize > 0) ? dd.isize : size;
-+    for (out_pos = 0; in_pos < readsize; ) {
+    for (out_pos = 0; in_pos < readsize; block_count++) {
         int in_ret, out_ret;
 -        int bytes = (in_pos + in.bsz > size) ? size - in_pos : in.bsz;
 +        int bytes = (in_pos + in.bsz > readsize) ? readsize - in_pos : in.bsz;
         if (blk1) {
             in_ret = blk_pread(blk1, in_pos, bytes, in.buf, 0);
             if (in_ret == 0) {
-@@ -5335,6 +5354,9 @@ static int img_dd(int argc, char **argv)
+@@ -5168,6 +5187,9 @@ static int img_dd(int argc, char **argv)
         } else {
             in_ret = read(STDIN_FILENO, in.buf, bytes);
             if (in_ret == 0) {
--- a/debian/patches/pve/0012-PVE-Up-qemu-img-dd-add-n-skip_create.patch
+++ b/debian/patches/pve/0012-PVE-Up-qemu-img-dd-add-n-skip_create.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PVE: [Up] qemu-img dd: add -n skip_create

 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 [FE: fix getopt-string + add documentation]
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
 ---
 docs/tools/qemu-img.rst | 11 ++++++++++-
 qemu-img-cmds.hx        |  4 ++--
@@ -13,10 +13,10 @@ Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 3 files changed, 26 insertions(+), 12 deletions(-)

 diff --git a/docs/tools/qemu-img.rst b/docs/tools/qemu-img.rst
-index 3653adb963..d83e8fb3c0 100644
+index 85a6e05b35..699229eef6 100644
 --- a/docs/tools/qemu-img.rst
 +++ b/docs/tools/qemu-img.rst
-@@ -212,6 +212,10 @@ Parameters to convert subcommand:
+@@ -208,6 +208,10 @@ Parameters to convert subcommand:
 
 Parameters to dd subcommand:
 
@@ -27,7 +27,7 @@ index 3653adb963..d83e8fb3c0 100644
 .. program:: qemu-img-dd
 
 .. option:: bs=BLOCK_SIZE
-@@ -492,7 +496,7 @@ Command description:
+@@ -488,7 +492,7 @@ Command description:
   it doesn't need to be specified separately in this case.
 
 
@@ -36,7 +36,7 @@ index 3653adb963..d83e8fb3c0 100644
 
   dd copies from *INPUT* file to *OUTPUT* file converting it from
   *FMT* format to *OUTPUT_FMT* format.
-@@ -503,6 +507,11 @@ Command description:
+@@ -499,6 +503,11 @@ Command description:
 
   The size syntax is similar to :manpage:`dd(1)`'s size syntax.
 
@@ -49,10 +49,10 @@ index 3653adb963..d83e8fb3c0 100644
 
   Give information about the disk image *FILENAME*. Use it in
 diff --git a/qemu-img-cmds.hx b/qemu-img-cmds.hx
-index 048788b23d..0b29a67a06 100644
+index d1616c045a..b5b0bb4467 100644
 --- a/qemu-img-cmds.hx
 +++ b/qemu-img-cmds.hx
-@@ -60,9 +60,9 @@ SRST
+@@ -58,9 +58,9 @@ SRST
 ERST
 
 DEF("dd", img_dd,
@@ -65,19 +65,19 @@ index 048788b23d..0b29a67a06 100644
 
 DEF("info", img_info,
 diff --git a/qemu-img.c b/qemu-img.c
-index b98184bba1..6fc8384f64 100644
+index 14594d44b6..c6b4a5567d 100644
 --- a/qemu-img.c
 +++ b/qemu-img.c
-@@ -5118,7 +5118,7 @@ static int img_dd(int argc, char **argv)
+@@ -4951,7 +4951,7 @@ static int img_dd(int argc, char **argv)
     const char *fmt = NULL;
     int64_t size = 0, readsize = 0;
-     int64_t out_pos, in_pos;
+     int64_t block_count = 0, out_pos, in_pos;
 -    bool force_share = false;
 +    bool force_share = false, skip_create = false;
     struct DdInfo dd = {
         .flags = 0,
         .count = 0,
-@@ -5156,7 +5156,7 @@ static int img_dd(int argc, char **argv)
+@@ -4989,7 +4989,7 @@ static int img_dd(int argc, char **argv)
         { 0, 0, 0, 0 }
     };
 
@@ -86,7 +86,7 @@ index b98184bba1..6fc8384f64 100644
         if (c == EOF) {
             break;
         }
-@@ -5176,6 +5176,9 @@ static int img_dd(int argc, char **argv)
+@@ -5009,6 +5009,9 @@ static int img_dd(int argc, char **argv)
         case 'h':
             help();
             break;
@@ -96,7 +96,7 @@ index b98184bba1..6fc8384f64 100644
         case 'U':
             force_share = true;
             break;
-@@ -5306,13 +5309,15 @@ static int img_dd(int argc, char **argv)
+@@ -5139,13 +5142,15 @@ static int img_dd(int argc, char **argv)
                                 size - in.bsz * in.offset, &error_abort);
         }
 
--- a/debian/patches/pve/0013-PVE-virtio-balloon-improve-query-balloon.patch
+++ b/debian/patches/pve/0013-PVE-virtio-balloon-improve-query-balloon.patch
@@ -7,62 +7,17 @@ Actually provide memory information via the query-balloon
 command.

 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
-[FE: add BalloonInfo to member name exceptions list
-     rebase for 8.0 - moved to hw/core/machine-hmp-cmds.c]
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 ---
- hw/core/machine-hmp-cmds.c | 30 +++++++++++++++++++++++++++++-
 hw/virtio/virtio-balloon.c | 33 +++++++++++++++++++++++++++++++--
+ monitor/hmp-cmds.c         | 30 +++++++++++++++++++++++++++++-
 qapi/machine.json          | 22 +++++++++++++++++++++-
- qapi/pragma.json           |  1 +
- 4 files changed, 82 insertions(+), 4 deletions(-)
+ 3 files changed, 81 insertions(+), 4 deletions(-)

-diff --git a/hw/core/machine-hmp-cmds.c b/hw/core/machine-hmp-cmds.c
-index a6ff6a4875..e7f74d1c63 100644
--- a/hw/core/machine-hmp-cmds.c
-+++ b/hw/core/machine-hmp-cmds.c
-@@ -175,7 +175,35 @@ void hmp_info_balloon(Monitor *mon, const QDict *qdict)
-         return;
-     }
- 
-    monitor_printf(mon, "balloon: actual=%" PRId64 "\n", info->actual >> 20);
-+    monitor_printf(mon, "balloon: actual=%" PRId64, info->actual >> 20);
-+    monitor_printf(mon, " max_mem=%" PRId64, info->max_mem >> 20);
-+    if (info->has_total_mem) {
-+        monitor_printf(mon, " total_mem=%" PRId64, info->total_mem >> 20);
-+    }
-+    if (info->has_free_mem) {
-+        monitor_printf(mon, " free_mem=%" PRId64, info->free_mem >> 20);
-+    }
-+
-+    if (info->has_mem_swapped_in) {
-+        monitor_printf(mon, " mem_swapped_in=%" PRId64, info->mem_swapped_in);
-+    }
-+    if (info->has_mem_swapped_out) {
-+        monitor_printf(mon, " mem_swapped_out=%" PRId64, info->mem_swapped_out);
-+    }
-+    if (info->has_major_page_faults) {
-+        monitor_printf(mon, " major_page_faults=%" PRId64,
-+                       info->major_page_faults);
-+    }
-+    if (info->has_minor_page_faults) {
-+        monitor_printf(mon, " minor_page_faults=%" PRId64,
-+                       info->minor_page_faults);
-+    }
-+    if (info->has_last_update) {
-+        monitor_printf(mon, " last_update=%" PRId64,
-+                       info->last_update);
-+    }
-+
-+    monitor_printf(mon, "\n");
- 
-     qapi_free_BalloonInfo(info);
- }
 diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
-index 609e39a821..8cb6dfcac3 100644
+index 73ac5eb675..bbfe7eca62 100644
 --- a/hw/virtio/virtio-balloon.c
 +++ b/hw/virtio/virtio-balloon.c
-@@ -781,8 +781,37 @@ static uint64_t virtio_balloon_get_features(VirtIODevice *vdev, uint64_t f,
+@@ -806,8 +806,37 @@ static uint64_t virtio_balloon_get_features(VirtIODevice *vdev, uint64_t f,
 static void virtio_balloon_stat(void *opaque, BalloonInfo *info)
 {
     VirtIOBalloon *dev = opaque;
@@ -102,13 +57,54 @@ index 609e39a821..8cb6dfcac3 100644
 }
 
 static void virtio_balloon_to_target(void *opaque, ram_addr_t target)
+diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
+index c6cd6f91dd..15572befb1 100644
+--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
+@@ -715,7 +715,35 @@ void hmp_info_balloon(Monitor *mon, const QDict *qdict)
+         return;
+     }
+ 
+-    monitor_printf(mon, "balloon: actual=%" PRId64 "\n", info->actual >> 20);
+    monitor_printf(mon, "balloon: actual=%" PRId64, info->actual >> 20);
+    monitor_printf(mon, " max_mem=%" PRId64, info->max_mem >> 20);
+    if (info->has_total_mem) {
+        monitor_printf(mon, " total_mem=%" PRId64, info->total_mem >> 20);
+    }
+    if (info->has_free_mem) {
+        monitor_printf(mon, " free_mem=%" PRId64, info->free_mem >> 20);
+    }
+
+    if (info->has_mem_swapped_in) {
+        monitor_printf(mon, " mem_swapped_in=%" PRId64, info->mem_swapped_in);
+    }
+    if (info->has_mem_swapped_out) {
+        monitor_printf(mon, " mem_swapped_out=%" PRId64, info->mem_swapped_out);
+    }
+    if (info->has_major_page_faults) {
+        monitor_printf(mon, " major_page_faults=%" PRId64,
+                       info->major_page_faults);
+    }
+    if (info->has_minor_page_faults) {
+        monitor_printf(mon, " minor_page_faults=%" PRId64,
+                       info->minor_page_faults);
+    }
+    if (info->has_last_update) {
+        monitor_printf(mon, " last_update=%" PRId64,
+                       info->last_update);
+    }
+
+    monitor_printf(mon, "\n");
+ 
+     qapi_free_BalloonInfo(info);
+ }
 diff --git a/qapi/machine.json b/qapi/machine.json
-index e8b60641f2..2054cdc70d 100644
+index 6afd1936b0..8b4be9b718 100644
 --- a/qapi/machine.json
 +++ b/qapi/machine.json
-@@ -1079,9 +1079,29 @@
- # @actual: the logical size of the VM in bytes Formula used:
- #     logical_vm_size = vm_ram_size - balloon_size
+@@ -1054,9 +1054,29 @@
+ # @actual: the logical size of the VM in bytes
+ #          Formula used: logical_vm_size = vm_ram_size - balloon_size
 #
 +# @last_update: time when stats got updated from guest
 +#
@@ -137,15 +133,3 @@ index e8b60641f2..2054cdc70d 100644
 
 ##
 # @query-balloon:
-diff --git a/qapi/pragma.json b/qapi/pragma.json
-index 59fbe74b8c..be8fa304c5 100644
--- a/qapi/pragma.json
-+++ b/qapi/pragma.json
-@@ -90,6 +90,7 @@
-     'member-name-exceptions': [     # visible in:
-         'ACPISlotType',             # query-acpi-ospm-status
-         'AcpiTableOptions',         # -acpitable
-+        'BalloonInfo',              # query-balloon
-         'BlkdebugEvent',            # blockdev-add, -blockdev
-         'BlkdebugSetStateOptions',  # blockdev-add, -blockdev
-         'BlockDeviceInfo',          # query-block
--- a/debian/patches/pve/0014-PVE-qapi-modify-query-machines.patch
+++ b/debian/patches/pve/0014-PVE-qapi-modify-query-machines.patch
@@ -13,13 +13,13 @@ Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
 2 files changed, 9 insertions(+), 1 deletion(-)

 diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c
-index 4b72009cd3..314351cdff 100644
+index 4f4ab30f8c..76fff60a6b 100644
 --- a/hw/core/machine-qmp-cmds.c
 +++ b/hw/core/machine-qmp-cmds.c
-@@ -90,6 +90,12 @@ MachineInfoList *qmp_query_machines(Error **errp)
+@@ -99,6 +99,12 @@ MachineInfoList *qmp_query_machines(Error **errp)
+         info->hotpluggable_cpus = mc->has_hotpluggable_cpus;
         info->numa_mem_supported = mc->numa_mem_supported;
         info->deprecated = !!mc->deprecation_reason;
-         info->acpi = !!object_class_property_find(OBJECT_CLASS(mc), "acpi");
 +
 +        if (strcmp(mc->name, MACHINE_GET_CLASS(current_machine)->name) == 0) {
 +            info->has_is_current = true;
@@ -28,21 +28,21 @@ index 4b72009cd3..314351cdff 100644
 +
         if (mc->default_cpu_type) {
             info->default_cpu_type = g_strdup(mc->default_cpu_type);
-         }
+             info->has_default_cpu_type = true;
 diff --git a/qapi/machine.json b/qapi/machine.json
-index 2054cdc70d..a024d5b05d 100644
+index 8b4be9b718..555458f785 100644
 --- a/qapi/machine.json
 +++ b/qapi/machine.json
-@@ -146,6 +146,8 @@
+@@ -138,6 +138,8 @@
 #
 # @is-default: whether the machine is default
 #
 +# @is-current: whether this machine is currently used
 +#
 # @cpu-max: maximum number of CPUs supported by the machine type
- #     (since 1.5)
+ #           (since 1.5)
 #
-@@ -170,7 +172,7 @@
+@@ -159,7 +161,7 @@
 ##
 { 'struct': 'MachineInfo',
   'data': { 'name': 'str', '*alias': 'str',
@@ -50,4 +50,4 @@ index 2054cdc70d..a024d5b05d 100644
 +            '*is-default': 'bool', '*is-current': 'bool', 'cpu-max': 'int',
             'hotpluggable-cpus': 'bool',  'numa-mem-supported': 'bool',
             'deprecated': 'bool', '*default-cpu-type': 'str',
-             '*default-ram-id': 'str', 'acpi': 'bool' } }
+             '*default-ram-id': 'str' } }
--- a/debian/patches/pve/0015-PVE-qapi-modify-spice-query.patch
+++ b/debian/patches/pve/0015-PVE-qapi-modify-spice-query.patch
@@ -6,18 +6,16 @@ Subject: [PATCH] PVE: qapi: modify spice query
 Provide the last ticket in the SpiceInfo struct optionally.

 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
-[FE: adapt to QAPI change]
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 ---
 qapi/ui.json    | 3 +++
- ui/spice-core.c | 4 ++++
- 2 files changed, 7 insertions(+)
+ ui/spice-core.c | 5 +++++
+ 2 files changed, 8 insertions(+)

 diff --git a/qapi/ui.json b/qapi/ui.json
-index f610bce118..6ea26a9acb 100644
+index cf58ab4283..0be2388941 100644
 --- a/qapi/ui.json
 +++ b/qapi/ui.json
-@@ -314,11 +314,14 @@
+@@ -310,11 +310,14 @@
 #
 # @channels: a list of @SpiceChannel for each active spice channel
 #
@@ -33,14 +31,15 @@ index f610bce118..6ea26a9acb 100644
   'if': 'CONFIG_SPICE' }
 
 diff --git a/ui/spice-core.c b/ui/spice-core.c
-index ea20e6153c..55a15fba8b 100644
+index 37774f1c0a..367f77f2b4 100644
 --- a/ui/spice-core.c
 +++ b/ui/spice-core.c
-@@ -548,6 +548,10 @@ static SpiceInfo *qmp_query_spice_real(Error **errp)
+@@ -534,6 +534,11 @@ static SpiceInfo *qmp_query_spice_real(Error **errp)
     micro = SPICE_SERVER_VERSION & 0xff;
     info->compiled_version = g_strdup_printf("%d.%d.%d", major, minor, micro);
 
 +    if (auth_passwd) {
+        info->has_ticket = true;
 +        info->ticket =  g_strdup(auth_passwd);
 +    }
 +
--- a/debian/patches/pve/0016-PVE-add-IOChannel-implementation-for-savevm-async.patch
+++ b/debian/patches/pve/0016-PVE-add-IOChannel-implementation-for-savevm-async.patch
@@ -14,21 +14,20 @@ Additionally, allows tracking the current position from the outside
 (intended to be used for progress tracking).

 Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
- migration/channel-savevm-async.c | 184 +++++++++++++++++++++++++++++++
+ migration/channel-savevm-async.c | 182 +++++++++++++++++++++++++++++++
 migration/channel-savevm-async.h |  51 +++++++++
 migration/meson.build            |   1 +
- 3 files changed, 236 insertions(+)
+ 3 files changed, 234 insertions(+)
 create mode 100644 migration/channel-savevm-async.c
 create mode 100644 migration/channel-savevm-async.h

 diff --git a/migration/channel-savevm-async.c b/migration/channel-savevm-async.c
 new file mode 100644
-index 0000000000..081a192f49
+index 0000000000..06d5484778
 --- /dev/null
 +++ b/migration/channel-savevm-async.c
-@@ -0,0 +1,184 @@
+@@ -0,0 +1,182 @@
 +/*
 + * QIO Channel implementation to be used by savevm-async QMP calls
 + */
@@ -72,7 +71,6 @@ index 0000000000..081a192f49
 +                               size_t niov,
 +                               int **fds,
 +                               size_t *nfds,
-+                               int flags,
 +                               Error **errp)
 +{
 +    QIOChannelSavevmAsync *saioc = QIO_CHANNEL_SAVEVM_ASYNC(ioc);
@@ -175,9 +173,8 @@ index 0000000000..081a192f49
 +
 +static void
 +qio_channel_savevm_async_set_aio_fd_handler(QIOChannel *ioc,
-+                                            AioContext *read_ctx,
+                                            AioContext *ctx,
 +                                            IOHandler *io_read,
-+                                            AioContext *write_ctx,
 +                                            IOHandler *io_write,
 +                                            void *opaque)
 +{
@@ -271,14 +268,14 @@ index 0000000000..17ae2cb261
 +
 +#endif /* QIO_CHANNEL_SAVEVM_ASYNC_H */
 diff --git a/migration/meson.build b/migration/meson.build
-index 1eeb915ff6..95d1cf2250 100644
+index 690487cf1a..8cac83c06c 100644
 --- a/migration/meson.build
 +++ b/migration/meson.build
-@@ -13,6 +13,7 @@ system_ss.add(files(
+@@ -13,6 +13,7 @@ softmmu_ss.add(files(
   'block-dirty-bitmap.c',
   'channel.c',
   'channel-block.c',
 +  'channel-savevm-async.c',
-   'dirtyrate.c',
+   'colo-failover.c',
+   'colo.c',
   'exec.c',
-   'fd.c',
--- a/debian/patches/pve/0017-PVE-add-savevm-async-for-background-state-snapshots.patch
+++ b/debian/patches/pve/0017-PVE-add-savevm-async-for-background-state-snapshots.patch
@@ -21,36 +21,31 @@ still opened by QEMU.
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
 Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
-[SR: improve aborting
-     register yank before migration_incoming_state_destroy]
+[improve aborting]
 Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
 [FE: further improve aborting
-     adapt to removal of QEMUFileOps
-     improve condition for entering final stage
-     adapt to QAPI and other changes for 8.2
-     make sure to not call vm_start() from coroutine
-     stop CPU throttling after finishing]
+     adapt to removal of QEMUFileOps]
 Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 ---
 hmp-commands-info.hx         |  13 +
- hmp-commands.hx              |  17 ++
+ hmp-commands.hx              |  33 +++
 include/migration/snapshot.h |   2 +
- include/monitor/hmp.h        |   3 +
+ include/monitor/hmp.h        |   5 +
 migration/meson.build        |   1 +
- migration/savevm-async.c     | 545 +++++++++++++++++++++++++++++++++++
- monitor/hmp-cmds.c           |  38 +++
+ migration/savevm-async.c     | 531 +++++++++++++++++++++++++++++++++++
+ monitor/hmp-cmds.c           |  57 ++++
 qapi/migration.json          |  34 +++
- qapi/misc.json               |  18 ++
+ qapi/misc.json               |  32 +++
 qemu-options.hx              |  12 +
- system/vl.c                  |  10 +
- 11 files changed, 693 insertions(+)
+ softmmu/vl.c                 |  10 +
+ 11 files changed, 730 insertions(+)
 create mode 100644 migration/savevm-async.c

 diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx
-index ad1b1306e3..d5ab880492 100644
+index 188d9ece3b..97b88eaaad 100644
 --- a/hmp-commands-info.hx
 +++ b/hmp-commands-info.hx
-@@ -525,6 +525,19 @@ SRST
+@@ -538,6 +538,19 @@ SRST
     Show current migration parameters.
 ERST
 
@@ -71,13 +66,13 @@ index ad1b1306e3..d5ab880492 100644
         .name       = "balloon",
         .args_type  = "",
 diff --git a/hmp-commands.hx b/hmp-commands.hx
-index 2e2a3bcf98..7506de251c 100644
+index 182e639d14..bbcc73e942 100644
 --- a/hmp-commands.hx
 +++ b/hmp-commands.hx
-@@ -1862,3 +1862,20 @@ SRST
-   List event channels in the guest
- ERST
- #endif
+@@ -1800,3 +1800,36 @@ ERST
+                       "\n\t\t\t\t\t limit on a specified virtual cpu",
+         .cmd        = hmp_cancel_vcpu_dirty_limit,
+     },
 +
 +    {
 +        .name       = "savevm-start",
@@ -88,6 +83,22 @@ index 2e2a3bcf98..7506de251c 100644
 +    },
 +
 +    {
+        .name       = "snapshot-drive",
+        .args_type  = "device:s,name:s",
+        .params     = "device name",
+        .help       = "Create internal snapshot.",
+        .cmd = hmp_snapshot_drive,
+    },
+
+    {
+        .name       = "delete-drive-snapshot",
+        .args_type  = "device:s,name:s",
+        .params     = "device name",
+        .help       = "Delete internal snapshot.",
+        .cmd = hmp_delete_drive_snapshot,
+    },
+
+    {
 +        .name       = "savevm-end",
 +        .args_type  = "",
 +        .params     = "",
@@ -96,21 +107,21 @@ index 2e2a3bcf98..7506de251c 100644
 +        .coroutine  = true,
 +    },
 diff --git a/include/migration/snapshot.h b/include/migration/snapshot.h
-index 9e4dcaaa75..2581730d74 100644
+index e72083b117..c846d37806 100644
 --- a/include/migration/snapshot.h
 +++ b/include/migration/snapshot.h
-@@ -68,4 +68,6 @@ bool delete_snapshot(const char *name,
-  */
- void load_snapshot_resume(RunState state);
+@@ -61,4 +61,6 @@ bool delete_snapshot(const char *name,
+                     bool has_devices, strList *devices,
+                     Error **errp);
 
 +int load_snapshot_from_blockdev(const char *filename, Error **errp);
 +
 #endif
 diff --git a/include/monitor/hmp.h b/include/monitor/hmp.h
-index 13f9a2dedb..7a7def7530 100644
+index a618eb1e4e..55067beff1 100644
 --- a/include/monitor/hmp.h
 +++ b/include/monitor/hmp.h
-@@ -28,6 +28,7 @@ void hmp_info_status(Monitor *mon, const QDict *qdict);
+@@ -26,6 +26,7 @@ void hmp_info_status(Monitor *mon, const QDict *qdict);
 void hmp_info_uuid(Monitor *mon, const QDict *qdict);
 void hmp_info_chardev(Monitor *mon, const QDict *qdict);
 void hmp_info_mice(Monitor *mon, const QDict *qdict);
@@ -118,44 +129,43 @@ index 13f9a2dedb..7a7def7530 100644
 void hmp_info_migrate(Monitor *mon, const QDict *qdict);
 void hmp_info_migrate_capabilities(Monitor *mon, const QDict *qdict);
 void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict);
-@@ -94,6 +95,8 @@ void hmp_closefd(Monitor *mon, const QDict *qdict);
- void hmp_mouse_move(Monitor *mon, const QDict *qdict);
- void hmp_mouse_button(Monitor *mon, const QDict *qdict);
- void hmp_mouse_set(Monitor *mon, const QDict *qdict);
+@@ -80,6 +81,10 @@ void hmp_netdev_add(Monitor *mon, const QDict *qdict);
+ void hmp_netdev_del(Monitor *mon, const QDict *qdict);
+ void hmp_getfd(Monitor *mon, const QDict *qdict);
+ void hmp_closefd(Monitor *mon, const QDict *qdict);
 +void hmp_savevm_start(Monitor *mon, const QDict *qdict);
+void hmp_snapshot_drive(Monitor *mon, const QDict *qdict);
+void hmp_delete_drive_snapshot(Monitor *mon, const QDict *qdict);
 +void hmp_savevm_end(Monitor *mon, const QDict *qdict);
 void hmp_sendkey(Monitor *mon, const QDict *qdict);
- void coroutine_fn hmp_screendump(Monitor *mon, const QDict *qdict);
+ void hmp_screendump(Monitor *mon, const QDict *qdict);
 void hmp_chardev_add(Monitor *mon, const QDict *qdict);
 diff --git a/migration/meson.build b/migration/meson.build
-index 95d1cf2250..800f12a60d 100644
+index 8cac83c06c..0842d00cd2 100644
 --- a/migration/meson.build
 +++ b/migration/meson.build
-@@ -28,6 +28,7 @@ system_ss.add(files(
-   'options.c',
+@@ -24,6 +24,7 @@ softmmu_ss.add(files(
+   'multifd-zlib.c',
   'postcopy-ram.c',
   'savevm.c',
 +  'savevm-async.c',
   'socket.c',
   'tls.c',
-   'threadinfo.c',
+ ), gnutls)
 diff --git a/migration/savevm-async.c b/migration/savevm-async.c
 new file mode 100644
-index 0000000000..1af32604c7
+index 0000000000..05d394c0e2
 --- /dev/null
 +++ b/migration/savevm-async.c
-@@ -0,0 +1,545 @@
+@@ -0,0 +1,531 @@
 +#include "qemu/osdep.h"
 +#include "migration/channel-savevm-async.h"
 +#include "migration/migration.h"
-+#include "migration/migration-stats.h"
-+#include "migration/options.h"
 +#include "migration/savevm.h"
 +#include "migration/snapshot.h"
 +#include "migration/global_state.h"
 +#include "migration/ram.h"
 +#include "migration/qemu-file.h"
-+#include "sysemu/cpu-throttle.h"
 +#include "sysemu/sysemu.h"
 +#include "sysemu/runstate.h"
 +#include "block/block.h"
@@ -170,7 +180,6 @@ index 0000000000..1af32604c7
 +#include "qemu/timer.h"
 +#include "qemu/main-loop.h"
 +#include "qemu/rcu.h"
-+#include "qemu/yank.h"
 +
 +/* #define DEBUG_SAVEVM_STATE */
 +
@@ -221,20 +230,24 @@ index 0000000000..1af32604c7
 +        info->bytes = s->bs_pos;
 +        switch (s->state) {
 +        case SAVE_STATE_ERROR:
+            info->has_status = true;
 +            info->status = g_strdup("failed");
 +            info->has_total_time = true;
 +            info->total_time = s->total_time;
 +            if (s->error) {
+                info->has_error = true;
 +                info->error = g_strdup(error_get_pretty(s->error));
 +            }
 +            break;
 +        case SAVE_STATE_ACTIVE:
+            info->has_status = true;
 +            info->status = g_strdup("active");
 +            info->has_total_time = true;
 +            info->total_time = qemu_clock_get_ms(QEMU_CLOCK_REALTIME)
 +                - s->total_time;
 +            break;
 +        case SAVE_STATE_COMPLETED:
+            info->has_status = true;
 +            info->status = g_strdup("completed");
 +            info->has_total_time = true;
 +            info->total_time = s->total_time;
@@ -280,7 +293,7 @@ index 0000000000..1af32604c7
 +    return ret;
 +}
 +
-+static void G_GNUC_PRINTF(1, 2) save_snapshot_error(const char *fmt, ...)
+static void save_snapshot_error(const char *fmt, ...)
 +{
 +    va_list ap;
 +    char *msg;
@@ -303,6 +316,7 @@ index 0000000000..1af32604c7
 +static void process_savevm_finalize(void *opaque)
 +{
 +    int ret;
+    AioContext *iohandler_ctx = iohandler_get_aio_context();
 +    MigrationState *ms = migrate_get_current();
 +
 +    bool aborted = savevm_aborted();
@@ -319,7 +333,9 @@ index 0000000000..1af32604c7
 +     * so move it back. It can stay in the main context and live out its live
 +     * there, since we're done with it after this method ends anyway.
 +     */
+    aio_context_acquire(iohandler_ctx);
 +    blk_set_aio_context(snap_state.target, qemu_get_aio_context(), NULL);
+    aio_context_release(iohandler_ctx);
 +
 +    ret = vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
 +    if (ret < 0) {
@@ -331,7 +347,7 @@ index 0000000000..1af32604c7
 +        (void)qemu_savevm_state_complete_precopy(snap_state.file, false, false);
 +        ret = qemu_file_get_error(snap_state.file);
 +        if (ret < 0) {
-+            save_snapshot_error("qemu_savevm_state_complete_precopy error %d", ret);
+                save_snapshot_error("qemu_savevm_state_iterate error %d", ret);
 +        }
 +    }
 +
@@ -344,12 +360,6 @@ index 0000000000..1af32604c7
 +        ret || aborted ? MIGRATION_STATUS_FAILED : MIGRATION_STATUS_COMPLETED);
 +    ms->to_dst_file = NULL;
 +
-+    /*
-+     * Same as in migration_iteration_finish(): saving RAM might've turned on CPU throttling for
-+     * auto-converge, make sure to disable it.
-+     */
-+    cpu_throttle_stop();
-+
 +    qemu_savevm_state_cleanup();
 +
 +    ret = save_snapshot_cleanup();
@@ -394,32 +404,18 @@ index 0000000000..1af32604c7
 +    }
 +
 +    while (snap_state.state == SAVE_STATE_ACTIVE) {
-+        uint64_t pending_size, pend_precopy, pend_postcopy;
-+        uint64_t threshold = 400 * 1000;
+        uint64_t pending_size, pend_precopy, pend_compatible, pend_postcopy;
 +
-+        /*
-+         * pending_{estimate,exact} are expected to be called without iothread
-+         * lock. Similar to what is done in migration.c, call the exact variant
-+         * only once pend_precopy in the estimate is below the threshold.
-+         */
-+        bql_unlock();
-+        qemu_savevm_state_pending_estimate(&pend_precopy, &pend_postcopy);
-+        if (pend_precopy <= threshold) {
-+            qemu_savevm_state_pending_exact(&pend_precopy, &pend_postcopy);
-+        }
-+        bql_lock();
-+        pending_size = pend_precopy + pend_postcopy;
+        /* pending is expected to be called without iothread lock */
+        qemu_mutex_unlock_iothread();
+        qemu_savevm_state_pending(snap_state.file, 0, &pend_precopy, &pend_compatible, &pend_postcopy);
+        qemu_mutex_lock_iothread();
 +
-+        /*
-+         * A guest reaching this cutoff is dirtying lots of RAM. It should be
-+         * large enough so that the guest can't dirty this much between the
-+         * check and the guest actually being stopped, but it should be small
-+         * enough to avoid long downtimes for non-hibernation snapshots.
-+         */
-+        maxlen = blk_getlength(snap_state.target) - 100*1024*1024;
+        pending_size = pend_precopy + pend_compatible + pend_postcopy;
 +
-+        /* Note that there is no progress for pend_postcopy when iterating */
-+        if (pend_precopy > threshold && snap_state.bs_pos + pending_size < maxlen) {
+        maxlen = blk_getlength(snap_state.target) - 30*1024*1024;
+
+        if (pending_size > 400000 && snap_state.bs_pos + pending_size < maxlen) {
 +            ret = qemu_savevm_state_iterate(snap_state.file, false);
 +            if (ret < 0) {
 +                save_snapshot_error("qemu_savevm_state_iterate error %d", ret);
@@ -428,7 +424,11 @@ index 0000000000..1af32604c7
 +            DPRINTF("savevm iterate pending size %lu ret %d\n", pending_size, ret);
 +        } else {
 +            qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER, NULL);
-+            global_state_store();
+            ret = global_state_store();
+            if (ret) {
+                save_snapshot_error("global_state_store error %d", ret);
+                break;
+            }
 +
 +            DPRINTF("savevm iterate complete\n");
 +            break;
@@ -447,25 +447,19 @@ index 0000000000..1af32604c7
 +     * so move there now and after every flush.
 +     */
 +    aio_co_reschedule_self(qemu_get_aio_context());
-+    bdrv_graph_co_rdlock();
-+    bs = bdrv_first(&it);
-+    bdrv_graph_co_rdunlock();
-+    while (bs) {
+    for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {
 +        /* target has BDRV_O_NO_FLUSH, no sense calling bdrv_flush on it */
-+        if (bs != blk_bs(snap_state.target)) {
-+            AioContext *bs_ctx = bdrv_get_aio_context(bs);
-+            if (bs_ctx != qemu_get_aio_context()) {
-+                DPRINTF("savevm: async flushing drive %s\n", bs->filename);
-+                aio_co_reschedule_self(bs_ctx);
-+                bdrv_graph_co_rdlock();
-+                bdrv_flush(bs);
-+                bdrv_graph_co_rdunlock();
-+                aio_co_reschedule_self(qemu_get_aio_context());
-+            }
+        if (bs == blk_bs(snap_state.target)) {
+            continue;
+        }
+
+        AioContext *bs_ctx = bdrv_get_aio_context(bs);
+        if (bs_ctx != qemu_get_aio_context()) {
+            DPRINTF("savevm: async flushing drive %s\n", bs->filename);
+            aio_co_reschedule_self(bs_ctx);
+            bdrv_flush(bs);
+            aio_co_reschedule_self(qemu_get_aio_context());
 +        }
-+        bdrv_graph_co_rdlock();
-+        bs = bdrv_next(&it);
-+        bdrv_graph_co_rdunlock();
 +    }
 +
 +    DPRINTF("timing: async flushing took %ld ms\n",
@@ -474,7 +468,7 @@ index 0000000000..1af32604c7
 +    qemu_bh_schedule(snap_state.finalize_bh);
 +}
 +
-+void qmp_savevm_start(const char *statefile, Error **errp)
+void qmp_savevm_start(bool has_statefile, const char *statefile, Error **errp)
 +{
 +    Error *local_err = NULL;
 +    MigrationState *ms = migrate_get_current();
@@ -488,12 +482,12 @@ index 0000000000..1af32604c7
 +        return;
 +    }
 +
-+    if (migration_is_running()) {
+    if (migration_is_running(ms->state)) {
 +        error_set(errp, ERROR_CLASS_GENERIC_ERROR, QERR_MIGRATION_ACTIVE);
 +        return;
 +    }
 +
-+    if (migrate_block()) {
+    if (migrate_use_block()) {
 +        error_set(errp, ERROR_CLASS_GENERIC_ERROR,
 +                  "Block migration and snapshots are incompatible");
 +        return;
@@ -511,7 +505,7 @@ index 0000000000..1af32604c7
 +        snap_state.error = NULL;
 +    }
 +
-+    if (!statefile) {
+    if (!has_statefile) {
 +        vm_stop(RUN_STATE_SAVE_VM);
 +        snap_state.state = SAVE_STATE_COMPLETED;
 +        return;
@@ -545,10 +539,8 @@ index 0000000000..1af32604c7
 +     * State is cleared in process_savevm_co, but has to be initialized
 +     * here (blocking main thread, from QMP) to avoid race conditions.
 +     */
-+    if (migrate_init(ms, errp)) {
-+        return;
-+    }
-+    memset(&mig_stats, 0, sizeof(mig_stats));
+    migrate_init(ms);
+    memset(&ram_counters, 0, sizeof(ram_counters));
 +    ms->to_dst_file = snap_state.file;
 +
 +    error_setg(&snap_state.blocker, "block device is in use by savevm");
@@ -557,8 +549,10 @@ index 0000000000..1af32604c7
 +    snap_state.state = SAVE_STATE_ACTIVE;
 +    snap_state.finalize_bh = qemu_bh_new(process_savevm_finalize, &snap_state);
 +    snap_state.co = qemu_coroutine_create(&process_savevm_co, NULL);
+    qemu_mutex_unlock_iothread();
 +    qemu_savevm_state_header(snap_state.file);
 +    qemu_savevm_state_setup(snap_state.file);
+    qemu_mutex_lock_iothread();
 +
 +    /* Async processing from here on out happens in iohandler context, so let
 +     * the target bdrv have its home there.
@@ -579,10 +573,29 @@ index 0000000000..1af32604c7
 +    }
 +}
 +
-+static void coroutine_fn wait_for_close_co(void *opaque)
+void coroutine_fn qmp_savevm_end(Error **errp)
 +{
 +    int64_t timeout;
 +
+    if (snap_state.state == SAVE_STATE_DONE) {
+        error_set(errp, ERROR_CLASS_GENERIC_ERROR,
+                  "VM snapshot not started\n");
+        return;
+    }
+
+    if (snap_state.state == SAVE_STATE_ACTIVE) {
+        snap_state.state = SAVE_STATE_CANCELLED;
+        goto wait_for_close;
+    }
+
+    if (snap_state.saved_vm_running) {
+        vm_start();
+        snap_state.saved_vm_running = false;
+    }
+
+    snap_state.state = SAVE_STATE_DONE;
+
+wait_for_close:
 +    if (!snap_state.target) {
 +        DPRINTF("savevm-end: no target file open\n");
 +        return;
@@ -610,30 +623,20 @@ index 0000000000..1af32604c7
 +    DPRINTF("savevm-end: cleanup done\n");
 +}
 +
-+void qmp_savevm_end(Error **errp)
+// FIXME: Deprecated
+void qmp_snapshot_drive(const char *device, const char *name, Error **errp)
 +{
-+    if (snap_state.state == SAVE_STATE_DONE) {
-+        error_set(errp, ERROR_CLASS_GENERIC_ERROR,
-+                  "VM snapshot not started\n");
-+        return;
-+    }
+    // Compatibility to older qemu-server.
+    qmp_blockdev_snapshot_internal_sync(device, name, errp);
+}
 +
-+    Coroutine *wait_for_close = qemu_coroutine_create(wait_for_close_co, NULL);
-+
-+    if (snap_state.state == SAVE_STATE_ACTIVE) {
-+        snap_state.state = SAVE_STATE_CANCELLED;
-+        qemu_coroutine_enter(wait_for_close);
-+        return;
-+    }
-+
-+    if (snap_state.saved_vm_running) {
-+        vm_start();
-+        snap_state.saved_vm_running = false;
-+    }
-+
-+    snap_state.state = SAVE_STATE_DONE;
-+
-+    qemu_coroutine_enter(wait_for_close);
+// FIXME: Deprecated
+void qmp_delete_drive_snapshot(const char *device, const char *name,
+                               Error **errp)
+{
+    // Compatibility to older qemu-server.
+    (void)qmp_blockdev_snapshot_delete_internal_sync(device, false, NULL,
+                                                     true, name, errp);
 +}
 +
 +int load_snapshot_from_blockdev(const char *filename, Error **errp)
@@ -670,10 +673,6 @@ index 0000000000..1af32604c7
 +    dirty_bitmap_mig_before_vm_start();
 +
 +    qemu_fclose(f);
-+
-+    /* state_destroy assumes a real migration which would have added a yank */
-+    yank_register_instance(MIGRATION_YANK_INSTANCE, &error_abort);
-+
 +    migration_incoming_state_destroy();
 +    if (ret < 0) {
 +        error_setg_errno(errp, -ret, "Error while loading VM state");
@@ -691,28 +690,39 @@ index 0000000000..1af32604c7
 +    return ret;
 +}
 diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
-index 871898ac46..ef4634e5c1 100644
+index 15572befb1..1507180990 100644
 --- a/monitor/hmp-cmds.c
 +++ b/monitor/hmp-cmds.c
-@@ -22,6 +22,7 @@
- #include "monitor/monitor-internal.h"
- #include "qapi/error.h"
- #include "qapi/qapi-commands-control.h"
-+#include "qapi/qapi-commands-migration.h"
- #include "qapi/qapi-commands-misc.h"
- #include "qapi/qmp/qdict.h"
- #include "qemu/cutils.h"
-@@ -443,3 +444,40 @@ void hmp_info_mtree(Monitor *mon, const QDict *qdict)
- 
-     mtree_info(flatview, dispatch_tree, owner, disabled);
+@@ -1925,6 +1925,63 @@ void hmp_info_memory_devices(Monitor *mon, const QDict *qdict)
+     hmp_handle_error(mon, err);
 }
-+
+ 
 +void hmp_savevm_start(Monitor *mon, const QDict *qdict)
 +{
 +    Error *errp = NULL;
 +    const char *statefile = qdict_get_try_str(qdict, "statefile");
 +
-+    qmp_savevm_start(statefile, &errp);
+    qmp_savevm_start(statefile != NULL, statefile, &errp);
+    hmp_handle_error(mon, errp);
+}
+
+void hmp_snapshot_drive(Monitor *mon, const QDict *qdict)
+{
+    Error *errp = NULL;
+    const char *name = qdict_get_str(qdict, "name");
+    const char *device = qdict_get_str(qdict, "device");
+
+    qmp_snapshot_drive(device, name, &errp);
+    hmp_handle_error(mon, errp);
+}
+
+void hmp_delete_drive_snapshot(Monitor *mon, const QDict *qdict)
+{
+    Error *errp = NULL;
+    const char *name = qdict_get_str(qdict, "name");
+    const char *device = qdict_get_str(qdict, "device");
+
+    qmp_delete_drive_snapshot(device, name, &errp);
 +    hmp_handle_error(mon, errp);
 +}
 +
@@ -729,7 +739,7 @@ index 871898ac46..ef4634e5c1 100644
 +    SaveVMInfo *info;
 +    info = qmp_query_savevm(NULL);
 +
-+    if (info->status) {
+    if (info->has_status) {
 +        monitor_printf(mon, "savevm status: %s\n", info->status);
 +        monitor_printf(mon, "total time: %" PRIu64 " milliseconds\n",
 +                       info->total_time);
@@ -739,17 +749,21 @@ index 871898ac46..ef4634e5c1 100644
 +    if (info->has_bytes) {
 +        monitor_printf(mon, "Bytes saved: %"PRIu64"\n", info->bytes);
 +    }
-+    if (info->error) {
+    if (info->has_error) {
 +        monitor_printf(mon, "Error: %s\n", info->error);
 +    }
 +}
+
+ void hmp_info_iothreads(Monitor *mon, const QDict *qdict)
+ {
+     IOThreadInfoList *info_list = qmp_query_iothreads(NULL);
 diff --git a/qapi/migration.json b/qapi/migration.json
-index 8c65b90328..ed20d066cd 100644
+index 81185d4311..3129f71fa8 100644
 --- a/qapi/migration.json
 +++ b/qapi/migration.json
-@@ -297,6 +297,40 @@
-            '*dirty-limit-throttle-time-per-round': 'uint64',
-            '*dirty-limit-ring-full-time': 'uint64'} }
+@@ -261,6 +261,40 @@
+            '*compression': 'CompressionStats',
+            '*socket-address': ['SocketAddress'] } }
 
 +##
 +# @SaveVMInfo:
@@ -789,10 +803,10 @@ index 8c65b90328..ed20d066cd 100644
 # @query-migrate:
 #
 diff --git a/qapi/misc.json b/qapi/misc.json
-index ec30e5c570..3c68633f68 100644
+index 27ef5a2b20..b3ce75dcae 100644
 --- a/qapi/misc.json
 +++ b/qapi/misc.json
-@@ -454,6 +454,24 @@
+@@ -435,6 +435,38 @@
 ##
 { 'command': 'query-fdsets', 'returns': ['FdsetInfo'] }
 
@@ -801,27 +815,41 @@ index ec30e5c570..3c68633f68 100644
 +#
 +# Prepare for snapshot and halt VM. Save VM state to statefile.
 +#
-+# @statefile: target file that state should be written to.
-+#
 +##
 +{ 'command': 'savevm-start', 'data': { '*statefile': 'str' } }
 +
 +##
+# @snapshot-drive:
+#
+# Create an internal drive snapshot.
+#
+##
+{ 'command': 'snapshot-drive', 'data': { 'device': 'str', 'name': 'str' } }
+
+##
+# @delete-drive-snapshot:
+#
+# Delete a drive snapshot.
+#
+##
+{ 'command': 'delete-drive-snapshot', 'data': { 'device': 'str', 'name': 'str' } }
+
+##
 +# @savevm-end:
 +#
 +# Resume VM after a snapshot.
 +#
 +##
-+{ 'command': 'savevm-end' }
+{ 'command': 'savevm-end', 'coroutine': true }
 +
 ##
 # @CommandLineParameterType:
 #
 diff --git a/qemu-options.hx b/qemu-options.hx
-index 8ce85d4559..511ab9415e 100644
+index 31c04f7eea..c2ca6e91b5 100644
 --- a/qemu-options.hx
 +++ b/qemu-options.hx
-@@ -4610,6 +4610,18 @@ SRST
+@@ -4341,6 +4341,18 @@ SRST
     Start right away with a saved state (``loadvm`` in monitor)
 ERST
 
@@ -840,11 +868,11 @@ index 8ce85d4559..511ab9415e 100644
 #ifndef _WIN32
 DEF("daemonize", 0, QEMU_OPTION_daemonize, \
     "-daemonize      daemonize QEMU after initializing\n", QEMU_ARCH_ALL)
-diff --git a/system/vl.c b/system/vl.c
-index c644222982..2738ab7c91 100644
--- a/system/vl.c
-+++ b/system/vl.c
-@@ -163,6 +163,7 @@ static const char *accelerators;
+diff --git a/softmmu/vl.c b/softmmu/vl.c
+index 706bd7cff7..b8637c4262 100644
+--- a/softmmu/vl.c
+++ b/softmmu/vl.c
+@@ -165,6 +165,7 @@ static const char *accelerators;
 static bool have_custom_ram_size;
 static const char *ram_memdev_id;
 static QDict *machine_opts_dict;
@@ -852,10 +880,10 @@ index c644222982..2738ab7c91 100644
 static QTAILQ_HEAD(, ObjectOption) object_opts = QTAILQ_HEAD_INITIALIZER(object_opts);
 static QTAILQ_HEAD(, DeviceOption) device_opts = QTAILQ_HEAD_INITIALIZER(device_opts);
 static int display_remote;
-@@ -2712,6 +2713,12 @@ void qmp_x_exit_preconfig(Error **errp)
-         RunState state = autostart ? RUN_STATE_RUNNING : runstate_get();
+@@ -2584,6 +2585,12 @@ void qmp_x_exit_preconfig(Error **errp)
+ 
+     if (loadvm) {
         load_snapshot(loadvm, NULL, false, NULL, &error_fatal);
-         load_snapshot_resume(state);
 +    } else if (loadstate) {
 +        Error *local_err = NULL;
 +        if (load_snapshot_from_blockdev(loadstate, &local_err) < 0) {
@@ -865,7 +893,7 @@ index c644222982..2738ab7c91 100644
     }
     if (replay_mode != REPLAY_MODE_NONE) {
         replay_vmstate_init();
-@@ -3259,6 +3266,9 @@ void qemu_init(int argc, char **argv)
+@@ -3133,6 +3140,9 @@ void qemu_init(int argc, char **argv, char **envp)
             case QEMU_OPTION_loadvm:
                 loadvm = optarg;
                 break;
--- a/debian/patches/pve/0018-PVE-add-optional-buffer-size-to-QEMUFile.patch
+++ b/debian/patches/pve/0018-PVE-add-optional-buffer-size-to-QEMUFile.patch
@@ -13,18 +13,18 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 [FE: adapt to removal of QEMUFileOps]
 Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 ---
- migration/qemu-file.c    | 50 +++++++++++++++++++++++++++-------------
+ migration/qemu-file.c    | 49 +++++++++++++++++++++++++++-------------
 migration/qemu-file.h    |  2 ++
 migration/savevm-async.c |  5 ++--
- 3 files changed, 39 insertions(+), 18 deletions(-)
+ 3 files changed, 38 insertions(+), 18 deletions(-)

 diff --git a/migration/qemu-file.c b/migration/qemu-file.c
-index a10882d47f..19c1de0472 100644
+index 4f400c2e52..21e8998867 100644
 --- a/migration/qemu-file.c
 +++ b/migration/qemu-file.c
-@@ -35,8 +35,8 @@
- #include "rdma.h"
- #include "io/channel-file.h"
+@@ -31,8 +31,8 @@
+ #include "trace.h"
+ #include "qapi/error.h"
 
 -#define IO_BUF_SIZE 32768
 -#define MAX_IOV_SIZE MIN_CONST(IOV_MAX, 64)
@@ -32,8 +32,8 @@ index a10882d47f..19c1de0472 100644
 +#define MAX_IOV_SIZE MIN_CONST(IOV_MAX, 256)
 
 struct QEMUFile {
-     QIOChannel *ioc;
-@@ -44,7 +44,8 @@ struct QEMUFile {
+     const QEMUFileHooks *hooks;
+@@ -55,7 +55,8 @@ struct QEMUFile {
 
     int buf_index;
     int buf_size; /* 0 when writing */
@@ -43,8 +43,8 @@ index a10882d47f..19c1de0472 100644
 
     DECLARE_BITMAP(may_free, MAX_IOV_SIZE);
     struct iovec iov[MAX_IOV_SIZE];
-@@ -101,7 +102,9 @@ int qemu_file_shutdown(QEMUFile *f)
-     return 0;
+@@ -106,7 +107,9 @@ bool qemu_file_mode_is_not_valid(const char *mode)
+     return false;
 }
 
 -static QEMUFile *qemu_file_new_impl(QIOChannel *ioc, bool is_writable)
@@ -54,7 +54,7 @@ index a10882d47f..19c1de0472 100644
 {
     QEMUFile *f;
 
-@@ -110,6 +113,8 @@ static QEMUFile *qemu_file_new_impl(QIOChannel *ioc, bool is_writable)
+@@ -115,6 +118,8 @@ static QEMUFile *qemu_file_new_impl(QIOChannel *ioc, bool is_writable)
     object_ref(ioc);
     f->ioc = ioc;
     f->is_writable = is_writable;
@@ -63,7 +63,7 @@ index a10882d47f..19c1de0472 100644
 
     return f;
 }
-@@ -120,17 +125,27 @@ static QEMUFile *qemu_file_new_impl(QIOChannel *ioc, bool is_writable)
+@@ -125,17 +130,27 @@ static QEMUFile *qemu_file_new_impl(QIOChannel *ioc, bool is_writable)
  */
 QEMUFile *qemu_file_get_return_path(QEMUFile *f)
 {
@@ -93,8 +93,8 @@ index a10882d47f..19c1de0472 100644
 +    return qemu_file_new_impl(ioc, false, buffer_size);
 }
 
- /*
-@@ -328,7 +343,7 @@ static ssize_t coroutine_mixed_fn qemu_fill_buffer(QEMUFile *f)
+ void qemu_file_set_hooks(QEMUFile *f, const QEMUFileHooks *hooks)
+@@ -393,7 +408,7 @@ static ssize_t qemu_fill_buffer(QEMUFile *f)
     do {
         len = qio_channel_read(f->ioc,
                                (char *)f->buf + pending,
@@ -103,17 +103,16 @@ index a10882d47f..19c1de0472 100644
                                &local_error);
         if (len == QIO_CHANNEL_ERR_BLOCK) {
             if (qemu_in_coroutine()) {
-@@ -368,6 +383,9 @@ int qemu_fclose(QEMUFile *f)
-         ret = ret2;
+@@ -443,6 +458,8 @@ int qemu_fclose(QEMUFile *f)
     }
     g_clear_pointer(&f->ioc, object_unref);
-+
+ 
 +    free(f->buf);
 +
-     error_free(f->last_error_obj);
-     g_free(f);
-     trace_qemu_file_fclose();
-@@ -416,7 +434,7 @@ static void add_buf_to_iovec(QEMUFile *f, size_t len)
+     /* If any error was spotted before closing, we should report it
+      * instead of the close() return value.
+      */
+@@ -497,7 +514,7 @@ static void add_buf_to_iovec(QEMUFile *f, size_t len)
 {
     if (!add_to_iovec(f, f->buf + f->buf_index, len, false)) {
         f->buf_index += len;
@@ -122,7 +121,7 @@ index a10882d47f..19c1de0472 100644
             qemu_fflush(f);
         }
     }
-@@ -441,7 +459,7 @@ void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, size_t size)
+@@ -523,7 +540,7 @@ void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, size_t size)
     }
 
     while (size > 0) {
@@ -131,7 +130,7 @@ index a10882d47f..19c1de0472 100644
         if (l > size) {
             l = size;
         }
-@@ -587,8 +605,8 @@ size_t coroutine_mixed_fn qemu_peek_buffer(QEMUFile *f, uint8_t **buf, size_t si
+@@ -570,8 +587,8 @@ size_t qemu_peek_buffer(QEMUFile *f, uint8_t **buf, size_t size, size_t offset)
     size_t index;
 
     assert(!qemu_file_is_writable(f));
@@ -142,7 +141,7 @@ index a10882d47f..19c1de0472 100644
 
     /* The 1st byte to read from */
     index = f->buf_index + offset;
-@@ -638,7 +656,7 @@ size_t coroutine_mixed_fn qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_t size
+@@ -621,7 +638,7 @@ size_t qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_t size)
         size_t res;
         uint8_t *src;
 
@@ -151,16 +150,16 @@ index a10882d47f..19c1de0472 100644
         if (res == 0) {
             return done;
         }
-@@ -672,7 +690,7 @@ size_t coroutine_mixed_fn qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_t size
+@@ -655,7 +672,7 @@ size_t qemu_get_buffer(QEMUFile *f, uint8_t *buf, size_t size)
  */
- size_t coroutine_mixed_fn qemu_get_buffer_in_place(QEMUFile *f, uint8_t **buf, size_t size)
+ size_t qemu_get_buffer_in_place(QEMUFile *f, uint8_t **buf, size_t size)
 {
 -    if (size < IO_BUF_SIZE) {
 +    if (size < f->buf_allocated_size) {
         size_t res;
         uint8_t *src = NULL;
 
-@@ -697,7 +715,7 @@ int coroutine_mixed_fn qemu_peek_byte(QEMUFile *f, int offset)
+@@ -680,7 +697,7 @@ int qemu_peek_byte(QEMUFile *f, int offset)
     int index = f->buf_index + offset;
 
     assert(!qemu_file_is_writable(f));
@@ -169,7 +168,7 @@ index a10882d47f..19c1de0472 100644
 
     if (index >= f->buf_size) {
         qemu_fill_buffer(f);
-@@ -811,7 +829,7 @@ static int qemu_compress_data(z_stream *stream, uint8_t *dest, size_t dest_len,
+@@ -832,7 +849,7 @@ static int qemu_compress_data(z_stream *stream, uint8_t *dest, size_t dest_len,
 ssize_t qemu_put_compression_data(QEMUFile *f, z_stream *stream,
                                   const uint8_t *p, size_t size)
 {
@@ -179,24 +178,24 @@ index a10882d47f..19c1de0472 100644
     if (blen < compressBound(size)) {
         return -1;
 diff --git a/migration/qemu-file.h b/migration/qemu-file.h
-index 32fd4a34fd..36a0cd8cc8 100644
+index fa13d04d78..914f1a63a8 100644
 --- a/migration/qemu-file.h
 +++ b/migration/qemu-file.h
-@@ -30,7 +30,9 @@
- #include "io/channel.h"
+@@ -63,7 +63,9 @@ typedef struct QEMUFileHooks {
+ } QEMUFileHooks;
 
 QEMUFile *qemu_file_new_input(QIOChannel *ioc);
 +QEMUFile *qemu_file_new_input_sized(QIOChannel *ioc, size_t buffer_size);
 QEMUFile *qemu_file_new_output(QIOChannel *ioc);
 +QEMUFile *qemu_file_new_output_sized(QIOChannel *ioc, size_t buffer_size);
+ void qemu_file_set_hooks(QEMUFile *f, const QEMUFileHooks *hooks);
 int qemu_fclose(QEMUFile *f);
 
- /*
 diff --git a/migration/savevm-async.c b/migration/savevm-async.c
-index 1af32604c7..be2035cd2e 100644
+index b3692739a0..e65a5e3482 100644
 --- a/migration/savevm-async.c
 +++ b/migration/savevm-async.c
-@@ -386,7 +386,7 @@ void qmp_savevm_start(const char *statefile, Error **errp)
+@@ -367,7 +367,7 @@ void qmp_savevm_start(bool has_statefile, const char *statefile, Error **errp)
 
     QIOChannel *ioc = QIO_CHANNEL(qio_channel_savevm_async_new(snap_state.target,
                                                                &snap_state.bs_pos));
@@ -205,7 +204,7 @@ index 1af32604c7..be2035cd2e 100644
 
     if (!snap_state.file) {
         error_set(errp, ERROR_CLASS_GENERIC_ERROR, "failed to open '%s'", statefile);
-@@ -510,7 +510,8 @@ int load_snapshot_from_blockdev(const char *filename, Error **errp)
+@@ -500,7 +500,8 @@ int load_snapshot_from_blockdev(const char *filename, Error **errp)
     blk_op_block_all(be, blocker);
 
     /* restore the VM state */
--- a/debian/patches/pve/0019-PVE-block-add-the-zeroinit-block-driver-filter.patch
+++ b/debian/patches/pve/0019-PVE-block-add-the-zeroinit-block-driver-filter.patch
@@ -4,34 +4,32 @@ Date: Mon, 6 Apr 2020 12:16:47 +0200
 Subject: [PATCH] PVE: block: add the zeroinit block driver filter

 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
-[FE: adapt to changed function signatures
-     adhere to block graph lock requirements
-     use dedicated function to open file child]
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+[adapt to changed function signatures]
+Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
 ---
 block/meson.build |   1 +
- block/zeroinit.c  | 207 ++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 208 insertions(+)
+ block/zeroinit.c  | 196 ++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 197 insertions(+)
 create mode 100644 block/zeroinit.c

 diff --git a/block/meson.build b/block/meson.build
-index e1f03fd773..b530e117b5 100644
+index 60bc305597..ad40c10b6a 100644
 --- a/block/meson.build
 +++ b/block/meson.build
-@@ -39,6 +39,7 @@ block_ss.add(files(
-   'throttle.c',
-   'throttle-groups.c',
+@@ -43,6 +43,7 @@ block_ss.add(files(
+   'vmdk.c',
+   'vpc.c',
   'write-threshold.c',
 +  'zeroinit.c',
 ), zstd, zlib, gnutls)
 
- system_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
+ softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
 diff --git a/block/zeroinit.c b/block/zeroinit.c
 new file mode 100644
-index 0000000000..7998c9332d
+index 0000000000..20ee611f22
 --- /dev/null
 +++ b/block/zeroinit.c
-@@ -0,0 +1,207 @@
+@@ -0,0 +1,196 @@
 +/*
 + * Filter to fake a zero-initialized block device.
 + *
@@ -45,8 +43,6 @@ index 0000000000..7998c9332d
 +#include "qemu/osdep.h"
 +#include "qapi/error.h"
 +#include "block/block_int.h"
-+#include "block/block-io.h"
-+#include "block/graph-lock.h"
 +#include "qapi/qmp/qdict.h"
 +#include "qapi/qmp/qstring.h"
 +#include "qemu/cutils.h"
@@ -112,9 +108,10 @@ index 0000000000..7998c9332d
 +    }
 +
 +    /* Open the raw file */
-+    ret = bdrv_open_file_child(qemu_opt_get(opts, "x-next"), options, "next",
-+                               bs, &local_err);
-+    if (ret < 0) {
+    bs->file = bdrv_open_child(qemu_opt_get(opts, "x-next"), options, "next",
+                               bs, &child_of_bds, BDRV_CHILD_FILTERED, false, &local_err);
+    if (local_err) {
+        ret = -EINVAL;
 +        error_propagate(errp, local_err);
 +        goto fail;
 +    }
@@ -125,9 +122,7 @@ index 0000000000..7998c9332d
 +    ret = 0;
 +fail:
 +    if (ret < 0) {
-+        bdrv_graph_wrlock();
 +        bdrv_unref_child(bs, bs->file);
-+        bdrv_graph_wrunlock();
 +    }
 +    qemu_opts_del(opts);
 +    return ret;
@@ -139,22 +134,19 @@ index 0000000000..7998c9332d
 +    (void)s;
 +}
 +
-+static coroutine_fn int64_t GRAPH_RDLOCK
-+zeroinit_co_getlength(BlockDriverState *bs)
+static int64_t zeroinit_getlength(BlockDriverState *bs)
 +{
-+    return bdrv_co_getlength(bs->file->bs);
+    return bdrv_getlength(bs->file->bs);
 +}
 +
-+static int coroutine_fn GRAPH_RDLOCK
-+zeroinit_co_preadv(BlockDriverState *bs, int64_t offset, int64_t bytes,
-+                   QEMUIOVector *qiov, BdrvRequestFlags flags)
+static int coroutine_fn zeroinit_co_preadv(BlockDriverState *bs,
+    int64_t offset, int64_t bytes, QEMUIOVector *qiov, BdrvRequestFlags flags)
 +{
 +    return bdrv_co_preadv(bs->file, offset, bytes, qiov, flags);
 +}
 +
-+static int coroutine_fn GRAPH_RDLOCK
-+zeroinit_co_pwrite_zeroes(BlockDriverState *bs, int64_t offset, int64_t bytes,
-+                          BdrvRequestFlags flags)
+static int coroutine_fn zeroinit_co_pwrite_zeroes(BlockDriverState *bs, int64_t offset,
+                                                 int64_t bytes, BdrvRequestFlags flags)
 +{
 +    BDRVZeroinitState *s = bs->opaque;
 +    if (offset >= s->extents)
@@ -162,9 +154,8 @@ index 0000000000..7998c9332d
 +    return bdrv_pwrite_zeroes(bs->file, offset, bytes, flags);
 +}
 +
-+static int coroutine_fn GRAPH_RDLOCK
-+zeroinit_co_pwritev(BlockDriverState *bs, int64_t offset, int64_t bytes,
-+                    QEMUIOVector *qiov, BdrvRequestFlags flags)
+static int coroutine_fn zeroinit_co_pwritev(BlockDriverState *bs,
+    int64_t offset, int64_t bytes, QEMUIOVector *qiov, BdrvRequestFlags flags)
 +{
 +    BDRVZeroinitState *s = bs->opaque;
 +    int64_t extents = offset + bytes;
@@ -173,37 +164,33 @@ index 0000000000..7998c9332d
 +    return bdrv_co_pwritev(bs->file, offset, bytes, qiov, flags);
 +}
 +
-+static coroutine_fn int GRAPH_RDLOCK
-+zeroinit_co_flush(BlockDriverState *bs)
+static coroutine_fn int zeroinit_co_flush(BlockDriverState *bs)
 +{
 +    return bdrv_co_flush(bs->file->bs);
 +}
 +
-+static int GRAPH_RDLOCK
-+zeroinit_has_zero_init(BlockDriverState *bs)
+static int zeroinit_has_zero_init(BlockDriverState *bs)
 +{
 +    BDRVZeroinitState *s = bs->opaque;
 +    return s->has_zero_init;
 +}
 +
-+static int coroutine_fn GRAPH_RDLOCK
-+zeroinit_co_pdiscard(BlockDriverState *bs, int64_t offset, int64_t bytes)
+static int coroutine_fn zeroinit_co_pdiscard(BlockDriverState *bs,
+                                             int64_t offset, int64_t bytes)
 +{
 +    return bdrv_co_pdiscard(bs->file, offset, bytes);
 +}
 +
-+static int GRAPH_RDLOCK
-+zeroinit_co_truncate(BlockDriverState *bs, int64_t offset, _Bool exact,
-+                     PreallocMode prealloc, BdrvRequestFlags req_flags,
-+                     Error **errp)
+static int zeroinit_co_truncate(BlockDriverState *bs, int64_t offset,
+                                _Bool exact, PreallocMode prealloc,
+                                BdrvRequestFlags req_flags, Error **errp)
 +{
 +    return bdrv_co_truncate(bs->file, offset, exact, prealloc, req_flags, errp);
 +}
 +
-+static coroutine_fn int GRAPH_RDLOCK
-+zeroinit_co_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
+static int zeroinit_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
 +{
-+    return bdrv_co_get_info(bs->file->bs, bdi);
+    return bdrv_get_info(bs->file->bs, bdi);
 +}
 +
 +static BlockDriver bdrv_zeroinit = {
@@ -214,7 +201,7 @@ index 0000000000..7998c9332d
 +    .bdrv_parse_filename              = zeroinit_parse_filename,
 +    .bdrv_file_open                   = zeroinit_open,
 +    .bdrv_close                       = zeroinit_close,
-+    .bdrv_co_getlength                = zeroinit_co_getlength,
+    .bdrv_getlength                   = zeroinit_getlength,
 +    .bdrv_child_perm                  = bdrv_default_perms,
 +    .bdrv_co_flush_to_disk            = zeroinit_co_flush,
 +
@@ -230,7 +217,7 @@ index 0000000000..7998c9332d
 +    .bdrv_co_pdiscard                 = zeroinit_co_pdiscard,
 +
 +    .bdrv_co_truncate                 = zeroinit_co_truncate,
-+    .bdrv_co_get_info                 = zeroinit_co_get_info,
+    .bdrv_get_info                    = zeroinit_get_info,
 +};
 +
 +static void bdrv_zeroinit_init(void)
--- a/debian/patches/pve/0020-PVE-Add-dummy-id-command-line-parameter.patch
+++ b/debian/patches/pve/0020-PVE-Add-dummy-id-command-line-parameter.patch
@@ -10,14 +10,14 @@ Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
 qemu-options.hx | 3 +++
- system/vl.c     | 8 ++++++++
+ softmmu/vl.c    | 8 ++++++++
 2 files changed, 11 insertions(+)

 diff --git a/qemu-options.hx b/qemu-options.hx
-index 511ab9415e..92e301d545 100644
+index c2ca6e91b5..ab4734ef32 100644
 --- a/qemu-options.hx
 +++ b/qemu-options.hx
-@@ -1237,6 +1237,9 @@ legacy PC, they are not recommended for modern configurations.
+@@ -1118,6 +1118,9 @@ backend describes how QEMU handles the data.
 
 ERST
 
@@ -27,11 +27,11 @@ index 511ab9415e..92e301d545 100644
 DEF("fda", HAS_ARG, QEMU_OPTION_fda,
     "-fda/-fdb file  use 'file' as floppy disk 0/1 image\n", QEMU_ARCH_ALL)
 DEF("fdb", HAS_ARG, QEMU_OPTION_fdb, "", QEMU_ARCH_ALL)
-diff --git a/system/vl.c b/system/vl.c
-index 2738ab7c91..20ebf2c920 100644
--- a/system/vl.c
-+++ b/system/vl.c
-@@ -2748,6 +2748,7 @@ void qemu_init(int argc, char **argv)
+diff --git a/softmmu/vl.c b/softmmu/vl.c
+index b8637c4262..39f149924e 100644
+--- a/softmmu/vl.c
+++ b/softmmu/vl.c
+@@ -2620,6 +2620,7 @@ void qemu_init(int argc, char **argv, char **envp)
     MachineClass *machine_class;
     bool userconfig = true;
     FILE *vmstate_dump_file = NULL;
@@ -39,7 +39,7 @@ index 2738ab7c91..20ebf2c920 100644
 
     qemu_add_opts(&qemu_drive_opts);
     qemu_add_drive_opts(&qemu_legacy_drive_opts);
-@@ -3371,6 +3372,13 @@ void qemu_init(int argc, char **argv)
+@@ -3245,6 +3246,13 @@ void qemu_init(int argc, char **argv, char **envp)
                 machine_parse_property_opt(qemu_find_opts("smp-opts"),
                                            "smp", optarg);
                 break;
@@ -50,6 +50,6 @@ index 2738ab7c91..20ebf2c920 100644
 +                    exit(1);
 +                }
 +                break;
- #ifdef CONFIG_VNC
             case QEMU_OPTION_vnc:
                 vnc_parse(optarg);
+                 break;
--- a/debian/patches/pve/0021-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch
+++ b/debian/patches/pve/0021-PVE-Config-Revert-target-i386-disable-LINT0-after-re.patch
@@ -11,10 +11,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 9 insertions(+)

 diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
-index d8fc1e2815..789694b8b3 100644
+index 2a20982066..7968ad5a93 100644
 --- a/hw/intc/apic_common.c
 +++ b/hw/intc/apic_common.c
-@@ -263,6 +263,15 @@ static void apic_reset_common(DeviceState *dev)
+@@ -278,6 +278,15 @@ static void apic_reset_common(DeviceState *dev)
     info->vapic_base_update(s);
 
     apic_init_reset(dev);
--- a/debian/patches/pve/0022-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch
+++ b/debian/patches/pve/0022-PVE-Up-Config-file-posix-make-locking-optiono-on-cre.patch
@@ -9,14 +9,14 @@ Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
 block/file-posix.c   | 59 ++++++++++++++++++++++++++++++--------------
- qapi/block-core.json |  7 +++++-
- 2 files changed, 46 insertions(+), 20 deletions(-)
+ qapi/block-core.json |  3 ++-
+ 2 files changed, 42 insertions(+), 20 deletions(-)

 diff --git a/block/file-posix.c b/block/file-posix.c
-index 43bc0bd520..60e98c87f1 100644
+index 3d60b80286..49ee1db5f9 100644
 --- a/block/file-posix.c
 +++ b/block/file-posix.c
-@@ -2876,6 +2876,7 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
+@@ -2475,6 +2475,7 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
     int fd;
     uint64_t perm, shared;
     int result = 0;
@@ -24,7 +24,7 @@ index 43bc0bd520..60e98c87f1 100644
 
     /* Validate options and set default values */
     assert(options->driver == BLOCKDEV_DRIVER_FILE);
-@@ -2916,19 +2917,22 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
+@@ -2515,19 +2516,22 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
     perm = BLK_PERM_WRITE | BLK_PERM_RESIZE;
     shared = BLK_PERM_ALL & ~BLK_PERM_RESIZE;
 
@@ -59,7 +59,7 @@ index 43bc0bd520..60e98c87f1 100644
     }
 
     /* Clear the file by truncating it to 0 */
-@@ -2982,13 +2986,15 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
+@@ -2581,13 +2585,15 @@ raw_co_create(BlockdevCreateOptions *options, Error **errp)
     }
 
 out_unlock:
@@ -82,7 +82,7 @@ index 43bc0bd520..60e98c87f1 100644
     }
 
 out_close:
-@@ -3012,6 +3018,7 @@ raw_co_create_opts(BlockDriver *drv, const char *filename,
+@@ -2612,6 +2618,7 @@ static int coroutine_fn raw_co_create_opts(BlockDriver *drv,
     PreallocMode prealloc;
     char *buf = NULL;
     Error *local_err = NULL;
@@ -90,7 +90,7 @@ index 43bc0bd520..60e98c87f1 100644
 
     /* Skip file: protocol prefix */
     strstart(filename, "file:", &filename);
-@@ -3034,6 +3041,18 @@ raw_co_create_opts(BlockDriver *drv, const char *filename,
+@@ -2634,6 +2641,18 @@ static int coroutine_fn raw_co_create_opts(BlockDriver *drv,
         return -EINVAL;
     }
 
@@ -109,7 +109,7 @@ index 43bc0bd520..60e98c87f1 100644
     options = (BlockdevCreateOptions) {
         .driver     = BLOCKDEV_DRIVER_FILE,
         .u.file     = {
-@@ -3045,6 +3064,8 @@ raw_co_create_opts(BlockDriver *drv, const char *filename,
+@@ -2645,6 +2664,8 @@ static int coroutine_fn raw_co_create_opts(BlockDriver *drv,
             .nocow              = nocow,
             .has_extent_size_hint = has_extent_size_hint,
             .extent_size_hint   = extent_size_hint,
@@ -119,21 +119,10 @@ index 43bc0bd520..60e98c87f1 100644
     };
     return raw_co_create(&options, errp);
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index 905da8be72..3db587a6e4 100644
+index e1857e7094..ddac91e8f6 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
-@@ -4956,6 +4956,10 @@
- # @extent-size-hint: Extent size hint to add to the image file; 0 for
- #     not adding an extent size hint (default: 1 MB, since 5.1)
- #
-+# @locking: whether to enable file locking.  If set to 'auto', only
-+#     enable when Open File Descriptor (OFD) locking API is available
-+#     (default: auto).
-+#
- # Since: 2.12
- ##
- { 'struct': 'BlockdevCreateOptionsFile',
-@@ -4963,7 +4967,8 @@
+@@ -4537,7 +4537,8 @@
             'size':                 'size',
             '*preallocation':       'PreallocMode',
             '*nocow':               'bool',
--- a/debian/patches/pve/0023-PVE-monitor-disable-oob-capability.patch
+++ b/debian/patches/pve/0023-PVE-monitor-disable-oob-capability.patch
@@ -18,10 +18,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 1 insertion(+), 2 deletions(-)

 diff --git a/monitor/qmp.c b/monitor/qmp.c
-index 589c9524f8..2505dd658a 100644
+index 6b8cfcf6d8..3ec67e32d3 100644
 --- a/monitor/qmp.c
 +++ b/monitor/qmp.c
-@@ -536,8 +536,7 @@ void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp)
+@@ -519,8 +519,7 @@ void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp)
     qemu_chr_fe_set_echo(&mon->common.chr, true);
 
     /* Note: we run QMP monitor in I/O thread when @chr supports that */
--- a/debian/patches/pve/0024-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch
+++ b/debian/patches/pve/0024-PVE-Compat-4.0-used-balloon-qemu-4-0-config-size-fal.patch
@@ -26,10 +26,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 2 insertions(+), 1 deletion(-)

 diff --git a/hw/core/machine.c b/hw/core/machine.c
-index 4273de16a0..83f1fc0293 100644
+index a673302cce..fa424440bd 100644
 --- a/hw/core/machine.c
 +++ b/hw/core/machine.c
-@@ -162,7 +162,8 @@ GlobalProperty hw_compat_4_0[] = {
+@@ -127,7 +127,8 @@ GlobalProperty hw_compat_4_0[] = {
     { "virtio-vga",     "edid", "false" },
     { "virtio-gpu-device", "edid", "false" },
     { "virtio-device", "use-started", "false" },
--- a/debian/patches/pve/0025-PVE-Allow-version-code-in-machine-type.patch
+++ b/debian/patches/pve/0025-PVE-Allow-version-code-in-machine-type.patch
@@ -11,79 +11,78 @@ and only if 'is-current').

 Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
-[FE: adapt to QAPI changes]
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 ---
- hw/core/machine-qmp-cmds.c |  5 +++++
+ hw/core/machine-qmp-cmds.c |  6 ++++++
 include/hw/boards.h        |  2 ++
 qapi/machine.json          |  4 +++-
- system/vl.c                | 25 +++++++++++++++++++++++++
- 4 files changed, 35 insertions(+), 1 deletion(-)
+ softmmu/vl.c               | 25 +++++++++++++++++++++++++
+ 4 files changed, 36 insertions(+), 1 deletion(-)

 diff --git a/hw/core/machine-qmp-cmds.c b/hw/core/machine-qmp-cmds.c
-index 314351cdff..628a3537c5 100644
+index 76fff60a6b..ec9201fb9a 100644
 --- a/hw/core/machine-qmp-cmds.c
 +++ b/hw/core/machine-qmp-cmds.c
-@@ -94,6 +94,11 @@ MachineInfoList *qmp_query_machines(Error **errp)
+@@ -103,6 +103,12 @@ MachineInfoList *qmp_query_machines(Error **errp)
         if (strcmp(mc->name, MACHINE_GET_CLASS(current_machine)->name) == 0) {
             info->has_is_current = true;
             info->is_current = true;
 +
 +            // PVE version string only exists for current machine
 +            if (mc->pve_version) {
+                info->has_pve_version = true;
 +                info->pve_version = g_strdup(mc->pve_version);
 +            }
         }
 
         if (mc->default_cpu_type) {
 diff --git a/include/hw/boards.h b/include/hw/boards.h
-index 8b8f6d5c00..dd6d0a1447 100644
+index 7b416c9787..8ae15c51aa 100644
 --- a/include/hw/boards.h
 +++ b/include/hw/boards.h
-@@ -246,6 +246,8 @@ struct MachineClass {
+@@ -230,6 +230,8 @@ struct MachineClass {
     const char *desc;
     const char *deprecation_reason;
 
 +    const char *pve_version;
 +
     void (*init)(MachineState *state);
-     void (*reset)(MachineState *state, ShutdownCause reason);
+     void (*reset)(MachineState *state);
     void (*wakeup)(MachineState *state);
 diff --git a/qapi/machine.json b/qapi/machine.json
-index a024d5b05d..1d69bffaa0 100644
+index 555458f785..d868e4d31d 100644
 --- a/qapi/machine.json
 +++ b/qapi/machine.json
-@@ -168,6 +168,8 @@
+@@ -157,6 +157,8 @@
 #
- # @acpi: machine type supports ACPI (since 8.0)
+ # @default-ram-id: the default ID of initial RAM memory backend (since 5.2)
 #
 +# @pve-version: custom PVE version suffix specified as 'machine+pveN'
 +#
 # Since: 1.2
 ##
 { 'struct': 'MachineInfo',
-@@ -175,7 +177,7 @@
+@@ -164,7 +166,7 @@
             '*is-default': 'bool', '*is-current': 'bool', 'cpu-max': 'int',
             'hotpluggable-cpus': 'bool',  'numa-mem-supported': 'bool',
             'deprecated': 'bool', '*default-cpu-type': 'str',
-            '*default-ram-id': 'str', 'acpi': 'bool' } }
-+            '*default-ram-id': 'str', 'acpi': 'bool', '*pve-version': 'str' } }
+-            '*default-ram-id': 'str' } }
+            '*default-ram-id': 'str', '*pve-version': 'str' } }
 
 ##
 # @query-machines:
-diff --git a/system/vl.c b/system/vl.c
-index 20ebf2c920..4d39e32097 100644
--- a/system/vl.c
-+++ b/system/vl.c
-@@ -1659,6 +1659,7 @@ static const QEMUOption *lookup_opt(int argc, char **argv,
+diff --git a/softmmu/vl.c b/softmmu/vl.c
+index 39f149924e..0d233d55f3 100644
+--- a/softmmu/vl.c
+++ b/softmmu/vl.c
+@@ -1580,6 +1580,7 @@ static const QEMUOption *lookup_opt(int argc, char **argv,
 static MachineClass *select_machine(QDict *qdict, Error **errp)
 {
-     const char *machine_type = qdict_get_try_str(qdict, "type");
+     const char *optarg = qdict_get_try_str(qdict, "type");
 +    const char *pvever = qdict_get_try_str(qdict, "pvever");
     GSList *machines = object_class_get_list(TYPE_MACHINE, false);
     MachineClass *machine_class;
     Error *local_err = NULL;
-@@ -1676,6 +1677,11 @@ static MachineClass *select_machine(QDict *qdict, Error **errp)
+@@ -1597,6 +1598,11 @@ static MachineClass *select_machine(QDict *qdict, Error **errp)
         }
     }
 
@@ -95,7 +94,7 @@ index 20ebf2c920..4d39e32097 100644
     g_slist_free(machines);
     if (local_err) {
         error_append_hint(&local_err, "Use -machine help to list supported machines\n");
-@@ -3313,12 +3319,31 @@ void qemu_init(int argc, char **argv)
+@@ -3187,12 +3193,31 @@ void qemu_init(int argc, char **argv, char **envp)
             case QEMU_OPTION_machine:
                 {
                     bool help;
--- a/debian/patches/pve/0026-block-backup-move-bcs-bitmap-initialization-to-job-c.patch
+++ b/debian/patches/pve/0026-block-backup-move-bcs-bitmap-initialization-to-job-c.patch
@@ -25,7 +25,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 4 insertions(+), 4 deletions(-)

 diff --git a/block/backup.c b/block/backup.c
-index 3dd2e229d2..eba5b11493 100644
+index b2b649e305..b6fa9e8a69 100644
 --- a/block/backup.c
 +++ b/block/backup.c
@@ -237,8 +237,8 @@ static void backup_init_bcs_bitmap(BackupBlockJob *job)
@@ -48,9 +48,9 @@ index 3dd2e229d2..eba5b11493 100644
     if (s->sync_mode == MIRROR_SYNC_MODE_TOP) {
         int64_t offset = 0;
         int64_t count;
-@@ -502,6 +500,8 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
+@@ -492,6 +490,8 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
+     block_job_add_bdrv(&job->common, "target", target, 0, BLK_PERM_ALL,
                        &error_abort);
-     bdrv_graph_wrunlock();
 
 +    backup_init_bcs_bitmap(job);
 +
--- a/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch
+++ b/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch
@@ -3,46 +3,40 @@ From: Dietmar Maurer <dietmar@proxmox.com>
 Date: Mon, 6 Apr 2020 12:16:57 +0200
 Subject: [PATCH] PVE-Backup: add vma backup format code

-Notes about partial restoring: skipping a certain drive is done via a
-map line of the form skip=drive-scsi0. Since in PVE, most archives are
-compressed and piped to vma for restore, it's not easily possible to
-skip reads.
-
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
-[FE: improvements during create
-     allow partial restore]
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
+[FE: create: register all streams before entering coroutines]
+Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
 ---
 block/meson.build |   2 +
 meson.build       |   5 +
- vma-reader.c      | 870 ++++++++++++++++++++++++++++++++++++++++++++
- vma-writer.c      | 817 +++++++++++++++++++++++++++++++++++++++++
- vma.c             | 901 ++++++++++++++++++++++++++++++++++++++++++++++
+ vma-reader.c      | 859 ++++++++++++++++++++++++++++++++++++++++++++++
+ vma-writer.c      | 791 ++++++++++++++++++++++++++++++++++++++++++
+ vma.c             | 849 +++++++++++++++++++++++++++++++++++++++++++++
 vma.h             | 150 ++++++++
- 6 files changed, 2745 insertions(+)
+ 6 files changed, 2656 insertions(+)
 create mode 100644 vma-reader.c
 create mode 100644 vma-writer.c
 create mode 100644 vma.c
 create mode 100644 vma.h

 diff --git a/block/meson.build b/block/meson.build
-index b530e117b5..b245daa98e 100644
+index ad40c10b6a..3a0b84bc11 100644
 --- a/block/meson.build
 +++ b/block/meson.build
-@@ -42,6 +42,8 @@ block_ss.add(files(
+@@ -46,6 +46,8 @@ block_ss.add(files(
   'zeroinit.c',
 ), zstd, zlib, gnutls)
 
 +block_ss.add(files('../vma-writer.c'), libuuid)
 +
- system_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
- system_ss.add(files('block-ram-registrar.c'))
+ softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
 
+ if get_option('qcow1').allowed()
 diff --git a/meson.build b/meson.build
-index 91a0aa64c6..620cc594b2 100644
+index d5230eadd6..ffff66c0cc 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -1922,6 +1922,8 @@ endif
+@@ -1462,6 +1462,8 @@ keyutils = dependency('libkeyutils', required: false,
 
 has_gettid = cc.has_function('gettid')
 
@@ -51,7 +45,7 @@ index 91a0aa64c6..620cc594b2 100644
 # libselinux
 selinux = dependency('libselinux',
                      required: get_option('selinux'),
-@@ -4023,6 +4025,9 @@ if have_tools
+@@ -3607,6 +3609,9 @@ if have_tools
                dependencies: [blockdev, qemuutil, gnutls, selinux],
                install: true)
 
@@ -59,14 +53,14 @@ index 91a0aa64c6..620cc594b2 100644
 +                   dependencies: [authz, block, crypto, io, qom], install: true)
 +
   subdir('storage-daemon')
- 
-   foreach exe: [ 'qemu-img', 'qemu-io', 'qemu-nbd', 'qemu-storage-daemon']
+   subdir('contrib/rdmacm-mux')
+   subdir('contrib/elf2dmp')
 diff --git a/vma-reader.c b/vma-reader.c
 new file mode 100644
-index 0000000000..d0b6721812
+index 0000000000..e65f1e8415
 --- /dev/null
 +++ b/vma-reader.c
-@@ -0,0 +1,870 @@
+@@ -0,0 +1,859 @@
 +/*
 + * VMA: Virtual Machine Archive
 + *
@@ -88,7 +82,6 @@ index 0000000000..d0b6721812
 +#include "qemu/ratelimit.h"
 +#include "vma.h"
 +#include "block/block.h"
-+#include "block/graph-lock.h"
 +#include "sysemu/block-backend.h"
 +
 +static unsigned char zero_vma_block[VMA_BLOCK_SIZE];
@@ -98,7 +91,6 @@ index 0000000000..d0b6721812
 +    bool write_zeroes;
 +    unsigned long *bitmap;
 +    int bitmap_size;
-+    bool skip;
 +}  VmaRestoreState;
 +
 +struct VmaReader {
@@ -496,14 +488,13 @@ index 0000000000..d0b6721812
 +}
 +
 +static void allocate_rstate(VmaReader *vmar,  guint8 dev_id,
-+                            BlockBackend *target, bool write_zeroes, bool skip)
+                            BlockBackend *target, bool write_zeroes)
 +{
 +    assert(vmar);
 +    assert(dev_id);
 +
 +    vmar->rstate[dev_id].target = target;
 +    vmar->rstate[dev_id].write_zeroes = write_zeroes;
-+    vmar->rstate[dev_id].skip = skip;
 +
 +    int64_t size = vmar->devinfo[dev_id].size;
 +
@@ -518,30 +509,28 @@ index 0000000000..d0b6721812
 +}
 +
 +int vma_reader_register_bs(VmaReader *vmar, guint8 dev_id, BlockBackend *target,
-+                           bool write_zeroes, bool skip, Error **errp)
+                           bool write_zeroes, Error **errp)
 +{
 +    assert(vmar);
-+    assert(target != NULL || skip);
+    assert(target != NULL);
 +    assert(dev_id);
-+    assert(vmar->rstate[dev_id].target == NULL && !vmar->rstate[dev_id].skip);
+    assert(vmar->rstate[dev_id].target == NULL);
 +
-+    if (target != NULL) {
-+        int64_t size = blk_getlength(target);
-+        int64_t size_diff = size - vmar->devinfo[dev_id].size;
+    int64_t size = blk_getlength(target);
+    int64_t size_diff = size - vmar->devinfo[dev_id].size;
 +
-+        /* storage types can have different size restrictions, so it
-+         * is not always possible to create an image with exact size.
-+         * So we tolerate a size difference up to 4MB.
-+         */
-+        if ((size_diff < 0) || (size_diff > 4*1024*1024)) {
-+            error_setg(errp, "vma_reader_register_bs for stream %s failed - "
-+                       "unexpected size %zd != %zd", vmar->devinfo[dev_id].devname,
-+                       size, vmar->devinfo[dev_id].size);
-+            return -1;
-+        }
+    /* storage types can have different size restrictions, so it
+     * is not always possible to create an image with exact size.
+     * So we tolerate a size difference up to 4MB.
+     */
+    if ((size_diff < 0) || (size_diff > 4*1024*1024)) {
+        error_setg(errp, "vma_reader_register_bs for stream %s failed - "
+                   "unexpected size %zd != %zd", vmar->devinfo[dev_id].devname,
+                   size, vmar->devinfo[dev_id].size);
+        return -1;
 +    }
 +
-+    allocate_rstate(vmar, dev_id, target, write_zeroes, skip);
+    allocate_rstate(vmar, dev_id, target, write_zeroes);
 +
 +    return 0;
 +}
@@ -601,10 +590,8 @@ index 0000000000..d0b6721812
 +    } else {
 +        int res = blk_pwrite(target, sector_num * BDRV_SECTOR_SIZE, nb_sectors * BDRV_SECTOR_SIZE, buf, 0);
 +        if (res < 0) {
-+            bdrv_graph_rdlock_main_loop();
 +            error_setg(errp, "blk_pwrite to %s failed (%d)",
 +                       bdrv_get_device_name(blk_bs(target)), res);
-+            bdrv_graph_rdunlock_main_loop();
 +            return -1;
 +        }
 +    }
@@ -636,23 +623,19 @@ index 0000000000..d0b6721812
 +        VmaRestoreState *rstate = &vmar->rstate[dev_id];
 +        BlockBackend *target = NULL;
 +
-+        bool skip = rstate->skip;
-+
 +        if (dev_id != vmar->vmstate_stream) {
 +            target = rstate->target;
-+            if (!verify && !target && !skip) {
+            if (!verify && !target) {
 +                error_setg(errp, "got wrong dev id %d", dev_id);
 +                return -1;
 +            }
 +
-+            if (!skip) {
-+                if (vma_reader_get_bitmap(rstate, cluster_num)) {
-+                    error_setg(errp, "found duplicated cluster %zd for stream %s",
-+                              cluster_num, vmar->devinfo[dev_id].devname);
-+                    return -1;
-+                }
-+                vma_reader_set_bitmap(rstate, cluster_num, 1);
+            if (vma_reader_get_bitmap(rstate, cluster_num)) {
+                error_setg(errp, "found duplicated cluster %zd for stream %s",
+                          cluster_num, vmar->devinfo[dev_id].devname);
+                return -1;
 +            }
+            vma_reader_set_bitmap(rstate, cluster_num, 1);
 +
 +            max_sector = vmar->devinfo[dev_id].size/BDRV_SECTOR_SIZE;
 +        } else {
@@ -698,7 +681,7 @@ index 0000000000..d0b6721812
 +                return -1;
 +            }
 +
-+            if (!verify && !skip) {
+            if (!verify) {
 +                int nb_sectors = end_sector - sector_num;
 +                if (restore_write_data(vmar, dev_id, target, vmstate_fd,
 +                                       buf + start, sector_num, nb_sectors,
@@ -734,7 +717,7 @@ index 0000000000..d0b6721812
 +                        return -1;
 +                    }
 +
-+                    if (!verify && !skip) {
+                    if (!verify) {
 +                        int nb_sectors = end_sector - sector_num;
 +                        if (restore_write_data(vmar, dev_id, target, vmstate_fd,
 +                                               buf + start, sector_num,
@@ -759,7 +742,7 @@ index 0000000000..d0b6721812
 +                            vmar->partial_zero_cluster_data += zero_size;
 +                        }
 +
-+                        if (rstate->write_zeroes && !verify && !skip) {
+                        if (rstate->write_zeroes && !verify) {
 +                            if (restore_write_data(vmar, dev_id, target, vmstate_fd,
 +                                                   zero_vma_block, sector_num,
 +                                                   nb_sectors, errp) < 0) {
@@ -930,7 +913,7 @@ index 0000000000..d0b6721812
 +
 +    for (dev_id = 1; dev_id < 255; dev_id++) {
 +        if (vma_reader_get_device_info(vmar, dev_id)) {
-+            allocate_rstate(vmar, dev_id, NULL, false, false);
+            allocate_rstate(vmar, dev_id, NULL, false);
 +        }
 +    }
 +
@@ -939,10 +922,10 @@ index 0000000000..d0b6721812
 +
 diff --git a/vma-writer.c b/vma-writer.c
 new file mode 100644
-index 0000000000..a466652a5d
+index 0000000000..df4b20793d
 --- /dev/null
 +++ b/vma-writer.c
-@@ -0,0 +1,817 @@
+@@ -0,0 +1,791 @@
 +/*
 + * VMA: Virtual Machine Archive
 + *
@@ -958,8 +941,6 @@ index 0000000000..a466652a5d
 +
 +#include "qemu/osdep.h"
 +#include <glib.h>
-+#include <linux/magic.h>
-+#include <sys/vfs.h>
 +#include <uuid/uuid.h>
 +
 +#include "vma.h"
@@ -968,7 +949,6 @@ index 0000000000..a466652a5d
 +#include "qemu/main-loop.h"
 +#include "qemu/coroutine.h"
 +#include "qemu/cutils.h"
-+#include "qemu/error-report.h"
 +#include "qemu/memalign.h"
 +
 +#define DEBUG_VMA 0
@@ -1152,10 +1132,10 @@ index 0000000000..a466652a5d
 +{
 +    assert(qemu_in_coroutine());
 +    AioContext *ctx = qemu_get_current_aio_context();
-+    aio_set_fd_handler(ctx, fd, NULL, (IOHandler *)qemu_coroutine_enter, NULL,
-+                       NULL, qemu_coroutine_self());
+    aio_set_fd_handler(ctx, fd, false, NULL, (IOHandler *)qemu_coroutine_enter,
+                       NULL, NULL, qemu_coroutine_self());
 +    qemu_coroutine_yield();
-+    aio_set_fd_handler(ctx, fd, NULL, NULL, NULL, NULL, NULL);
+    aio_set_fd_handler(ctx, fd, false, NULL, NULL, NULL, NULL, NULL);
 +}
 +
 +static ssize_t coroutine_fn
@@ -1204,23 +1184,6 @@ index 0000000000..a466652a5d
 +    return (done == bytes) ? bytes : -1;
 +}
 +
-+static bool is_path_tmpfs(const char *path) {
-+    struct statfs fs;
-+    int ret;
-+
-+    do {
-+        ret = statfs(path, &fs);
-+    } while (ret != 0 && errno == EINTR);
-+
-+    if (ret != 0) {
-+        warn_report("statfs call for %s failed, assuming not tmpfs - %s\n",
-+                    path, strerror(errno));
-+        return false;
-+    }
-+
-+    return fs.f_type == TMPFS_MAGIC;
-+}
-+
 +VmaWriter *vma_writer_create(const char *filename, uuid_t uuid, Error **errp)
 +{
 +    const char *p;
@@ -1270,19 +1233,12 @@ index 0000000000..a466652a5d
 +            }
 +            /* try to use O_NONBLOCK */
 +            fcntl(vmaw->fd, F_SETFL, fcntl(vmaw->fd, F_GETFL)|O_NONBLOCK);
-+        } else {
-+            gchar *dirname = g_path_get_dirname(filename);
-+            oflags = O_NONBLOCK|O_WRONLY|O_EXCL;
-+            if (!is_path_tmpfs(dirname)) {
-+                oflags |= O_DIRECT;
-+            }
-+            g_free(dirname);
+        } else  {
+            oflags = O_NONBLOCK|O_DIRECT|O_WRONLY|O_EXCL;
 +            vmaw->fd = qemu_create(filename, oflags, 0644, errp);
 +        }
 +
 +        if (vmaw->fd < 0) {
-+            error_free(*errp);
-+            *errp = NULL;
 +            error_setg(errp, "can't open file %s - %s\n", filename,
 +                       g_strerror(errno));
 +            goto err;
@@ -1517,16 +1473,17 @@ index 0000000000..a466652a5d
 +    int i;
 +
 +    g_assert(vmaw != NULL);
-+    g_assert(status != NULL);
 +
-+    status->status = vmaw->status;
-+    g_strlcpy(status->errmsg, vmaw->errmsg, sizeof(status->errmsg));
-+    for (i = 0; i <= 255; i++) {
-+        status->stream_info[i] = vmaw->stream_info[i];
+    if (status) {
+        status->status = vmaw->status;
+        g_strlcpy(status->errmsg, vmaw->errmsg, sizeof(status->errmsg));
+        for (i = 0; i <= 255; i++) {
+            status->stream_info[i] = vmaw->stream_info[i];
+        }
+
+        uuid_unparse_lower(vmaw->uuid, status->uuid_str);
 +    }
 +
-+    uuid_unparse_lower(vmaw->uuid, status->uuid_str);
-+
 +    status->closed = vmaw->closed;
 +
 +    return vmaw->status;
@@ -1762,10 +1719,10 @@ index 0000000000..a466652a5d
 +}
 diff --git a/vma.c b/vma.c
 new file mode 100644
-index 0000000000..bb715e9061
+index 0000000000..e8dffb43e0
 --- /dev/null
 +++ b/vma.c
-@@ -0,0 +1,901 @@
+@@ -0,0 +1,849 @@
 +/*
 + * VMA: Virtual Machine Archive
 + *
@@ -1799,7 +1756,7 @@ index 0000000000..bb715e9061
 +        "vma list <filename>\n"
 +        "vma config <filename> [-c config]\n"
 +        "vma create <filename> [-c config] pathname ...\n"
-+        "vma extract <filename> [-d <drive-list>] [-r <fifo>] <targetdir>\n"
+        "vma extract <filename> [-r <fifo>] <targetdir>\n"
 +        "vma verify <filename> [-v]\n"
 +        ;
 +
@@ -1906,7 +1863,6 @@ index 0000000000..bb715e9061
 +    char *throttling_group;
 +    char *cache;
 +    bool write_zero;
-+    bool skip;
 +} RestoreMap;
 +
 +static bool try_parse_option(char **line, const char *optname, char **out, const char *inbuf) {
@@ -1944,10 +1900,9 @@ index 0000000000..bb715e9061
 +    const char *filename;
 +    const char *dirname;
 +    const char *readmap = NULL;
-+    gchar **drive_list = NULL;
 +
 +    for (;;) {
-+        c = getopt(argc, argv, "hvd:r:");
+        c = getopt(argc, argv, "hvr:");
 +        if (c == -1) {
 +            break;
 +        }
@@ -1956,9 +1911,6 @@ index 0000000000..bb715e9061
 +        case 'h':
 +            help();
 +            break;
-+        case 'd':
-+            drive_list = g_strsplit(optarg, ",", 254);
-+            break;
 +        case 'r':
 +            readmap = optarg;
 +            break;
@@ -2018,89 +1970,74 @@ index 0000000000..bb715e9061
 +            char *bps = NULL;
 +            char *group = NULL;
 +            char *cache = NULL;
-+            char *devname = NULL;
-+            bool skip = false;
-+            uint64_t bps_value = 0;
-+            const char *path = NULL;
-+            bool write_zero = true;
-+
 +            if (!line || line[0] == '\0' || !strcmp(line, "done\n")) {
 +                break;
 +            }
 +            int len = strlen(line);
 +            if (line[len - 1] == '\n') {
 +                line[len - 1] = '\0';
-+                len = len - 1;
-+                if (len == 0) {
+                if (len == 1) {
 +                    break;
 +                }
 +            }
 +
-+            if (strncmp(line, "skip", 4) == 0) {
-+                if (len < 6 || line[4] != '=') {
-+                    g_error("read map failed - option 'skip' has no value ('%s')",
-+                            inbuf);
-+                } else {
-+                    devname = line + 5;
-+                    skip = true;
+            while (1) {
+                if (!try_parse_option(&line, "format", &format, inbuf) &&
+                    !try_parse_option(&line, "throttling.bps", &bps, inbuf) &&
+                    !try_parse_option(&line, "throttling.group", &group, inbuf) &&
+                    !try_parse_option(&line, "cache", &cache, inbuf))
+                {
+                    break;
 +                }
-+            } else {
-+                while (1) {
-+                    if (!try_parse_option(&line, "format", &format, inbuf) &&
-+                        !try_parse_option(&line, "throttling.bps", &bps, inbuf) &&
-+                        !try_parse_option(&line, "throttling.group", &group, inbuf) &&
-+                        !try_parse_option(&line, "cache", &cache, inbuf))
-+                    {
-+                        break;
-+                    }
-+                }
-+
-+                if (bps) {
-+                    bps_value = verify_u64(bps);
-+                    g_free(bps);
-+                }
-+
-+                if (line[0] == '0' && line[1] == ':') {
-+                    path = line + 2;
-+                    write_zero = false;
-+                } else if (line[0] == '1' && line[1] == ':') {
-+                    path = line + 2;
-+                    write_zero = true;
-+                } else {
-+                    g_error("read map failed - parse error ('%s')", inbuf);
-+                }
-+
-+                path = extract_devname(path, &devname, -1);
 +            }
 +
+            uint64_t bps_value = 0;
+            if (bps) {
+                bps_value = verify_u64(bps);
+                g_free(bps);
+            }
+
+            const char *path;
+            bool write_zero;
+            if (line[0] == '0' && line[1] == ':') {
+                path = line + 2;
+                write_zero = false;
+            } else if (line[0] == '1' && line[1] == ':') {
+                path = line + 2;
+                write_zero = true;
+            } else {
+                g_error("read map failed - parse error ('%s')", inbuf);
+            }
+
+            char *devname = NULL;
+            path = extract_devname(path, &devname, -1);
 +            if (!devname) {
 +                g_error("read map failed - no dev name specified ('%s')",
 +                        inbuf);
 +            }
 +
-+            RestoreMap *restore_map = g_new0(RestoreMap, 1);
-+            restore_map->devname = g_strdup(devname);
-+            restore_map->path = g_strdup(path);
-+            restore_map->format = format;
-+            restore_map->throttling_bps = bps_value;
-+            restore_map->throttling_group = group;
-+            restore_map->cache = cache;
-+            restore_map->write_zero = write_zero;
-+            restore_map->skip = skip;
+            RestoreMap *map = g_new0(RestoreMap, 1);
+            map->devname = g_strdup(devname);
+            map->path = g_strdup(path);
+            map->format = format;
+            map->throttling_bps = bps_value;
+            map->throttling_group = group;
+            map->cache = cache;
+            map->write_zero = write_zero;
 +
-+            g_hash_table_insert(devmap, restore_map->devname, restore_map);
+            g_hash_table_insert(devmap, map->devname, map);
 +
 +        };
 +    }
 +
 +    int i;
 +    int vmstate_fd = -1;
-+    bool drive_rename_bitmap[255];
-+    memset(drive_rename_bitmap, 0, sizeof(drive_rename_bitmap));
+    guint8 vmstate_stream = 0;
 +
 +    for (i = 1; i < 255; i++) {
 +        VmaDeviceInfo *di = vma_reader_get_device_info(vmar, i);
 +        if (di && (strcmp(di->devname, "vmstate") == 0)) {
+            vmstate_stream = i;
 +            char *statefn = g_strdup_printf("%s/vmstate.bin", dirname);
 +            vmstate_fd = open(statefn, O_WRONLY|O_CREAT|O_EXCL, 0644);
 +            if (vmstate_fd < 0) {
@@ -2116,25 +2053,10 @@ index 0000000000..bb715e9061
 +            const char *cache = NULL;
 +            int flags = BDRV_O_RDWR;
 +            bool write_zero = true;
-+            bool skip = false;
 +
 +            BlockBackend *blk = NULL;
 +
-+            if (drive_list) {
-+                skip = true;
-+                int j;
-+                for (j = 0; drive_list[j]; j++) {
-+                    if (strcmp(drive_list[j], di->devname) == 0) {
-+                        skip = false;
-+                        drive_rename_bitmap[i] = true;
-+                        break;
-+                    }
-+                }
-+            } else {
-+                drive_rename_bitmap[i] = true;
-+            }
-+
-+            if (!skip && readmap) {
+            if (readmap) {
 +                RestoreMap *map;
 +                map = (RestoreMap *)g_hash_table_lookup(devmap, di->devname);
 +                if (map == NULL) {
@@ -2146,8 +2068,7 @@ index 0000000000..bb715e9061
 +                throttling_group = map->throttling_group;
 +                cache = map->cache;
 +                write_zero = map->write_zero;
-+                skip = map->skip;
-+            } else if (!skip) {
+            } else {
 +                devfn = g_strdup_printf("%s/tmp-disk-%s.raw",
 +                                        dirname, di->devname);
 +                printf("DEVINFO %s %zd\n", devfn, di->size);
@@ -2165,60 +2086,57 @@ index 0000000000..bb715e9061
 +                write_zero = false;
 +            }
 +
-+            if (!skip) {
-+                size_t devlen = strlen(devfn);
-+                QDict *options = NULL;
-+                bool writethrough;
-+                if (format) {
-+                    /* explicit format from commandline */
-+                    options = qdict_new();
-+                    qdict_put_str(options, "driver", format);
-+                } else if ((devlen > 4 && strcmp(devfn+devlen-4, ".raw") == 0) ||
-+                    strncmp(devfn, "/dev/", 5) == 0)
-+                {
-+                    /* This part is now deprecated for PVE as well (just as qemu
-+                     * deprecated not specifying an explicit raw format, too.
-+                     */
-+                    /* explicit raw format */
-+                    options = qdict_new();
-+                    qdict_put_str(options, "driver", "raw");
-+                }
-+
-+                if (cache && bdrv_parse_cache_mode(cache, &flags, &writethrough)) {
-+                    g_error("invalid cache option: %s\n", cache);
-+                }
-+
-+                if (errp || !(blk = blk_new_open(devfn, NULL, options, flags, &errp))) {
-+                    g_error("can't open file %s - %s", devfn,
-+                            error_get_pretty(errp));
-+                }
-+
-+                if (cache) {
-+                    blk_set_enable_write_cache(blk, !writethrough);
-+                }
-+
-+                if (throttling_group) {
-+                    blk_io_limits_enable(blk, throttling_group);
-+                }
-+
-+                if (throttling_bps) {
-+                    if (!throttling_group) {
-+                        blk_io_limits_enable(blk, devfn);
-+                    }
-+
-+                    ThrottleConfig cfg;
-+                    throttle_config_init(&cfg);
-+                    cfg.buckets[THROTTLE_BPS_WRITE].avg = throttling_bps;
-+                    Error *err = NULL;
-+                    if (!throttle_is_valid(&cfg, &err)) {
-+                        error_report_err(err);
-+                        g_error("failed to apply throttling");
-+                    }
-+                    blk_set_io_limits(blk, &cfg);
-+                }
+	    size_t devlen = strlen(devfn);
+	    QDict *options = NULL;
+            bool writethrough;
+            if (format) {
+                /* explicit format from commandline */
+                options = qdict_new();
+                qdict_put_str(options, "driver", format);
+            } else if ((devlen > 4 && strcmp(devfn+devlen-4, ".raw") == 0) ||
+	               strncmp(devfn, "/dev/", 5) == 0)
+	    {
+                /* This part is now deprecated for PVE as well (just as qemu
+                 * deprecated not specifying an explicit raw format, too.
+                 */
+		/* explicit raw format */
+		options = qdict_new();
+		qdict_put_str(options, "driver", "raw");
+	    }
+            if (cache && bdrv_parse_cache_mode(cache, &flags, &writethrough)) {
+                g_error("invalid cache option: %s\n", cache);
 +            }
 +
-+            if (vma_reader_register_bs(vmar, i, blk, write_zero, skip, &errp) < 0) {
+	    if (errp || !(blk = blk_new_open(devfn, NULL, options, flags, &errp))) {
+                g_error("can't open file %s - %s", devfn,
+                        error_get_pretty(errp));
+            }
+
+            if (cache) {
+                blk_set_enable_write_cache(blk, !writethrough);
+            }
+
+            if (throttling_group) {
+                blk_io_limits_enable(blk, throttling_group);
+            }
+
+            if (throttling_bps) {
+                if (!throttling_group) {
+                    blk_io_limits_enable(blk, devfn);
+                }
+
+                ThrottleConfig cfg;
+                throttle_config_init(&cfg);
+                cfg.buckets[THROTTLE_BPS_WRITE].avg = throttling_bps;
+                Error *err = NULL;
+                if (!throttle_is_valid(&cfg, &err)) {
+                    error_report_err(err);
+                    g_error("failed to apply throttling");
+                }
+                blk_set_io_limits(blk, &cfg);
+            }
+
+            if (vma_reader_register_bs(vmar, i, blk, write_zero, &errp) < 0) {
 +                g_error("%s", error_get_pretty(errp));
 +            }
 +
@@ -2228,10 +2146,6 @@ index 0000000000..bb715e9061
 +        }
 +    }
 +
-+    if (drive_list) {
-+        g_strfreev(drive_list);
-+    }
-+
 +    if (vma_reader_restore(vmar, vmstate_fd, verbose, &errp) < 0) {
 +        g_error("restore failed - %s", error_get_pretty(errp));
 +    }
@@ -2239,7 +2153,7 @@ index 0000000000..bb715e9061
 +    if (!readmap) {
 +        for (i = 1; i < 255; i++) {
 +            VmaDeviceInfo *di = vma_reader_get_device_info(vmar, i);
-+            if (di && drive_rename_bitmap[i]) {
+            if (di && (i != vmstate_stream)) {
 +                char *tmpfn = g_strdup_printf("%s/tmp-disk-%s.raw",
 +                                              dirname, di->devname);
 +                char *fn = g_strdup_printf("%s/disk-%s.raw",
@@ -2338,7 +2252,7 @@ index 0000000000..bb715e9061
 +    struct iovec iov;
 +    QEMUIOVector qiov;
 +
-+    int64_t start, end, readlen;
+    int64_t start, end;
 +    int ret = 0;
 +
 +    unsigned char *buf = blk_blockalign(job->target, VMA_CLUSTER_SIZE);
@@ -2352,24 +2266,16 @@ index 0000000000..bb715e9061
 +        iov.iov_len = VMA_CLUSTER_SIZE;
 +        qemu_iovec_init_external(&qiov, &iov, 1);
 +
-+        if (start + 1 == end) {
-+            memset(buf, 0, VMA_CLUSTER_SIZE);
-+            readlen = job->len - start * VMA_CLUSTER_SIZE;
-+            assert(readlen > 0 && readlen <= VMA_CLUSTER_SIZE);
-+        } else {
-+            readlen = VMA_CLUSTER_SIZE;
-+        }
-+
 +        ret = blk_co_preadv(job->target, start * VMA_CLUSTER_SIZE,
-+                            readlen, &qiov, 0);
+                            VMA_CLUSTER_SIZE, &qiov, 0);
 +        if (ret < 0) {
-+            vma_writer_set_error(job->vmaw, "read error");
+            vma_writer_set_error(job->vmaw, "read error", -1);
 +            goto out;
 +        }
 +
 +        size_t zb = 0;
 +        if (vma_writer_write(job->vmaw, job->dev_id, start, buf, &zb) < 0) {
-+            vma_writer_set_error(job->vmaw, "backup_dump_cb vma_writer_write failed");
+            vma_writer_set_error(job->vmaw, "backup_dump_cb vma_writer_write failed", -1);
 +            goto out;
 +        }
 +    }
@@ -2387,7 +2293,7 @@ index 0000000000..bb715e9061
 +
 +static int create_archive(int argc, char **argv)
 +{
-+    int c;
+    int i, c;
 +    int verbose = 0;
 +    const char *archivename;
 +    GList *backup_coroutines = NULL;
@@ -2545,7 +2451,6 @@ index 0000000000..bb715e9061
 +    vma_writer_get_status(vmaw, &vmastat);
 +
 +    if (verbose) {
-+        int i;
 +        for (i = 0; i < 256; i++) {
 +            VmaStreamInfo *si = &vmastat.stream_info[i];
 +            if (si->size) {
@@ -2669,7 +2574,7 @@ index 0000000000..bb715e9061
 +}
 diff --git a/vma.h b/vma.h
 new file mode 100644
-index 0000000000..86d2873aa5
+index 0000000000..c895c97f6d
 --- /dev/null
 +++ b/vma.h
@@ -0,0 +1,150 @@
@@ -2807,7 +2712,7 @@ index 0000000000..86d2873aa5
 +int coroutine_fn vma_writer_flush_output(VmaWriter *vmaw);
 +
 +int vma_writer_get_status(VmaWriter *vmaw, VmaStatus *status);
-+void vma_writer_set_error(VmaWriter *vmaw, const char *fmt, ...) G_GNUC_PRINTF(2, 3);
+void vma_writer_set_error(VmaWriter *vmaw, const char *fmt, ...);
 +
 +
 +VmaReader *vma_reader_create(const char *filename, Error **errp);
@@ -2817,7 +2722,7 @@ index 0000000000..86d2873aa5
 +VmaDeviceInfo *vma_reader_get_device_info(VmaReader *vmar, guint8 dev_id);
 +int vma_reader_register_bs(VmaReader *vmar, guint8 dev_id,
 +                           BlockBackend *target, bool write_zeroes,
-+                           bool skip, Error **errp);
+                           Error **errp);
 +int vma_reader_restore(VmaReader *vmar, int vmstate_fd, bool verbose,
 +                       Error **errp);
 +int vma_reader_verify(VmaReader *vmar, bool verbose, Error **errp);
--- a/debian/patches/pve/0028-PVE-Backup-add-backup-dump-block-driver.patch
+++ b/debian/patches/pve/0028-PVE-Backup-add-backup-dump-block-driver.patch
@@ -9,23 +9,21 @@ Subject: [PATCH] PVE-Backup: add backup-dump block driver
 - job.c: make job_should_pause non-static

 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
-[FE: adapt to coroutine changes]
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 ---
- block/backup-dump.c              | 172 +++++++++++++++++++++++++++++++
+ block/backup-dump.c              | 167 +++++++++++++++++++++++++++++++
 block/backup.c                   |  30 ++----
 block/meson.build                |   1 +
 include/block/block_int-common.h |  35 +++++++
 job.c                            |   3 +-
- 5 files changed, 218 insertions(+), 23 deletions(-)
+ 5 files changed, 213 insertions(+), 23 deletions(-)
 create mode 100644 block/backup-dump.c

 diff --git a/block/backup-dump.c b/block/backup-dump.c
 new file mode 100644
-index 0000000000..e46abf1070
+index 0000000000..04718a94e2
 --- /dev/null
 +++ b/block/backup-dump.c
-@@ -0,0 +1,172 @@
+@@ -0,0 +1,167 @@
 +/*
 + * BlockDriver to send backup data stream to a callback function
 + *
@@ -37,8 +35,6 @@ index 0000000000..e46abf1070
 + */
 +
 +#include "qemu/osdep.h"
-+
-+#include "qapi/qmp/qdict.h"
 +#include "qom/object_interfaces.h"
 +#include "block/block_int.h"
 +
@@ -49,8 +45,7 @@ index 0000000000..e46abf1070
 +    void           *dump_cb_data;
 +} BDRVBackupDumpState;
 +
-+static coroutine_fn int qemu_backup_dump_co_get_info(BlockDriverState *bs,
-+                                                     BlockDriverInfo *bdi)
+static int qemu_backup_dump_get_info(BlockDriverState *bs, BlockDriverInfo *bdi)
 +{
 +    BDRVBackupDumpState *s = bs->opaque;
 +
@@ -91,7 +86,7 @@ index 0000000000..e46abf1070
 +    /* Nothing to do. */
 +}
 +
-+static coroutine_fn int64_t qemu_backup_dump_co_getlength(BlockDriverState *bs)
+static int64_t qemu_backup_dump_getlength(BlockDriverState *bs)
 +{
 +    BDRVBackupDumpState *s = bs->opaque;
 +
@@ -151,8 +146,8 @@ index 0000000000..e46abf1070
 +
 +    .bdrv_close                   = qemu_backup_dump_close,
 +    .bdrv_has_zero_init           = bdrv_has_zero_init_1,
-+    .bdrv_co_getlength            = qemu_backup_dump_co_getlength,
-+    .bdrv_co_get_info             = qemu_backup_dump_co_get_info,
+    .bdrv_getlength               = qemu_backup_dump_getlength,
+    .bdrv_get_info                = qemu_backup_dump_get_info,
 +
 +    .bdrv_co_writev               = qemu_backup_dump_co_writev,
 +
@@ -171,7 +166,7 @@ index 0000000000..e46abf1070
 +block_init(bdrv_backup_dump_init);
 +
 +
-+BlockDriverState *coroutine_fn bdrv_co_backup_dump_create(
+BlockDriverState *bdrv_backup_dump_create(
 +    int dump_cb_block_size,
 +    uint64_t byte_size,
 +    BackupDumpFunc *dump_cb,
@@ -179,11 +174,9 @@ index 0000000000..e46abf1070
 +    Error **errp)
 +{
 +    BDRVBackupDumpState *state;
+    BlockDriverState *bs = bdrv_new_open_driver(
+        &bdrv_backup_dump_drive, NULL, BDRV_O_RDWR, errp);
 +
-+    QDict *options = qdict_new();
-+    qdict_put_str(options, "driver", "backup-dump-drive");
-+
-+    BlockDriverState *bs = bdrv_co_open(NULL, NULL, options, BDRV_O_RDWR, errp);
 +    if (!bs) {
 +        return NULL;
 +    }
@@ -199,7 +192,7 @@ index 0000000000..e46abf1070
 +    return bs;
 +}
 diff --git a/block/backup.c b/block/backup.c
-index eba5b11493..1963e47ab9 100644
+index b6fa9e8a69..789f8b7799 100644
 --- a/block/backup.c
 +++ b/block/backup.c
@@ -29,28 +29,6 @@
@@ -231,7 +224,7 @@ index eba5b11493..1963e47ab9 100644
 static const BlockJobDriver backup_job_driver;
 
 static void backup_cleanup_sync_bitmap(BackupBlockJob *job, int ret)
-@@ -462,6 +440,14 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
+@@ -454,6 +432,14 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs,
     }
 
     cluster_size = block_copy_cluster_size(bcs);
@@ -247,7 +240,7 @@ index eba5b11493..1963e47ab9 100644
     if (perf->max_chunk && perf->max_chunk < cluster_size) {
         error_setg(errp, "Required max-chunk (%" PRIi64 ") is less than backup "
 diff --git a/block/meson.build b/block/meson.build
-index b245daa98e..e99914eaa4 100644
+index 3a0b84bc11..7f22e7f177 100644
 --- a/block/meson.build
 +++ b/block/meson.build
@@ -4,6 +4,7 @@ block_ss.add(files(
@@ -255,28 +248,28 @@ index b245daa98e..e99914eaa4 100644
   'amend.c',
   'backup.c',
 +  'backup-dump.c',
+   'copy-before-write.c',
   'blkdebug.c',
   'blklogwrites.c',
-   'blkverify.c',
 diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h
-index 761276127e..b3e6697613 100644
+index 8947abab76..f272d0d8dc 100644
 --- a/include/block/block_int-common.h
 +++ b/include/block/block_int-common.h
@@ -26,6 +26,7 @@
 
- #include "block/aio.h"
- #include "block/block-common.h"
+ #include "block/accounting.h"
+ #include "block/block.h"
 +#include "block/block-copy.h"
- #include "block/block-global-state.h"
- #include "block/snapshot.h"
- #include "qemu/iov.h"
-@@ -60,6 +61,40 @@
+ #include "block/aio-wait.h"
+ #include "qemu/queue.h"
+ #include "qemu/coroutine.h"
+@@ -64,6 +65,40 @@
 
 #define BLOCK_PROBE_BUF_SIZE        512
 
 +typedef int BackupDumpFunc(void *opaque, uint64_t offset, uint64_t bytes, const void *buf);
 +
-+BlockDriverState *coroutine_fn bdrv_co_backup_dump_create(
+BlockDriverState *bdrv_backup_dump_create(
 +    int dump_cb_block_size,
 +    uint64_t byte_size,
 +    BackupDumpFunc *dump_cb,
@@ -312,16 +305,16 @@ index 761276127e..b3e6697613 100644
     BDRV_TRACKED_READ,
     BDRV_TRACKED_WRITE,
 diff --git a/job.c b/job.c
-index 660ce22c56..baf54c8d60 100644
+index 075c6f3a20..e5699ad200 100644
 --- a/job.c
 +++ b/job.c
-@@ -331,7 +331,8 @@ static bool job_started_locked(Job *job)
+@@ -276,7 +276,8 @@ static bool job_started(Job *job)
+     return job->co;
 }
 
- /* Called with job_mutex held. */
-static bool job_should_pause_locked(Job *job)
-+bool job_should_pause_locked(Job *job);
-+bool job_should_pause_locked(Job *job)
+-static bool job_should_pause(Job *job)
+bool job_should_pause(Job *job);
+bool job_should_pause(Job *job)
 {
     return job->pause_count > 0;
 }
--- a/debian/patches/pve/0029-PVE-Backup-proxmox-backup-patches-for-qemu.patch
+++ b/debian/patches/pve/0029-PVE-Backup-proxmox-backup-patches-for-qemu.patch
--- a/debian/patches/pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch
+++ b/debian/patches/pve/0030-PVE-Backup-Proxmox-backup-patches-for-QEMU.patch
--- a/debian/patches/pve/0030-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch
+++ b/debian/patches/pve/0030-PVE-Backup-pbs-restore-new-command-to-restore-from-p.patch
@@ -5,19 +5,17 @@ Subject: [PATCH] PVE-Backup: pbs-restore - new command to restore from proxmox
 backup server

 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
-[WB: add namespace support]
-Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
 ---
 meson.build   |   4 +
- pbs-restore.c | 236 ++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 240 insertions(+)
+ pbs-restore.c | 223 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 227 insertions(+)
 create mode 100644 pbs-restore.c

 diff --git a/meson.build b/meson.build
-index d16b97cf3c..6de51c34cb 100644
+index 0bc2fb5b10..f48d2e0457 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -4029,6 +4029,10 @@ if have_tools
+@@ -3613,6 +3613,10 @@ if have_tools
   vma = executable('vma', files('vma.c', 'vma-reader.c') + genh,
                    dependencies: [authz, block, crypto, io, qom], install: true)
 
@@ -26,14 +24,14 @@ index d16b97cf3c..6de51c34cb 100644
 +                    libproxmox_backup_qemu], install: true)
 +
   subdir('storage-daemon')
- 
-   foreach exe: [ 'qemu-img', 'qemu-io', 'qemu-nbd', 'qemu-storage-daemon']
+   subdir('contrib/rdmacm-mux')
+   subdir('contrib/elf2dmp')
 diff --git a/pbs-restore.c b/pbs-restore.c
 new file mode 100644
-index 0000000000..f03d9bab8d
+index 0000000000..2f834cf42e
 --- /dev/null
 +++ b/pbs-restore.c
-@@ -0,0 +1,236 @@
+@@ -0,0 +1,223 @@
 +/*
 + * Qemu image restore helper for Proxmox Backup
 + *
@@ -65,7 +63,7 @@ index 0000000000..f03d9bab8d
 +static void help(void)
 +{
 +    const char *help_msg =
-+        "usage: pbs-restore [--repository <repo>] [--ns namespace] snapshot archive-name target [command options]\n"
+        "usage: pbs-restore [--repository <repo>] snapshot archive-name target [command options]\n"
 +        ;
 +
 +    printf("%s", help_msg);
@@ -113,7 +111,6 @@ index 0000000000..f03d9bab8d
 +    Error *main_loop_err = NULL;
 +    const char *format = "raw";
 +    const char *repository = NULL;
-+    const char *backup_ns = NULL;
 +    const char *keyfile = NULL;
 +    int verbose = false;
 +    bool skip_zero = false;
@@ -127,7 +124,6 @@ index 0000000000..f03d9bab8d
 +            {"verbose", no_argument, 0, 'v'},
 +            {"format", required_argument, 0, 'f'},
 +            {"repository", required_argument, 0, 'r'},
-+            {"ns", required_argument, 0, 'n'},
 +            {"keyfile", required_argument, 0, 'k'},
 +            {0, 0, 0, 0}
 +        };
@@ -148,9 +144,6 @@ index 0000000000..f03d9bab8d
 +            case 'r':
 +                repository = g_strdup(argv[optind - 1]);
 +                break;
-+            case 'n':
-+                backup_ns = g_strdup(argv[optind - 1]);
-+                break;
 +            case 'k':
 +                keyfile = g_strdup(argv[optind - 1]);
 +                break;
@@ -201,16 +194,8 @@ index 0000000000..f03d9bab8d
 +        fprintf(stderr, "connecting to repository '%s'\n", repository);
 +    }
 +    char *pbs_error = NULL;
-+    ProxmoxRestoreHandle *conn = proxmox_restore_new_ns(
-+        repository,
-+        snapshot,
-+        backup_ns,
-+        password,
-+        keyfile,
-+        key_password,
-+        fingerprint,
-+        &pbs_error
-+    );
+    ProxmoxRestoreHandle *conn = proxmox_restore_new(
+        repository, snapshot, password, keyfile, key_password, fingerprint, &pbs_error);
 +    if (conn == NULL) {
 +        fprintf(stderr, "restore failed: %s\n", pbs_error);
 +        return -1;
--- a/debian/patches/pve/0031-PVE-Backup-Add-dirty-bitmap-tracking-for-incremental.patch
+++ b/debian/patches/pve/0031-PVE-Backup-Add-dirty-bitmap-tracking-for-incremental.patch
@@ -0,0 +1,452 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Stefan Reiter <s.reiter@proxmox.com>
+Date: Mon, 29 Jun 2020 11:06:03 +0200
+Subject: [PATCH] PVE-Backup: Add dirty-bitmap tracking for incremental backups
+
+Uses QEMU's existing MIRROR_SYNC_MODE_BITMAP and a dirty-bitmap on top
+of all backed-up drives. This will only execute the data-write callback
+for any changed chunks, the PBS rust code will reuse chunks from the
+previous index for everything it doesn't receive if reuse_index is true.
+
+On error or cancellation, remove all dirty bitmaps to ensure
+consistency.
+
+Add PBS/incremental specific information to query backup info QMP and
+HMP commands.
+
+Only supported for PBS backups.
+
+Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
+Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ block/monitor/block-hmp-cmds.c |   1 +
+ monitor/hmp-cmds.c             |  45 ++++++++++----
+ proxmox-backup-client.c        |   3 +-
+ proxmox-backup-client.h        |   1 +
+ pve-backup.c                   | 103 ++++++++++++++++++++++++++++++---
+ qapi/block-core.json           |  12 +++-
+ 6 files changed, 142 insertions(+), 23 deletions(-)
+
+diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c
+index 89ca64444d..45da74d7a0 100644
+--- a/block/monitor/block-hmp-cmds.c
+++ b/block/monitor/block-hmp-cmds.c
+@@ -1042,6 +1042,7 @@ void hmp_backup(Monitor *mon, const QDict *qdict)
+         false, NULL, // PBS fingerprint
+         false, NULL, // PBS backup-id
+         false, 0, // PBS backup-time
+        false, false, // PBS incremental
+         true, dir ? BACKUP_FORMAT_DIR : BACKUP_FORMAT_VMA,
+         false, NULL, false, NULL, !!devlist,
+         devlist, qdict_haskey(qdict, "speed"), speed, &error);
+diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
+index 1168773da7..4c1671e289 100644
+--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
+@@ -223,19 +223,42 @@ void hmp_info_backup(Monitor *mon, const QDict *qdict)
+             monitor_printf(mon, "End time: %s", ctime(&info->end_time));
+         }
+ 
+-        int per = (info->has_total && info->total &&
+-            info->has_transferred && info->transferred) ?
+-            (info->transferred * 100)/info->total : 0;
+-        int zero_per = (info->has_total && info->total &&
+-                        info->has_zero_bytes && info->zero_bytes) ?
+-            (info->zero_bytes * 100)/info->total : 0;
+         monitor_printf(mon, "Backup file: %s\n", info->backup_file);
+         monitor_printf(mon, "Backup uuid: %s\n", info->uuid);
+-        monitor_printf(mon, "Total size: %zd\n", info->total);
+-        monitor_printf(mon, "Transferred bytes: %zd (%d%%)\n",
+-                       info->transferred, per);
+-        monitor_printf(mon, "Zero bytes: %zd (%d%%)\n",
+-                       info->zero_bytes, zero_per);
+
+        if (!(info->has_total && info->total))  {
+            // this should not happen normally
+            monitor_printf(mon, "Total size: %d\n", 0);
+        } else {
+            bool incremental = false;
+            size_t total_or_dirty = info->total;
+            if (info->has_transferred) {
+                if (info->has_dirty && info->dirty) {
+                     if (info->dirty < info->total) {
+                        total_or_dirty = info->dirty;
+                        incremental = true;
+                    }
+                }
+            }
+
+            int per = (info->transferred * 100)/total_or_dirty;
+
+            monitor_printf(mon, "Backup mode: %s\n", incremental ? "incremental" : "full");
+
+            int zero_per = (info->has_zero_bytes && info->zero_bytes) ?
+                (info->zero_bytes * 100)/info->total : 0;
+            monitor_printf(mon, "Total size: %zd\n", info->total);
+            monitor_printf(mon, "Transferred bytes: %zd (%d%%)\n",
+                           info->transferred, per);
+            monitor_printf(mon, "Zero bytes: %zd (%d%%)\n",
+                           info->zero_bytes, zero_per);
+
+            if (info->has_reused) {
+                int reused_per = (info->reused * 100)/total_or_dirty;
+                monitor_printf(mon, "Reused bytes: %zd (%d%%)\n",
+                               info->reused, reused_per);
+            }
+        }
+     }
+ 
+     qapi_free_BackupStatus(info);
+diff --git a/proxmox-backup-client.c b/proxmox-backup-client.c
+index a8f6653a81..4ce7bc0b5e 100644
+--- a/proxmox-backup-client.c
+++ b/proxmox-backup-client.c
+@@ -89,6 +89,7 @@ proxmox_backup_co_register_image(
+     ProxmoxBackupHandle *pbs,
+     const char *device_name,
+     uint64_t size,
+    bool incremental,
+     Error **errp)
+ {
+     Coroutine *co = qemu_coroutine_self();
+@@ -98,7 +99,7 @@ proxmox_backup_co_register_image(
+     int pbs_res = -1;
+ 
+     proxmox_backup_register_image_async(
+-        pbs, device_name, size ,proxmox_backup_schedule_wake, &waker, &pbs_res, &pbs_err);
+        pbs, device_name, size, incremental, proxmox_backup_schedule_wake, &waker, &pbs_res, &pbs_err);
+     qemu_coroutine_yield();
+     if (pbs_res < 0) {
+         if (errp) error_setg(errp, "backup register image failed: %s", pbs_err ? pbs_err : "unknown error");
+diff --git a/proxmox-backup-client.h b/proxmox-backup-client.h
+index 1dda8b7d8f..8cbf645b2c 100644
+--- a/proxmox-backup-client.h
+++ b/proxmox-backup-client.h
+@@ -32,6 +32,7 @@ proxmox_backup_co_register_image(
+     ProxmoxBackupHandle *pbs,
+     const char *device_name,
+     uint64_t size,
+    bool incremental,
+     Error **errp);
+ 
+ 
+diff --git a/pve-backup.c b/pve-backup.c
+index 88f5ee133f..1c49cd178d 100644
+--- a/pve-backup.c
+++ b/pve-backup.c
+@@ -28,6 +28,8 @@
+  *
+  */
+ 
+const char *PBS_BITMAP_NAME = "pbs-incremental-dirty-bitmap";
+
+ static struct PVEBackupState {
+     struct {
+         // Everithing accessed from qmp_backup_query command is protected using lock
+@@ -39,7 +41,9 @@ static struct PVEBackupState {
+         uuid_t uuid;
+         char uuid_str[37];
+         size_t total;
+        size_t dirty;
+         size_t transferred;
+        size_t reused;
+         size_t zero_bytes;
+     } stat;
+     int64_t speed;
+@@ -66,6 +70,7 @@ typedef struct PVEBackupDevInfo {
+     uint8_t dev_id;
+     bool completed;
+     char targetfile[PATH_MAX];
+    BdrvDirtyBitmap *bitmap;
+     BlockDriverState *target;
+ } PVEBackupDevInfo;
+ 
+@@ -105,11 +110,12 @@ static bool pvebackup_error_or_canceled(void)
+     return error_or_canceled;
+ }
+ 
+-static void pvebackup_add_transfered_bytes(size_t transferred, size_t zero_bytes)
+static void pvebackup_add_transfered_bytes(size_t transferred, size_t zero_bytes, size_t reused)
+ {
+     qemu_mutex_lock(&backup_state.stat.lock);
+     backup_state.stat.zero_bytes += zero_bytes;
+     backup_state.stat.transferred += transferred;
+    backup_state.stat.reused += reused;
+     qemu_mutex_unlock(&backup_state.stat.lock);
+ }
+ 
+@@ -148,7 +154,8 @@ pvebackup_co_dump_pbs_cb(
+         pvebackup_propagate_error(local_err);
+         return pbs_res;
+     } else {
+-        pvebackup_add_transfered_bytes(size, !buf ? size : 0);
+        size_t reused = (pbs_res == 0) ? size : 0;
+        pvebackup_add_transfered_bytes(size, !buf ? size : 0, reused);
+     }
+ 
+     return size;
+@@ -208,11 +215,11 @@ pvebackup_co_dump_vma_cb(
+         } else {
+             if (remaining >= VMA_CLUSTER_SIZE) {
+                 assert(ret == VMA_CLUSTER_SIZE);
+-                pvebackup_add_transfered_bytes(VMA_CLUSTER_SIZE, zero_bytes);
+                pvebackup_add_transfered_bytes(VMA_CLUSTER_SIZE, zero_bytes, 0);
+                 remaining -= VMA_CLUSTER_SIZE;
+             } else {
+                 assert(ret == remaining);
+-                pvebackup_add_transfered_bytes(remaining, zero_bytes);
+                pvebackup_add_transfered_bytes(remaining, zero_bytes, 0);
+                 remaining = 0;
+             }
+         }
+@@ -248,6 +255,18 @@ static void coroutine_fn pvebackup_co_cleanup(void *unused)
+             if (local_err != NULL) {
+                 pvebackup_propagate_error(local_err);
+             }
+        } else {
+            // on error or cancel we cannot ensure synchronization of dirty
+            // bitmaps with backup server, so remove all and do full backup next
+            GList *l = backup_state.di_list;
+            while (l) {
+                PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
+                l = g_list_next(l);
+
+                if (di->bitmap) {
+                    bdrv_release_dirty_bitmap(di->bitmap);
+                }
+            }
+         }
+ 
+         proxmox_backup_disconnect(backup_state.pbs);
+@@ -303,6 +322,12 @@ static void pvebackup_complete_cb(void *opaque, int ret)
+     // remove self from job queue
+     backup_state.di_list = g_list_remove(backup_state.di_list, di);
+ 
+    if (di->bitmap && ret < 0) {
+        // on error or cancel we cannot ensure synchronization of dirty
+        // bitmaps with backup server, so remove all and do full backup next
+        bdrv_release_dirty_bitmap(di->bitmap);
+    }
+
+     g_free(di);
+ 
+     qemu_mutex_unlock(&backup_state.backup_mutex);
+@@ -472,12 +497,18 @@ static bool create_backup_jobs(void) {
+ 
+         assert(di->target != NULL);
+ 
+        MirrorSyncMode sync_mode = MIRROR_SYNC_MODE_FULL;
+        BitmapSyncMode bitmap_mode = BITMAP_SYNC_MODE_NEVER;
+        if (di->bitmap) {
+            sync_mode = MIRROR_SYNC_MODE_BITMAP;
+            bitmap_mode = BITMAP_SYNC_MODE_ON_SUCCESS;
+        }
+         AioContext *aio_context = bdrv_get_aio_context(di->bs);
+         aio_context_acquire(aio_context);
+ 
+         BlockJob *job = backup_job_create(
+-            NULL, di->bs, di->target, backup_state.speed, MIRROR_SYNC_MODE_FULL, NULL,
+-            BITMAP_SYNC_MODE_NEVER, false, NULL, &perf, BLOCKDEV_ON_ERROR_REPORT, BLOCKDEV_ON_ERROR_REPORT,
+            NULL, di->bs, di->target, backup_state.speed, sync_mode, di->bitmap,
+            bitmap_mode, false, NULL, &perf, BLOCKDEV_ON_ERROR_REPORT, BLOCKDEV_ON_ERROR_REPORT,
+             JOB_DEFAULT, pvebackup_complete_cb, di, NULL, &local_err);
+ 
+         aio_context_release(aio_context);
+@@ -528,6 +559,8 @@ typedef struct QmpBackupTask {
+     const char *fingerprint;
+     bool has_fingerprint;
+     int64_t backup_time;
+    bool has_use_dirty_bitmap;
+    bool use_dirty_bitmap;
+     bool has_format;
+     BackupFormat format;
+     bool has_config_file;
+@@ -619,6 +652,7 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+     }
+ 
+     size_t total = 0;
+    size_t dirty = 0;
+ 
+     l = di_list;
+     while (l) {
+@@ -656,6 +690,8 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+         int dump_cb_block_size = PROXMOX_BACKUP_DEFAULT_CHUNK_SIZE; // Hardcoded (4M)
+         firewall_name = "fw.conf";
+ 
+        bool use_dirty_bitmap = task->has_use_dirty_bitmap && task->use_dirty_bitmap;
+
+         char *pbs_err = NULL;
+         pbs = proxmox_backup_new(
+             task->backup_file,
+@@ -675,7 +711,8 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+             goto err;
+         }
+ 
+-        if (proxmox_backup_co_connect(pbs, task->errp) < 0)
+        int connect_result = proxmox_backup_co_connect(pbs, task->errp);
+        if (connect_result < 0)
+             goto err;
+ 
+         /* register all devices */
+@@ -686,9 +723,40 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+ 
+             const char *devname = bdrv_get_device_name(di->bs);
+ 
+-            int dev_id = proxmox_backup_co_register_image(pbs, devname, di->size, task->errp);
+-            if (dev_id < 0)
+            BdrvDirtyBitmap *bitmap = bdrv_find_dirty_bitmap(di->bs, PBS_BITMAP_NAME);
+            bool expect_only_dirty = false;
+
+            if (use_dirty_bitmap) {
+                if (bitmap == NULL) {
+                    bitmap = bdrv_create_dirty_bitmap(di->bs, dump_cb_block_size, PBS_BITMAP_NAME, task->errp);
+                    if (!bitmap) {
+                        goto err;
+                    }
+                } else {
+                    expect_only_dirty = proxmox_backup_check_incremental(pbs, devname, di->size) != 0;
+                }
+
+                if (expect_only_dirty) {
+                    dirty += bdrv_get_dirty_count(bitmap);
+                } else {
+                    /* mark entire bitmap as dirty to make full backup */
+                    bdrv_set_dirty_bitmap(bitmap, 0, di->size);
+                    dirty += di->size;
+                }
+                di->bitmap = bitmap;
+            } else {
+                dirty += di->size;
+
+                /* after a full backup the old dirty bitmap is invalid anyway */
+                if (bitmap != NULL) {
+                    bdrv_release_dirty_bitmap(bitmap);
+                }
+            }
+
+            int dev_id = proxmox_backup_co_register_image(pbs, devname, di->size, expect_only_dirty, task->errp);
+            if (dev_id < 0) {
+                 goto err;
+            }
+ 
+             if (!(di->target = bdrv_backup_dump_create(dump_cb_block_size, di->size, pvebackup_co_dump_pbs_cb, di, task->errp))) {
+                 goto err;
+@@ -697,6 +765,8 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+             di->dev_id = dev_id;
+         }
+     } else if (format == BACKUP_FORMAT_VMA) {
+        dirty = total;
+
+         vmaw = vma_writer_create(task->backup_file, uuid, &local_err);
+         if (!vmaw) {
+             if (local_err) {
+@@ -724,6 +794,8 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+             }
+         }
+     } else if (format == BACKUP_FORMAT_DIR) {
+        dirty = total;
+
+         if (mkdir(task->backup_file, 0640) != 0) {
+             error_setg_errno(task->errp, errno, "can't create directory '%s'\n",
+                              task->backup_file);
+@@ -796,8 +868,10 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+     char *uuid_str = g_strdup(backup_state.stat.uuid_str);
+ 
+     backup_state.stat.total = total;
+    backup_state.stat.dirty = dirty;
+     backup_state.stat.transferred = 0;
+     backup_state.stat.zero_bytes = 0;
+    backup_state.stat.reused = format == BACKUP_FORMAT_PBS && dirty >= total ? 0 : total - dirty;
+ 
+     qemu_mutex_unlock(&backup_state.stat.lock);
+ 
+@@ -821,6 +895,10 @@ err:
+         PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
+         l = g_list_next(l);
+ 
+        if (di->bitmap) {
+            bdrv_release_dirty_bitmap(di->bitmap);
+        }
+
+         if (di->target) {
+             bdrv_unref(di->target);
+         }
+@@ -862,6 +940,7 @@ UuidInfo *qmp_backup(
+     bool has_fingerprint, const char *fingerprint,
+     bool has_backup_id, const char *backup_id,
+     bool has_backup_time, int64_t backup_time,
+    bool has_use_dirty_bitmap, bool use_dirty_bitmap,
+     bool has_format, BackupFormat format,
+     bool has_config_file, const char *config_file,
+     bool has_firewall_file, const char *firewall_file,
+@@ -880,6 +959,8 @@ UuidInfo *qmp_backup(
+         .backup_id = backup_id,
+         .has_backup_time = has_backup_time,
+         .backup_time = backup_time,
+        .has_use_dirty_bitmap = has_use_dirty_bitmap,
+        .use_dirty_bitmap = use_dirty_bitmap,
+         .has_format = has_format,
+         .format = format,
+         .has_config_file = has_config_file,
+@@ -948,10 +1029,14 @@ BackupStatus *qmp_query_backup(Error **errp)
+ 
+     info->has_total = true;
+     info->total = backup_state.stat.total;
+    info->has_dirty = true;
+    info->dirty = backup_state.stat.dirty;
+     info->has_zero_bytes = true;
+     info->zero_bytes = backup_state.stat.zero_bytes;
+     info->has_transferred = true;
+     info->transferred = backup_state.stat.transferred;
+    info->has_reused = true;
+    info->reused = backup_state.stat.reused;
+ 
+     qemu_mutex_unlock(&backup_state.stat.lock);
+ 
+diff --git a/qapi/block-core.json b/qapi/block-core.json
+index 90ad07b7ee..3ad9eb5d1a 100644
+--- a/qapi/block-core.json
+++ b/qapi/block-core.json
+@@ -753,8 +753,13 @@
+ #
+ # @total: total amount of bytes involved in the backup process
+ #
+# @dirty: with incremental mode (PBS) this is the amount of bytes involved
+#         in the backup process which are marked dirty.
+#
+ # @transferred: amount of bytes already backed up.
+ #
+# @reused: amount of bytes reused due to deduplication.
+#
+ # @zero-bytes: amount of 'zero' bytes detected.
+ #
+ # @start-time: time (epoch) when backup job started.
+@@ -767,8 +772,8 @@
+ #
+ ##
+ { 'struct': 'BackupStatus',
+-  'data': {'*status': 'str', '*errmsg': 'str', '*total': 'int',
+-           '*transferred': 'int', '*zero-bytes': 'int',
+  'data': {'*status': 'str', '*errmsg': 'str', '*total': 'int', '*dirty': 'int',
+           '*transferred': 'int', '*zero-bytes': 'int', '*reused': 'int',
+            '*start-time': 'int', '*end-time': 'int',
+            '*backup-file': 'str', '*uuid': 'str' } }
+ 
+@@ -811,6 +816,8 @@
+ #
+ # @backup-time: backup timestamp (Unix epoch, required for format 'pbs')
+ #
+# @use-dirty-bitmap: use dirty bitmap to detect incremental changes since last job (optional for format 'pbs')
+#
+ # Returns: the uuid of the backup job
+ #
+ ##
+@@ -821,6 +828,7 @@
+                                     '*fingerprint': 'str',
+                                     '*backup-id': 'str',
+                                     '*backup-time': 'int',
+                                    '*use-dirty-bitmap': 'bool',
+                                     '*format': 'BackupFormat',
+                                     '*config-file': 'str',
+                                     '*firewall-file': 'str',
--- a/debian/patches/pve/0032-PVE-various-PBS-fixes.patch
+++ b/debian/patches/pve/0032-PVE-various-PBS-fixes.patch
@@ -0,0 +1,219 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Dietmar Maurer <dietmar@proxmox.com>
+Date: Thu, 9 Jul 2020 12:53:08 +0200
+Subject: [PATCH] PVE: various PBS fixes
+
+pbs: fix crypt and compress parameters
+Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
+
+PVE: handle PBS write callback with big blocks correctly
+Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
+
+PVE: add zero block handling to PBS dump callback
+Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ block/monitor/block-hmp-cmds.c |  4 ++-
+ pve-backup.c                   | 57 +++++++++++++++++++++++++++-------
+ qapi/block-core.json           |  6 ++++
+ 3 files changed, 54 insertions(+), 13 deletions(-)
+
+diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c
+index 45da74d7a0..ea7b665aa2 100644
+--- a/block/monitor/block-hmp-cmds.c
+++ b/block/monitor/block-hmp-cmds.c
+@@ -1042,7 +1042,9 @@ void hmp_backup(Monitor *mon, const QDict *qdict)
+         false, NULL, // PBS fingerprint
+         false, NULL, // PBS backup-id
+         false, 0, // PBS backup-time
+-        false, false, // PBS incremental
+        false, false, // PBS use-dirty-bitmap
+        false, false, // PBS compress
+        false, false, // PBS encrypt
+         true, dir ? BACKUP_FORMAT_DIR : BACKUP_FORMAT_VMA,
+         false, NULL, false, NULL, !!devlist,
+         devlist, qdict_haskey(qdict, "speed"), speed, &error);
+diff --git a/pve-backup.c b/pve-backup.c
+index 1c49cd178d..c15abefdda 100644
+--- a/pve-backup.c
+++ b/pve-backup.c
+@@ -8,6 +8,7 @@
+ #include "block/blockjob.h"
+ #include "qapi/qapi-commands-block.h"
+ #include "qapi/qmp/qerror.h"
+#include "qemu/cutils.h"
+ 
+ /* PVE backup state and related function */
+ 
+@@ -67,6 +68,7 @@ opts_init(pvebackup_init);
+ typedef struct PVEBackupDevInfo {
+     BlockDriverState *bs;
+     size_t size;
+    uint64_t block_size;
+     uint8_t dev_id;
+     bool completed;
+     char targetfile[PATH_MAX];
+@@ -135,10 +137,13 @@ pvebackup_co_dump_pbs_cb(
+     PVEBackupDevInfo *di = opaque;
+ 
+     assert(backup_state.pbs);
+    assert(buf);
+ 
+     Error *local_err = NULL;
+     int pbs_res = -1;
+ 
+    bool is_zero_block = size == di->block_size && buffer_is_zero(buf, size);
+
+     qemu_co_mutex_lock(&backup_state.dump_callback_mutex);
+ 
+     // avoid deadlock if job is cancelled
+@@ -147,17 +152,29 @@ pvebackup_co_dump_pbs_cb(
+         return -1;
+     }
+ 
+-    pbs_res = proxmox_backup_co_write_data(backup_state.pbs, di->dev_id, buf, start, size, &local_err);
+-    qemu_co_mutex_unlock(&backup_state.dump_callback_mutex);
+    uint64_t transferred = 0;
+    uint64_t reused = 0;
+    while (transferred < size) {
+        uint64_t left = size - transferred;
+        uint64_t to_transfer = left < di->block_size ? left : di->block_size;
+ 
+-    if (pbs_res < 0) {
+-        pvebackup_propagate_error(local_err);
+-        return pbs_res;
+-    } else {
+-        size_t reused = (pbs_res == 0) ? size : 0;
+-        pvebackup_add_transfered_bytes(size, !buf ? size : 0, reused);
+        pbs_res = proxmox_backup_co_write_data(backup_state.pbs, di->dev_id,
+            is_zero_block ? NULL : buf + transferred, start + transferred,
+            to_transfer, &local_err);
+        transferred += to_transfer;
+
+        if (pbs_res < 0) {
+            pvebackup_propagate_error(local_err);
+            qemu_co_mutex_unlock(&backup_state.dump_callback_mutex);
+            return pbs_res;
+        }
+
+        reused += pbs_res == 0 ? to_transfer : 0;
+     }
+ 
+    qemu_co_mutex_unlock(&backup_state.dump_callback_mutex);
+    pvebackup_add_transfered_bytes(size, is_zero_block ? size : 0, reused);
+
+     return size;
+ }
+ 
+@@ -178,6 +195,7 @@ pvebackup_co_dump_vma_cb(
+     int ret = -1;
+ 
+     assert(backup_state.vmaw);
+    assert(buf);
+ 
+     uint64_t remaining = size;
+ 
+@@ -204,9 +222,7 @@ pvebackup_co_dump_vma_cb(
+         qemu_co_mutex_unlock(&backup_state.dump_callback_mutex);
+ 
+         ++cluster_num;
+-        if (buf) {
+-            buf += VMA_CLUSTER_SIZE;
+-        }
+        buf += VMA_CLUSTER_SIZE;
+         if (ret < 0) {
+             Error *local_err = NULL;
+             vma_writer_error_propagate(backup_state.vmaw, &local_err);
+@@ -569,6 +585,10 @@ typedef struct QmpBackupTask {
+     const char *firewall_file;
+     bool has_devlist;
+     const char *devlist;
+    bool has_compress;
+    bool compress;
+    bool has_encrypt;
+    bool encrypt;
+     bool has_speed;
+     int64_t speed;
+     Error **errp;
+@@ -692,6 +712,7 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+ 
+         bool use_dirty_bitmap = task->has_use_dirty_bitmap && task->use_dirty_bitmap;
+ 
+
+         char *pbs_err = NULL;
+         pbs = proxmox_backup_new(
+             task->backup_file,
+@@ -701,8 +722,10 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+             task->has_password ? task->password : NULL,
+             task->has_keyfile ? task->keyfile : NULL,
+             task->has_key_password ? task->key_password : NULL,
+            task->has_compress ? task->compress : true,
+            task->has_encrypt ? task->encrypt : task->has_keyfile,
+             task->has_fingerprint ? task->fingerprint : NULL,
+-            &pbs_err);
+             &pbs_err);
+ 
+         if (!pbs) {
+             error_set(task->errp, ERROR_CLASS_GENERIC_ERROR,
+@@ -721,6 +744,8 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+             PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
+             l = g_list_next(l);
+ 
+            di->block_size = dump_cb_block_size;
+
+             const char *devname = bdrv_get_device_name(di->bs);
+ 
+             BdrvDirtyBitmap *bitmap = bdrv_find_dirty_bitmap(di->bs, PBS_BITMAP_NAME);
+@@ -941,6 +966,8 @@ UuidInfo *qmp_backup(
+     bool has_backup_id, const char *backup_id,
+     bool has_backup_time, int64_t backup_time,
+     bool has_use_dirty_bitmap, bool use_dirty_bitmap,
+    bool has_compress, bool compress,
+    bool has_encrypt, bool encrypt,
+     bool has_format, BackupFormat format,
+     bool has_config_file, const char *config_file,
+     bool has_firewall_file, const char *firewall_file,
+@@ -951,6 +978,8 @@ UuidInfo *qmp_backup(
+         .backup_file = backup_file,
+         .has_password = has_password,
+         .password = password,
+        .has_keyfile = has_keyfile,
+        .keyfile = keyfile,
+         .has_key_password = has_key_password,
+         .key_password = key_password,
+         .has_fingerprint = has_fingerprint,
+@@ -961,6 +990,10 @@ UuidInfo *qmp_backup(
+         .backup_time = backup_time,
+         .has_use_dirty_bitmap = has_use_dirty_bitmap,
+         .use_dirty_bitmap = use_dirty_bitmap,
+        .has_compress = has_compress,
+        .compress = compress,
+        .has_encrypt = has_encrypt,
+        .encrypt = encrypt,
+         .has_format = has_format,
+         .format = format,
+         .has_config_file = has_config_file,
+diff --git a/qapi/block-core.json b/qapi/block-core.json
+index 3ad9eb5d1a..4120052690 100644
+--- a/qapi/block-core.json
+++ b/qapi/block-core.json
+@@ -818,6 +818,10 @@
+ #
+ # @use-dirty-bitmap: use dirty bitmap to detect incremental changes since last job (optional for format 'pbs')
+ #
+# @compress: use compression (optional for format 'pbs', defaults to true)
+#
+# @encrypt: use encryption ((optional for format 'pbs', defaults to true if there is a keyfile)
+#
+ # Returns: the uuid of the backup job
+ #
+ ##
+@@ -829,6 +833,8 @@
+                                     '*backup-id': 'str',
+                                     '*backup-time': 'int',
+                                     '*use-dirty-bitmap': 'bool',
+                                    '*compress': 'bool',
+                                    '*encrypt': 'bool',
+                                     '*format': 'BackupFormat',
+                                     '*config-file': 'str',
+                                     '*firewall-file': 'str',
--- a/debian/patches/pve/0033-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch
+++ b/debian/patches/pve/0033-PVE-Add-PBS-block-driver-to-map-backup-archives-into.patch
@@ -7,40 +7,38 @@ Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
 [error cleanups, file_open implementation]
 Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
-[WB: add namespace support]
-Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
 [FE: adapt to changed function signatures
-     make pbs_co_preadv return values consistent with QEMU
-     getlength is now a coroutine function]
+     make pbs_co_preadv return values consistent with QEMU]
 Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 ---
- block/meson.build    |   2 +
- block/pbs.c          | 313 +++++++++++++++++++++++++++++++++++++++++++
+ block/meson.build    |   3 +
+ block/pbs.c          | 276 +++++++++++++++++++++++++++++++++++++++++++
+ configure            |   9 ++
 meson.build          |   2 +-
- qapi/block-core.json |  29 ++++
- qapi/pragma.json     |   1 +
- 5 files changed, 346 insertions(+), 1 deletion(-)
+ qapi/block-core.json |  13 ++
+ 5 files changed, 302 insertions(+), 1 deletion(-)
 create mode 100644 block/pbs.c

 diff --git a/block/meson.build b/block/meson.build
-index 6bba803f94..1945e04eeb 100644
+index 2783b77e9c..a26a69434e 100644
 --- a/block/meson.build
 +++ b/block/meson.build
-@@ -49,6 +49,8 @@ block_ss.add(files(
+@@ -53,6 +53,9 @@ block_ss.add(files(
   '../pve-backup.c',
 ), libproxmox_backup_qemu)
 
-+block_ss.add(files('pbs.c'), libproxmox_backup_qemu)
+block_ss.add(when: 'CONFIG_PBS_BDRV', if_true: files('pbs.c'))
+block_ss.add(when: 'CONFIG_PBS_BDRV', if_true: libproxmox_backup_qemu)
 +
 
- system_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
- system_ss.add(files('block-ram-registrar.c'))
+ softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
+ 
 diff --git a/block/pbs.c b/block/pbs.c
 new file mode 100644
-index 0000000000..aee66c2e93
+index 0000000000..9d1f1f39d4
 --- /dev/null
 +++ b/block/pbs.c
-@@ -0,0 +1,313 @@
+@@ -0,0 +1,276 @@
 +/*
 + * Proxmox Backup Server read-only block driver
 + */
@@ -53,12 +51,10 @@ index 0000000000..aee66c2e93
 +#include "qemu/option.h"
 +#include "qemu/cutils.h"
 +#include "block/block_int.h"
-+#include "block/block-io.h"
 +
 +#include <proxmox-backup-qemu.h>
 +
 +#define PBS_OPT_REPOSITORY "repository"
-+#define PBS_OPT_NAMESPACE "namespace"
 +#define PBS_OPT_SNAPSHOT "snapshot"
 +#define PBS_OPT_ARCHIVE "archive"
 +#define PBS_OPT_KEYFILE "keyfile"
@@ -68,11 +64,10 @@ index 0000000000..aee66c2e93
 +
 +typedef struct {
 +    ProxmoxRestoreHandle *conn;
-+    uint8_t aid;
+    char aid;
 +    int64_t length;
 +
 +    char *repository;
-+    char *namespace;
 +    char *snapshot;
 +    char *archive;
 +} BDRVPBSState;
@@ -87,11 +82,6 @@ index 0000000000..aee66c2e93
 +            .help = "The server address and repository to connect to.",
 +        },
 +        {
-+            .name = PBS_OPT_NAMESPACE,
-+            .type = QEMU_OPT_STRING,
-+            .help = "Optional: The snapshot's namespace.",
-+        },
-+        {
 +            .name = PBS_OPT_SNAPSHOT,
 +            .type = QEMU_OPT_STRING,
 +            .help = "The snapshot to read.",
@@ -127,7 +117,7 @@ index 0000000000..aee66c2e93
 +
 +
 +// filename format:
-+// pbs:repository=<repo>,namespace=<ns>,snapshot=<snap>,password=<pw>,key_password=<kpw>,fingerprint=<fp>,archive=<archive>
+// pbs:repository=<repo>,snapshot=<snap>,password=<pw>,key_password=<kpw>,fingerprint=<fp>,archive=<archive>
 +static void pbs_parse_filename(const char *filename, QDict *options,
 +                                     Error **errp)
 +{
@@ -163,7 +153,6 @@ index 0000000000..aee66c2e93
 +    s->archive = g_strdup(qemu_opt_get(opts, PBS_OPT_ARCHIVE));
 +    const char *keyfile = qemu_opt_get(opts, PBS_OPT_KEYFILE);
 +    const char *password = qemu_opt_get(opts, PBS_OPT_PASSWORD);
-+    const char *namespace = qemu_opt_get(opts, PBS_OPT_NAMESPACE);
 +    const char *fingerprint = qemu_opt_get(opts, PBS_OPT_FINGERPRINT);
 +    const char *key_password = qemu_opt_get(opts, PBS_OPT_ENCRYPTION_PASSWORD);
 +
@@ -176,12 +165,9 @@ index 0000000000..aee66c2e93
 +    if (!key_password) {
 +        key_password = getenv("PBS_ENCRYPTION_PASSWORD");
 +    }
-+    if (namespace) {
-+        s->namespace = g_strdup(namespace);
-+    }
 +
 +    /* connect to PBS server in read mode */
-+    s->conn = proxmox_restore_new_ns(s->repository, s->snapshot, s->namespace, password,
+    s->conn = proxmox_restore_new(s->repository, s->snapshot, password,
 +        keyfile, key_password, fingerprint, &pbs_error);
 +
 +    /* invalidates qemu_opt_get char pointers from above */
@@ -201,18 +187,12 @@ index 0000000000..aee66c2e93
 +    }
 +
 +    /* acquire handle and length */
-+    ret = proxmox_restore_open_image(s->conn, s->archive, &pbs_error);
-+    if (ret < 0) {
+    s->aid = proxmox_restore_open_image(s->conn, s->archive, &pbs_error);
+    if (s->aid < 0) {
 +        if (pbs_error && errp) error_setg(errp, "PBS open_image failed: %s", pbs_error);
 +        if (pbs_error) proxmox_backup_free_error(pbs_error);
 +        return -ENODEV;
 +    }
-+    if (ret > UINT8_MAX) {
-+        error_setg(errp, "PBS open_image returned an ID larger than %u", UINT8_MAX);
-+        return -ENODEV;
-+    }
-+    s->aid = ret;
-+
 +    s->length = proxmox_restore_get_image_length(s->conn, s->aid, &pbs_error);
 +    if (s->length < 0) {
 +        if (pbs_error && errp) error_setg(errp, "PBS get_image_length failed: %s", pbs_error);
@@ -232,14 +212,12 @@ index 0000000000..aee66c2e93
 +static void pbs_close(BlockDriverState *bs) {
 +    BDRVPBSState *s = bs->opaque;
 +    g_free(s->repository);
-+    g_free(s->namespace);
 +    g_free(s->snapshot);
 +    g_free(s->archive);
 +    proxmox_restore_disconnect(s->conn);
 +}
 +
-+static coroutine_fn int64_t GRAPH_RDLOCK
-+pbs_co_getlength(BlockDriverState *bs)
+static int64_t pbs_getlength(BlockDriverState *bs)
 +{
 +    BDRVPBSState *s = bs->opaque;
 +    return s->length;
@@ -256,23 +234,14 @@ index 0000000000..aee66c2e93
 +    aio_co_schedule(rcb->ctx, rcb->co);
 +}
 +
-+static coroutine_fn int GRAPH_RDLOCK
-+pbs_co_preadv(BlockDriverState *bs, int64_t offset, int64_t bytes,
-+              QEMUIOVector *qiov, BdrvRequestFlags flags)
+static coroutine_fn int pbs_co_preadv(BlockDriverState *bs,
+                                      int64_t offset, int64_t bytes,
+                                      QEMUIOVector *qiov, BdrvRequestFlags flags)
 +{
 +    BDRVPBSState *s = bs->opaque;
 +    int ret;
 +    char *pbs_error = NULL;
-+    uint8_t *buf;
-+    bool inline_buf = true;
-+
-+    /* for single-buffer IO vectors we can fast-path the write directly to it */
-+    if (qiov->niov == 1 && qiov->iov->iov_len >= bytes) {
-+        buf = qiov->iov->iov_base;
-+    } else {
-+        inline_buf = false;
-+        buf = g_malloc(bytes);
-+    }
+    uint8_t *buf = malloc(bytes);
 +
 +    if (offset < 0 || bytes < 0) {
 +        fprintf(stderr, "unexpected negative 'offset' or 'bytes' value!\n");
@@ -295,34 +264,26 @@ index 0000000000..aee66c2e93
 +        return -EIO;
 +    }
 +
-+    if (!inline_buf) {
-+        qemu_iovec_from_buf(qiov, 0, buf, bytes);
-+        g_free(buf);
-+    }
+    qemu_iovec_from_buf(qiov, 0, buf, bytes);
+    free(buf);
 +
 +    return 0;
 +}
 +
-+static coroutine_fn int GRAPH_RDLOCK
-+pbs_co_pwritev(BlockDriverState *bs, int64_t offset, int64_t bytes,
-+               QEMUIOVector *qiov, BdrvRequestFlags flags)
+static coroutine_fn int pbs_co_pwritev(BlockDriverState *bs,
+                                       int64_t offset, int64_t bytes,
+                                       QEMUIOVector *qiov, BdrvRequestFlags flags)
 +{
 +    fprintf(stderr, "pbs-bdrv: cannot write to backup file, make sure "
 +           "any attached disk devices are set to read-only!\n");
 +    return -EPERM;
 +}
 +
-+static void GRAPH_RDLOCK
-+pbs_refresh_filename(BlockDriverState *bs)
+static void pbs_refresh_filename(BlockDriverState *bs)
 +{
 +    BDRVPBSState *s = bs->opaque;
-+    if (s->namespace) {
-+        snprintf(bs->exact_filename, sizeof(bs->exact_filename), "%s/%s:%s(%s)",
-+                 s->repository, s->namespace, s->snapshot, s->archive);
-+    } else {
-+        snprintf(bs->exact_filename, sizeof(bs->exact_filename), "%s/%s(%s)",
-+                 s->repository, s->snapshot, s->archive);
-+    }
+    snprintf(bs->exact_filename, sizeof(bs->exact_filename), "%s/%s(%s)",
+             s->repository, s->snapshot, s->archive);
 +}
 +
 +static const char *const pbs_strong_runtime_opts[] = {
@@ -339,7 +300,7 @@ index 0000000000..aee66c2e93
 +    .bdrv_file_open         = pbs_file_open,
 +    .bdrv_open              = pbs_open,
 +    .bdrv_close             = pbs_close,
-+    .bdrv_co_getlength      = pbs_co_getlength,
+    .bdrv_getlength         = pbs_getlength,
 +
 +    .bdrv_co_preadv         = pbs_co_preadv,
 +    .bdrv_co_pwritev        = pbs_co_pwritev,
@@ -354,11 +315,52 @@ index 0000000000..aee66c2e93
 +}
 +
 +block_init(bdrv_pbs_init);
+diff --git a/configure b/configure
+index 72ab03f11a..7203c270ec 100755
+--- a/configure
+++ b/configure
+@@ -309,6 +309,7 @@ linux_user=""
+ bsd_user=""
+ pie=""
+ coroutine=""
+pbs_bdrv="yes"
+ plugins="$default_feature"
+ meson=""
+ meson_args=""
+@@ -902,6 +903,10 @@ for opt do
+   --enable-uuid|--disable-uuid)
+       echo "$0: $opt is obsolete, UUID support is always built" >&2
+   ;;
+  --disable-pbs-bdrv) pbs_bdrv="no"
+  ;;
+  --enable-pbs-bdrv) pbs_bdrv="yes"
+  ;;
+   --with-git=*) git="$optarg"
+   ;;
+   --with-git-submodules=*)
+@@ -1087,6 +1092,7 @@ cat << EOF
+   debug-info      debugging information
+   safe-stack      SafeStack Stack Smash Protection. Depends on
+                   clang/llvm >= 3.7 and requires coroutine backend ucontext.
+  pbs-bdrv        Proxmox backup server read-only block driver support
+ 
+ NOTE: The object files are built at the place where configure is launched
+ EOF
+@@ -2463,6 +2469,9 @@ echo "TARGET_DIRS=$target_list" >> $config_host_mak
+ if test "$modules" = "yes"; then
+   echo "CONFIG_MODULES=y" >> $config_host_mak
+ fi
+if test "$pbs_bdrv" = "yes" ; then
+  echo "CONFIG_PBS_BDRV=y" >> $config_host_mak
+fi
+ 
+ # XXX: suppress that
+ if [ "$bsd" = "yes" ] ; then
 diff --git a/meson.build b/meson.build
-index 6de51c34cb..3bc039f60f 100644
+index f48d2e0457..be4785e2f6 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -4477,7 +4477,7 @@ summary_info += {'bzip2 support':     libbzip2}
+@@ -3986,7 +3986,7 @@ summary_info += {'bzip2 support':     libbzip2}
 summary_info += {'lzfse support':     liblzfse}
 summary_info += {'zstd support':      zstd}
 summary_info += {'NUMA host support': numa}
@@ -368,18 +370,18 @@ index 6de51c34cb..3bc039f60f 100644
 summary_info += {'libdaxctl support': libdaxctl}
 summary_info += {'libudev':           libudev}
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index d05fffce1d..e7cf3d94f3 100644
+index 4120052690..96bc696aaa 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
-@@ -3457,6 +3457,7 @@
-             'parallels', 'preallocate', 'qcow', 'qcow2', 'qed', 'quorum',
-             'raw', 'rbd',
+@@ -3099,6 +3099,7 @@
+             'luks', 'nbd', 'nfs', 'null-aio', 'null-co', 'nvme', 'parallels',
+             'preallocate', 'qcow', 'qcow2', 'qed', 'quorum', 'raw', 'rbd',
             { 'name': 'replication', 'if': 'CONFIG_REPLICATION' },
 +            'pbs',
-             'ssh', 'throttle', 'vdi', 'vhdx',
-             { 'name': 'virtio-blk-vfio-pci', 'if': 'CONFIG_BLKIO' },
-             { 'name': 'virtio-blk-vhost-user', 'if': 'CONFIG_BLKIO' },
-@@ -3543,6 +3544,33 @@
+             'ssh', 'throttle', 'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat' ] }
+ 
+ ##
+@@ -3171,6 +3172,17 @@
 { 'struct': 'BlockdevOptionsNull',
   'data': { '*size': 'int', '*latency-ns': 'uint64', '*read-zeroes': 'bool' } }
 
@@ -388,48 +390,20 @@ index d05fffce1d..e7cf3d94f3 100644
 +#
 +# Driver specific block device options for the PBS backend.
 +#
-+# @repository: Proxmox Backup Server repository.
-+#
-+# @snapshot: backup snapshots ID.
-+#
-+# @archive: archive name.
-+#
-+# @keyfile: keyfile to use for encryption.
-+#
-+# @password: password to use for connection.
-+#
-+# @fingerprint: backup server fingerprint.
-+#
-+# @key_password: password to unlock key.
-+#
-+# @namespace: namespace where backup snapshot lives.
-+#
 +##
 +{ 'struct': 'BlockdevOptionsPbs',
 +  'data': { 'repository': 'str', 'snapshot': 'str', 'archive': 'str',
 +            '*keyfile': 'str', '*password': 'str', '*fingerprint': 'str',
-+            '*key_password': 'str', '*namespace': 'str' } }
+            '*key_password': 'str' } }
 +
 ##
 # @BlockdevOptionsNVMe:
 #
-@@ -4977,6 +5005,7 @@
+@@ -4455,6 +4467,7 @@
       'nfs':        'BlockdevOptionsNfs',
       'null-aio':   'BlockdevOptionsNull',
       'null-co':    'BlockdevOptionsNull',
 +      'pbs':        'BlockdevOptionsPbs',
       'nvme':       'BlockdevOptionsNVMe',
-       'nvme-io_uring': { 'type': 'BlockdevOptionsNvmeIoUring',
-                          'if': 'CONFIG_BLKIO' },
-diff --git a/qapi/pragma.json b/qapi/pragma.json
-index be8fa304c5..7ff46bd128 100644
--- a/qapi/pragma.json
-+++ b/qapi/pragma.json
-@@ -100,6 +100,7 @@
-         'BlockInfo',                # query-block
-         'BlockdevAioOptions',       # blockdev-add, -blockdev
-         'BlockdevDriver',           # blockdev-add, query-blockstats, ...
-+        'BlockdevOptionsPbs',       # for PBS backwards compat
-         'BlockdevVmdkAdapterType',  # blockdev-create (to match VMDK spec)
-         'BlockdevVmdkSubformat',    # blockdev-create (to match VMDK spec)
-         'ColoCompareProperties',    # object_add, -object
+       'parallels':  'BlockdevOptionsGenericFormat',
+       'preallocate':'BlockdevOptionsPreallocate',
--- a/debian/patches/pve/0034-PVE-add-query_proxmox_support-QMP-command.patch
+++ b/debian/patches/pve/0034-PVE-add-query_proxmox_support-QMP-command.patch
@@ -0,0 +1,74 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Stefan Reiter <s.reiter@proxmox.com>
+Date: Wed, 8 Jul 2020 11:57:53 +0200
+Subject: [PATCH] PVE: add query_proxmox_support QMP command
+
+Generic interface for future use, currently used for PBS dirty-bitmap
+backup support.
+
+Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+[PVE: query-proxmox-support: include library version]
+Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
+---
+ pve-backup.c         |  9 +++++++++
+ qapi/block-core.json | 29 +++++++++++++++++++++++++++++
+ 2 files changed, 38 insertions(+)
+
+diff --git a/pve-backup.c b/pve-backup.c
+index c15abefdda..4684789813 100644
+--- a/pve-backup.c
+++ b/pve-backup.c
+@@ -1075,3 +1075,12 @@ BackupStatus *qmp_query_backup(Error **errp)
+ 
+     return info;
+ }
+
+ProxmoxSupportStatus *qmp_query_proxmox_support(Error **errp)
+{
+    ProxmoxSupportStatus *ret = g_malloc0(sizeof(*ret));
+    ret->pbs_library_version = g_strdup(proxmox_backup_qemu_version());
+    ret->pbs_dirty_bitmap = true;
+    ret->pbs_dirty_bitmap_savevm = true;
+    return ret;
+}
+diff --git a/qapi/block-core.json b/qapi/block-core.json
+index 96bc696aaa..0b453c61d4 100644
+--- a/qapi/block-core.json
+++ b/qapi/block-core.json
+@@ -863,6 +863,35 @@
+ ##
+ { 'command': 'backup-cancel' }
+ 
+##
+# @ProxmoxSupportStatus:
+#
+# Contains info about supported features added by Proxmox.
+#
+# @pbs-dirty-bitmap: True if dirty-bitmap-incremental backups to PBS are
+#                    supported.
+#
+# @pbs-dirty-bitmap-savevm: True if 'dirty-bitmaps' migration capability can
+#                           safely be set for savevm-async.
+#
+# @pbs-library-version: Running version of libproxmox-backup-qemu0 library.
+#
+##
+{ 'struct': 'ProxmoxSupportStatus',
+  'data': { 'pbs-dirty-bitmap': 'bool',
+            'pbs-dirty-bitmap-savevm': 'bool',
+            'pbs-library-version': 'str' } }
+
+##
+# @query-proxmox-support:
+#
+# Returns information about supported features added by Proxmox.
+#
+# Returns: @ProxmoxSupportStatus
+#
+##
+{ 'command': 'query-proxmox-support', 'returns': 'ProxmoxSupportStatus' }
+
+ ##
+ # @BlockDeviceTimedStats:
+ #
--- a/debian/patches/pve/0035-PVE-add-query-pbs-bitmap-info-QMP-call.patch
+++ b/debian/patches/pve/0035-PVE-add-query-pbs-bitmap-info-QMP-call.patch
@@ -0,0 +1,441 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Stefan Reiter <s.reiter@proxmox.com>
+Date: Wed, 19 Aug 2020 17:02:00 +0200
+Subject: [PATCH] PVE: add query-pbs-bitmap-info QMP call
+
+Returns advanced information about dirty bitmaps used (or not used) for
+the latest PBS backup.
+
+Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ monitor/hmp-cmds.c   |  28 ++++++-----
+ pve-backup.c         | 117 ++++++++++++++++++++++++++++++++-----------
+ qapi/block-core.json |  56 +++++++++++++++++++++
+ 3 files changed, 159 insertions(+), 42 deletions(-)
+
+diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
+index 4c1671e289..c1152f55a7 100644
+--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
+@@ -200,6 +200,7 @@ void hmp_info_mice(Monitor *mon, const QDict *qdict)
+ void hmp_info_backup(Monitor *mon, const QDict *qdict)
+ {
+     BackupStatus *info;
+    PBSBitmapInfoList *bitmap_info;
+ 
+     info = qmp_query_backup(NULL);
+ 
+@@ -230,26 +231,29 @@ void hmp_info_backup(Monitor *mon, const QDict *qdict)
+             // this should not happen normally
+             monitor_printf(mon, "Total size: %d\n", 0);
+         } else {
+-            bool incremental = false;
+             size_t total_or_dirty = info->total;
+-            if (info->has_transferred) {
+-                if (info->has_dirty && info->dirty) {
+-                     if (info->dirty < info->total) {
+-                        total_or_dirty = info->dirty;
+-                        incremental = true;
+-                    }
+-                }
+            bitmap_info = qmp_query_pbs_bitmap_info(NULL);
+
+            while (bitmap_info) {
+                monitor_printf(mon, "Drive %s:\n",
+                        bitmap_info->value->drive);
+                monitor_printf(mon, "  bitmap action: %s\n",
+                        PBSBitmapAction_str(bitmap_info->value->action));
+                monitor_printf(mon, "  size: %zd\n",
+                        bitmap_info->value->size);
+                monitor_printf(mon, "  dirty: %zd\n",
+                        bitmap_info->value->dirty);
+                bitmap_info = bitmap_info->next;
+             }
+ 
+-            int per = (info->transferred * 100)/total_or_dirty;
+-
+-            monitor_printf(mon, "Backup mode: %s\n", incremental ? "incremental" : "full");
+            qapi_free_PBSBitmapInfoList(bitmap_info);
+ 
+             int zero_per = (info->has_zero_bytes && info->zero_bytes) ?
+                 (info->zero_bytes * 100)/info->total : 0;
+             monitor_printf(mon, "Total size: %zd\n", info->total);
+            int trans_per = (info->transferred * 100)/total_or_dirty;
+             monitor_printf(mon, "Transferred bytes: %zd (%d%%)\n",
+-                           info->transferred, per);
+                           info->transferred, trans_per);
+             monitor_printf(mon, "Zero bytes: %zd (%d%%)\n",
+                            info->zero_bytes, zero_per);
+ 
+diff --git a/pve-backup.c b/pve-backup.c
+index 4684789813..f90abaa50a 100644
+--- a/pve-backup.c
+++ b/pve-backup.c
+@@ -46,6 +46,7 @@ static struct PVEBackupState {
+         size_t transferred;
+         size_t reused;
+         size_t zero_bytes;
+        GList *bitmap_list;
+     } stat;
+     int64_t speed;
+     VmaWriter *vmaw;
+@@ -672,7 +673,6 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+     }
+ 
+     size_t total = 0;
+-    size_t dirty = 0;
+ 
+     l = di_list;
+     while (l) {
+@@ -693,18 +693,33 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+ 
+     uuid_generate(uuid);
+ 
+    qemu_mutex_lock(&backup_state.stat.lock);
+    backup_state.stat.reused = 0;
+
+    /* clear previous backup's bitmap_list */
+    if (backup_state.stat.bitmap_list) {
+        GList *bl = backup_state.stat.bitmap_list;
+        while (bl) {
+            g_free(((PBSBitmapInfo *)bl->data)->drive);
+            g_free(bl->data);
+            bl = g_list_next(bl);
+        }
+        g_list_free(backup_state.stat.bitmap_list);
+        backup_state.stat.bitmap_list = NULL;
+    }
+
+     if (format == BACKUP_FORMAT_PBS) {
+         if (!task->has_password) {
+             error_set(task->errp, ERROR_CLASS_GENERIC_ERROR, "missing parameter 'password'");
+-            goto err;
+            goto err_mutex;
+         }
+         if (!task->has_backup_id) {
+             error_set(task->errp, ERROR_CLASS_GENERIC_ERROR, "missing parameter 'backup-id'");
+-            goto err;
+            goto err_mutex;
+         }
+         if (!task->has_backup_time) {
+             error_set(task->errp, ERROR_CLASS_GENERIC_ERROR, "missing parameter 'backup-time'");
+-            goto err;
+            goto err_mutex;
+         }
+ 
+         int dump_cb_block_size = PROXMOX_BACKUP_DEFAULT_CHUNK_SIZE; // Hardcoded (4M)
+@@ -731,12 +746,12 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+             error_set(task->errp, ERROR_CLASS_GENERIC_ERROR,
+                       "proxmox_backup_new failed: %s", pbs_err);
+             proxmox_backup_free_error(pbs_err);
+-            goto err;
+            goto err_mutex;
+         }
+ 
+         int connect_result = proxmox_backup_co_connect(pbs, task->errp);
+         if (connect_result < 0)
+-            goto err;
+            goto err_mutex;
+ 
+         /* register all devices */
+         l = di_list;
+@@ -747,6 +762,8 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+             di->block_size = dump_cb_block_size;
+ 
+             const char *devname = bdrv_get_device_name(di->bs);
+            PBSBitmapAction action = PBS_BITMAP_ACTION_NOT_USED;
+            size_t dirty = di->size;
+ 
+             BdrvDirtyBitmap *bitmap = bdrv_find_dirty_bitmap(di->bs, PBS_BITMAP_NAME);
+             bool expect_only_dirty = false;
+@@ -755,49 +772,59 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+                 if (bitmap == NULL) {
+                     bitmap = bdrv_create_dirty_bitmap(di->bs, dump_cb_block_size, PBS_BITMAP_NAME, task->errp);
+                     if (!bitmap) {
+-                        goto err;
+                        goto err_mutex;
+                     }
+                    action = PBS_BITMAP_ACTION_NEW;
+                 } else {
+                     expect_only_dirty = proxmox_backup_check_incremental(pbs, devname, di->size) != 0;
+                 }
+ 
+                 if (expect_only_dirty) {
+-                    dirty += bdrv_get_dirty_count(bitmap);
+                    /* track clean chunks as reused */
+                    dirty = MIN(bdrv_get_dirty_count(bitmap), di->size);
+                    backup_state.stat.reused += di->size - dirty;
+                    action = PBS_BITMAP_ACTION_USED;
+                 } else {
+                     /* mark entire bitmap as dirty to make full backup */
+                     bdrv_set_dirty_bitmap(bitmap, 0, di->size);
+-                    dirty += di->size;
+                    if (action != PBS_BITMAP_ACTION_NEW) {
+                        action = PBS_BITMAP_ACTION_INVALID;
+                    }
+                 }
+                 di->bitmap = bitmap;
+             } else {
+-                dirty += di->size;
+-
+                 /* after a full backup the old dirty bitmap is invalid anyway */
+                 if (bitmap != NULL) {
+                     bdrv_release_dirty_bitmap(bitmap);
+                    action = PBS_BITMAP_ACTION_NOT_USED_REMOVED;
+                 }
+             }
+ 
+             int dev_id = proxmox_backup_co_register_image(pbs, devname, di->size, expect_only_dirty, task->errp);
+             if (dev_id < 0) {
+-                goto err;
+                goto err_mutex;
+             }
+ 
+             if (!(di->target = bdrv_backup_dump_create(dump_cb_block_size, di->size, pvebackup_co_dump_pbs_cb, di, task->errp))) {
+-                goto err;
+                goto err_mutex;
+             }
+ 
+             di->dev_id = dev_id;
+
+            PBSBitmapInfo *info = g_malloc(sizeof(*info));
+            info->drive = g_strdup(devname);
+            info->action = action;
+            info->size = di->size;
+            info->dirty = dirty;
+            backup_state.stat.bitmap_list = g_list_append(backup_state.stat.bitmap_list, info);
+         }
+     } else if (format == BACKUP_FORMAT_VMA) {
+-        dirty = total;
+-
+         vmaw = vma_writer_create(task->backup_file, uuid, &local_err);
+         if (!vmaw) {
+             if (local_err) {
+                 error_propagate(task->errp, local_err);
+             }
+-            goto err;
+            goto err_mutex;
+         }
+ 
+         /* register all devices for vma writer */
+@@ -807,7 +834,7 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+             l = g_list_next(l);
+ 
+             if (!(di->target = bdrv_backup_dump_create(VMA_CLUSTER_SIZE, di->size, pvebackup_co_dump_vma_cb, di, task->errp))) {
+-                goto err;
+                goto err_mutex;
+             }
+ 
+             const char *devname = bdrv_get_device_name(di->bs);
+@@ -815,16 +842,14 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+             if (di->dev_id <= 0) {
+                 error_set(task->errp, ERROR_CLASS_GENERIC_ERROR,
+                           "register_stream failed");
+-                goto err;
+                goto err_mutex;
+             }
+         }
+     } else if (format == BACKUP_FORMAT_DIR) {
+-        dirty = total;
+-
+         if (mkdir(task->backup_file, 0640) != 0) {
+             error_setg_errno(task->errp, errno, "can't create directory '%s'\n",
+                              task->backup_file);
+-            goto err;
+            goto err_mutex;
+         }
+         backup_dir = task->backup_file;
+ 
+@@ -841,18 +866,18 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+                             di->size, flags, false, &local_err);
+             if (local_err) {
+                 error_propagate(task->errp, local_err);
+-                goto err;
+                goto err_mutex;
+             }
+ 
+             di->target = bdrv_open(di->targetfile, NULL, NULL, flags, &local_err);
+             if (!di->target) {
+                 error_propagate(task->errp, local_err);
+-                goto err;
+                goto err_mutex;
+             }
+         }
+     } else {
+         error_set(task->errp, ERROR_CLASS_GENERIC_ERROR, "unknown backup format");
+-        goto err;
+        goto err_mutex;
+     }
+ 
+ 
+@@ -860,7 +885,7 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+     if (task->has_config_file) {
+         if (pvebackup_co_add_config(task->config_file, config_name, format, backup_dir,
+                                     vmaw, pbs, task->errp) != 0) {
+-            goto err;
+            goto err_mutex;
+         }
+     }
+ 
+@@ -868,12 +893,11 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+     if (task->has_firewall_file) {
+         if (pvebackup_co_add_config(task->firewall_file, firewall_name, format, backup_dir,
+                                     vmaw, pbs, task->errp) != 0) {
+-            goto err;
+            goto err_mutex;
+         }
+     }
+     /* initialize global backup_state now */
+-
+-    qemu_mutex_lock(&backup_state.stat.lock);
+    /* note: 'reused' and 'bitmap_list' are initialized earlier */
+ 
+     if (backup_state.stat.error) {
+         error_free(backup_state.stat.error);
+@@ -893,10 +917,9 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+     char *uuid_str = g_strdup(backup_state.stat.uuid_str);
+ 
+     backup_state.stat.total = total;
+-    backup_state.stat.dirty = dirty;
+    backup_state.stat.dirty = total - backup_state.stat.reused;
+     backup_state.stat.transferred = 0;
+     backup_state.stat.zero_bytes = 0;
+-    backup_state.stat.reused = format == BACKUP_FORMAT_PBS && dirty >= total ? 0 : total - dirty;
+ 
+     qemu_mutex_unlock(&backup_state.stat.lock);
+ 
+@@ -913,6 +936,9 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+     task->result = uuid_info;
+     return;
+ 
+err_mutex:
+    qemu_mutex_unlock(&backup_state.stat.lock);
+
+ err:
+ 
+     l = di_list;
+@@ -1076,11 +1102,42 @@ BackupStatus *qmp_query_backup(Error **errp)
+     return info;
+ }
+ 
+PBSBitmapInfoList *qmp_query_pbs_bitmap_info(Error **errp)
+{
+    PBSBitmapInfoList *head = NULL, **p_next = &head;
+
+    qemu_mutex_lock(&backup_state.stat.lock);
+
+    GList *l = backup_state.stat.bitmap_list;
+    while (l) {
+        PBSBitmapInfo *info = (PBSBitmapInfo *)l->data;
+        l = g_list_next(l);
+
+        /* clone bitmap info to avoid auto free after QMP marshalling */
+        PBSBitmapInfo *info_ret = g_malloc0(sizeof(*info_ret));
+        info_ret->drive = g_strdup(info->drive);
+        info_ret->action = info->action;
+        info_ret->size = info->size;
+        info_ret->dirty = info->dirty;
+
+        PBSBitmapInfoList *info_list = g_malloc0(sizeof(*info_list));
+        info_list->value = info_ret;
+
+        *p_next = info_list;
+        p_next = &info_list->next;
+    }
+
+    qemu_mutex_unlock(&backup_state.stat.lock);
+
+    return head;
+}
+
+ ProxmoxSupportStatus *qmp_query_proxmox_support(Error **errp)
+ {
+     ProxmoxSupportStatus *ret = g_malloc0(sizeof(*ret));
+     ret->pbs_library_version = g_strdup(proxmox_backup_qemu_version());
+     ret->pbs_dirty_bitmap = true;
+     ret->pbs_dirty_bitmap_savevm = true;
+    ret->query_bitmap_info = true;
+     return ret;
+ }
+diff --git a/qapi/block-core.json b/qapi/block-core.json
+index 0b453c61d4..16e184dd28 100644
+--- a/qapi/block-core.json
+++ b/qapi/block-core.json
+@@ -871,6 +871,8 @@
+ # @pbs-dirty-bitmap: True if dirty-bitmap-incremental backups to PBS are
+ #                    supported.
+ #
+# @query-bitmap-info: True if the 'query-pbs-bitmap-info' QMP call is supported.
+#
+ # @pbs-dirty-bitmap-savevm: True if 'dirty-bitmaps' migration capability can
+ #                           safely be set for savevm-async.
+ #
+@@ -879,6 +881,7 @@
+ ##
+ { 'struct': 'ProxmoxSupportStatus',
+   'data': { 'pbs-dirty-bitmap': 'bool',
+            'query-bitmap-info': 'bool',
+             'pbs-dirty-bitmap-savevm': 'bool',
+             'pbs-library-version': 'str' } }
+ 
+@@ -892,6 +895,59 @@
+ ##
+ { 'command': 'query-proxmox-support', 'returns': 'ProxmoxSupportStatus' }
+ 
+##
+# @PBSBitmapAction:
+#
+# An action taken on a dirty-bitmap when a backup job was started.
+#
+# @not-used: Bitmap mode was not enabled.
+#
+# @not-used-removed: Bitmap mode was not enabled, but a bitmap from a
+#                    previous backup still existed and was removed.
+#
+# @new: A new bitmap was attached to the drive for this backup.
+#
+# @used: An existing bitmap will be used to only backup changed data.
+#
+# @invalid: A bitmap existed, but had to be cleared since it's associated
+#           base snapshot did not match the base given for the current job or
+#           the crypt mode has changed.
+#
+##
+{ 'enum': 'PBSBitmapAction',
+  'data': ['not-used', 'not-used-removed', 'new', 'used', 'invalid'] }
+
+##
+# @PBSBitmapInfo:
+#
+# Contains information about dirty bitmaps used for each drive in a PBS backup.
+#
+# @drive: The underlying drive.
+#
+# @action: The action that was taken when the backup started.
+#
+# @size: The total size of the drive.
+#
+# @dirty: How much of the drive is considered dirty and will be backed up,
+#         or 'size' if everything will be.
+#
+##
+{ 'struct': 'PBSBitmapInfo',
+  'data': { 'drive': 'str', 'action': 'PBSBitmapAction', 'size': 'int',
+            'dirty': 'int' } }
+
+##
+# @query-pbs-bitmap-info:
+#
+# Returns information about dirty bitmaps used on the most recently started
+# backup. Returns nothing when the last backup was not using PBS or if no
+# backup occured in this session.
+#
+# Returns: @PBSBitmapInfo
+#
+##
+{ 'command': 'query-pbs-bitmap-info', 'returns': ['PBSBitmapInfo'] }
+
+ ##
+ # @BlockDeviceTimedStats:
+ #
--- a/debian/patches/pve/0036-PVE-redirect-stderr-to-journal-when-daemonized.patch
+++ b/debian/patches/pve/0036-PVE-redirect-stderr-to-journal-when-daemonized.patch
@@ -9,15 +9,15 @@ fitting.
 Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
- meson.build | 3 ++-
+ meson.build | 2 ++
 os-posix.c  | 7 +++++--
- 2 files changed, 7 insertions(+), 3 deletions(-)
+ 2 files changed, 7 insertions(+), 2 deletions(-)

 diff --git a/meson.build b/meson.build
-index 3bc039f60f..067e8956a7 100644
+index be4785e2f6..3fc7c8d435 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -1923,6 +1923,7 @@ endif
+@@ -1463,6 +1463,7 @@ keyutils = dependency('libkeyutils', required: false,
 has_gettid = cc.has_function('gettid')
 
 libuuid = cc.find_library('uuid', required: true)
@@ -25,29 +25,28 @@ index 3bc039f60f..067e8956a7 100644
 libproxmox_backup_qemu = cc.find_library('proxmox_backup_qemu', required: true)
 
 # libselinux
-@@ -3530,7 +3531,7 @@ if have_block
-   if host_os == 'windows'
-     system_ss.add(files('os-win32.c'))
-   else
-    blockdev_ss.add(files('os-posix.c'))
-+    blockdev_ss.add(files('os-posix.c'), libsystemd)
-   endif
+@@ -3105,6 +3106,7 @@ if have_block
+   # os-posix.c contains POSIX-specific functions used by qemu-storage-daemon,
+   # os-win32.c does not
+   blockdev_ss.add(when: 'CONFIG_POSIX', if_true: files('os-posix.c'))
+  blockdev_ss.add(when: 'CONFIG_POSIX', if_true: libsystemd)
+   softmmu_ss.add(when: 'CONFIG_WIN32', if_true: [files('os-win32.c')])
 endif
 
 diff --git a/os-posix.c b/os-posix.c
-index a4284e2c07..197a2120fd 100644
+index 321fc4bd13..b1870d2690 100644
 --- a/os-posix.c
 +++ b/os-posix.c
-@@ -29,6 +29,8 @@
+@@ -28,6 +28,8 @@
 #include <pwd.h>
 #include <grp.h>
 #include <libgen.h>
 +#include <systemd/sd-journal.h>
 +#include <syslog.h>
 
- #include "qemu/error-report.h"
- #include "qemu/log.h"
-@@ -302,9 +304,10 @@ void os_setup_post(void)
+ /* Needed early for CONFIG_BSD etc. */
+ #include "net/slirp.h"
+@@ -281,9 +283,10 @@ void os_setup_post(void)
 
         dup2(fd, 0);
         dup2(fd, 1);
--- a/debian/patches/pve/0037-PVE-Add-sequential-job-transaction-support.patch
+++ b/debian/patches/pve/0037-PVE-Add-sequential-job-transaction-support.patch
@@ -7,14 +7,14 @@ Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
 include/qemu/job.h | 12 ++++++++++++
- job.c              | 34 ++++++++++++++++++++++++++++++++++
- 2 files changed, 46 insertions(+)
+ job.c              | 31 +++++++++++++++++++++++++++++++
+ 2 files changed, 43 insertions(+)

 diff --git a/include/qemu/job.h b/include/qemu/job.h
-index 2b873f2576..528cd6acb9 100644
+index c105b31076..5096679571 100644
 --- a/include/qemu/job.h
 +++ b/include/qemu/job.h
-@@ -362,6 +362,18 @@ void job_unlock(void);
+@@ -316,6 +316,18 @@ typedef enum JobCreateFlags {
  */
 JobTxn *job_txn_new(void);
 
@@ -34,10 +34,10 @@ index 2b873f2576..528cd6acb9 100644
  * Release a reference that was previously acquired with job_txn_add_job or
  * job_txn_new. If it's the last reference to the object, it will be freed.
 diff --git a/job.c b/job.c
-index baf54c8d60..3ac5e5cde2 100644
+index e5699ad200..34c9758349 100644
 --- a/job.c
 +++ b/job.c
-@@ -94,6 +94,8 @@ struct JobTxn {
+@@ -72,6 +72,8 @@ struct JobTxn {
 
     /* Reference count */
     int refcnt;
@@ -45,8 +45,8 @@ index baf54c8d60..3ac5e5cde2 100644
 +    bool sequential;
 };
 
- void job_lock(void)
-@@ -119,6 +121,25 @@ JobTxn *job_txn_new(void)
+ /* Right now, this mutex is only needed to synchronize accesses to job->busy
+@@ -102,6 +104,25 @@ JobTxn *job_txn_new(void)
     return txn;
 }
 
@@ -69,23 +69,20 @@ index baf54c8d60..3ac5e5cde2 100644
 +    job_start(first);
 +}
 +
- /* Called with job_mutex held. */
- static void job_txn_ref_locked(JobTxn *txn)
+ static void job_txn_ref(JobTxn *txn)
 {
-@@ -1042,6 +1063,12 @@ static void job_completed_txn_success_locked(Job *job)
+     txn->refcnt++;
+@@ -897,6 +918,9 @@ static void job_completed_txn_success(Job *job)
      */
     QLIST_FOREACH(other_job, &txn->jobs, txn_list) {
-         if (!job_is_completed_locked(other_job)) {
+         if (!job_is_completed(other_job)) {
 +            if (txn->sequential) {
-+                job_unlock();
-+                /* Needs to be called without holding the job lock */
 +                job_start(other_job);
-+                job_lock();
 +            }
             return;
         }
         assert(other_job->ret == 0);
-@@ -1253,6 +1280,13 @@ int job_finish_sync_locked(Job *job,
+@@ -1093,6 +1117,13 @@ int job_finish_sync(Job *job, void (*finish)(Job *, Error **errp), Error **errp)
         return -EBUSY;
     }
 
@@ -93,9 +90,9 @@ index baf54c8d60..3ac5e5cde2 100644
 +     * of cancelling, these have not begun work so job_enter won't do anything,
 +     * let's ensure they are marked as ABORTING if required */
 +    if (job->status == JOB_STATUS_CREATED && job->txn->sequential) {
-+        job_update_rc_locked(job);
+        job_update_rc(job);
 +    }
 +
-     job_unlock();
-     AIO_WAIT_WHILE_UNLOCKED(job->aio_context,
-                             (job_enter(job), !job_is_completed(job)));
+     AIO_WAIT_WHILE(job->aio_context,
+                    (job_enter(job), !job_is_completed(job)));
+ 
--- a/debian/patches/pve/0038-PVE-Backup-Use-a-transaction-to-synchronize-job-stat.patch
+++ b/debian/patches/pve/0038-PVE-Backup-Use-a-transaction-to-synchronize-job-stat.patch
@@ -0,0 +1,295 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Stefan Reiter <s.reiter@proxmox.com>
+Date: Thu, 20 Aug 2020 14:25:00 +0200
+Subject: [PATCH] PVE-Backup: Use a transaction to synchronize job states
+
+By using a JobTxn, we can sync dirty bitmaps only when *all* jobs were
+successful - meaning we don't need to remove them when the backup fails,
+since QEMU's BITMAP_SYNC_MODE_ON_SUCCESS will now handle that for us.
+
+To keep the rate-limiting and IO impact from before, we use a sequential
+transaction, so drives will still be backed up one after the other.
+
+Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+[add new force parameter to job_cancel_sync calls]
+Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
+---
+ pve-backup.c | 167 +++++++++++++++------------------------------------
+ 1 file changed, 49 insertions(+), 118 deletions(-)
+
+diff --git a/pve-backup.c b/pve-backup.c
+index f90abaa50a..63c686463f 100644
+--- a/pve-backup.c
+++ b/pve-backup.c
+@@ -52,6 +52,7 @@ static struct PVEBackupState {
+     VmaWriter *vmaw;
+     ProxmoxBackupHandle *pbs;
+     GList *di_list;
+    JobTxn *txn;
+     QemuMutex backup_mutex;
+     CoMutex dump_callback_mutex;
+ } backup_state;
+@@ -71,32 +72,12 @@ typedef struct PVEBackupDevInfo {
+     size_t size;
+     uint64_t block_size;
+     uint8_t dev_id;
+-    bool completed;
+     char targetfile[PATH_MAX];
+     BdrvDirtyBitmap *bitmap;
+     BlockDriverState *target;
+    BlockJob *job;
+ } PVEBackupDevInfo;
+ 
+-static void pvebackup_run_next_job(void);
+-
+-static BlockJob *
+-lookup_active_block_job(PVEBackupDevInfo *di)
+-{
+-    if (!di->completed && di->bs) {
+-        for (BlockJob *job = block_job_next(NULL); job; job = block_job_next(job)) {
+-            if (job->job.driver->job_type != JOB_TYPE_BACKUP) {
+-                continue;
+-            }
+-
+-            BackupBlockJob *bjob = container_of(job, BackupBlockJob, common);
+-            if (bjob && bjob->source_bs == di->bs) {
+-                return job;
+-            }
+-        }
+-    }
+-    return NULL;
+-}
+-
+ static void pvebackup_propagate_error(Error *err)
+ {
+     qemu_mutex_lock(&backup_state.stat.lock);
+@@ -272,18 +253,6 @@ static void coroutine_fn pvebackup_co_cleanup(void *unused)
+             if (local_err != NULL) {
+                 pvebackup_propagate_error(local_err);
+             }
+-        } else {
+-            // on error or cancel we cannot ensure synchronization of dirty
+-            // bitmaps with backup server, so remove all and do full backup next
+-            GList *l = backup_state.di_list;
+-            while (l) {
+-                PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
+-                l = g_list_next(l);
+-
+-                if (di->bitmap) {
+-                    bdrv_release_dirty_bitmap(di->bitmap);
+-                }
+-            }
+         }
+ 
+         proxmox_backup_disconnect(backup_state.pbs);
+@@ -322,8 +291,6 @@ static void pvebackup_complete_cb(void *opaque, int ret)
+ 
+     qemu_mutex_lock(&backup_state.backup_mutex);
+ 
+-    di->completed = true;
+-
+     if (ret < 0) {
+         Error *local_err = NULL;
+         error_setg(&local_err, "job failed with err %d - %s", ret, strerror(-ret));
+@@ -336,20 +303,17 @@ static void pvebackup_complete_cb(void *opaque, int ret)
+ 
+     block_on_coroutine_fn(pvebackup_complete_stream, di);
+ 
+-    // remove self from job queue
+    // remove self from job list
+     backup_state.di_list = g_list_remove(backup_state.di_list, di);
+ 
+-    if (di->bitmap && ret < 0) {
+-        // on error or cancel we cannot ensure synchronization of dirty
+-        // bitmaps with backup server, so remove all and do full backup next
+-        bdrv_release_dirty_bitmap(di->bitmap);
+-    }
+-
+     g_free(di);
+ 
+-    qemu_mutex_unlock(&backup_state.backup_mutex);
+    /* call cleanup if we're the last job */
+    if (!g_list_first(backup_state.di_list)) {
+        block_on_coroutine_fn(pvebackup_co_cleanup, NULL);
+    }
+ 
+-    pvebackup_run_next_job();
+    qemu_mutex_unlock(&backup_state.backup_mutex);
+ }
+ 
+ static void pvebackup_cancel(void)
+@@ -371,36 +335,28 @@ static void pvebackup_cancel(void)
+         proxmox_backup_abort(backup_state.pbs, "backup canceled");
+     }
+ 
+-    qemu_mutex_unlock(&backup_state.backup_mutex);
+-
+-    for(;;) {
+-
+-        BlockJob *next_job = NULL;
+-
+-        qemu_mutex_lock(&backup_state.backup_mutex);
+-
+-        GList *l = backup_state.di_list;
+-        while (l) {
+-            PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
+-            l = g_list_next(l);
+    /* it's enough to cancel one job in the transaction, the rest will follow
+     * automatically */
+    GList *bdi = g_list_first(backup_state.di_list);
+    BlockJob *cancel_job = bdi && bdi->data ?
+        ((PVEBackupDevInfo *)bdi->data)->job :
+        NULL;
+ 
+-            BlockJob *job = lookup_active_block_job(di);
+-            if (job != NULL) {
+-                next_job = job;
+-                break;
+-            }
+-        }
+    /* ref the job before releasing the mutex, just to be safe */
+    if (cancel_job) {
+        job_ref(&cancel_job->job);
+    }
+ 
+-        qemu_mutex_unlock(&backup_state.backup_mutex);
+    /* job_cancel_sync may enter the job, so we need to release the
+     * backup_mutex to avoid deadlock */
+    qemu_mutex_unlock(&backup_state.backup_mutex);
+ 
+-        if (next_job) {
+-            AioContext *aio_context = next_job->job.aio_context;
+-            aio_context_acquire(aio_context);
+-            job_cancel_sync(&next_job->job, true);
+-            aio_context_release(aio_context);
+-        } else {
+-            break;
+-        }
+    if (cancel_job) {
+        AioContext *aio_context = cancel_job->job.aio_context;
+        aio_context_acquire(aio_context);
+        job_cancel_sync(&cancel_job->job, true);
+        job_unref(&cancel_job->job);
+        aio_context_release(aio_context);
+     }
+ }
+ 
+@@ -459,51 +415,19 @@ static int coroutine_fn pvebackup_co_add_config(
+     goto out;
+ }
+ 
+-bool job_should_pause(Job *job);
+-
+-static void pvebackup_run_next_job(void)
+-{
+-    assert(!qemu_in_coroutine());
+-
+-    qemu_mutex_lock(&backup_state.backup_mutex);
+-
+-    GList *l = backup_state.di_list;
+-    while (l) {
+-        PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
+-        l = g_list_next(l);
+-
+-        BlockJob *job = lookup_active_block_job(di);
+-
+-        if (job) {
+-            qemu_mutex_unlock(&backup_state.backup_mutex);
+-
+-            AioContext *aio_context = job->job.aio_context;
+-            aio_context_acquire(aio_context);
+-
+-            if (job_should_pause(&job->job)) {
+-                bool error_or_canceled = pvebackup_error_or_canceled();
+-                if (error_or_canceled) {
+-                    job_cancel_sync(&job->job, true);
+-                } else {
+-                    job_resume(&job->job);
+-                }
+-            }
+-            aio_context_release(aio_context);
+-            return;
+-        }
+-    }
+-
+-    block_on_coroutine_fn(pvebackup_co_cleanup, NULL); // no more jobs, run cleanup
+-
+-    qemu_mutex_unlock(&backup_state.backup_mutex);
+-}
+-
+ static bool create_backup_jobs(void) {
+ 
+     assert(!qemu_in_coroutine());
+ 
+     Error *local_err = NULL;
+ 
+    /* create job transaction to synchronize bitmap commit and cancel all
+     * jobs in case one errors */
+    if (backup_state.txn) {
+        job_txn_unref(backup_state.txn);
+    }
+    backup_state.txn = job_txn_new_seq();
+
+     BackupPerf perf = { .max_workers = 16 };
+ 
+     /* create and start all jobs (paused state) */
+@@ -526,7 +450,7 @@ static bool create_backup_jobs(void) {
+         BlockJob *job = backup_job_create(
+             NULL, di->bs, di->target, backup_state.speed, sync_mode, di->bitmap,
+             bitmap_mode, false, NULL, &perf, BLOCKDEV_ON_ERROR_REPORT, BLOCKDEV_ON_ERROR_REPORT,
+-            JOB_DEFAULT, pvebackup_complete_cb, di, NULL, &local_err);
+            JOB_DEFAULT, pvebackup_complete_cb, di, backup_state.txn, &local_err);
+ 
+         aio_context_release(aio_context);
+ 
+@@ -538,7 +462,8 @@ static bool create_backup_jobs(void) {
+             pvebackup_propagate_error(create_job_err);
+             break;
+         }
+-        job_start(&job->job);
+
+        di->job = job;
+ 
+         bdrv_unref(di->target);
+         di->target = NULL;
+@@ -556,6 +481,10 @@ static bool create_backup_jobs(void) {
+                 bdrv_unref(di->target);
+                 di->target = NULL;
+             }
+
+            if (di->job) {
+                job_unref(&di->job->job);
+            }
+         }
+     }
+ 
+@@ -946,10 +875,6 @@ err:
+         PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
+         l = g_list_next(l);
+ 
+-        if (di->bitmap) {
+-            bdrv_release_dirty_bitmap(di->bitmap);
+-        }
+-
+         if (di->target) {
+             bdrv_unref(di->target);
+         }
+@@ -1038,9 +963,15 @@ UuidInfo *qmp_backup(
+     block_on_coroutine_fn(pvebackup_co_prepare, &task);
+ 
+     if (*errp == NULL) {
+-        create_backup_jobs();
+        bool errors = create_backup_jobs();
+         qemu_mutex_unlock(&backup_state.backup_mutex);
+-        pvebackup_run_next_job();
+
+        if (!errors) {
+            /* start the first job in the transaction
+             * note: this might directly enter the job, so we need to do this
+             * after unlocking the backup_mutex */
+            job_txn_start_seq(backup_state.txn);
+        }
+     } else {
+         qemu_mutex_unlock(&backup_state.backup_mutex);
+     }
--- a/debian/patches/pve/0039-PVE-Backup-Don-t-block-on-finishing-and-cleanup-crea.patch
+++ b/debian/patches/pve/0039-PVE-Backup-Don-t-block-on-finishing-and-cleanup-crea.patch
@@ -0,0 +1,503 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Stefan Reiter <s.reiter@proxmox.com>
+Date: Mon, 28 Sep 2020 13:40:51 +0200
+Subject: [PATCH] PVE-Backup: Don't block on finishing and cleanup
+ create_backup_jobs
+
+proxmox_backup_co_finish is already async, but previously we would wait
+for the coroutine using block_on_coroutine_fn(). Avoid this by
+scheduling pvebackup_co_complete_stream (and thus pvebackup_co_cleanup)
+as a real coroutine when calling from pvebackup_complete_cb. This is ok,
+since complete_stream uses the backup_mutex internally to synchronize,
+and other streams can happily continue writing in the meantime anyway.
+
+To accomodate, backup_mutex is converted to a CoMutex. This means
+converting every user to a coroutine. This is not just useful here, but
+will come in handy once this series[0] is merged, and QMP calls can be
+yield-able coroutines too. Then we can also finally get rid of
+block_on_coroutine_fn.
+
+Cases of aio_context_acquire/release from within what is now a coroutine
+are changed to aio_co_reschedule_self, which works since a running
+coroutine always holds the aio lock for the context it is running in.
+
+job_cancel_sync is called from a BH since it can't be run from a
+coroutine (uses AIO_WAIT_WHILE internally).
+
+Same thing for create_backup_jobs, which is converted to a BH too.
+
+To communicate the finishing state, a new property is introduced to
+query-backup: 'finishing'. A new state is explicitly not used, since
+that would break compatibility with older qemu-server versions.
+
+Also fix create_backup_jobs:
+
+No more weird bool returns, just the standard "errp" format used
+everywhere else too. With this, if backup_job_create fails, the error
+message is actually returned over QMP and can be shown to the user.
+
+To facilitate correct cleanup on such an error, we call
+create_backup_jobs as a bottom half directly from pvebackup_co_prepare.
+This additionally allows us to actually hold the backup_mutex during
+operation.
+
+Also add a job_cancel_sync before job_unref, since a job must be in
+STATUS_NULL to be deleted by unref, which could trigger an assert
+before.
+
+[0] https://lists.gnu.org/archive/html/qemu-devel/2020-09/msg03515.html
+
+Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+[add new force parameter to job_cancel_sync calls]
+Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
+---
+ pve-backup.c         | 217 ++++++++++++++++++++++++++++---------------
+ qapi/block-core.json |   5 +-
+ 2 files changed, 144 insertions(+), 78 deletions(-)
+
+diff --git a/pve-backup.c b/pve-backup.c
+index 63c686463f..6f05796fad 100644
+--- a/pve-backup.c
+++ b/pve-backup.c
+@@ -33,7 +33,9 @@ const char *PBS_BITMAP_NAME = "pbs-incremental-dirty-bitmap";
+ 
+ static struct PVEBackupState {
+     struct {
+-        // Everithing accessed from qmp_backup_query command is protected using lock
+        // Everything accessed from qmp_backup_query command is protected using
+        // this lock. Do NOT hold this lock for long times, as it is sometimes
+        // acquired from coroutines, and thus any wait time may block the guest.
+         QemuMutex lock;
+         Error *error;
+         time_t start_time;
+@@ -47,20 +49,22 @@ static struct PVEBackupState {
+         size_t reused;
+         size_t zero_bytes;
+         GList *bitmap_list;
+        bool finishing;
+        bool starting;
+     } stat;
+     int64_t speed;
+     VmaWriter *vmaw;
+     ProxmoxBackupHandle *pbs;
+     GList *di_list;
+     JobTxn *txn;
+-    QemuMutex backup_mutex;
+    CoMutex backup_mutex;
+     CoMutex dump_callback_mutex;
+ } backup_state;
+ 
+ static void pvebackup_init(void)
+ {
+     qemu_mutex_init(&backup_state.stat.lock);
+-    qemu_mutex_init(&backup_state.backup_mutex);
+    qemu_co_mutex_init(&backup_state.backup_mutex);
+     qemu_co_mutex_init(&backup_state.dump_callback_mutex);
+ }
+ 
+@@ -72,6 +76,7 @@ typedef struct PVEBackupDevInfo {
+     size_t size;
+     uint64_t block_size;
+     uint8_t dev_id;
+    int completed_ret; // INT_MAX if not completed
+     char targetfile[PATH_MAX];
+     BdrvDirtyBitmap *bitmap;
+     BlockDriverState *target;
+@@ -227,12 +232,12 @@ pvebackup_co_dump_vma_cb(
+ }
+ 
+ // assumes the caller holds backup_mutex
+-static void coroutine_fn pvebackup_co_cleanup(void *unused)
+static void coroutine_fn pvebackup_co_cleanup(void)
+ {
+     assert(qemu_in_coroutine());
+ 
+     qemu_mutex_lock(&backup_state.stat.lock);
+-    backup_state.stat.end_time = time(NULL);
+    backup_state.stat.finishing = true;
+     qemu_mutex_unlock(&backup_state.stat.lock);
+ 
+     if (backup_state.vmaw) {
+@@ -261,35 +266,29 @@ static void coroutine_fn pvebackup_co_cleanup(void *unused)
+ 
+     g_list_free(backup_state.di_list);
+     backup_state.di_list = NULL;
+
+    qemu_mutex_lock(&backup_state.stat.lock);
+    backup_state.stat.end_time = time(NULL);
+    backup_state.stat.finishing = false;
+    qemu_mutex_unlock(&backup_state.stat.lock);
+ }
+ 
+-// assumes the caller holds backup_mutex
+-static void coroutine_fn pvebackup_complete_stream(void *opaque)
+static void coroutine_fn pvebackup_co_complete_stream(void *opaque)
+ {
+     PVEBackupDevInfo *di = opaque;
+    int ret = di->completed_ret;
+ 
+-    bool error_or_canceled = pvebackup_error_or_canceled();
+-
+-    if (backup_state.vmaw) {
+-        vma_writer_close_stream(backup_state.vmaw, di->dev_id);
+    qemu_mutex_lock(&backup_state.stat.lock);
+    bool starting = backup_state.stat.starting;
+    qemu_mutex_unlock(&backup_state.stat.lock);
+    if (starting) {
+        /* in 'starting' state, no tasks have been run yet, meaning we can (and
+         * must) skip all cleanup, as we don't know what has and hasn't been
+         * initialized yet. */
+        return;
+     }
+ 
+-    if (backup_state.pbs && !error_or_canceled) {
+-        Error *local_err = NULL;
+-        proxmox_backup_co_close_image(backup_state.pbs, di->dev_id, &local_err);
+-        if (local_err != NULL) {
+-            pvebackup_propagate_error(local_err);
+-        }
+-    }
+-}
+-
+-static void pvebackup_complete_cb(void *opaque, int ret)
+-{
+-    assert(!qemu_in_coroutine());
+-
+-    PVEBackupDevInfo *di = opaque;
+-
+-    qemu_mutex_lock(&backup_state.backup_mutex);
+    qemu_co_mutex_lock(&backup_state.backup_mutex);
+ 
+     if (ret < 0) {
+         Error *local_err = NULL;
+@@ -301,7 +300,19 @@ static void pvebackup_complete_cb(void *opaque, int ret)
+ 
+     assert(di->target == NULL);
+ 
+-    block_on_coroutine_fn(pvebackup_complete_stream, di);
+    bool error_or_canceled = pvebackup_error_or_canceled();
+
+    if (backup_state.vmaw) {
+        vma_writer_close_stream(backup_state.vmaw, di->dev_id);
+    }
+
+    if (backup_state.pbs && !error_or_canceled) {
+        Error *local_err = NULL;
+        proxmox_backup_co_close_image(backup_state.pbs, di->dev_id, &local_err);
+        if (local_err != NULL) {
+            pvebackup_propagate_error(local_err);
+        }
+    }
+ 
+     // remove self from job list
+     backup_state.di_list = g_list_remove(backup_state.di_list, di);
+@@ -310,21 +321,49 @@ static void pvebackup_complete_cb(void *opaque, int ret)
+ 
+     /* call cleanup if we're the last job */
+     if (!g_list_first(backup_state.di_list)) {
+-        block_on_coroutine_fn(pvebackup_co_cleanup, NULL);
+        pvebackup_co_cleanup();
+     }
+ 
+-    qemu_mutex_unlock(&backup_state.backup_mutex);
+    qemu_co_mutex_unlock(&backup_state.backup_mutex);
+ }
+ 
+-static void pvebackup_cancel(void)
+static void pvebackup_complete_cb(void *opaque, int ret)
+ {
+-    assert(!qemu_in_coroutine());
+    PVEBackupDevInfo *di = opaque;
+    di->completed_ret = ret;
+
+    /*
+     * Schedule stream cleanup in async coroutine. close_image and finish might
+     * take a while, so we can't block on them here. This way it also doesn't
+     * matter if we're already running in a coroutine or not.
+     * Note: di is a pointer to an entry in the global backup_state struct, so
+     * it stays valid.
+     */
+    Coroutine *co = qemu_coroutine_create(pvebackup_co_complete_stream, di);
+    aio_co_enter(qemu_get_aio_context(), co);
+}
+
+/*
+ * job_cancel(_sync) does not like to be called from coroutines, so defer to
+ * main loop processing via a bottom half.
+ */
+static void job_cancel_bh(void *opaque) {
+    CoCtxData *data = (CoCtxData*)opaque;
+    Job *job = (Job*)data->data;
+    AioContext *job_ctx = job->aio_context;
+    aio_context_acquire(job_ctx);
+    job_cancel_sync(job, true);
+    aio_context_release(job_ctx);
+    aio_co_enter(data->ctx, data->co);
+}
+ 
+static void coroutine_fn pvebackup_co_cancel(void *opaque)
+{
+     Error *cancel_err = NULL;
+     error_setg(&cancel_err, "backup canceled");
+     pvebackup_propagate_error(cancel_err);
+ 
+-    qemu_mutex_lock(&backup_state.backup_mutex);
+    qemu_co_mutex_lock(&backup_state.backup_mutex);
+ 
+     if (backup_state.vmaw) {
+         /* make sure vma writer does not block anymore */
+@@ -342,27 +381,22 @@ static void pvebackup_cancel(void)
+         ((PVEBackupDevInfo *)bdi->data)->job :
+         NULL;
+ 
+-    /* ref the job before releasing the mutex, just to be safe */
+     if (cancel_job) {
+-        job_ref(&cancel_job->job);
+        CoCtxData data = {
+            .ctx = qemu_get_current_aio_context(),
+            .co = qemu_coroutine_self(),
+            .data = &cancel_job->job,
+        };
+        aio_bh_schedule_oneshot(data.ctx, job_cancel_bh, &data);
+        qemu_coroutine_yield();
+     }
+ 
+-    /* job_cancel_sync may enter the job, so we need to release the
+-     * backup_mutex to avoid deadlock */
+-    qemu_mutex_unlock(&backup_state.backup_mutex);
+-
+-    if (cancel_job) {
+-        AioContext *aio_context = cancel_job->job.aio_context;
+-        aio_context_acquire(aio_context);
+-        job_cancel_sync(&cancel_job->job, true);
+-        job_unref(&cancel_job->job);
+-        aio_context_release(aio_context);
+-    }
+    qemu_co_mutex_unlock(&backup_state.backup_mutex);
+ }
+ 
+ void qmp_backup_cancel(Error **errp)
+ {
+-    pvebackup_cancel();
+    block_on_coroutine_fn(pvebackup_co_cancel, NULL);
+ }
+ 
+ // assumes the caller holds backup_mutex
+@@ -415,10 +449,18 @@ static int coroutine_fn pvebackup_co_add_config(
+     goto out;
+ }
+ 
+-static bool create_backup_jobs(void) {
+/*
+ * backup_job_create can *not* be run from a coroutine (and requires an
+ * acquired AioContext), so this can't either.
+ * The caller is responsible that backup_mutex is held nonetheless.
+ */
+static void create_backup_jobs_bh(void *opaque) {
+ 
+     assert(!qemu_in_coroutine());
+ 
+    CoCtxData *data = (CoCtxData*)opaque;
+    Error **errp = (Error**)data->data;
+
+     Error *local_err = NULL;
+ 
+     /* create job transaction to synchronize bitmap commit and cancel all
+@@ -454,24 +496,19 @@ static bool create_backup_jobs(void) {
+ 
+         aio_context_release(aio_context);
+ 
+-        if (!job || local_err != NULL) {
+-            Error *create_job_err = NULL;
+-            error_setg(&create_job_err, "backup_job_create failed: %s",
+-                       local_err ? error_get_pretty(local_err) : "null");
+        di->job = job;
+ 
+-            pvebackup_propagate_error(create_job_err);
+        if (!job || local_err) {
+            error_setg(errp, "backup_job_create failed: %s",
+                       local_err ? error_get_pretty(local_err) : "null");
+             break;
+         }
+ 
+-        di->job = job;
+-
+         bdrv_unref(di->target);
+         di->target = NULL;
+     }
+ 
+-    bool errors = pvebackup_error_or_canceled();
+-
+-    if (errors) {
+    if (*errp) {
+         l = backup_state.di_list;
+         while (l) {
+             PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
+@@ -483,12 +520,17 @@ static bool create_backup_jobs(void) {
+             }
+ 
+             if (di->job) {
+                AioContext *ctx = di->job->job.aio_context;
+                aio_context_acquire(ctx);
+                job_cancel_sync(&di->job->job, true);
+                 job_unref(&di->job->job);
+                aio_context_release(ctx);
+             }
+         }
+     }
+ 
+-    return errors;
+    /* return */
+    aio_co_enter(data->ctx, data->co);
+ }
+ 
+ typedef struct QmpBackupTask {
+@@ -525,11 +567,12 @@ typedef struct QmpBackupTask {
+     UuidInfo *result;
+ } QmpBackupTask;
+ 
+-// assumes the caller holds backup_mutex
+ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+ {
+     assert(qemu_in_coroutine());
+ 
+    qemu_co_mutex_lock(&backup_state.backup_mutex);
+
+     QmpBackupTask *task = opaque;
+ 
+     task->result = NULL; // just to be sure
+@@ -550,8 +593,9 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+     const char *firewall_name = "qemu-server.fw";
+ 
+     if (backup_state.di_list) {
+-         error_set(task->errp, ERROR_CLASS_GENERIC_ERROR,
+        error_set(task->errp, ERROR_CLASS_GENERIC_ERROR,
+                   "previous backup not finished");
+        qemu_co_mutex_unlock(&backup_state.backup_mutex);
+         return;
+     }
+ 
+@@ -618,6 +662,8 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+         }
+         di->size = size;
+         total += size;
+
+        di->completed_ret = INT_MAX;
+     }
+ 
+     uuid_generate(uuid);
+@@ -849,6 +895,8 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+     backup_state.stat.dirty = total - backup_state.stat.reused;
+     backup_state.stat.transferred = 0;
+     backup_state.stat.zero_bytes = 0;
+    backup_state.stat.finishing = false;
+    backup_state.stat.starting = true;
+ 
+     qemu_mutex_unlock(&backup_state.stat.lock);
+ 
+@@ -863,6 +911,33 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+     uuid_info->UUID = uuid_str;
+ 
+     task->result = uuid_info;
+
+    /* Run create_backup_jobs_bh outside of coroutine (in BH) but keep
+    * backup_mutex locked. This is fine, a CoMutex can be held across yield
+    * points, and we'll release it as soon as the BH reschedules us.
+    */
+    CoCtxData waker = {
+        .co = qemu_coroutine_self(),
+        .ctx = qemu_get_current_aio_context(),
+        .data = &local_err,
+    };
+    aio_bh_schedule_oneshot(waker.ctx, create_backup_jobs_bh, &waker);
+    qemu_coroutine_yield();
+
+    if (local_err) {
+        error_propagate(task->errp, local_err);
+        goto err;
+    }
+
+    qemu_co_mutex_unlock(&backup_state.backup_mutex);
+
+    qemu_mutex_lock(&backup_state.stat.lock);
+    backup_state.stat.starting = false;
+    qemu_mutex_unlock(&backup_state.stat.lock);
+
+    /* start the first job in the transaction */
+    job_txn_start_seq(backup_state.txn);
+
+     return;
+ 
+ err_mutex:
+@@ -885,6 +960,7 @@ err:
+         g_free(di);
+     }
+     g_list_free(di_list);
+    backup_state.di_list = NULL;
+ 
+     if (devs) {
+         g_strfreev(devs);
+@@ -905,6 +981,8 @@ err:
+     }
+ 
+     task->result = NULL;
+
+    qemu_co_mutex_unlock(&backup_state.backup_mutex);
+     return;
+ }
+ 
+@@ -958,24 +1036,8 @@ UuidInfo *qmp_backup(
+         .errp = errp,
+     };
+ 
+-    qemu_mutex_lock(&backup_state.backup_mutex);
+-
+     block_on_coroutine_fn(pvebackup_co_prepare, &task);
+ 
+-    if (*errp == NULL) {
+-        bool errors = create_backup_jobs();
+-        qemu_mutex_unlock(&backup_state.backup_mutex);
+-
+-        if (!errors) {
+-            /* start the first job in the transaction
+-             * note: this might directly enter the job, so we need to do this
+-             * after unlocking the backup_mutex */
+-            job_txn_start_seq(backup_state.txn);
+-        }
+-    } else {
+-        qemu_mutex_unlock(&backup_state.backup_mutex);
+-    }
+-
+     return task.result;
+ }
+ 
+@@ -1027,6 +1089,7 @@ BackupStatus *qmp_query_backup(Error **errp)
+     info->transferred = backup_state.stat.transferred;
+     info->has_reused = true;
+     info->reused = backup_state.stat.reused;
+    info->finishing = backup_state.stat.finishing;
+ 
+     qemu_mutex_unlock(&backup_state.stat.lock);
+ 
+diff --git a/qapi/block-core.json b/qapi/block-core.json
+index 16e184dd28..cb17d00fe0 100644
+--- a/qapi/block-core.json
+++ b/qapi/block-core.json
+@@ -770,12 +770,15 @@
+ #
+ # @uuid: uuid for this backup job
+ #
+# @finishing: if status='active' and finishing=true, then the backup process is
+#             waiting for the target to finish.
+#
+ ##
+ { 'struct': 'BackupStatus',
+   'data': {'*status': 'str', '*errmsg': 'str', '*total': 'int', '*dirty': 'int',
+            '*transferred': 'int', '*zero-bytes': 'int', '*reused': 'int',
+            '*start-time': 'int', '*end-time': 'int',
+-           '*backup-file': 'str', '*uuid': 'str' } }
+           '*backup-file': 'str', '*uuid': 'str', 'finishing': 'bool' } }
+ 
+ ##
+ # @BackupFormat:
--- a/debian/patches/pve/0040-PVE-Migrate-dirty-bitmap-state-via-savevm.patch
+++ b/debian/patches/pve/0040-PVE-Migrate-dirty-bitmap-state-via-savevm.patch
@@ -13,23 +13,21 @@ safe migration is possible and makes sense.

 Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
-[FE: split up state_pending for 8.0]
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
 ---
 include/migration/misc.h |   3 ++
 migration/meson.build    |   2 +
 migration/migration.c    |   1 +
- migration/pbs-state.c    | 104 +++++++++++++++++++++++++++++++++++++++
+ migration/pbs-state.c    | 106 +++++++++++++++++++++++++++++++++++++++
 pve-backup.c             |   1 +
 qapi/block-core.json     |   6 +++
- 6 files changed, 117 insertions(+)
+ 6 files changed, 119 insertions(+)
 create mode 100644 migration/pbs-state.c

 diff --git a/include/migration/misc.h b/include/migration/misc.h
-index c9e200f4eb..12c99ebc69 100644
+index 465906710d..4f0aeceb6f 100644
 --- a/include/migration/misc.h
 +++ b/include/migration/misc.h
-@@ -117,4 +117,7 @@ bool migration_in_bg_snapshot(void);
+@@ -75,4 +75,7 @@ bool migration_in_bg_snapshot(void);
 /* migration/block-dirty-bitmap.c */
 void dirty_bitmap_mig_init(void);
 
@@ -38,37 +36,38 @@ index c9e200f4eb..12c99ebc69 100644
 +
 #endif
 diff --git a/migration/meson.build b/migration/meson.build
-index 800f12a60d..35a4306183 100644
+index 0842d00cd2..d012f4d8d3 100644
 --- a/migration/meson.build
 +++ b/migration/meson.build
-@@ -7,7 +7,9 @@ migration_files = files(
+@@ -6,8 +6,10 @@ migration_files = files(
   'vmstate.c',
   'qemu-file.c',
   'yank_functions.c',
 +  'pbs-state.c',
 )
-+system_ss.add(libproxmox_backup_qemu)
+ softmmu_ss.add(migration_files)
+softmmu_ss.add(libproxmox_backup_qemu)
 
- system_ss.add(files(
+ softmmu_ss.add(files(
   'block-dirty-bitmap.c',
 diff --git a/migration/migration.c b/migration/migration.c
-index 86bf76e925..b8d7e471a4 100644
+index bb8bbddfe4..8109e468eb 100644
 --- a/migration/migration.c
 +++ b/migration/migration.c
-@@ -239,6 +239,7 @@ void migration_object_init(void)
+@@ -229,6 +229,7 @@ void migration_object_init(void)
     blk_mig_init();
     ram_mig_init();
     dirty_bitmap_mig_init();
 +    pbs_state_mig_init();
 }
 
- typedef struct {
+ void migration_cancel(const Error *error)
 diff --git a/migration/pbs-state.c b/migration/pbs-state.c
 new file mode 100644
-index 0000000000..887e998b9e
+index 0000000000..29f2b3860d
 --- /dev/null
 +++ b/migration/pbs-state.c
-@@ -0,0 +1,104 @@
+@@ -0,0 +1,106 @@
 +/*
 + * PBS (dirty-bitmap) state migration
 + */
@@ -87,8 +86,11 @@ index 0000000000..887e998b9e
 +/* state is accessed via this static variable directly, 'opaque' is NULL */
 +static PBSState pbs_state;
 +
-+static void pbs_state_pending(void *opaque, uint64_t *must_precopy,
-+                              uint64_t *can_postcopy)
+static void pbs_state_save_pending(QEMUFile *f, void *opaque,
+                                      uint64_t max_size,
+                                      uint64_t *res_precopy_only,
+                                      uint64_t *res_compatible,
+                                      uint64_t *res_postcopy_only)
 +{
 +    /* we send everything in save_setup, so nothing is ever pending */
 +}
@@ -158,8 +160,7 @@ index 0000000000..887e998b9e
 +static SaveVMHandlers savevm_pbs_state_handlers = {
 +    .save_setup = pbs_state_save_setup,
 +    .has_postcopy = pbs_state_has_postcopy,
-+    .state_pending_exact = pbs_state_pending,
-+    .state_pending_estimate = pbs_state_pending,
+    .save_live_pending = pbs_state_save_pending,
 +    .is_active_iterate = pbs_state_is_active_iterate,
 +    .load_state = pbs_state_load,
 +    .is_active = pbs_state_is_active,
@@ -174,22 +175,22 @@ index 0000000000..887e998b9e
 +                         NULL);
 +}
 diff --git a/pve-backup.c b/pve-backup.c
-index c755bf302b..5ebb6a3947 100644
+index 6f05796fad..5fa3cc1352 100644
 --- a/pve-backup.c
 +++ b/pve-backup.c
-@@ -1085,6 +1085,7 @@ ProxmoxSupportStatus *qmp_query_proxmox_support(Error **errp)
+@@ -1132,6 +1132,7 @@ ProxmoxSupportStatus *qmp_query_proxmox_support(Error **errp)
     ret->pbs_library_version = g_strdup(proxmox_backup_qemu_version());
     ret->pbs_dirty_bitmap = true;
     ret->pbs_dirty_bitmap_savevm = true;
 +    ret->pbs_dirty_bitmap_migration = true;
     ret->query_bitmap_info = true;
-     ret->pbs_masterkey = true;
-     ret->backup_max_workers = true;
+     return ret;
+ }
 diff --git a/qapi/block-core.json b/qapi/block-core.json
-index e7cf3d94f3..282e2e8a8c 100644
+index cb17d00fe0..bd978ea562 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
-@@ -1004,6 +1004,11 @@
+@@ -879,6 +879,11 @@
 # @pbs-dirty-bitmap-savevm: True if 'dirty-bitmaps' migration capability can
 #                           safely be set for savevm-async.
 #
@@ -198,14 +199,14 @@ index e7cf3d94f3..282e2e8a8c 100644
 +#                              migration cap if this is false/unset may lead
 +#                              to crashes on migration!
 +#
- # @pbs-masterkey: True if the QMP backup call supports the 'master_keyfile'
- #                 parameter.
+ # @pbs-library-version: Running version of libproxmox-backup-qemu0 library.
 #
-@@ -1017,6 +1022,7 @@
+ ##
+@@ -886,6 +891,7 @@
   'data': { 'pbs-dirty-bitmap': 'bool',
             'query-bitmap-info': 'bool',
             'pbs-dirty-bitmap-savevm': 'bool',
 +            'pbs-dirty-bitmap-migration': 'bool',
-             'pbs-masterkey': 'bool',
-             'pbs-library-version': 'str',
-             'backup-max-workers': 'bool' } }
+             'pbs-library-version': 'str' } }
+ 
+ ##
--- a/debian/patches/pve/0041-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch
+++ b/debian/patches/pve/0041-migration-block-dirty-bitmap-migrate-other-bitmaps-e.patch
@@ -19,10 +19,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
-index 2708abf3d7..fb17c01308 100644
+index 9aba7d9c22..f4ecf9c9f9 100644
 --- a/migration/block-dirty-bitmap.c
 +++ b/migration/block-dirty-bitmap.c
-@@ -540,7 +540,7 @@ static int add_bitmaps_to_list(DBMSaveState *s, BlockDriverState *bs,
+@@ -538,7 +538,7 @@ static int add_bitmaps_to_list(DBMSaveState *s, BlockDriverState *bs,
 
         if (bdrv_dirty_bitmap_check(bitmap, BDRV_BITMAP_DEFAULT, &local_err)) {
             error_report_err(local_err);
--- a/debian/patches/pve/0042-PVE-fall-back-to-open-iscsi-initiatorname.patch
+++ b/debian/patches/pve/0042-PVE-fall-back-to-open-iscsi-initiatorname.patch
@@ -21,10 +21,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 1 file changed, 30 insertions(+)

 diff --git a/block/iscsi.c b/block/iscsi.c
-index 2ff14b7472..46f275fbf7 100644
+index d707d0b354..da6ed52323 100644
 --- a/block/iscsi.c
 +++ b/block/iscsi.c
-@@ -1392,12 +1392,42 @@ static char *get_initiator_name(QemuOpts *opts)
+@@ -1386,12 +1386,42 @@ static char *get_initiator_name(QemuOpts *opts)
     const char *name;
     char *iscsi_name;
     UuidInfo *uuid_info;
--- a/debian/patches/pve/0042-alloc-track-error-out-when-auto-remove-is-not-set.patch
+++ b/debian/patches/pve/0042-alloc-track-error-out-when-auto-remove-is-not-set.patch
@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Tue, 26 Mar 2024 14:57:51 +0100
-Subject: [PATCH] alloc-track: error out when auto-remove is not set
-
-Since replacing the node now happens in the stream job, where the
-option cannot be read from (it's internal to the driver), it will
-always be treated as on.
-
-qemu-server will always set it, make sure to have other users notice
-the change (should they even exist). The option can be fully dropped
-in the future while adding a version guard in qemu-server.
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- block/alloc-track.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/block/alloc-track.c b/block/alloc-track.c
-index b9f8ea9137..f3ed2935c4 100644
--- a/block/alloc-track.c
-+++ b/block/alloc-track.c
-@@ -34,7 +34,6 @@ typedef struct {
-     BdrvDirtyBitmap *bitmap;
-     uint64_t granularity;
-     DropState drop_state;
-    bool auto_remove;
- } BDRVAllocTrackState;
- 
- static QemuOptsList runtime_opts = {
-@@ -86,7 +85,11 @@ static int track_open(BlockDriverState *bs, QDict *options, int flags,
-         goto fail;
-     }
- 
-    s->auto_remove = qemu_opt_get_bool(opts, TRACK_OPT_AUTO_REMOVE, false);
-+    if (!qemu_opt_get_bool(opts, TRACK_OPT_AUTO_REMOVE, false)) {
-+        error_setg(errp, "alloc-track: requires auto-remove option to be set to on");
-+        ret = -EINVAL;
-+        goto fail;
-+    }
- 
-     /* open the target (write) node, backing will be attached by block layer */
-     file = bdrv_open_child(NULL, options, "file", bs, &child_of_bds,
--- a/debian/patches/pve/0043-PVE-Use-coroutine-QMP-for-backup-cancel_backup.patch
+++ b/debian/patches/pve/0043-PVE-Use-coroutine-QMP-for-backup-cancel_backup.patch
@@ -0,0 +1,598 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Stefan Reiter <s.reiter@proxmox.com>
+Date: Tue, 26 Jan 2021 15:45:30 +0100
+Subject: [PATCH] PVE: Use coroutine QMP for backup/cancel_backup
+
+Finally turn backup QMP calls into coroutines, now that it's possible.
+This has the benefit that calls are asynchronous to the main loop, i.e.
+long running operations like connecting to a PBS server will no longer
+hang the VM.
+
+Additionally, it allows us to get rid of block_on_coroutine_fn, which
+was always a hacky workaround.
+
+While we're already spring cleaning, also remove the QmpBackupTask
+struct, since we can now put the 'prepare' function directly into
+qmp_backup and thus no longer need those giant walls of text.
+
+(Note that for our patches to work with 5.2.0 this change is actually
+required, otherwise monitor_get_fd() fails as we're not in a QMP
+coroutine, but one we start ourselves - we could of course set the
+monitor for that coroutine ourselves, but let's just fix it the right
+way instead)
+
+Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ block/monitor/block-hmp-cmds.c |   4 +-
+ hmp-commands.hx                |   2 +
+ proxmox-backup-client.c        |  31 -----
+ pve-backup.c                   | 232 ++++++++++-----------------------
+ qapi/block-core.json           |   4 +-
+ 5 files changed, 77 insertions(+), 196 deletions(-)
+
+diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c
+index ea7b665aa2..ef45552e3b 100644
+--- a/block/monitor/block-hmp-cmds.c
+++ b/block/monitor/block-hmp-cmds.c
+@@ -1016,7 +1016,7 @@ void hmp_info_snapshots(Monitor *mon, const QDict *qdict)
+     g_free(global_snapshots);
+ }
+ 
+-void hmp_backup_cancel(Monitor *mon, const QDict *qdict)
+void coroutine_fn hmp_backup_cancel(Monitor *mon, const QDict *qdict)
+ {
+     Error *error = NULL;
+ 
+@@ -1025,7 +1025,7 @@ void hmp_backup_cancel(Monitor *mon, const QDict *qdict)
+     hmp_handle_error(mon, error);
+ }
+ 
+-void hmp_backup(Monitor *mon, const QDict *qdict)
+void coroutine_fn hmp_backup(Monitor *mon, const QDict *qdict)
+ {
+     Error *error = NULL;
+ 
+diff --git a/hmp-commands.hx b/hmp-commands.hx
+index 97f24942b3..7a2be816da 100644
+--- a/hmp-commands.hx
+++ b/hmp-commands.hx
+@@ -111,6 +111,7 @@ ERST
+ 		    "\n\t\t\t Use -d to dump data into a directory instead"
+ 		    "\n\t\t\t of using VMA format.",
+         .cmd = hmp_backup,
+        .coroutine  = true,
+     },
+ 
+ SRST
+@@ -124,6 +125,7 @@ ERST
+         .params     = "",
+         .help       = "cancel the current VM backup",
+         .cmd        = hmp_backup_cancel,
+        .coroutine  = true,
+     },
+ 
+ SRST
+diff --git a/proxmox-backup-client.c b/proxmox-backup-client.c
+index 4ce7bc0b5e..0923037dec 100644
+--- a/proxmox-backup-client.c
+++ b/proxmox-backup-client.c
+@@ -5,37 +5,6 @@
+ 
+ /* Proxmox Backup Server client bindings using coroutines */
+ 
+-typedef struct BlockOnCoroutineWrapper {
+-    AioContext *ctx;
+-    CoroutineEntry *entry;
+-    void *entry_arg;
+-    bool finished;
+-} BlockOnCoroutineWrapper;
+-
+-static void coroutine_fn block_on_coroutine_wrapper(void *opaque)
+-{
+-    BlockOnCoroutineWrapper *wrapper = opaque;
+-    wrapper->entry(wrapper->entry_arg);
+-    wrapper->finished = true;
+-    aio_wait_kick();
+-}
+-
+-void block_on_coroutine_fn(CoroutineEntry *entry, void *entry_arg)
+-{
+-    assert(!qemu_in_coroutine());
+-
+-    AioContext *ctx = qemu_get_current_aio_context();
+-    BlockOnCoroutineWrapper wrapper = {
+-        .finished = false,
+-        .entry = entry,
+-        .entry_arg = entry_arg,
+-        .ctx = ctx,
+-    };
+-    Coroutine *wrapper_co = qemu_coroutine_create(block_on_coroutine_wrapper, &wrapper);
+-    aio_co_enter(ctx, wrapper_co);
+-    AIO_WAIT_WHILE(ctx, !wrapper.finished);
+-}
+-
+ // This is called from another thread, so we use aio_co_schedule()
+ static void proxmox_backup_schedule_wake(void *data) {
+     CoCtxData *waker = (CoCtxData *)data;
+diff --git a/pve-backup.c b/pve-backup.c
+index 5fa3cc1352..323014744c 100644
+--- a/pve-backup.c
+++ b/pve-backup.c
+@@ -357,7 +357,7 @@ static void job_cancel_bh(void *opaque) {
+     aio_co_enter(data->ctx, data->co);
+ }
+ 
+-static void coroutine_fn pvebackup_co_cancel(void *opaque)
+void coroutine_fn qmp_backup_cancel(Error **errp)
+ {
+     Error *cancel_err = NULL;
+     error_setg(&cancel_err, "backup canceled");
+@@ -394,11 +394,6 @@ static void coroutine_fn pvebackup_co_cancel(void *opaque)
+     qemu_co_mutex_unlock(&backup_state.backup_mutex);
+ }
+ 
+-void qmp_backup_cancel(Error **errp)
+-{
+-    block_on_coroutine_fn(pvebackup_co_cancel, NULL);
+-}
+-
+ // assumes the caller holds backup_mutex
+ static int coroutine_fn pvebackup_co_add_config(
+     const char *file,
+@@ -533,50 +528,27 @@ static void create_backup_jobs_bh(void *opaque) {
+     aio_co_enter(data->ctx, data->co);
+ }
+ 
+-typedef struct QmpBackupTask {
+-    const char *backup_file;
+-    bool has_password;
+-    const char *password;
+-    bool has_keyfile;
+-    const char *keyfile;
+-    bool has_key_password;
+-    const char *key_password;
+-    bool has_backup_id;
+-    const char *backup_id;
+-    bool has_backup_time;
+-    const char *fingerprint;
+-    bool has_fingerprint;
+-    int64_t backup_time;
+-    bool has_use_dirty_bitmap;
+-    bool use_dirty_bitmap;
+-    bool has_format;
+-    BackupFormat format;
+-    bool has_config_file;
+-    const char *config_file;
+-    bool has_firewall_file;
+-    const char *firewall_file;
+-    bool has_devlist;
+-    const char *devlist;
+-    bool has_compress;
+-    bool compress;
+-    bool has_encrypt;
+-    bool encrypt;
+-    bool has_speed;
+-    int64_t speed;
+-    Error **errp;
+-    UuidInfo *result;
+-} QmpBackupTask;
+-
+-static void coroutine_fn pvebackup_co_prepare(void *opaque)
+UuidInfo coroutine_fn *qmp_backup(
+    const char *backup_file,
+    bool has_password, const char *password,
+    bool has_keyfile, const char *keyfile,
+    bool has_key_password, const char *key_password,
+    bool has_fingerprint, const char *fingerprint,
+    bool has_backup_id, const char *backup_id,
+    bool has_backup_time, int64_t backup_time,
+    bool has_use_dirty_bitmap, bool use_dirty_bitmap,
+    bool has_compress, bool compress,
+    bool has_encrypt, bool encrypt,
+    bool has_format, BackupFormat format,
+    bool has_config_file, const char *config_file,
+    bool has_firewall_file, const char *firewall_file,
+    bool has_devlist, const char *devlist,
+    bool has_speed, int64_t speed, Error **errp)
+ {
+     assert(qemu_in_coroutine());
+ 
+     qemu_co_mutex_lock(&backup_state.backup_mutex);
+ 
+-    QmpBackupTask *task = opaque;
+-
+-    task->result = NULL; // just to be sure
+-
+     BlockBackend *blk;
+     BlockDriverState *bs = NULL;
+     const char *backup_dir = NULL;
+@@ -593,17 +565,17 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+     const char *firewall_name = "qemu-server.fw";
+ 
+     if (backup_state.di_list) {
+-        error_set(task->errp, ERROR_CLASS_GENERIC_ERROR,
+        error_set(errp, ERROR_CLASS_GENERIC_ERROR,
+                   "previous backup not finished");
+         qemu_co_mutex_unlock(&backup_state.backup_mutex);
+-        return;
+        return NULL;
+     }
+ 
+     /* Todo: try to auto-detect format based on file name */
+-    BackupFormat format = task->has_format ? task->format : BACKUP_FORMAT_VMA;
+    format = has_format ? format : BACKUP_FORMAT_VMA;
+ 
+-    if (task->has_devlist) {
+-        devs = g_strsplit_set(task->devlist, ",;:", -1);
+    if (has_devlist) {
+        devs = g_strsplit_set(devlist, ",;:", -1);
+ 
+         gchar **d = devs;
+         while (d && *d) {
+@@ -611,14 +583,14 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+             if (blk) {
+                 bs = blk_bs(blk);
+                 if (!bdrv_is_inserted(bs)) {
+-                    error_setg(task->errp, QERR_DEVICE_HAS_NO_MEDIUM, *d);
+                    error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, *d);
+                     goto err;
+                 }
+                 PVEBackupDevInfo *di = g_new0(PVEBackupDevInfo, 1);
+                 di->bs = bs;
+                 di_list = g_list_append(di_list, di);
+             } else {
+-                error_set(task->errp, ERROR_CLASS_DEVICE_NOT_FOUND,
+                error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
+                           "Device '%s' not found", *d);
+                 goto err;
+             }
+@@ -641,7 +613,7 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+     }
+ 
+     if (!di_list) {
+-        error_set(task->errp, ERROR_CLASS_GENERIC_ERROR, "empty device list");
+        error_set(errp, ERROR_CLASS_GENERIC_ERROR, "empty device list");
+         goto err;
+     }
+ 
+@@ -651,13 +623,13 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+     while (l) {
+         PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
+         l = g_list_next(l);
+-        if (bdrv_op_is_blocked(di->bs, BLOCK_OP_TYPE_BACKUP_SOURCE, task->errp)) {
+        if (bdrv_op_is_blocked(di->bs, BLOCK_OP_TYPE_BACKUP_SOURCE, errp)) {
+             goto err;
+         }
+ 
+         ssize_t size = bdrv_getlength(di->bs);
+         if (size < 0) {
+-            error_setg_errno(task->errp, -di->size, "bdrv_getlength failed");
+            error_setg_errno(errp, -di->size, "bdrv_getlength failed");
+             goto err;
+         }
+         di->size = size;
+@@ -684,47 +656,44 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+     }
+ 
+     if (format == BACKUP_FORMAT_PBS) {
+-        if (!task->has_password) {
+-            error_set(task->errp, ERROR_CLASS_GENERIC_ERROR, "missing parameter 'password'");
+        if (!has_password) {
+            error_set(errp, ERROR_CLASS_GENERIC_ERROR, "missing parameter 'password'");
+             goto err_mutex;
+         }
+-        if (!task->has_backup_id) {
+-            error_set(task->errp, ERROR_CLASS_GENERIC_ERROR, "missing parameter 'backup-id'");
+        if (!has_backup_id) {
+            error_set(errp, ERROR_CLASS_GENERIC_ERROR, "missing parameter 'backup-id'");
+             goto err_mutex;
+         }
+-        if (!task->has_backup_time) {
+-            error_set(task->errp, ERROR_CLASS_GENERIC_ERROR, "missing parameter 'backup-time'");
+        if (!has_backup_time) {
+            error_set(errp, ERROR_CLASS_GENERIC_ERROR, "missing parameter 'backup-time'");
+             goto err_mutex;
+         }
+ 
+         int dump_cb_block_size = PROXMOX_BACKUP_DEFAULT_CHUNK_SIZE; // Hardcoded (4M)
+         firewall_name = "fw.conf";
+ 
+-        bool use_dirty_bitmap = task->has_use_dirty_bitmap && task->use_dirty_bitmap;
+-
+-
+         char *pbs_err = NULL;
+         pbs = proxmox_backup_new(
+-            task->backup_file,
+-            task->backup_id,
+-            task->backup_time,
+            backup_file,
+            backup_id,
+            backup_time,
+             dump_cb_block_size,
+-            task->has_password ? task->password : NULL,
+-            task->has_keyfile ? task->keyfile : NULL,
+-            task->has_key_password ? task->key_password : NULL,
+-            task->has_compress ? task->compress : true,
+-            task->has_encrypt ? task->encrypt : task->has_keyfile,
+-            task->has_fingerprint ? task->fingerprint : NULL,
+            has_password ? password : NULL,
+            has_keyfile ? keyfile : NULL,
+            has_key_password ? key_password : NULL,
+            has_compress ? compress : true,
+            has_encrypt ? encrypt : has_keyfile,
+            has_fingerprint ? fingerprint : NULL,
+              &pbs_err);
+ 
+         if (!pbs) {
+-            error_set(task->errp, ERROR_CLASS_GENERIC_ERROR,
+            error_set(errp, ERROR_CLASS_GENERIC_ERROR,
+                       "proxmox_backup_new failed: %s", pbs_err);
+             proxmox_backup_free_error(pbs_err);
+             goto err_mutex;
+         }
+ 
+-        int connect_result = proxmox_backup_co_connect(pbs, task->errp);
+        int connect_result = proxmox_backup_co_connect(pbs, errp);
+         if (connect_result < 0)
+             goto err_mutex;
+ 
+@@ -743,9 +712,9 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+             BdrvDirtyBitmap *bitmap = bdrv_find_dirty_bitmap(di->bs, PBS_BITMAP_NAME);
+             bool expect_only_dirty = false;
+ 
+-            if (use_dirty_bitmap) {
+            if (has_use_dirty_bitmap && use_dirty_bitmap) {
+                 if (bitmap == NULL) {
+-                    bitmap = bdrv_create_dirty_bitmap(di->bs, dump_cb_block_size, PBS_BITMAP_NAME, task->errp);
+                    bitmap = bdrv_create_dirty_bitmap(di->bs, dump_cb_block_size, PBS_BITMAP_NAME, errp);
+                     if (!bitmap) {
+                         goto err_mutex;
+                     }
+@@ -775,12 +744,12 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+                 }
+             }
+ 
+-            int dev_id = proxmox_backup_co_register_image(pbs, devname, di->size, expect_only_dirty, task->errp);
+            int dev_id = proxmox_backup_co_register_image(pbs, devname, di->size, expect_only_dirty, errp);
+             if (dev_id < 0) {
+                 goto err_mutex;
+             }
+ 
+-            if (!(di->target = bdrv_backup_dump_create(dump_cb_block_size, di->size, pvebackup_co_dump_pbs_cb, di, task->errp))) {
+            if (!(di->target = bdrv_backup_dump_create(dump_cb_block_size, di->size, pvebackup_co_dump_pbs_cb, di, errp))) {
+                 goto err_mutex;
+             }
+ 
+@@ -794,10 +763,10 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+             backup_state.stat.bitmap_list = g_list_append(backup_state.stat.bitmap_list, info);
+         }
+     } else if (format == BACKUP_FORMAT_VMA) {
+-        vmaw = vma_writer_create(task->backup_file, uuid, &local_err);
+        vmaw = vma_writer_create(backup_file, uuid, &local_err);
+         if (!vmaw) {
+             if (local_err) {
+-                error_propagate(task->errp, local_err);
+                error_propagate(errp, local_err);
+             }
+             goto err_mutex;
+         }
+@@ -808,25 +777,25 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+             PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data;
+             l = g_list_next(l);
+ 
+-            if (!(di->target = bdrv_backup_dump_create(VMA_CLUSTER_SIZE, di->size, pvebackup_co_dump_vma_cb, di, task->errp))) {
+            if (!(di->target = bdrv_backup_dump_create(VMA_CLUSTER_SIZE, di->size, pvebackup_co_dump_vma_cb, di, errp))) {
+                 goto err_mutex;
+             }
+ 
+             const char *devname = bdrv_get_device_name(di->bs);
+             di->dev_id = vma_writer_register_stream(vmaw, devname, di->size);
+             if (di->dev_id <= 0) {
+-                error_set(task->errp, ERROR_CLASS_GENERIC_ERROR,
+                error_set(errp, ERROR_CLASS_GENERIC_ERROR,
+                           "register_stream failed");
+                 goto err_mutex;
+             }
+         }
+     } else if (format == BACKUP_FORMAT_DIR) {
+-        if (mkdir(task->backup_file, 0640) != 0) {
+-            error_setg_errno(task->errp, errno, "can't create directory '%s'\n",
+-                             task->backup_file);
+        if (mkdir(backup_file, 0640) != 0) {
+            error_setg_errno(errp, errno, "can't create directory '%s'\n",
+                             backup_file);
+             goto err_mutex;
+         }
+-        backup_dir = task->backup_file;
+        backup_dir = backup_file;
+ 
+         l = di_list;
+         while (l) {
+@@ -840,34 +809,34 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+             bdrv_img_create(di->targetfile, "raw", NULL, NULL, NULL,
+                             di->size, flags, false, &local_err);
+             if (local_err) {
+-                error_propagate(task->errp, local_err);
+                error_propagate(errp, local_err);
+                 goto err_mutex;
+             }
+ 
+             di->target = bdrv_open(di->targetfile, NULL, NULL, flags, &local_err);
+             if (!di->target) {
+-                error_propagate(task->errp, local_err);
+                error_propagate(errp, local_err);
+                 goto err_mutex;
+             }
+         }
+     } else {
+-        error_set(task->errp, ERROR_CLASS_GENERIC_ERROR, "unknown backup format");
+        error_set(errp, ERROR_CLASS_GENERIC_ERROR, "unknown backup format");
+         goto err_mutex;
+     }
+ 
+ 
+     /* add configuration file to archive */
+-    if (task->has_config_file) {
+-        if (pvebackup_co_add_config(task->config_file, config_name, format, backup_dir,
+-                                    vmaw, pbs, task->errp) != 0) {
+    if (has_config_file) {
+        if (pvebackup_co_add_config(config_file, config_name, format, backup_dir,
+                                    vmaw, pbs, errp) != 0) {
+             goto err_mutex;
+         }
+     }
+ 
+     /* add firewall file to archive */
+-    if (task->has_firewall_file) {
+-        if (pvebackup_co_add_config(task->firewall_file, firewall_name, format, backup_dir,
+-                                    vmaw, pbs, task->errp) != 0) {
+    if (has_firewall_file) {
+        if (pvebackup_co_add_config(firewall_file, firewall_name, format, backup_dir,
+                                    vmaw, pbs, errp) != 0) {
+             goto err_mutex;
+         }
+     }
+@@ -885,7 +854,7 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+     if (backup_state.stat.backup_file) {
+         g_free(backup_state.stat.backup_file);
+     }
+-    backup_state.stat.backup_file = g_strdup(task->backup_file);
+    backup_state.stat.backup_file = g_strdup(backup_file);
+ 
+     uuid_copy(backup_state.stat.uuid, uuid);
+     uuid_unparse_lower(uuid, backup_state.stat.uuid_str);
+@@ -900,7 +869,7 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+ 
+     qemu_mutex_unlock(&backup_state.stat.lock);
+ 
+-    backup_state.speed = (task->has_speed && task->speed > 0) ? task->speed : 0;
+    backup_state.speed = (has_speed && speed > 0) ? speed : 0;
+ 
+     backup_state.vmaw = vmaw;
+     backup_state.pbs = pbs;
+@@ -910,8 +879,6 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+     uuid_info = g_malloc0(sizeof(*uuid_info));
+     uuid_info->UUID = uuid_str;
+ 
+-    task->result = uuid_info;
+-
+     /* Run create_backup_jobs_bh outside of coroutine (in BH) but keep
+     * backup_mutex locked. This is fine, a CoMutex can be held across yield
+     * points, and we'll release it as soon as the BH reschedules us.
+@@ -925,7 +892,7 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+     qemu_coroutine_yield();
+ 
+     if (local_err) {
+-        error_propagate(task->errp, local_err);
+        error_propagate(errp, local_err);
+         goto err;
+     }
+ 
+@@ -938,7 +905,7 @@ static void coroutine_fn pvebackup_co_prepare(void *opaque)
+     /* start the first job in the transaction */
+     job_txn_start_seq(backup_state.txn);
+ 
+-    return;
+    return uuid_info;
+ 
+ err_mutex:
+     qemu_mutex_unlock(&backup_state.stat.lock);
+@@ -969,7 +936,7 @@ err:
+     if (vmaw) {
+         Error *err = NULL;
+         vma_writer_close(vmaw, &err);
+-        unlink(task->backup_file);
+        unlink(backup_file);
+     }
+ 
+     if (pbs) {
+@@ -980,65 +947,8 @@ err:
+         rmdir(backup_dir);
+     }
+ 
+-    task->result = NULL;
+-
+     qemu_co_mutex_unlock(&backup_state.backup_mutex);
+-    return;
+-}
+-
+-UuidInfo *qmp_backup(
+-    const char *backup_file,
+-    bool has_password, const char *password,
+-    bool has_keyfile, const char *keyfile,
+-    bool has_key_password, const char *key_password,
+-    bool has_fingerprint, const char *fingerprint,
+-    bool has_backup_id, const char *backup_id,
+-    bool has_backup_time, int64_t backup_time,
+-    bool has_use_dirty_bitmap, bool use_dirty_bitmap,
+-    bool has_compress, bool compress,
+-    bool has_encrypt, bool encrypt,
+-    bool has_format, BackupFormat format,
+-    bool has_config_file, const char *config_file,
+-    bool has_firewall_file, const char *firewall_file,
+-    bool has_devlist, const char *devlist,
+-    bool has_speed, int64_t speed, Error **errp)
+-{
+-    QmpBackupTask task = {
+-        .backup_file = backup_file,
+-        .has_password = has_password,
+-        .password = password,
+-        .has_keyfile = has_keyfile,
+-        .keyfile = keyfile,
+-        .has_key_password = has_key_password,
+-        .key_password = key_password,
+-        .has_fingerprint = has_fingerprint,
+-        .fingerprint = fingerprint,
+-        .has_backup_id = has_backup_id,
+-        .backup_id = backup_id,
+-        .has_backup_time = has_backup_time,
+-        .backup_time = backup_time,
+-        .has_use_dirty_bitmap = has_use_dirty_bitmap,
+-        .use_dirty_bitmap = use_dirty_bitmap,
+-        .has_compress = has_compress,
+-        .compress = compress,
+-        .has_encrypt = has_encrypt,
+-        .encrypt = encrypt,
+-        .has_format = has_format,
+-        .format = format,
+-        .has_config_file = has_config_file,
+-        .config_file = config_file,
+-        .has_firewall_file = has_firewall_file,
+-        .firewall_file = firewall_file,
+-        .has_devlist = has_devlist,
+-        .devlist = devlist,
+-        .has_speed = has_speed,
+-        .speed = speed,
+-        .errp = errp,
+-    };
+-
+-    block_on_coroutine_fn(pvebackup_co_prepare, &task);
+-
+-    return task.result;
+    return NULL;
+ }
+ 
+ BackupStatus *qmp_query_backup(Error **errp)
+diff --git a/qapi/block-core.json b/qapi/block-core.json
+index bd978ea562..ca1966f54b 100644
+--- a/qapi/block-core.json
+++ b/qapi/block-core.json
+@@ -842,7 +842,7 @@
+                                     '*config-file': 'str',
+                                     '*firewall-file': 'str',
+                                     '*devlist': 'str', '*speed': 'int' },
+-  'returns': 'UuidInfo' }
+  'returns': 'UuidInfo', 'coroutine': true }
+ 
+ ##
+ # @query-backup:
+@@ -864,7 +864,7 @@
+ # Notes: This command succeeds even if there is no backup process running.
+ #
+ ##
+-{ 'command': 'backup-cancel' }
+{ 'command': 'backup-cancel', 'coroutine': true }
+ 
+ ##
+ # @ProxmoxSupportStatus:
--- a/debian/patches/pve/0043-alloc-track-avoid-seemingly-superfluous-child-permis.patch
+++ b/debian/patches/pve/0043-alloc-track-avoid-seemingly-superfluous-child-permis.patch
@@ -1,84 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Fiona Ebner <f.ebner@proxmox.com>
-Date: Wed, 27 Mar 2024 11:15:39 +0100
-Subject: [PATCH] alloc-track: avoid seemingly superfluous child permission
- update
-
-Doesn't seem necessary nowadays (maybe after commit "alloc-track: fix
-deadlock during drop" where the dropping is not rescheduled and delayed
-anymore or some upstream change). Should there really be some issue,
-instead of having a drop state, this could also be just based off the
-fact whether there is still a backing child.
-
-Dumping the cumulative (shared) permissions for the BDS with a debug
-print yields the same values after this patch and with QEMU 8.1,
-namely 3 and 5.
-
-Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
- block/alloc-track.c | 26 --------------------------
- 1 file changed, 26 deletions(-)
-
-diff --git a/block/alloc-track.c b/block/alloc-track.c
-index f3ed2935c4..29138dcc49 100644
--- a/block/alloc-track.c
-+++ b/block/alloc-track.c
-@@ -25,15 +25,9 @@
- 
- #define TRACK_OPT_AUTO_REMOVE "auto-remove"
- 
-typedef enum DropState {
-    DropNone,
-    DropInProgress,
-} DropState;
-
- typedef struct {
-     BdrvDirtyBitmap *bitmap;
-     uint64_t granularity;
-    DropState drop_state;
- } BDRVAllocTrackState;
- 
- static QemuOptsList runtime_opts = {
-@@ -137,8 +131,6 @@ static int track_open(BlockDriverState *bs, QDict *options, int flags,
-         goto fail;
-     }
- 
-    s->drop_state = DropNone;
-
- fail:
-     if (ret < 0) {
-         bdrv_graph_wrlock();
-@@ -289,18 +281,8 @@ track_child_perm(BlockDriverState *bs, BdrvChild *c, BdrvChildRole role,
-                  BlockReopenQueue *reopen_queue, uint64_t perm, uint64_t shared,
-                  uint64_t *nperm, uint64_t *nshared)
- {
-    BDRVAllocTrackState *s = bs->opaque;
-
-     *nshared = BLK_PERM_ALL;
- 
-    /* in case we're currently dropping ourselves, claim to not use any
-     * permissions at all - which is fine, since from this point on we will
-     * never issue a read or write anymore */
-    if (s->drop_state == DropInProgress) {
-        *nperm = 0;
-        return;
-    }
-
-     if (role & BDRV_CHILD_DATA) {
-         *nperm = perm & DEFAULT_PERM_PASSTHROUGH;
-     } else {
-@@ -326,14 +308,6 @@ track_co_change_backing_file(BlockDriverState *bs, const char *backing_file,
-      * kinda fits better, but in the long-term, a special parameter would be
-      * nice (or done via qemu-server via upcoming blockdev-replace QMP command).
-      */
-    if (backing_file == NULL) {
-        BDRVAllocTrackState *s = bs->opaque;
-        bdrv_drained_begin(bs);
-        s->drop_state = DropInProgress;
-        bdrv_child_refresh_perms(bs, bs->file, &error_abort);
-        bdrv_drained_end(bs);
-    }
-
-     return 0;
- }
- 
--- a/debian/patches/pve/0044-PBS-add-master-key-support.patch
+++ b/debian/patches/pve/0044-PBS-add-master-key-support.patch
@@ -0,0 +1,98 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Stefan Reiter <s.reiter@proxmox.com>
+Date: Wed, 10 Feb 2021 11:07:06 +0100
+Subject: [PATCH] PBS: add master key support
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+this requires a new enough libproxmox-backup-qemu0, and allows querying
+from the PVE side to avoid QMP calls with unsupported parameters.
+
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ block/monitor/block-hmp-cmds.c | 1 +
+ pve-backup.c                   | 3 +++
+ qapi/block-core.json           | 7 +++++++
+ 3 files changed, 11 insertions(+)
+
+diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c
+index ef45552e3b..4c799f00d9 100644
+--- a/block/monitor/block-hmp-cmds.c
+++ b/block/monitor/block-hmp-cmds.c
+@@ -1039,6 +1039,7 @@ void coroutine_fn hmp_backup(Monitor *mon, const QDict *qdict)
+         false, NULL, // PBS password
+         false, NULL, // PBS keyfile
+         false, NULL, // PBS key_password
+        false, NULL, // PBS master_keyfile
+         false, NULL, // PBS fingerprint
+         false, NULL, // PBS backup-id
+         false, 0, // PBS backup-time
+diff --git a/pve-backup.c b/pve-backup.c
+index 323014744c..9f6c04a512 100644
+--- a/pve-backup.c
+++ b/pve-backup.c
+@@ -533,6 +533,7 @@ UuidInfo coroutine_fn *qmp_backup(
+     bool has_password, const char *password,
+     bool has_keyfile, const char *keyfile,
+     bool has_key_password, const char *key_password,
+    bool has_master_keyfile, const char *master_keyfile,
+     bool has_fingerprint, const char *fingerprint,
+     bool has_backup_id, const char *backup_id,
+     bool has_backup_time, int64_t backup_time,
+@@ -681,6 +682,7 @@ UuidInfo coroutine_fn *qmp_backup(
+             has_password ? password : NULL,
+             has_keyfile ? keyfile : NULL,
+             has_key_password ? key_password : NULL,
+            has_master_keyfile ? master_keyfile : NULL,
+             has_compress ? compress : true,
+             has_encrypt ? encrypt : has_keyfile,
+             has_fingerprint ? fingerprint : NULL,
+@@ -1044,5 +1046,6 @@ ProxmoxSupportStatus *qmp_query_proxmox_support(Error **errp)
+     ret->pbs_dirty_bitmap_savevm = true;
+     ret->pbs_dirty_bitmap_migration = true;
+     ret->query_bitmap_info = true;
+    ret->pbs_masterkey = true;
+     return ret;
+ }
+diff --git a/qapi/block-core.json b/qapi/block-core.json
+index ca1966f54b..fc8a125451 100644
+--- a/qapi/block-core.json
+++ b/qapi/block-core.json
+@@ -813,6 +813,8 @@
+ #
+ # @key-password: password for keyfile (optional for format 'pbs')
+ #
+# @master-keyfile: PEM-formatted master public keyfile (optional for format 'pbs')
+#
+ # @fingerprint: server cert fingerprint (optional for format 'pbs')
+ #
+ # @backup-id: backup ID (required for format 'pbs')
+@@ -832,6 +834,7 @@
+                                     '*password': 'str',
+                                     '*keyfile': 'str',
+                                     '*key-password': 'str',
+                                    '*master-keyfile': 'str',
+                                     '*fingerprint': 'str',
+                                     '*backup-id': 'str',
+                                     '*backup-time': 'int',
+@@ -884,6 +887,9 @@
+ #                              migration cap if this is false/unset may lead
+ #                              to crashes on migration!
+ #
+# @pbs-masterkey: True if the QMP backup call supports the 'master_keyfile'
+#                 parameter.
+#
+ # @pbs-library-version: Running version of libproxmox-backup-qemu0 library.
+ #
+ ##
+@@ -892,6 +898,7 @@
+             'query-bitmap-info': 'bool',
+             'pbs-dirty-bitmap-savevm': 'bool',
+             'pbs-dirty-bitmap-migration': 'bool',
+            'pbs-masterkey': 'bool',
+             'pbs-library-version': 'str' } }
+ 
+ ##
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Vitaliy Filippov	bf8b97b3d8	Fix truncation, add write-back cache support	2023-10-27 21:05:44 +03:00
Vitaliy Filippov	a3b2ef93ab	Improve performance by adding io_uring support, fix iothread compat	2023-07-19 02:27:08 +03:00
Vitaliy Filippov	0fa004b912	Add bdrv_co_block_status	2023-07-18 18:26:09 +03:00
Vitaliy Filippov	78a75914b3	Add Vitastor support	2022-12-15 19:32:46 +03:00