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.

Sign up for GitHub

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

Add aarch64 support, and more responsive qemu interaction #23

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add aarch64 support, and more responsive qemu interaction #23

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c83d5a
Modify "expect" like logic to prepare for aarch64
jlintonarm Sep 16, 2020
1c2d73d
Add aarch64 support
jlinton Oct 26, 2018
8a58490
Force the architecture
jlintonarm Sep 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ovmf-vars-generator
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def strip_special(line):
def generate_qemu_cmd(args, readonly, *extra_args):
is_x86 = True
arch_args = []
if os.path.basename(args.qemu_binary) == 'qemu-system-aarch64':
if os.path.basename(args.qemu_binary) == 'qemu-system-aarch64' or args.arch == 'aarch64':
Copy link

@dannf dannf Sep 22, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

Personally I'd prefer we not make any assumptions about what the qemu_binary path means and just blindly use whatever they pass in. I think --arch should be the one and only way to determine what arguments are passed to that binary. If the user doesn't specify a binary, we can then pick a reasonable default based on the arch (where I think x86_64 would be the reasonable default).

machinetype = 'virt'
arch_args.extend(['-cpu', 'cortex-a57'])
is_x86 = False
Expand Down Expand Up @@ -212,6 +212,8 @@ def test_keys(args):

def parse_args():
parser = argparse.ArgumentParser()
parser.add_argument('--arch', '-a', help='Architecture hint',
choices=['x86_64', 'aarch64'])
Copy link

Choose a reason for hiding this comment

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

I suggest using the UEFI names x64 & aarch64, since that's really what we're referring to here.

Copy link

Choose a reason for hiding this comment

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

Should we add default='x86_64' (or 'x64') here?

parser.add_argument('output', help='Filename for output vars file')
parser.add_argument('--out-temp', help=argparse.SUPPRESS)
parser.add_argument('--force', help='Overwrite existing output file',
Expand Down