Update Kata to use qemu-6.1 #2502
Conversation
|
/test |
|
On qemu-experimental, does qemu-6.1 support virtio-fs dax? |
I think so, but I don't know the code well enough to be sure. |
|
@stefanha could you help to clarify qemu v6.1 status of virtio-fs dax support? |
DAX is not yet supported in QEMU 6.1. |
Yes, and more to the point I'll need to propagate and update the patches in the kata tree which add dax support; I incorrectly thought I could drop them. I'll update as soon as I get a chance. |
|
/test |
|
Ok, I've changed the series to keep the experimental branch, and move the virtiofs-dax patches forwards to it. Not entirely sure how to test that the patches still all apply properly on the experimental version - AFAICT the CI doesn't use it. I'm trying to do a manual attempt with Wainer's vagrant stuff, but I'm not really sure what I'm doing. |
|
@stefanha the virtio fs dax patches that are in the Kata tree no longer apply clean to v6.1. I could probably rebase them, but it seems like it would be more sensible to grab a new snapshot of the virtio-fs-dax branch. Where would I find that? |
@dagrh can advise about the best git tree to use. He's working on upstreaming DAX in QEMU. |
|
Ok, new version updates qemu-experimental to current tree that @dagrh pointed me towards. |
|
/test |
|
/qemu-experimental |
|
@dgibson I is green but there is a problem with s390x build |
|
The error is the following /cc @Jakob-Naucke |
If the script doesn't find a patches directory it expects, it gives an error saying to create a dummy 'no_patches' file if you really don't want any patches applied for that version. But actual practice in the tree is to call the dummy file 'no_patches.txt' rather than simply 'no_patches'. Correct the message to match existing practice. Signed-off-by: David Gibson <[email protected]>
|
1
Gah. Looks like the scripts in the tests repo break if the patches directory (not the tag_patches directory) has no patches in it, even with no_patches.txt. Why s390 is going through that path when the other builds don't, I have no idea, but for whatever reason it is. |
|
Urgh. Ok, so the "static build" path used by most of the targets uses the patching scripts from within the kata-containers repo, which work. The other build path uses patching logic from the tests repo, which breaks in this case. |
|
/test |
|
please fix your |
|
/qemu-experimental |
|
/test |
We need qemu-6.1 for ACPI PCI hotplug support for the q35 machine. At the moment qemu will use SHPC hotplug under the PCIe to PCI bridge on q35. SHPC is too slow to use for our purposes (it requires a 5s delay). Update the qemu version to v6.1.0. This leaves the experimental version *older* than the normal version, but we'll fix that up later. We also need to tweak the snapcraft.yaml, since the location for configs has changed in the new qemu version. fixes kata-containers#1691 Signed-off-by: David Gibson <[email protected]>
This brings it back into line with the normal qemu version. We refer to v6.1.0 by full SHA in versions.yaml, rather than the tag, so that apply_patches.sh sees it as different and applies the virtiofs DAX patches which is what the experimental version is actually about having. The virtiofs DAX patches themselves are updated to the version from https://gitlab.com/virtio-fs/qemu, virtio-fs-dev branch as of commit 3620cb0a. Signed-off-by: David Gibson <[email protected]>
|
/test |
|
/qemu-experimental |
|
/retest-clh |
|
/retest-ubuntu |
2 similar comments
|
/retest-ubuntu |
|
/retest-ubuntu |
|
See #2618 for the now-occurring s390x failure, which is unrelated to this PR. |
Thanks for the information. I suspected that failure was unrelated, but it's good to have it confirmed. I think we're ready to merge. Any objections? |
qemu-6.1 is now released. This includes a bunch of things we've been carrying around patches for, and also ACPI hotplug support for q35 which we need to fix some future problems.
Update our packaging to use the new qemu version.