Ubuntu
qemu package

Merge ~sergiodj/ubuntu/+source/qemu:fix-virtiofsd-jammy into ubuntu/+source/qemu:ubuntu/jammy-devel

  1. Git
  2. lp:~sergiodj/ubuntu/+source/qemu
  3. fix-virtiofsd-jammy
  4. Merge into ubuntu/jammy-devel
Proposed by Sergio Durigan Junior
Status: Merged
Approved by: git-ubuntu bot
Approved revision: not available
Merged at revision: 20e2b1e1f2b38be5e5e411cc6dc3577c387ffb3a
Proposed branch: ~sergiodj/ubuntu/+source/qemu:fix-virtiofsd-jammy
Merge into: ubuntu/+source/qemu:ubuntu/jammy-devel
Diff against target: 84 lines (+62/-0)
3 files modified
debian/changelog (+9/-0)
debian/patches/series (+1/-0)
debian/patches/ubuntu/lp-2033957-virtiofsd-Fix-breakage-due-to-fuse_init_in.patch (+52/-0)
Reviewer Review Type Date Requested Status
git-ubuntu bot Approve
Athos Ribeiro (community) Approve
Canonical Server Core Reviewers Pending
Canonical Server Reporter Pending
Review via email: mp+450752@code.staging.launchpad.net

Description of the change

This is the fix for bug #2033957.

virtiofsd is failing to serve mountpoints due to a change in the Linux kernel headers we carry inside qemu. These headers were updated as part of the fix for bug #1853307, but virtiofsd relies on the fixed size of "struct fuse_init_in", but this size has changed.

The fix is simple (instead of parsing the whole binary struct, only parse the initial 16 bytes), and I opted to cherry-pick only the patch that implements this workaround, instead of backporting more commits from the following upstream merge:

https://gitlab.com/qemu-project/qemu/-/commit/242f2cae782d433d69d195e14564b6437ec9f7e6

The reason is because the commits from the merge above actually implement more virtiofsd features, which is not suitable for an SRU.

dep8 & qemu-migration-test results pending.

To post a comment you must log in.
Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

PPA: https://launchpad.net/~sergiodj/+archive/ubuntu/qemu-bug2033957

Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

I'll write the SRU template tomorrow; gotta get some sleep first.

Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote :

DEP8 test results:

* Results:
  - qemu/1:6.2+dfsg-2ubuntu6.14~ppa1
    + ✅ qemu on jammy for amd64 @ 06.09.23 14:49:41 Log️ 🗒️
    + ✅ qemu on jammy for arm64 @ 06.09.23 14:54:59 Log️ 🗒️
    + ✅ qemu on jammy for armhf @ 06.09.23 15:03:37 Log️ 🗒️
    + ✅ qemu on jammy for ppc64el @ 06.09.23 14:52:35 Log️ 🗒️
    + ✅ qemu on jammy for s390x @ 06.09.23 15:05:55 Log️ 🗒️

LGTM! Thanks, Sergio :)

review: Approve
Revision history for this message
git-ubuntu bot (git-ubuntu-bot) wrote :

Approvers: sergiodj, athos-ribeiro
Uploaders: sergiodj, athos-ribeiro
MP auto-approved

review: Approve
Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

Thanks, Athos.

Uploaded:

$ dput qemu_6.2+dfsg-2ubuntu6.14_source.changes
Trying to upload package to ubuntu
Checking signature on .changes
gpg: /home/sergio/work/qemu/qemu_6.2+dfsg-2ubuntu6.14_source.changes: Valid signature from 106DA1C8C3CBBF14
Checking signature on .dsc
gpg: /home/sergio/work/qemu/qemu_6.2+dfsg-2ubuntu6.14.dsc: Valid signature from 106DA1C8C3CBBF14
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading qemu_6.2+dfsg-2ubuntu6.14.dsc: done.
  Uploading qemu_6.2+dfsg-2ubuntu6.14.debian.tar.xz: done.
  Uploading qemu_6.2+dfsg-2ubuntu6.14_source.buildinfo: done.
  Uploading qemu_6.2+dfsg-2ubuntu6.14_source.changes: done.
Successfully uploaded packages.

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches