Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>

d/kvm-spice: fix when acceleration is already defined on the commandline

See merge request qemu-team/qemu!29

Issue:

+ lxc exec testkvm-impish-from -- virsh migrate --unsafe --live kvmguest-bionic-normal qemu+ssh://10.104.227.250/system
error: internal error: process exited while connecting to monitor: /usr/bin/kvm-spice: W: this is an old compat wrapper script for qemu-system-x86_64 -enable-kvm
/usr/bin/kvm-spice: W: please use qemu-system-x86_64 instead of /usr/bin/kvm-spice
2022-02-07T15:16:56.765786Z qemu-system-x86_64: The -accel and "-machine accel=" options are incompatible

Original check since qemu 5.0
commit 6f6e1698
Author: Paolo Bonzini <pbonzini@redhat.com>
Date:   Wed Nov 13 10:10:47 2019 +0100

    vl: configure accelerators from -accel options

But since recent commit (qemu 6.1)

commit dadafe67


Author: Jason Andryuk <jandryuk@gmail.com>
Date:   Mon Jul 12 22:15:52 2021 -0400

    vl: Parse legacy default_machine_opt

Combined with our fallback legacy kvm-spice wrapper that does
  exec qemu-system-x86_64 -enable-kvm "$@"

It can happen that we have -enable-kvm added by our wrapper (e.g. a guest
created on Bionic has that set as emulator, migrating to a new system).
Then the wrapper adds -enable-kvm.
Internally that is mapped to QEMU_OPTION_enable_kvm which becomes
  qdict_put_str(machine_opts_dict, "accel", "kvm")
that is equivalent to '-accel kvm'

But if libvirt is already passing the new style '-machine accel=kvm' then the
above older check triggers and rightfully complains about the duplication.

Repro, on jammy spawn a guest and set <emulator>/usr/bin/kvm-spice</emulator>
Then starting it will fail with above message.

An example arg might look like:
-machine none,accel=kvm:tcg
-machine none,accel=tcg
-machine accel=tcg
-accel kvm
-accel tcg

In that case we can not add -enable-kvm without breaking it.

To resolve that split kvm-spice and qemu-system-x86_64-spice, set the wanted
permissions and check in kvm-spice for that pattern and skip adding -enable-kvm.
This also allows to eliminate quite some d/rules magic that is no more
needed.

Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>

Qemu 6.2 xen (Ubuntu) fixes

See merge request qemu-team/qemu!28

Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>

Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>

With qemu 6.2, the source archive contains symlinks. Previously
we used to pack only regular files. Pack everything, and rework
archive creation to include everything too.

Sort archive by name too.

We need CONFIG_PARISC to be set for:
 target-$(CONFIG_PARISC) += $(OUT)hppa-firmware.img
But in roms/seabios-hppa/.config it is:
 # CONFIG_PARISC is not set

This was formerly delivered as part of qemu tarball, but no more:
$ tar tf qemu-6.0.0.tar.xz | grep -e 'seabios-hppa/\.config'
qemu-6.0.0/roms/seabios-hppa/.config
$ tar tf qemu-6.1.0.tar.xz | grep -e 'seabios-hppa/\.config'
qemu-6.1.0/roms/seabios-hppa/.config
$ tar tf qemu-6.2.0.tar.xz | grep -e 'seabios-hppa/\.config'
<nothing>

This is due to commit
https://gitlab.com/qemu-project/qemu/-/commit/e770b8cf76083cc51497b854e73f0a9bb92d1bc7
And the reference no more shipping a .config
https://gitlab.com/qemu-project/seabios-hppa/-/tags/seabios-hppa-v2



Select what we want PARISC and let kconfig pick the rest from defaults.

Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>

Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>

Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>

Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>

Revert "make fuse debian-only, since libfuse3 in ubuntu is in universe", it is now in main (LP: #1934510)

This reverts commit 7bfe9b6e.

Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>

Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>

- d/p/hmp-unbreak-change-vnc.patch
- d/p/qemu-sockets-fix-unix-socket-path-copy-again.patch
- d/p/skiboot-no-Werror.patch
- d/p/uas-add-stream-number-sanity-checks-CVE-2021-3713.patch
- d/p/virtio-net-fix-use-after-unmap-free-for-sg-CVE-2021-3748.patch

Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>

Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>

v6.2.0 release

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

Merge tag 'pull-target-arm-20211207' of https://git.linaro.org/people/pmaydell/qemu-arm into staging

target-arm queue:
 * Fix calculation of ICH_MISR_EL2.LRENP to avoid incorrect generation
   of maintenance interrupts

# gpg: Signature made Tue 07 Dec 2021 09:18:50 AM PST
# gpg:                using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE
# gpg:                issuer "peter.maydell@linaro.org"
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" [full]
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>" [full]
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" [full]

* tag 'pull-target-arm-20211207' of https://git.linaro.org/people/pmaydell/qemu-arm

:
  gicv3: fix ICH_MISR's LRENP computation

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

According to the "Arm Generic Interrupt Controller Architecture
Specification GIC architecture version 3 and 4" (version G: page 345
for aarch64 or 509 for aarch32):
LRENP bit of ICH_MISR is set when ICH_HCR.LRENPIE==1 and
ICH_HCR.EOIcount is non-zero.

When only LRENPIE was set (and EOI count was zero), the LRENP bit was
wrongly set and MISR value was wrong.

As an additional consequence, if an hypervisor set ICH_HCR.LRENPIE,
the maintenance interrupt was constantly fired. It happens since patch
9cee1efe ("hw/intc: Set GIC maintenance interrupt level to only 0 or 1")
which fixed another bug about maintenance interrupt (most significant
bits of misr, including this one, were ignored in the interrupt trigger).

Fixes: 83f036fe

 ("hw/intc/arm_gicv3: Add accessors for ICH_ system registers")
Signed-off-by: Damien Hedde <damien.hedde@greensocs.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20211207094427.3473-1-damien.hedde@greensocs.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>