Merge qemu from Debian unstable for kinetic

[Bryce Harrington]

Upstream: tbd
Debian: 1:7.0+dfsg-2
Ubuntu: 1:6.2+dfsg-2ubuntu6

Debian does new releases regularly, so it's likely there will be newer versions available before FF that we can pick up if this merge is done later in the cycle.

### New Debian Changes ###

qemu (1:7.0+dfsg-2) unstable; urgency=medium

  * d/control: add Rules-Requires-Root: no
  * d/control: switch to debhelper-compat=13
  * d/control: drop 'qemu' empty/dummy pseudopackage
  * d/control: do not build linux-user* on ia64 and powerpc
    (not supported by upstream anymore)
  * d/control: add Breaks for qemu-system-data for other packages from which
    it borrowed files in the past (Closes: #1008095)
  * d/rules: switch to the dh sequence (but keep build-{arch,indep}),
    rearrange some rules.
    This brings us dh_dwz (very slow) and dh_strip_nondeterminism.
  * d/rules: do not explicitly turn off slirp & capstone (now properly
    controlled by --with[out]-default-features option)
  * d/rules: do not try to enable tcg-interpreter on the unsupported
    targets, it does not help to build tools anymore
  * d/rules: do not chown -w d/control, it breaks dpkg-source
  * d/rules: clean up the clean target
  * d/not-installed: list many documentation files and qemu-plugin.h
  * configure-make-fortify_source-yes-by-default.patch: enable
    fortify-source for minimal builds too
  * d/changelog: mention #990562 (CVE-2021-3611) closed by 7.0

 -- Michael Tokarev <email address hidden> Sat, 30 Apr 2022 13:38:12 +0300

qemu (1:7.0+dfsg-1) unstable; urgency=medium

  * update to 7.0 release

 -- Michael Tokarev <email address hidden> Thu, 21 Apr 2022 14:19:51 +0300

qemu (1:7.0~rc4+dfsg-1) experimental; urgency=medium

  * New upstream 7.0 (rc)
    Closes: #990562, CVE-2021-3611
  * remove patches applied upstream
  * remove new binary file, pc-bios/edk2-x86_64-microvm.fd.bz2
  * d/control: remove libxfs-dev build dependency,
    the ioctl is implemented inline
  * d/control: stop build-depend-indep on libc6.1-dev-alpha-cross,
    not needed anymore
  * d/rules: update skiboot version check (skiboot hasn't canged since 6.1)
  * build & install vbootrom (npcm7xx_bootrom.bin), and
    build-depend-indep on gcc-arm-none-eabi
  * create a new binary package, qemu-system-xen, which provides
    /usr/libexec/xen-qemu-system-i386 binary for use by xen only.
    Once xen switches to use this binary instead of usual qemu-system-i386,
    xen support will be removed from the regular qemu-system-x86 build
  * use a fast inline version of /usr/share/dpkg/architecture.mk

 -- Michael Tokarev <email address hidden> Sun, 17 Apr 2022 15:08:40 +0300

qemu (1:6.2+dfsg-3) unstable; urgency=medium

  [ Christian Ehrhardt ]
  * d/rules: ensure xen is built on x86
  * d/rules: xen libexec dir is no more versioned
  * d/kvm-spice: fix when acceleration is already defined on the commandline

  [ Michael Tokarev ]
  * d/control, d/rules: do not compile xen support on i386,
    since it is amd64-only now (since 4.16)
  * d/control: add libbpf-dev & --enable-bpf for eBPF support
    (Closes: #994573)

 -- Michael Tokarev <email address hidden> Fri, 25 Feb 2022 12:01:46 +0300

qemu (1:6.2+dfsg-2) unstable; urgency=medium

  * bump meson build-dep to 0.59.3
  * build & include multiboot_dma.bin (Closes: #1003930)
  * libxml2 is not needed for parallels.
    Enable parallels block image format (Closes: #1003162)
  * acpi-validate-hotplug-selector-on-access-CVE-2021-4158.patch
    Closes: CVE-2021-4158
  * acpi-fix-QEMU-crash-when-started-with-SLIC-table.patch
    (Closes: #1004017)
  * acpi-fix-OEM_ID-padding.patch
  * debian/get-orig-source.sh: repack dfsg archive differently
  * mention closing of a few CVEs by 6.2.0

 -- Michael Tokarev <email address hidden> Thu, 20 Jan 2022 10:52:19 +0300

qemu (1:6.2+dfsg-1) unstable; urgency=medium

  [ Christian Ehrhardt ]
  * 6.2.0 upstream release
    Closes: #984452, CVE-2021-20203
     (integer overflow issue in the vmxnet3 NIC emulator)
    Closes: #984453, CVE-2021-20196
     (fdc: check drive block device before usage)
    Closes: #984451, CVE-2021-20255
     (infinite recursion / DMA reentrancy in eepro100 i8255x device emulator)
  * d/get-orig-source.sh: remove pc-bios/multiboot_dma.bin in dfsg-clean
  * Drop patches upstream in v6.2.0
  * d/p/spelling.diff: update for v6.2.0 (partially accepted)
  * d/rules: use new --disable-install-blobs build arg
  * Revert 'make fuse debian-only, since libfuse3 in ubuntu is in universe',
    it is now in main (LP: #1934510)
  * d/rules: bump skiboot version for qemu v6.2.0

### Old Ubuntu Delta ###

qemu (1:6.2+dfsg-2ubuntu6) jammy; urgency=medium

  * debian/control[-in]: no more disable glusterfs in Ubuntu (LP: #1246924)
  * Fix diff handling on ceph that can cause data corruption (LP: #1968258)
      - d/p/u/lp-1968258-block-rbd-fix-handling-of-holes-in-.bdrv_co.patch
      - d/p/u/lp-1968258-block-rbd-workaround-for-ceph-issue-53784.patch

 -- Christian Ehrhardt <email address hidden> Fri, 08 Apr 2022 09:36:34 +0200

qemu (1:6.2+dfsg-2ubuntu5) jammy; urgency=medium

  * d/p/u/tcg-Remove-dh_alias-indirection-for-dh_typecode.patch: fix 32bit
    tcg on s390x.

 -- Christian Ehrhardt <email address hidden> Thu, 17 Feb 2022 09:54:36 +0100

qemu (1:6.2+dfsg-2ubuntu4) jammy; urgency=medium

  * No-change rebuild to update maintainer scripts, see LP: 1959054

 -- Dave Jones <email address hidden> Wed, 16 Feb 2022 17:28:14 +0000

qemu (1:6.2+dfsg-2ubuntu3) jammy; urgency=medium

  * Merge with Debian unstable, remaining changes:
    - qemu-kvm to systemd unit
      - d/qemu-kvm-init: script for QEMU KVM preparation modules, ksm,
        hugepages and architecture specifics
      - d/qemu-system-common.qemu-kvm.service: systemd unit to call
        qemu-kvm-init
      - d/qemu-system-common.install: install helper script
      - d/qemu-system-common.qemu-kvm.default: defaults for
        /etc/default/qemu-kvm
      - d/rules: call dh_installinit and dh_installsystemd for qemu-kvm
    - Distribution specific machine type
      (LP: 1304107 1621042 1776189 1761372 1761372 1776189)
      - d/p/ubuntu/define-ubuntu-machine-types.patch: define distro machine
        types containing release versioned machine attributes
      - d/qemu-system-x86.NEWS Info on fixed machine type defintions
        for host-phys-bits=true
      - Add an info about -hpb machine type in debian/qemu-system-x86.NEWS
      - ubuntu-q35 alias added to auto-select the most recent q35 ubuntu type
    - Enable nesting by default
      - d/p/ubuntu/enable-svm-by-default.patch: Enable nested svm by default
        in qemu64 on amd
        [ No more strictly needed, but required for backward compatibility ]
    - tolerate ipxe size change on migrations to >=18.04 (LP: 1713490)
      - d/p/ubuntu/pre-bionic-256k-ipxe-efi-roms.patch: old machine types
        reference 256k path
      - d/control-in: depend on ipxe-qemu-256k-compat-efi-roms to be able to
        handle incoming migrations from former releases.
    - d/qemu-system-x86.README.Debian: add info about updated nesting changes
    - d/p/lp-1952448-relax-skiboot-gcc-deprecation-errors.patch:
      add patch to workaround FTBFS when building against OpenSSL 3.0.
    - d/optionrom.mak, d/p/u/avoid-fcf-clashing-with-i486.patch: fix
      -fcf-protection being unavailble on -march=i486 (LP 1940029)
    - Ease the use of module retention on upgrades (LP 1913421)
      - debian/qemu-block-extra.postinst: enable mount unit on install/upgrade
    - Make qemu-system-x86-microvm a transitional package as the binary is now
      in qemu-system-x86 itself.
  * Dropped Changes [now part of 1:6.1+dfsg-8]:
    - updated debian/patches/linux-user-binfmt-P.diff to work with in-kernel code
      (#993658) (LP 1947860)
    - improved dependencies
      - Make qemu-system-common depend on qemu-block-extra
      - Make qemu-utils depend on qemu-block-extra
    - d/control*, d/rules: disable xen by default, but provide universe
      package qemu-system-x86-xen as alternative
      [includes compat links changes of 5.0-5ubuntu4]
    - d/p/ubuntu/lp-1929926-*: avoid segfaults by uretprobes (LP 1929926)
  * Dropped Changes [now part of upstream]
    - d/p/u/lp-1932175-s390x-cpumodel-add-3931-and-3932.patch: add new 3931
      and 3932 machines (LP 1932175)
   - d/p/u/lp-1940288-audio-Never-send-migration-section.patch: fix
      migration with audio devices present (LP 1940288)
  * Added changes:
    - update patches for qemu v6.2.0
      - d/p/u/enable-svm-by-default.patch
      - d/p/u/define-ubuntu-machine-types.patch
      - d/p/u/lp-1952448-relax-skiboot-gcc-deprecation-errors.patch
    - d/rules: xen libexec dir is no more versioned
    - d/rules: ensure xen is built on x86
    - d/p/u/lp-1959984-s390x-ipl-support-extended-kernel-command-line-size.patch
      Allow long kernel command lines for QEMU (LP: #1959984)
    - d/kvm-spice: fix when acceleration is already defined on the commandline
    - d/p/u/fix-virtiofsd-for-glibc2.35.patch: add rseq to seccomp allow list

 -- Christian Ehrhardt <email address hidden> Wed, 05 Jan 2022 12:18:25 +0100

[Christian Ehrhardt  (paelzer)]

This is updated a lot by Michael in recent days.

When looking at this please recheck to also ensure that all the bios packages are not stuck in proposed.

[Christian Ehrhardt  (paelzer)]

Up to 1:7.0+dfsg-7 now.

When merging >= 1:7.0+dfsg-6~ we also can do more.
Debian has adopted our qemu-...-xen in a slightly modified way.

1. we might need some transitionals from our old to the new joint package names (in our src:qemu delta until 24.04)
2. afterwards we can make src:xen a sync as Debian also switched to depend on a -xen variant

Adding src:xen task to remind us

[Christian Ehrhardt  (paelzer)]

Xen check in more detail:
- after all the reduction in the past all real delta left is to depend on qemu-system-x86-xen instead of qemu-system-x86

Debian has followed that idea with some variation:
- xen-utils-4.16: depends on qemu-system-xen (>> 1:7.0+dfsg-6~) [amd64]
- the 4.16.1-1 entry in [1] talks about it

TODO (for xen):
- our merge of qemu will follow the Debian change to establish qemu-system-xen (naming reason is that 4.16 stopped doing i386 xen support anyway)
- We will need a transitional qemu-system-x86-xen -> qemu-system-xen
- once qemu 7.0 is in Kinetic we can sync xen 4.16.1-1

[1]: https://salsa.debian.org/xen-team/debian-xen/-/blob/master/debian/xen-utils-common.NEWS#L1

[Christian Ehrhardt  (paelzer)]

Check related bios packages
New seabios and edk2 are already synced to Kinetic - no further effort needed on those.

 seabios | 1.16.0-4 | kinetic | source, all
 edk2 | 2022.05-2 | kinetic | source

[Christian Ehrhardt  (paelzer)]

Check upstream changes:
- dropped
  -no-quit
  - swift-bmc
  - ppc64abi32
=> none of these should require explicit action from our side on the upgrade

Check Debian changes
- binfmt changes - ok we want to follow
- some unsupported TCG arches disabled - ok we don't have them in Ubuntu (old powerpc and ia64)
- minimal autopkgtest - ok, glad to have them

Check applied security fixes:
- CVE-2021-3507 - not in 7.0, still needed
- CVE-2021-3929 - in 7.0, drop
- CVE-2021-4206 - in 7.0, drop
- CVE-2021-4207 - in 7.0, drop
- CVE-2022-0358 - in 7.0, drop
- CVE-2022-26353 - in 7.0, drop
- CVE-2022-26354 - in 7.0, drop

[Christian Ehrhardt  (paelzer)]

Check Current Ubuntu Delta:
- d/p/u/lp-1970563-ui-vnc.c-Fixed-a-deadlock-bug.patch - in 7.0, drop
- d/p/u/lp1970737-linux-aio-*.patch - not in 7.0 - keep
- d/p/u/lp-1968258-* - in 7.0, drop
- d/p/u/lp-1959984-s390x-ipl-support-extended-kernel-command-line-size.patch - in 7.0, drop
- d/p/u/fix-virtiofsd-for-glibc2.35.patch - in 7.0, drop
- d/p/u/avoid-fcf-clashing-with-i486.patch - supposed ot be fixed in gcc, drop
- d/p/u/tcg-Remove-dh_alias-indirection-for-dh_typecode.patch - in 7.0, drop

- d/p/lp-1952448-relax-skiboot-gcc-deprecation-errors.patch - could work now, try dropping

- d/rules: xen libexec dir is no more versioned - in Debian now
- d/rules: ensure xen is built on x86 - in Debian now
- d/kvm-spice: fix when acceleration is already defined on the commandline - ubuntu only, keep
- debian/control-in: no more disable glusterfs in Ubuntu - in Debian
- d/kvm-spice: fix when acceleration is already defined on the commandline - in Debian

- transitional for qemu-system-x86-microvm - can be dropped as upgrades go through jammy

- regenerated d/control can be dropped and eventually regenerated (as usual)

The rest stays as is (plus updates to new source)

[Launchpad Janitor (janitor)]

This bug was fixed in the package qemu - 1:7.0+dfsg-7ubuntu1

---------------
qemu (1:7.0+dfsg-7ubuntu1) kinetic; urgency=medium

  * Merge with Debian unstable (LP: #1971315)(LP: #1980896), remaining changes:
    - qemu-kvm to systemd unit
      - d/qemu-kvm-init: script for QEMU KVM preparation modules, ksm,
        hugepages and architecture specifics
      - d/qemu-system-common.qemu-kvm.service: systemd unit to call
        qemu-kvm-init
      - d/qemu-system-common.install: install helper script
      - d/qemu-system-common.qemu-kvm.default: defaults for
        /etc/default/qemu-kvm
      - d/rules: call dh_installinit and dh_installsystemd for qemu-kvm
    - Distribution specific machine type
      (LP: 1304107 1621042 1776189 1761372 1761372 1776189)
      - d/p/ubuntu/define-ubuntu-machine-types.patch: define distro machine
        types containing release versioned machine attributes
      - d/qemu-system-x86.NEWS Info on fixed machine type defintions
        for host-phys-bits=true
      - Add an info about -hpb machine type in debian/qemu-system-x86.NEWS
      - ubuntu-q35 alias added to auto-select the most recent q35 ubuntu type
    - Enable nesting by default
      - d/p/ubuntu/enable-svm-by-default.patch: Enable nested svm by default
        in qemu64 on amd
        [ No more strictly needed, but required for backward compatibility ]
    - tolerate ipxe size change on migrations to >=18.04 (LP: 1713490)
      - d/p/ubuntu/pre-bionic-256k-ipxe-efi-roms.patch: old machine types
        reference 256k path
      - d/control-in: depend on ipxe-qemu-256k-compat-efi-roms to be able to
        handle incoming migrations from former releases.
    - d/qemu-system-x86.README.Debian: add info about updated nesting changes
    - Ease the use of module retention on upgrades (LP 1913421)
      - debian/qemu-block-extra.postinst: enable mount unit on install/upgrade
    - Fix I/O stalls when using NVMe storage (LP 1970737).
      - d/p/lp1970737-linux-aio-*.patch: Fix unbalanced plugged counter
        in laio_io_unplug.
    - SECURITY UPDATE: heap overflow in floppy disk emulator
      - debian/patches/CVE-2021-3507.patch: prevent end-of-track overrun in
        hw/block/fdc.c.
      - CVE-2021-3507
  * Dropped Changes [now part of 1:7.0+dfsg-7]:
    - d/rules: xen libexec dir is no more versioned
    - d/rules: ensure xen is built on x86
    - d/kvm-spice: fix when acceleration is already defined on the commandline
    - debian/control[-in]: no more disable glusterfs in Ubuntu (LP 1246924)
  * Dropped Changes [now part of upstream v7.0.0]
    - d/p/u/lp-1959984-s390x-ipl-support-extended-kernel-command-line-size.patch
      Allow long kernel command lines for QEMU (LP 1959984)
    - d/p/u/fix-virtiofsd-for-glibc2.35.patch: add rseq to seccomp allow list
    - d/p/u/tcg-Remove-dh_alias-indirection-for-dh_typecode.patch: fix 32bit
      tcg on s390x.
    - Fix diff handling on ceph that can cause data corruption (LP 1968258)
      - d/p/u/lp-1968258-block-rbd-fix-handling-of-holes-in-.bdrv_co.patch
      - d/p/u/lp-1968258-block-rbd-workaround-for-ceph-issue-53784.patch
    - d/p/u/lp-1970563-ui-vnc.c-Fixed-a-deadlock-bug.patch: avoid deadl...

[Christian Ehrhardt  (paelzer)]

FYI

Submitted our xen changes to Debian:
- https://salsa.debian.org/qemu-team/qemu/-/merge_requests/34

Triggered the sync of Xen now that it is ready:
- https://launchpad.net/ubuntu/+source/xen/4.16.1-1

[Christian Ehrhardt  (paelzer)]

The synce Xen has migrated as well.