[Ubuntu 21.04] QEMU is missing virtio-9p-ccw
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Ubuntu on IBM z Systems |
Fix Released
|
Medium
|
Skipper Bug Screeners | ||
qemu (Ubuntu) |
Fix Released
|
Medium
|
Christian Ehrhardt |
Bug Description
---Problem Description---
QEMU 5.2.0 (Ubuntu 21.04) does not have the virtio-9p-ccw device.
Following patch should be used at
https:/
This should be back-ported.
---Steps to Reproduce---
Build QEMU from https:/
Userspace tool common name: QEMU
The userspace tool has the following bit modes: 64-bit
Userspace rpm: qemu-system-s390x
Userspace tool obtained from project website: 5.2.0
Commit 2c44220d05 ("meson: convert hw/arch*"), which migrated the old
Makefile.objs to meson.build accidentally excluded virtio-ccw-9p.c and
thus the virtio-9p-ccw device from the build (and potentially also
included the file virtio-ccw-blk.c twice in the source set). And since
CONFIG_VIRTFS can't be used the way it was used here (see commit
2c9dce0196 ("meson: do not use CONFIG_VIRTFS")), the preconditions have
to be written differently.
Let's fix this!
Signed-off-by: Halil Pasic <email address hidden>
Fixes: 2c44220d05 ("meson: convert hw/arch*")
Reported-by: Jakob Naucke <email address hidden>
Cc: <email address hidden>
---
hw/s390x/
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/s390x/
index 2a7818d94b.
--- a/hw/s390x/
+++ b/hw/s390x/
@@ -40,7 +40,9 @@ virtio_ss.add(when: 'CONFIG_
files('
virtio_
virtio_
virtio_
files('
-virtio_
files('
+if have_virtfs
+ virtio_ss.add(when: 'CONFIG_VIRTIO_9P', if_true: files('
+endif
virtio_
virtio_
files('
s390x_
base-commit: 1af5629673bb5c1
--
2.25.1
Related branches
- Lucas Kanashiro (community): Approve
- Canonical Server packageset reviewers: Pending requested
- Canonical Server: Pending requested
-
Diff: 6465 lines (+5793/-30)17 files modifieddebian/changelog (+4288/-4)
debian/control (+88/-17)
debian/control-in (+59/-8)
debian/patches/series (+7/-0)
debian/patches/ubuntu/define-ubuntu-machine-types.patch (+784/-0)
debian/patches/ubuntu/enable-svm-by-default.patch (+34/-0)
debian/patches/ubuntu/lp-1907789-build-no-pie-is-no-functional-liker-flag.patch (+76/-0)
debian/patches/ubuntu/lp-1916230-hw-s390x-fix-build-for-virtio-9p-ccw.patch (+56/-0)
debian/patches/ubuntu/pre-bionic-256k-ipxe-efi-roms.patch (+62/-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-gui.prerm (+42/-0)
debian/qemu-system-x86.NEWS (+80/-0)
debian/qemu-system-x86.README.Debian (+47/-0)
debian/rules (+56/-1)
CVE References
tags: | added: architecture-all bugnameltc-191588 severity-medium targetmilestone-inin2104 |
Changed in ubuntu: | |
assignee: | nobody → Ubuntu on IBM Power Systems Bug Triage (ubuntu-power-triage) |
affects: | ubuntu → qemu (Ubuntu) |
Changed in qemu (Ubuntu): | |
assignee: | Ubuntu on IBM Power Systems Bug Triage (ubuntu-power-triage) → Skipper Bug Screeners (skipper-screen-team) |
Changed in ubuntu-z-systems: | |
assignee: | nobody → Skipper Bug Screeners (skipper-screen-team) |
Changed in qemu (Ubuntu): | |
importance: | Undecided → Medium |
Changed in ubuntu-z-systems: | |
importance: | Undecided → Medium |
tags: | added: qemu-21.04 |
Changed in ubuntu-z-systems: | |
status: | New → Triaged |
Changed in ubuntu-z-systems: | |
status: | Triaged → Fix Committed |
Changed in ubuntu-z-systems: | |
status: | Fix Committed → Fix Released |
Indeed this isn't built properly, thanks for the report! /lists. nongnu. org/archive/ html/qemu- devel/2021- 02/msg05910. html
I've asked Cornelia to also push it to GH to pick from there as she has already called it applied in https:/