~paelzer/ubuntu/+source/qemu:merge-6.2-jammy

Last commit made on 2022-02-10
Get this branch:
git clone -b merge-6.2-jammy https://git.launchpad.net/~paelzer/ubuntu/+source/qemu
Only Christian Ehrhardt  can upload to this branch. If you are Christian Ehrhardt  please log in for upload directions.

Branch merges

Branch information

Name:
merge-6.2-jammy
Repository:
lp:~paelzer/ubuntu/+source/qemu

Recent commits

2b159ee... by Christian Ehrhardt 

changelog: 1:6.2+dfsg-2ubuntu2

Signed-off-by: Christian Ehrhardt <email address hidden>

9ca0e4d... by Christian Ehrhardt 

d/kvm-spice,d/qemu-system-x86_64-spice: also fix the other spice compat wrapper

Submitted to Debian and to be squashed with the former fix on next
merge.

Signed-off-by: Christian Ehrhardt <email address hidden>

6461022... by Christian Ehrhardt 

changelog: add rseq to seccomp allow list

Signed-off-by: Christian Ehrhardt <email address hidden>

c914e6c... by Christian Ehrhardt 

d/p/u/fix-virtiofsd-for-glibc2.35.patch: add rseq to seccomp allow list

Signed-off-by: Christian Ehrhardt <email address hidden>

1e80146... by Christian Ehrhardt 

changelog: fix when acceleration is already defined on the commandline

Signed-off-by: Christian Ehrhardt <email address hidden>

be8c182... by Christian Ehrhardt 

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

FYI: submitted to Debian in https://salsa.debian.org/qemu-team/qemu/-/merge_requests/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 6f6e1698a68ceb49e57676528612f22eaf2c16c3
Author: Paolo Bonzini <email address hidden>
Date: Wed Nov 13 10:10:47 2019 +0100

    vl: configure accelerators from -accel options

But since recent commit (qemu 6.1)

commit dadafe6785ada3ec4a2d11410c691458b3c2b39f
Author: Jason Andryuk <email address hidden>
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.
Check for that pattern and skip adding -enable-kvm.

Signed-off-by: Christian Ehrhardt <email address hidden>

50bb88a... by Christian Ehrhardt 

changelog: Allow long kernel command lines for QEMU (LP: #1959984)

Signed-off-by: Christian Ehrhardt <email address hidden>

ba1aa99... by Christian Ehrhardt 

d/p/u/lp-1959984-s390x-ipl-support-extended-kernel-command-line-size.patch: Allow long kernel command lines for QEMU (LP: #1959984)

Signed-off-by: Christian Ehrhardt <email address hidden>

dc8af3f... by Christian Ehrhardt 

changelog: add missing mention on qemu-system-x86-microvm transitional

Signed-off-by: Christian Ehrhardt <email address hidden>

79e926b... by Christian Ehrhardt 

changelog: xen fixes

Signed-off-by: Christian Ehrhardt <email address hidden>