CP-312095: xenopsd/QEMU cross-version compatibility#6992
Merged
lindig merged 3 commits intoxapi-project:masterfrom Apr 8, 2026
Merged
CP-312095: xenopsd/QEMU cross-version compatibility#6992lindig merged 3 commits intoxapi-project:masterfrom
lindig merged 3 commits intoxapi-project:masterfrom
Conversation
lindig
reviewed
Apr 7, 2026
Contributor
lindig
left a comment
lindig
left a comment
There was a problem hiding this comment.
This looks good from a code point of view but I am not familiar with qemu to comment on this. So would like @rosslagerwall to take a look.
lindig
approved these changes
Apr 7, 2026
rosslagerwall
approved these changes
Apr 8, 2026
QEMU 10.x has changed some of the arguments' format, de-couple the xenopsd and qemu builds by making the qemu-wrapper script compatible with both the old and new versions of qemu. Signed-off-by: Gerald Elder-Vass <gerald.elder-vass@citrix.com>
Signed-off-by: Gerald Elder-Vass <gerald.elder-vass@citrix.com>
In QEMU upstream commit 7851b21 the piix3-ide-xen was removed as it duplicated the piix3-ide device (after 0f84458 made them identical). Therefore the global option(s) for piix3-ide-xen will be ignored unless they are updated to apply to piix3-ide instead. Provide both piix3-ide-xen and piix3-ide options to maintain behaviour across versions during the upgrade period. Options which are not relevant or used will simply generate a warning in the daemon.log but are otherwise ignored. Signed-off-by: Gerald Elder-Vass <gerald.elder-vass@citrix.com>
GeraldEV
force-pushed
the
private/geralde/QEMUUpgrade
branch
from
bde8ec1 to
54c4fd1
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Newer versions of QEMU accept slightly difference arguments than older versions.
Adding global variables for both piix3-ide and piix3-ide-xen ensures the variables are present the relevant device, variables which do not apply to any devices in use will log a warning (in daemon.log) but are otherwise ignored.
Example of the warning(s) produced:
These changes were tested alongside QEMU version 4.2.1 and QEMU version 10.1.0, in both cases guests booted as expected and the respective warning appeared in the daemon log.