~paelzer/ubuntu/+source/qemu:merge-6.0-2exp-impish

Branch merges

Propose for merging

Merged into ubuntu/+source/qemu:debian/experimental at revision 5abe35755e418d2d9afe6f28ed51872e47a874a9

Christian Ehrhardt  (community): Approve on 2021-08-18

Canonical Server: Pending requested 2021-08-16

Diff: 6906 lines (+6195/-31)

19 files modified

debian/changelog (+4528/-4)
debian/control (+87/-19)
debian/control-in (+56/-6)
debian/optionrom.mak (+1/-1)
debian/patches/series (+8/-0)
debian/patches/ubuntu/avoid-fcf-clashing-with-i486.patch (+23/-0)
debian/patches/ubuntu/define-ubuntu-machine-types.patch (+823/-0)
debian/patches/ubuntu/enable-svm-by-default.patch (+34/-0)
debian/patches/ubuntu/lp-1929926-target-s390x-Fix-translation-exception-on-illegal-in.patch (+101/-0)
debian/patches/ubuntu/lp-1932175-s390x-cpumodel-add-3931-and-3932.patch (+119/-0)
debian/patches/ubuntu/pre-bionic-256k-ipxe-efi-roms.patch (+62/-0)
debian/qemu-block-extra.postinst (+59/-0)
debian/qemu-kvm-init (+89/-0)
debian/qemu-system-common.install (+1/-0)
debian/qemu-system-common.qemu-kvm.default (+8/-0)
debian/qemu-system-common.qemu-kvm.service (+16/-0)
debian/qemu-system-x86.NEWS (+80/-0)
debian/qemu-system-x86.README.Debian (+47/-0)
debian/rules (+53/-1)

api

Superseded for merging into ubuntu/+source/qemu:ubuntu/devel

Canonical Server: Pending requested 2021-08-16

Canonical Server Core Reviewers: Pending requested 2021-08-16

Diff: 760 lines (+581/-5) (has conflicts)

14 files modified

debian/changelog (+109/-0)
debian/control (+11/-0)
debian/control-in (+13/-0)
debian/optionrom.mak (+1/-1)
debian/patches/pvrdma-ensure-correct-input-on-ring-init-CVE-2021-3607.patch (+40/-0)
debian/patches/pvrdma-fix-possible-mremap-overflow-in-pvrdma-device-CVE-2021-3582.patch (+43/-0)
debian/patches/pvrdma-fix-the-ring-init-error-flow-CVE-2021-3608.patch (+40/-0)
debian/patches/series (+14/-0)
debian/patches/target-ppc-fix-load-endianness-for-lxvwsx-lxvdsx.patch (+45/-0)
debian/patches/ubuntu/avoid-fcf-clashing-with-i486.patch (+23/-0)
debian/patches/ubuntu/lp-1932175-s390x-cpumodel-add-3931-and-3932.patch (+119/-0)
debian/patches/usb-limit-combined-packets-to-1-MiB-CVE-2021-3527.patch (+37/-0)
debian/patches/usb-redir-avoid-dynamic-stack-allocation-CVE-2021-3527.patch (+54/-0)
debian/rules (+32/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

5abe357... by Christian Ehrhardt  on 2021-08-12

changelog: 1:6.0+dfsg-2expubuntu1

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

d461655... by Christian Ehrhardt  on 2021-08-16

d/p/u/lp-1932175-s390x-cpumodel-add-3931-and-3932.patch: add new 3931 and 3932 machines (LP: #1932175)

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

be207da... by Christian Ehrhardt  on 2021-08-16

d/optionrom.mak, d/p/u/avoid-fcf-clashing-with-i486.patch: fix
-fcf-protection being unavailble on -march=i486 (LP: #1940029)

Note: Can be dropped once fixed in the compiler toolchain.

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

a75600c... by Christian Ehrhardt  on 2021-08-12

d/control: regenerated from d/control-in

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

1315416... by Christian Ehrhardt  on 2021-06-15

merge-changelogs

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

fea132d... by Christian Ehrhardt  on 2021-06-21

debian/qemu-block-extra.postinst: enable mount unit on install/upgrade

Note: this default-on behavior might stay Ubuntu-only as Debian would
prefer an opt-in, while we'd like it to work out of the box.

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

e58e184... by Christian Ehrhardt  on 2021-06-15

d/p/ubuntu/lp-1929926-target-s390x-Fix-translation-exception-on-illegal-in.patch: avoid segfaults by uretprobes (LP: #1929926)

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

8a24cc3... by Christian Ehrhardt  on 2021-06-15

d/p/ubuntu/define-ubuntu-machine-types.patch: add ubuntu machine types for v6.0

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

bba6c7b... by Christian Ehrhardt  on 2021-06-15

d/p/ubuntu/enable-svm-by-default.patch: update to match v6.0

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

0b0596c... by Christian Ehrhardt  on 2020-06-17

d/control.in: Make qemu-system-x86-microvm a transitional package (drop after 22.04)

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