Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

VM: Fix QMP arguments typing to support QEMU 9.2 (from Incus) #15154

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

VM: Fix QMP arguments typing to support QEMU 9.2 (from Incus) #15154

wants to merge 6 commits into from

Conversation

nmezhenskyi
Copy link
Contributor

@nmezhenskyi nmezhenskyi commented Mar 10, 2025 •
edited
Loading

Cherry-picks from lxc/incus#1531, lxc/incus#1601, and lxc/incus#1196.

Fixes #14916.

@nmezhenskyi nmezhenskyi requested a review from tomponline March 10, 2025 17:55
@nmezhenskyi nmezhenskyi marked this pull request as draft March 10, 2025 18:15
@nmezhenskyi nmezhenskyi removed the request for review from tomponline March 10, 2025 18:47
bensmrs added 2 commits March 10, 2025 15:14
@bensmrs @nmezhenskyi
lxd/instance/drivers/qemu: Fix QMP arguments typing
bbdc307 
Signed-off-by: Benjamin Somers <benjamin.somers@imt-atlantique.fr>
(cherry picked from commit 037d8123d9e6c892c5dba35e4c2141152c70db74)
Signed-off-by: Nikita Mezhenskyi <nikita.mezhenskyi@canonical.com>
License: Apache-2.0
@bensmrs @nmezhenskyi
lxd/instance/drivers/qemu: QEMU device naming consistency
1f00f27 
Signed-off-by: Benjamin Somers <benjamin.somers@imt-atlantique.fr>
(cherry picked from commit 3ed3a4afdab040cc36b3fc402feac6fd3fbc25c4)
Signed-off-by: Nikita Mezhenskyi <nikita.mezhenskyi@canonical.com>
License: Apache-2.0
@stgraber @nmezhenskyi
lxd/instance/drivers/qemu: Fix device_id warning on 9.2.x
e0f9946 
Closes lxc/incus#1536

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
(cherry picked from commit c984c6880214909e9c64f85f1311f1fa42e2d013)
Signed-off-by: Nikita Mezhenskyi <nikita.mezhenskyi@canonical.com>
License: Apache-2.0
@nmezhenskyi nmezhenskyi marked this pull request as ready for review March 10, 2025 23:24
@nmezhenskyi nmezhenskyi requested a review from tomponline March 10, 2025 23:24
@tomponline tomponline marked this pull request as draft March 11, 2025 14:10
@tomponline
Copy link
Member

converted to draft until tested

@stgraber @nmezhenskyi
lxd/instance/drivers/qemu: Set O_DIRECT when passing in FDs
d5ec27b 
This is required in most cases with QEMU 9.1.0.

Signed-off-by: Stéphane Graber <stgraber@stgraber.org>
(cherry picked from commit 572afb06f66f83ca95efa1b9386fceeaa1c9e11b)
Signed-off-by: Nikita Mezhenskyi <nikita.mezhenskyi@canonical.com>
License: Apache-2.0
@nmezhenskyi
Copy link
Contributor Author

Fixes #14916. Tested on Ubuntu 25.04 with QEMU 9.2.1.

@nmezhenskyi nmezhenskyi marked this pull request as ready for review March 11, 2025 20:28
@tomponline
Copy link
Member

@nmezhenskyi please remove the incorrect "fixes" lines for Incus issues as this PR does not fix any Incus issues.

tomponline
tomponline requested changes Mar 11, 2025
View reviewed changes
Copy link
Member

@tomponline tomponline left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good thanks.

2 minor things:

  1. Lets not go back to fmt.Sprintf where string concatenation has been used.
  2. Please check all type assertions and return/log an error where appropriate, we dont want to crash LXD if a type assertion cannot proceed.

@nmezhenskyi
lxd/instance/drivers/qemu: Replace unnecessary fmt.Sprintf with conca…
bd8dfd5 
…tenation

Signed-off-by: Nikita Mezhenskyi <nikita.mezhenskyi@canonical.com>
@nmezhenskyi
lxd/instance/drivers/qemu: Check type assertions
eae806c 
Signed-off-by: Nikita Mezhenskyi <nikita.mezhenskyi@canonical.com>
@nmezhenskyi nmezhenskyi requested a review from tomponline March 12, 2025 00:32
tomponline
tomponline approved these changes Mar 12, 2025
View reviewed changes
Copy link
Member

@tomponline tomponline left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@tomponline tomponline changed the title lxd/instance/drivers/qemu: Fix QMP arguments typing (from Incus) VM: Fix QMP arguments typing to support QEMU 9.2 (from Incus) Mar 12, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tomponline tomponline tomponline approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Support Qemu 9.2
4 participants
@nmezhenskyi @tomponline @bensmrs @stgraber