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

qemu: only set highmem=off for darwin if qemu version is below 7.0 or memory is below 3GB #14291

Merged
merged 7 commits into from
Jun 8, 2022

Conversation

sharifelgamal
Copy link
Collaborator

@sharifelgamal sharifelgamal commented Jun 7, 2022

qemu 7.0.0 fixes an issue that required highmem=off to be specified when using hardware acceleration in aarch64, so we should only specify it for older versions of qemu or if there isn't enough memory allocation to make highmem work.

Fixes #14273

Related #14146

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 7, 2022
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 7, 2022
Copy link

@mprimeaux mprimeaux left a comment

Choose a reason for hiding this comment

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

Just a minor change but nothing to hold back the PR.

pkg/minikube/registry/drvs/qemu2/qemu2.go Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 7, 2022
@sharifelgamal sharifelgamal changed the title qemu: only set highmem=off for darwin if available RAM is under 32GB qemu: only set highmem=off for darwin if qemu version is below 7.0 or memory is below 3GB Jun 8, 2022
Copy link

@mprimeaux mprimeaux left a comment

Choose a reason for hiding this comment

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

LGTM

pkg/minikube/registry/drvs/qemu2/qemu2.go Outdated Show resolved Hide resolved
Copy link

@mprimeaux mprimeaux left a comment

Choose a reason for hiding this comment

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

LGTM

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mprimeaux, sharifelgamal, spowelljr

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:
  • OWNERS [sharifelgamal,spowelljr]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@sharifelgamal sharifelgamal merged commit f11de6b into kubernetes:master Jun 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ERROR: qemu-system-aarch64: Addressing limited to 32 bits
4 participants