Signed-off-by: Waldemar Kozaczuk <jwkozac...@gmail.com>
---
scripts/run.py | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/scripts/run.py b/scripts/run.py
index 9e2ed146..c226056e 100755
--- a/scripts/run.py
+++ b/scripts/run.py
@@ -72,7 +72,7 @@ def set_imgargs(options):
execute = '--nopci ' + execute
if options.arch == 'aarch64':
- execute = '--nomount --maxnic=0 ' + execute #TODO: Investigate why
both virtio-blk and virtio-net does not seem to work
+ execute = '--disable_rofs_cache ' + execute
options.osv_cmdline = execute
if options.kernel or options.hypervisor == 'qemu_microvm' or options.arch
== 'aarch64':
@@ -141,7 +141,7 @@ def start_osv_qemu(options):
if options.arch == 'aarch64':
args += [
"-machine", "virt", "-machine", "gic-version=2", "-cpu", "cortex-a57",
- "-device", "virtio-blk-device,id=blk0,drive=hd0,scsi=off%s%s" %
(boot_index, options.virtio_device_suffix),
+ "-device", "virtio-blk-pci,id=blk0,drive=hd0,scsi=off%s%s" %
(boot_index, options.virtio_device_suffix),
"-drive", "file=%s,if=none,id=hd0,%s" % (options.image_file, aio)]
elif options.hypervisor == 'qemu_microvm':
args += [
@@ -583,11 +583,16 @@ if __name__ == "__main__":
help="path to the directory exposed via virtio-fs
mount")
cmdargs = parser.parse_args()
cmdargs.opt_path = "debug" if cmdargs.debug else "release" if
cmdargs.release else "last"
- cmdargs.image_file = os.path.abspath(cmdargs.image or
os.path.join(osv_base, "build/%s/usr.img" % cmdargs.opt_path))
if cmdargs.arch == 'aarch64':
cmdargs.kernel_file = os.path.join(osv_base, "build/%s/loader.img" %
cmdargs.opt_path)
else:
cmdargs.kernel_file = os.path.abspath(cmdargs.kernel_path or
os.path.join(osv_base, "build/%s/kernel.elf" % cmdargs.opt_path))
+ if cmdargs.image:
+ cmdargs.image_file = os.path.abspath(cmdargs.image)
+ elif cmdargs.arch == 'aarch64':
+ cmdargs.image_file = os.path.abspath(os.path.join(osv_base,
"build/%s/disk.img" % cmdargs.opt_path))
+ else:
+ cmdargs.image_file = os.path.abspath(os.path.join(osv_base,
"build/%s/usr.img" % cmdargs.opt_path))
if not os.path.exists(cmdargs.image_file):
raise Exception('Image file %s does not exist.' % cmdargs.image_file)
if cmdargs.cloud_init_image:
--
2.26.2
--
You received this message because you are subscribed to the Google Groups "OSv
Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to osv-dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/osv-dev/20200707032918.31695-1-jwkozaczuk%40gmail.com.
