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

pillar/hypervisor: fix discrepancy in setupSpec #4278

Merged
merged 1 commit into from
Sep 25, 2024

Conversation

christoph-zededa
Copy link
Contributor

kvm and xen sent an empty list of ioBundles to setupSpec, so that it failed to lookup devices with aa.LookupIoBundleAny(adapter.Name)

turns out, we can just not call this piece of code in the case of kvm and xen - only when using it directly from containerd; then we also include the proper ioBundles

@rouming
Copy link
Contributor

rouming commented Sep 23, 2024

Required to be backported (so labeled with "stable" or/and labeled with "fix")?

}
}

// I/O Adapter device access
Copy link
Contributor

Choose a reason for hiding this comment

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

Too many comments? :)

@rene
Copy link
Contributor

rene commented Sep 23, 2024

@christoph-zededa could you describe what was the issue observed with the current master?

Copy link
Contributor

@rene rene left a comment

Choose a reason for hiding this comment

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

LGTM

@OhmSpectator
Copy link
Member

Please rebase on the latest master. There were changes in the code close to changed here. I wanna be sure all together it's fine.

kvm and xen sent an empty list of ioBundles to setupSpec, so that
it failed to lookup devices with `aa.LookupIoBundleAny(adapter.Name)`

turns out, we can just not call this piece of code in the case of
kvm and xen - only when using it directly from containerd; then
we also include the proper ioBundles

Signed-off-by: Christoph Ostarek <[email protected]>
@christoph-zededa
Copy link
Contributor Author

@OhmSpectator

I also moved it into oci.go as everything else.

@christoph-zededa
Copy link
Contributor Author

Required to be backported (so labeled with "stable" or/and labeled with "fix")?

53d3ee8 is in no stable branch yet, so no need to backport it.

@eriknordmark eriknordmark added stable Should be backported to stable release(s) and removed stable Should be backported to stable release(s) labels Sep 24, 2024
Copy link
Contributor

@eriknordmark eriknordmark left a comment

Choose a reason for hiding this comment

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

LGTM

@eriknordmark eriknordmark merged commit 019f189 into lf-edge:master Sep 25, 2024
59 of 60 checks passed
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.

5 participants