Commit b00d5aa3 authored by Scott Graham's avatar Scott Graham Committed by Commit Bot

fuchsia: Use an AHCI drive for results, otherwise results in mount failures on arm64

See mount failure in e.g. https://ci.chromium.org/buildbot/tryserver.chromium.linux/fuchsia_arm64/13

Bug: 772031
Change-Id: Ic97e190754e1569b14c0d4643b3d6481fe539f5f
Reviewed-on: https://chromium-review.googlesource.com/744991Reviewed-by: default avatarWez <wez@chromium.org>
Commit-Queue: Wez <wez@chromium.org>
Commit-Queue: Scott Graham <scottmg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#512666}
parent 7349dd81
...@@ -549,7 +549,12 @@ def RunFuchsia(bootfs_data, use_device, kernel_path, dry_run, ...@@ -549,7 +549,12 @@ def RunFuchsia(bootfs_data, use_device, kernel_path, dry_run,
_RunAndCheck(dry_run, ['truncate', '-s100M', img_filename,]) _RunAndCheck(dry_run, ['truncate', '-s100M', img_filename,])
_RunAndCheck(dry_run, [os.path.join(SDK_ROOT, 'tools', 'minfs'), _RunAndCheck(dry_run, [os.path.join(SDK_ROOT, 'tools', 'minfs'),
img_filename, 'mkfs']) img_filename, 'mkfs'])
qemu_command.extend(['-drive', 'file=' + img_filename + ',format=raw']) # Specifically set an AHCI drive, otherwise the drive won't be mountable
# on ARM64.
qemu_command.extend(['-drive', 'file=' + img_filename +
',if=none,format=raw,id=resultsdisk',
'-device', 'ahci,id=ahci',
'-device', 'ide-drive,drive=resultsdisk,bus=ahci.0'])
if dry_run: if dry_run:
print 'Run:', ' '.join(qemu_command) print 'Run:', ' '.join(qemu_command)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment