Skip to content

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 edvin.torok@citrix.com
Signed-off-by: Christian Lindig christian.lindig@citrix.com

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 <edvin.torok@citrix.com>
Signed-off-by: Christian Lindig <christian.lindig@citrix.com>
@lindig lindig requested review from edwintorok and robhoes 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