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.

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

CA-366014 UPD-825 pass dm qemu to UEFI qemu, too #776

Merged
merged 1 commit into from
May 12, 2022

Conversation

lindig
Copy link
Contributor

@lindig lindig commented May 12, 2022

Backport from xe-api.git:

  • c12905cfbd5ca7d502bb05468d98122457cf9aff
  • 5f33eb2fd251e7183098f4ef96233f28b6198974
  • ec2f3c0e0ae794c2ca3e4b966f8e7d4a90e33760

emu-manager needs '-dm qemu' flag for migration to work correctly with
upstream QEMU. Otherwise emu-manager doesn't send
xen-set-global-dirty-log and some guest drivers may crash upon resume
(e.g. the mouse).

Treat Qemu_upstream_uefi as upstream too and pass the flag.

Commit 0e8624a introduced '-dm qemu'
but the UEFI version of the qemu profile didn't exist yet at the time.

Later commit 971d788 introduced the
UEFI qemu profile, and the build still worked due to the wildcard,
so the missing flag went unnoticed until now.

Replace the wildcard with an explicit list of when '-dm qemu' shouldn't
be added, so the next time we introduce a new qemu profile we get a
build failure and must decide which behaviour would be correct.

Signed-off-by: Edwin Török [email protected]
Signed-off-by: Christian Lindig [email protected]

Backport from xe-api.git:

* c12905cfbd5ca7d502bb05468d98122457cf9aff
* 5f33eb2fd251e7183098f4ef96233f28b6198974
* ec2f3c0e0ae794c2ca3e4b966f8e7d4a90e33760

emu-manager needs '-dm qemu' flag for migration to work correctly with
upstream QEMU.  Otherwise emu-manager doesn't send
xen-set-global-dirty-log and some guest drivers may crash upon resume
(e.g. the mouse).

Treat Qemu_upstream_uefi as upstream too and pass the flag.

Commit 0e8624a introduced '-dm qemu'
but the UEFI version of the qemu profile didn't exist yet at the time.

Later commit 971d788 introduced the
UEFI qemu profile, and the build still worked due to the wildcard,
so the missing flag went unnoticed until now.

Replace the wildcard with an explicit list of when '-dm qemu' shouldn't
be added, so the next time we introduce a new qemu profile we get a
build failure and must decide which behaviour would be correct.

Signed-off-by: Edwin Török <[email protected]>
Signed-off-by: Christian Lindig <[email protected]>
@lindig lindig requested review from robhoes and edwintorok May 12, 2022 12:54
Copy link
Member

@psafont psafont left a comment

Choose a reason for hiding this comment

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

This is a faithful backport

@lindig lindig merged commit 17f459f into xapi-project:0.150-lcm May 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants