Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

qemu: replace private migration patch with the upstream one#641

Merged
egernst merged 1 commit intokata-containers:masterfrom
bergwolf:qemu-migration
Jul 17, 2019
Merged

qemu: replace private migration patch with the upstream one#641
egernst merged 1 commit intokata-containers:masterfrom
bergwolf:qemu-migration

Conversation

@bergwolf
Copy link
Copy Markdown
Member

Then we can use x-ignore-shared to do migration and drop the
extra patch once we move to qemu 4.1.0 or later.

Fixes: #640
Depends-on: github.com/kata-containers/runtime#1799
Signed-off-by: Peng Tao bergwolf@hyper.sh

Then we can use x-ignore-shared to do migration and drop the
extra patch once we move to qemu 4.1.0 or later.

Fixes: kata-containers#640
Depends-on: github.com/kata-containers/runtime#1799
Signed-off-by: Peng Tao <bergwolf@hyper.sh>
bergwolf added a commit to bergwolf/kata-runtime that referenced this pull request Jul 17, 2019
qemu upstream has x-ignore-shared that works similar
to our private bypass-shared-memory. We can use it to
implement the vm template feature.

Fixes: kata-containers#1798
Depends-on: github.com/kata-containers/packaging#641
Signed-off-by: Peng Tao <bergwolf@hyper.sh>
@bergwolf
Copy link
Copy Markdown
Member Author

/test

bergwolf added a commit to bergwolf/kata-runtime that referenced this pull request Jul 17, 2019
qemu upstream has x-ignore-shared that works similar
to our private bypass-shared-memory. We can use it to
implement the vm template feature.

Fixes: kata-containers#1798
Depends-on: github.com/kata-containers/packaging#641
Signed-off-by: Peng Tao <bergwolf@hyper.sh>
@bergwolf
Copy link
Copy Markdown
Member Author

@chavafg How can I kick off ci here? Looks like /test command is not working.

Copy link
Copy Markdown

@jodh-intel jodh-intel left a comment

Choose a reason for hiding this comment

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

Thanks @bergwolf.

lgtm

- bool ignored = qemu_get_byte(f);
- if (ignored != ramblock_is_ignored(block)) {
- error_report("RAM block %s should %s be migrated",
- id, ignored ? "" : "not");
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Nit: this will cause an odd double space in the output when ignored is true so should really be:

error_report("RAM block %s should %sbe migrated",
                     id, ignored ? "" : "not ");

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

@jodh-intel The patch is removing these lines not adding them ;)

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Aiieeee - I need more coffee 😄

Copy link
Copy Markdown
Contributor

@grahamwhaley grahamwhaley left a comment

Choose a reason for hiding this comment

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

hah, diffs of patches - eye bending 👀
Looks like the CIs are running (at least pending builds) now..

bergwolf added a commit to bergwolf/kata-runtime that referenced this pull request Jul 17, 2019
qemu upstream has x-ignore-shared that works similar
to our private bypass-shared-memory. We can use it to
implement the vm template feature.

Fixes: kata-containers#1798
Depends-on: github.com/kata-containers/packaging#641
Signed-off-by: Peng Tao <bergwolf@hyper.sh>
@devimc
Copy link
Copy Markdown

devimc commented Jul 17, 2019

/AzurePipelines run

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 1 pipeline(s).

@egernst egernst merged commit 16d2142 into kata-containers:master Jul 17, 2019
bergwolf added a commit to bergwolf/kata-runtime that referenced this pull request Jul 18, 2019
qemu upstream has x-ignore-shared that works similar
to our private bypass-shared-memory. We can use it to
implement the vm template feature.

Fixes: kata-containers#1798
Depends-on: github.com/kata-containers/packaging#641
Signed-off-by: Peng Tao <bergwolf@hyper.sh>
egernst pushed a commit to egernst/runtime that referenced this pull request Jul 18, 2019
qemu upstream has x-ignore-shared that works similar
to our private bypass-shared-memory. We can use it to
implement the vm template feature.

Fixes: kata-containers#1798
Depends-on: github.com/kata-containers/packaging#641
Signed-off-by: Peng Tao <bergwolf@hyper.sh>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

qemu: use upstream x-ignore-shared instead of private migration-ignore-shared patch

5 participants