From 0fb672b493214551d777e73d0ed3b21b7f060e56 Mon Sep 17 00:00:00 2001 From: Stefan Kalkowski Date: Tue, 23 May 2017 15:05:55 +0200 Subject: [PATCH] run: use default Qemu memory size for x86 Fix #2428 --- repos/base-foc/run/cap_integrity.run | 2 +- repos/base-hw/run/cpu_scheduler.run | 2 +- repos/base-hw/run/double_list.run | 2 +- repos/base-nova/run/platform.run | 2 +- repos/base-okl4/run/priority.run | 2 +- repos/base/run/ada.run | 2 +- repos/base/run/affinity.run | 2 +- repos/base/run/affinity_subspace.run | 2 +- repos/base/run/ds_ownership.run | 2 +- repos/base/run/fpu.run | 2 +- repos/base/run/log.run | 2 +- repos/base/run/mp_server.run | 2 +- repos/base/run/new_delete.run | 2 +- repos/base/run/reconstructible.run | 2 +- repos/base/run/rm_fault.run | 2 +- repos/base/run/rm_nested.run | 2 +- repos/base/run/slab.run | 2 +- repos/base/run/sub_rm.run | 2 +- repos/base/run/synced_interface.run | 2 +- repos/base/run/thread.run | 2 +- repos/base/run/util_mmio.run | 2 +- repos/dde_bsd/run/audio_out.run | 2 +- repos/dde_linux/run/lxip_http_srv.run | 2 +- repos/dde_linux/run/lxip_udp_echo.run | 2 +- repos/dde_linux/run/usb_hid.run | 2 +- repos/dde_linux/run/usb_net.run | 2 +- repos/dde_linux/run/usb_storage.run | 6 +++--- repos/dde_linux/run/usb_terminal.run | 2 +- repos/dde_rump/run/libc_vfs_ext2.run | 2 +- repos/dde_rump/run/libc_vfs_fs_ext2.run | 2 +- repos/dde_rump/run/rump_cgd_ext2.run | 2 +- repos/dde_rump/run/rump_ext2.run | 2 +- repos/dde_rump/run/rump_fat.run | 2 +- repos/dde_rump/run/rump_iso.run | 2 +- repos/gems/run/cpu_load_display.run | 1 - repos/gems/run/cpu_sampler.run | 2 +- repos/gems/run/cpu_sampler_noux.run | 2 -- repos/gems/run/decorator_stress.run | 1 - repos/gems/run/launcher.run | 1 - repos/gems/run/tcp_terminal.run | 2 +- repos/gems/run/terminal_log.run | 1 - repos/gems/run/terminal_mux.run | 1 - repos/gems/run/wm.run | 1 - repos/libports/run/acpica.run | 2 +- repos/libports/run/avplay.run | 2 +- repos/libports/run/expat.run | 2 +- repos/libports/run/ldso.run | 2 +- repos/libports/run/libc.run | 2 +- repos/libports/run/libc_block.run | 2 +- repos/libports/run/libc_component.run | 2 +- repos/libports/run/libc_counter.run | 2 +- repos/libports/run/libc_ffat_fs.run | 2 +- repos/libports/run/libc_filesystem_test.inc | 2 +- repos/libports/run/libc_getenv.run | 2 +- repos/libports/run/libc_pipe.run | 2 +- repos/libports/run/libc_select.run | 2 +- repos/libports/run/libc_vfs.run | 2 +- repos/libports/run/libc_vfs_block.run | 2 +- repos/libports/run/libc_vfs_component.run | 2 +- repos/libports/run/libc_vfs_counter.run | 2 +- repos/libports/run/libc_vfs_fs.run | 2 +- repos/libports/run/libc_vfs_ram.run | 2 +- repos/libports/run/libc_vfs_select.run | 2 +- repos/libports/run/libc_with_libc.run | 2 +- repos/libports/run/lwip.run | 2 +- repos/libports/run/moon.run | 2 +- repos/libports/run/nic_bridge.run | 2 +- repos/libports/run/nic_bridge_lighttpd.run | 1 - repos/libports/run/nic_dump.run | 2 +- repos/libports/run/nic_router.run | 2 +- repos/libports/run/pthread.run | 2 +- repos/libports/run/python.run | 2 +- repos/libports/run/qt5.run | 1 - repos/libports/run/qt5_calculatorform.run | 1 - repos/libports/run/qt5_openglwindow.run | 1 - repos/libports/run/qt5_qpluginwidget.run | 1 - repos/libports/run/qt5_quicktest.run | 1 - repos/libports/run/qt5_samegame.run | 1 - repos/libports/run/qt5_tetrix.run | 1 - repos/libports/run/qt5_textedit.run | 2 +- repos/libports/run/rust.run | 2 +- repos/libports/run/sdl.run | 1 - repos/libports/run/stdcxx.run | 2 +- repos/libports/run/test-ping_client.run | 2 +- repos/libports/run/test-ping_server.run | 2 +- repos/os/run/ahci_bench.run | 2 +- repos/os/run/ahci_blk.run | 2 +- repos/os/run/audio_out_click.run | 2 +- repos/os/run/blk.run | 2 +- repos/os/run/blk_cache.run | 2 +- repos/os/run/bomb.run | 2 +- repos/os/run/cpu_quota.run | 2 +- repos/os/run/demo.run | 1 - repos/os/run/dynamic_config.run | 2 +- repos/os/run/dynamic_config_loader.run | 2 +- repos/os/run/dynamic_config_slave.run | 2 +- repos/os/run/fault_detection.run | 2 +- repos/os/run/fb_bench.run | 2 +- repos/os/run/fs_rom_update.run | 2 +- repos/os/run/init_smp.run | 2 +- repos/os/run/input.run | 1 - repos/os/run/kdb_uart_drv.run | 2 +- repos/os/run/loader.run | 1 - repos/os/run/mixer.run | 2 +- repos/os/run/nic_loopback.run | 2 +- repos/os/run/part_blk.inc | 2 +- repos/os/run/pci.run | 2 +- repos/os/run/ram_fs_chunk.run | 2 +- repos/os/run/report_rom.run | 2 +- repos/os/run/resource_request.run | 2 +- repos/os/run/resource_yield.run | 2 +- repos/os/run/rom_blk.run | 2 +- repos/os/run/rtc.run | 2 +- repos/os/run/signal.run | 2 +- repos/os/run/tar_rom.run | 2 +- repos/os/run/terminal_crosslink.run | 2 +- repos/os/run/thread_join.run | 2 +- repos/os/run/timed_semaphore.run | 2 +- repos/os/run/timeout.run | 2 +- repos/os/run/timer.run | 2 +- repos/os/run/timer_accuracy.run | 2 +- repos/os/run/trace.run | 2 +- repos/os/run/usb_block.run | 2 +- repos/os/run/weak_ptr.run | 2 +- repos/os/run/xml_generator.run | 2 +- repos/os/run/xml_node.run | 2 +- repos/ports/run/arora.run | 1 - repos/ports/run/debug_nitpicker.run | 1 - repos/ports/run/dosbox.run | 2 +- repos/ports/run/gdb_monitor.run | 2 +- repos/ports/run/gdb_monitor_interactive.run | 2 +- repos/ports/run/gdb_monitor_target_config.run | 2 +- repos/ports/run/netperf.inc | 4 ++-- repos/ports/run/noux.run | 1 - repos/ports/run/noux_bash.run | 1 - repos/ports/run/noux_gdb.run | 1 - repos/ports/run/noux_shell_script.run | 1 - repos/ports/run/noux_terminal_fs.run | 1 - repos/ports/run/noux_trace_fs.run | 1 - repos/ports/run/noux_two_terminal_fs.run | 1 - repos/ports/run/noux_uname.run | 1 - repos/ports/run/seoul-auto.run | 1 - repos/ports/run/seoul-net.run | 1 - repos/ports/run/vmm_utils.run | 1 - tool/run/power_on/qemu | 3 +++ 145 files changed, 118 insertions(+), 148 deletions(-) diff --git a/repos/base-foc/run/cap_integrity.run b/repos/base-foc/run/cap_integrity.run index 17a2653b3f..805841562f 100644 --- a/repos/base-foc/run/cap_integrity.run +++ b/repos/base-foc/run/cap_integrity.run @@ -23,7 +23,7 @@ install_config { build_boot_image "core ld.lib.so init test-cap_integrity" -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " # increase expect buffer size, since there might be many log messages match_max -d 100000 diff --git a/repos/base-hw/run/cpu_scheduler.run b/repos/base-hw/run/cpu_scheduler.run index 75e458b150..454635c8df 100644 --- a/repos/base-hw/run/cpu_scheduler.run +++ b/repos/base-hw/run/cpu_scheduler.run @@ -33,7 +33,7 @@ install_config { build_boot_image "core ld.lib.so init test-cpu_scheduler" # configure qemu to use 64 MB RAM and avoid GUI mode -append qemu_args " -m 64 -nographic" +append qemu_args " -nographic" # execute the test in qemu if the targeted platform is supported run_genode_until "done.*\n" 10 diff --git a/repos/base-hw/run/double_list.run b/repos/base-hw/run/double_list.run index 59665e850a..e47fc27a6a 100644 --- a/repos/base-hw/run/double_list.run +++ b/repos/base-hw/run/double_list.run @@ -30,7 +30,7 @@ install_config { build_boot_image "core ld.lib.so init test-double_list" # configure qemu to use 64 MB RAM and avoid GUI mode -append qemu_args " -m 64 -nographic" +append qemu_args " -nographic" # execute the test in qemu if the targeted platform is supported run_genode_until "done.*\n" 10 diff --git a/repos/base-nova/run/platform.run b/repos/base-nova/run/platform.run index ae9869bde8..c81683b574 100644 --- a/repos/base-nova/run/platform.run +++ b/repos/base-nova/run/platform.run @@ -35,7 +35,7 @@ install_config $config build_boot_image "core ld.lib.so init test-platform" -append qemu_args "-nographic -m 192 -smp 2" +append qemu_args "-nographic -smp 2" run_genode_until {Test finished} 200 diff --git a/repos/base-okl4/run/priority.run b/repos/base-okl4/run/priority.run index 81b4794723..7728bcee62 100644 --- a/repos/base-okl4/run/priority.run +++ b/repos/base-okl4/run/priority.run @@ -8,7 +8,7 @@ install_config "[exec cat [genode_dir]/repos/os/src/init/config.priority]" build_boot_image "core ld.lib.so init" -append qemu_args "-nographic -m 256" +append qemu_args "-nographic " # run genode until the init->init.2 process gives us a life sign run_genode_until "init.2.*No children to start.*\n" 100 diff --git a/repos/base/run/ada.run b/repos/base/run/ada.run index 9bc00dd693..2d3559b75a 100644 --- a/repos/base/run/ada.run +++ b/repos/base/run/ada.run @@ -23,7 +23,7 @@ install_config { build_boot_image "core ld.lib.so init test-ada" -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until {child "test-ada" exited with exit value 0.*} 10 diff --git a/repos/base/run/affinity.run b/repos/base/run/affinity.run index 306abac839..ef2b252489 100644 --- a/repos/base/run/affinity.run +++ b/repos/base/run/affinity.run @@ -65,7 +65,7 @@ if {[have_include "power_on/qemu"]} { set want_cpus_y 1 set want_cpus_total [expr $want_cpus_x*$want_cpus_y] set rounds "03" - append qemu_args "-nographic -m 64 -smp $want_cpus_total,cores=$want_cpus_total " + append qemu_args "-nographic -smp $want_cpus_total,cores=$want_cpus_total " } else { set rounds "10" if {[have_spec x86]} { set rounds "40" } diff --git a/repos/base/run/affinity_subspace.run b/repos/base/run/affinity_subspace.run index aafd4c5eb3..f35b4d2f60 100644 --- a/repos/base/run/affinity_subspace.run +++ b/repos/base/run/affinity_subspace.run @@ -50,7 +50,7 @@ install_config { } -append qemu_args " -nographic -m 64 -smp 8,cores=8 " +append qemu_args " -nographic -smp 8,cores=8 " build_boot_image "core init test-affinity" diff --git a/repos/base/run/ds_ownership.run b/repos/base/run/ds_ownership.run index 244ce77c7b..c8dcaa8132 100644 --- a/repos/base/run/ds_ownership.run +++ b/repos/base/run/ds_ownership.run @@ -33,7 +33,7 @@ install_config { build_boot_image "core ld.lib.so init test-ds_ownership" -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until {.*test succeeded.*\n} 10 diff --git a/repos/base/run/fpu.run b/repos/base/run/fpu.run index 29433c9ebe..9fd6d2dd1f 100644 --- a/repos/base/run/fpu.run +++ b/repos/base/run/fpu.run @@ -37,7 +37,7 @@ build_boot_image "core ld.lib.so init test-fpu" # Execution # -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until "test done.*\n" 60 diff --git a/repos/base/run/log.run b/repos/base/run/log.run index 87acbe289c..7adc0251f2 100644 --- a/repos/base/run/log.run +++ b/repos/base/run/log.run @@ -23,7 +23,7 @@ install_config { build_boot_image "core ld.lib.so init test-log" -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until "Test done.*\n" 10 diff --git a/repos/base/run/mp_server.run b/repos/base/run/mp_server.run index 0210ad8377..4e1ddcc49c 100644 --- a/repos/base/run/mp_server.run +++ b/repos/base/run/mp_server.run @@ -45,7 +45,7 @@ if {[have_include "power_on/qemu"]} { if {[have_spec zynq]} { set want_cpus 1 } if {[have_spec sel4]} { set want_cpus 1 } - append qemu_args " -nographic -m 64 -smp $want_cpus,cores=$want_cpus " + append qemu_args " -nographic -smp $want_cpus,cores=$want_cpus " } # run the test diff --git a/repos/base/run/new_delete.run b/repos/base/run/new_delete.run index d582c854e3..95607ae883 100644 --- a/repos/base/run/new_delete.run +++ b/repos/base/run/new_delete.run @@ -23,7 +23,7 @@ install_config { build_boot_image "core ld.lib.so init test-new_delete" -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until "Test done.*\n" 15 diff --git a/repos/base/run/reconstructible.run b/repos/base/run/reconstructible.run index 765d3ac864..e51e26fe10 100644 --- a/repos/base/run/reconstructible.run +++ b/repos/base/run/reconstructible.run @@ -24,7 +24,7 @@ install_config { build_boot_image "core ld.lib.so init test-reconstructible" -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until {.*--- Reconstructible utility test finished ---.*\n} 10 diff --git a/repos/base/run/rm_fault.run b/repos/base/run/rm_fault.run index 2f10801148..3ee3e0cf01 100644 --- a/repos/base/run/rm_fault.run +++ b/repos/base/run/rm_fault.run @@ -26,6 +26,6 @@ install_config { build_boot_image "core ld.lib.so init test-rm_fault" -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until {child "test-rm_fault" exited with exit value 0.*} 300 diff --git a/repos/base/run/rm_nested.run b/repos/base/run/rm_nested.run index a67da07db4..8d10e34da0 100644 --- a/repos/base/run/rm_nested.run +++ b/repos/base/run/rm_nested.run @@ -27,6 +27,6 @@ install_config { build_boot_image "core ld.lib.so init test-rm_nested" -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until ".*--- finished nested region map test ---.*\n" 300 diff --git a/repos/base/run/slab.run b/repos/base/run/slab.run index 4f7ae448f4..421c9d9b9a 100644 --- a/repos/base/run/slab.run +++ b/repos/base/run/slab.run @@ -36,7 +36,7 @@ install_config { build_boot_image "core ld.lib.so init timer test-slab" -append qemu_args "-nographic -m 128" +append qemu_args "-nographic " run_genode_until "Test done.*\n" 100 diff --git a/repos/base/run/sub_rm.run b/repos/base/run/sub_rm.run index de84c3311d..314034428e 100644 --- a/repos/base/run/sub_rm.run +++ b/repos/base/run/sub_rm.run @@ -24,7 +24,7 @@ install_config { build_boot_image "core ld.lib.so init test-sub_rm" -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until {.*--- end of sub-rm test ---.*} 10 diff --git a/repos/base/run/synced_interface.run b/repos/base/run/synced_interface.run index 6690e0dd79..bb2b4c7083 100644 --- a/repos/base/run/synced_interface.run +++ b/repos/base/run/synced_interface.run @@ -24,7 +24,7 @@ install_config { build_boot_image "core ld.lib.so init test-synced_interface" -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until {.*--- Synced interface test finished ---.*\n} 10 diff --git a/repos/base/run/thread.run b/repos/base/run/thread.run index 40625c8a06..4e84d51e49 100644 --- a/repos/base/run/thread.run +++ b/repos/base/run/thread.run @@ -42,7 +42,7 @@ install_config $config build_boot_image "core ld.lib.so init test-thread" -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until {.*test completed successfully.*\n} 60 diff --git a/repos/base/run/util_mmio.run b/repos/base/run/util_mmio.run index 86f7e62d29..7adc280230 100644 --- a/repos/base/run/util_mmio.run +++ b/repos/base/run/util_mmio.run @@ -38,7 +38,7 @@ build_boot_image "core ld.lib.so init test-util_mmio" # Execution # -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until "Test done.*\n" 10 diff --git a/repos/dde_bsd/run/audio_out.run b/repos/dde_bsd/run/audio_out.run index 9e9cda288f..6bf0606639 100644 --- a/repos/dde_bsd/run/audio_out.run +++ b/repos/dde_bsd/run/audio_out.run @@ -126,7 +126,7 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 128 -nographic -soundhw es1370 " +append qemu_args " -nographic -soundhw es1370 " # # For obvious reasons the timeout depends on the total diff --git a/repos/dde_linux/run/lxip_http_srv.run b/repos/dde_linux/run/lxip_http_srv.run index 50995d0cb9..5e89a9be7f 100644 --- a/repos/dde_linux/run/lxip_http_srv.run +++ b/repos/dde_linux/run/lxip_http_srv.run @@ -119,7 +119,7 @@ build_boot_image $boot_modules # # qemu config -append qemu_args " -m 128 -nographic " +append qemu_args " -nographic " append_if [have_spec x86] qemu_args " -net nic,model=e1000 " append_if [have_spec lan9118] qemu_args " -net nic,model=lan9118 " diff --git a/repos/dde_linux/run/lxip_udp_echo.run b/repos/dde_linux/run/lxip_udp_echo.run index 3b38c56653..5c5a95c3d0 100644 --- a/repos/dde_linux/run/lxip_udp_echo.run +++ b/repos/dde_linux/run/lxip_udp_echo.run @@ -119,7 +119,7 @@ build_boot_image $boot_modules # # qemu config -append qemu_args " -m 128 -nographic " +append qemu_args " -nographic " append_if [have_spec x86] qemu_args " -net nic,model=e1000 " append_if [have_spec lan9118] qemu_args " -net nic,model=lan9118 " diff --git a/repos/dde_linux/run/usb_hid.run b/repos/dde_linux/run/usb_hid.run index 4805e3ca8e..e8d5a34fcf 100644 --- a/repos/dde_linux/run/usb_hid.run +++ b/repos/dde_linux/run/usb_hid.run @@ -142,7 +142,7 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256 -usb -usbdevice mouse -usbdevice keyboard" +append qemu_args " -usb -usbdevice mouse -usbdevice keyboard" append qemu_args " -device usb-ehci,id=ehci" if { [have_include "power_on/qemu"] || ![get_cmd_switch --autopilot] } { run_genode_until forever } diff --git a/repos/dde_linux/run/usb_net.run b/repos/dde_linux/run/usb_net.run index 98b0f008c0..120e54d91a 100644 --- a/repos/dde_linux/run/usb_net.run +++ b/repos/dde_linux/run/usb_net.run @@ -102,7 +102,7 @@ lappend_if [have_spec gpio] boot_modules [gpio_drv] build_boot_image $boot_modules -append qemu_args " -m 256 -nographic" +append qemu_args " -nographic" run_genode_until forever diff --git a/repos/dde_linux/run/usb_storage.run b/repos/dde_linux/run/usb_storage.run index 90735032a3..656f168380 100644 --- a/repos/dde_linux/run/usb_storage.run +++ b/repos/dde_linux/run/usb_storage.run @@ -108,14 +108,14 @@ catch { exec sh -c $cmd } # # Qemu opts for UHCI # -#append qemu_args " -m 128 -nographic -usbdevice disk::$disk_image -boot order=d" +#append qemu_args " -nographic -usbdevice disk::$disk_image -boot order=d" # # Qemu opts for EHCI # append qemu_args "-drive if=none,id=disk,file=$disk_image" append qemu_args { \ --m 128 -nographic -M pc \ + -nographic -M pc \ -device usb-ehci,id=ehci \ -device usb-storage,bus=ehci.0,drive=disk \ -boot order=d } @@ -124,7 +124,7 @@ append qemu_args { \ # Qemu opts for XHCI # #append qemu_args { \ -#-m 128 -nographic -M pc \ +# -nographic -M pc \ #-device nec-usb-xhci,id=xhci \ #-device usb-storage,bus=xhci.0,drive=disk \ #-boot order=d } diff --git a/repos/dde_linux/run/usb_terminal.run b/repos/dde_linux/run/usb_terminal.run index aa4c9686d8..d346e55733 100644 --- a/repos/dde_linux/run/usb_terminal.run +++ b/repos/dde_linux/run/usb_terminal.run @@ -107,7 +107,7 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256 -nographic -usb -usbdevice host:$usb_raw_device -nographic" +append qemu_args " -nographic -usb -usbdevice host:$usb_raw_device -nographic" run_genode_until forever diff --git a/repos/dde_rump/run/libc_vfs_ext2.run b/repos/dde_rump/run/libc_vfs_ext2.run index 5305dbcf26..328fd4bd04 100644 --- a/repos/dde_rump/run/libc_vfs_ext2.run +++ b/repos/dde_rump/run/libc_vfs_ext2.run @@ -92,7 +92,7 @@ set boot_modules { build_boot_image $boot_modules -append qemu_args " -m 256 -nographic" +append qemu_args " -nographic" run_genode_until {.*child "test-libc_vfs" exited with exit value 0.*} 60 diff --git a/repos/dde_rump/run/libc_vfs_fs_ext2.run b/repos/dde_rump/run/libc_vfs_fs_ext2.run index 1a6f2cca82..2f7dad83ff 100644 --- a/repos/dde_rump/run/libc_vfs_fs_ext2.run +++ b/repos/dde_rump/run/libc_vfs_fs_ext2.run @@ -101,7 +101,7 @@ set boot_modules { build_boot_image $boot_modules -append qemu_args " -m 256 -nographic" +append qemu_args " -nographic" run_genode_until {.*child "test-libc_vfs" exited with exit value 0.*} 60 diff --git a/repos/dde_rump/run/rump_cgd_ext2.run b/repos/dde_rump/run/rump_cgd_ext2.run index 5702c6559e..2c825d7f25 100644 --- a/repos/dde_rump/run/rump_cgd_ext2.run +++ b/repos/dde_rump/run/rump_cgd_ext2.run @@ -127,7 +127,7 @@ append boot_modules "$disk_image" build_boot_image $boot_modules -append qemu_args " -m 256 -nographic" +append qemu_args " -nographic" run_genode_until {.*child "test-libc_vfs" exited with exit value 0.*} 60 diff --git a/repos/dde_rump/run/rump_ext2.run b/repos/dde_rump/run/rump_ext2.run index 2cff66fbee..0865f9ecd2 100644 --- a/repos/dde_rump/run/rump_ext2.run +++ b/repos/dde_rump/run/rump_ext2.run @@ -90,7 +90,7 @@ set boot_modules { build_boot_image $boot_modules -append qemu_args " -m 256 -nographic" +append qemu_args " -nographic" run_genode_until {.*child "test-libc_vfs" exited with exit value 0.*} 60 diff --git a/repos/dde_rump/run/rump_fat.run b/repos/dde_rump/run/rump_fat.run index e0a5633d4c..003f3b770d 100644 --- a/repos/dde_rump/run/rump_fat.run +++ b/repos/dde_rump/run/rump_fat.run @@ -90,7 +90,7 @@ set boot_modules { build_boot_image $boot_modules -append qemu_args " -m 256 -nographic " +append qemu_args " -nographic " run_genode_until {.*child "test-libc_vfs" exited with exit value 0.*} 60 diff --git a/repos/dde_rump/run/rump_iso.run b/repos/dde_rump/run/rump_iso.run index 0d4698a822..098a3efeee 100644 --- a/repos/dde_rump/run/rump_iso.run +++ b/repos/dde_rump/run/rump_iso.run @@ -96,7 +96,7 @@ set boot_modules { build_boot_image $boot_modules -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until {child .* exited with exit value 0.*\n} 60 diff --git a/repos/gems/run/cpu_load_display.run b/repos/gems/run/cpu_load_display.run index 579d8bdd8a..3d7eff0c2c 100644 --- a/repos/gems/run/cpu_load_display.run +++ b/repos/gems/run/cpu_load_display.run @@ -237,7 +237,6 @@ lappend_if [have_spec imx53] boot_modules input_drv build_boot_image $boot_modules -append qemu_args " -m 256 " append qemu_args " -smp 4,cores=4 " run_genode_until forever diff --git a/repos/gems/run/cpu_sampler.run b/repos/gems/run/cpu_sampler.run index cd64025d9f..0e0be5129c 100644 --- a/repos/gems/run/cpu_sampler.run +++ b/repos/gems/run/cpu_sampler.run @@ -82,7 +82,7 @@ build_boot_image { test-cpu_sampler } -append qemu_args "-nographic -m 128" +append qemu_args "-nographic " set match_string "Test started. func: 0x(\[0-9a-f\]+).*\n" diff --git a/repos/gems/run/cpu_sampler_noux.run b/repos/gems/run/cpu_sampler_noux.run index 77887284e2..e41aa450a2 100644 --- a/repos/gems/run/cpu_sampler_noux.run +++ b/repos/gems/run/cpu_sampler_noux.run @@ -243,9 +243,7 @@ build_boot_image $boot_modules if {[have_spec x86_64]} { # bash.tar is really huge when built for x86_64 - append qemu_args " -m 320 " } else { - append qemu_args " -m 256 " } if { ![get_cmd_switch --autopilot] } { run_genode_until forever } diff --git a/repos/gems/run/decorator_stress.run b/repos/gems/run/decorator_stress.run index d127a8816f..3bd57aa824 100644 --- a/repos/gems/run/decorator_stress.run +++ b/repos/gems/run/decorator_stress.run @@ -98,6 +98,5 @@ build { test/decorator_stress } build_boot_image { test-decorator_stress } -append qemu_args " -m 256 " run_genode_until forever diff --git a/repos/gems/run/launcher.run b/repos/gems/run/launcher.run index b0f8384507..f1032630e4 100644 --- a/repos/gems/run/launcher.run +++ b/repos/gems/run/launcher.run @@ -271,6 +271,5 @@ build { app/launcher test/nitpicker app/status_bar app/xray_trigger } build_boot_image { testnit launcher xray_trigger status_bar } -append qemu_args " -m 256 " run_genode_until forever diff --git a/repos/gems/run/tcp_terminal.run b/repos/gems/run/tcp_terminal.run index 050d7738a9..670409a6ef 100644 --- a/repos/gems/run/tcp_terminal.run +++ b/repos/gems/run/tcp_terminal.run @@ -102,7 +102,7 @@ build_boot_image $boot_modules # # qemu config -append qemu_args " -m 128 -nographic " +append qemu_args " -nographic " append_if [have_spec x86] qemu_args " -net nic,model=e1000 " append_if [have_spec lan9118] qemu_args " -net nic,model=lan9118 " diff --git a/repos/gems/run/terminal_log.run b/repos/gems/run/terminal_log.run index a1611c6b78..38902f5067 100644 --- a/repos/gems/run/terminal_log.run +++ b/repos/gems/run/terminal_log.run @@ -156,5 +156,4 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256 " run_genode_until forever diff --git a/repos/gems/run/terminal_mux.run b/repos/gems/run/terminal_mux.run index 52112f194c..0709ddb2b8 100644 --- a/repos/gems/run/terminal_mux.run +++ b/repos/gems/run/terminal_mux.run @@ -148,7 +148,6 @@ set fiasco_serial_esc_arg "" build_boot_image $boot_modules -append qemu_args " -m 256 " append qemu_args " -nographic " # diff --git a/repos/gems/run/wm.run b/repos/gems/run/wm.run index 815401a5d9..738cb48e29 100644 --- a/repos/gems/run/wm.run +++ b/repos/gems/run/wm.run @@ -143,6 +143,5 @@ install_config { build_boot_image { } -append qemu_args " -m 256 " run_genode_until forever diff --git a/repos/libports/run/acpica.run b/repos/libports/run/acpica.run index 7f6d00c0aa..d9b6fddea0 100644 --- a/repos/libports/run/acpica.run +++ b/repos/libports/run/acpica.run @@ -217,6 +217,6 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args "-nographic -m 128" +append qemu_args "-nographic " run_genode_until {\[init -\> acpica\].*SCI IRQ:.*\n} 30 diff --git a/repos/libports/run/avplay.run b/repos/libports/run/avplay.run index 889818c307..2782277976 100644 --- a/repos/libports/run/avplay.run +++ b/repos/libports/run/avplay.run @@ -128,7 +128,7 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256 -soundhw es1370" +append qemu_args " -soundhw es1370" run_genode_until forever diff --git a/repos/libports/run/expat.run b/repos/libports/run/expat.run index 9b29c62ffa..545c64061f 100644 --- a/repos/libports/run/expat.run +++ b/repos/libports/run/expat.run @@ -65,7 +65,7 @@ build_boot_image { # Execute test case # -append qemu_args " -nographic -m 64" +append qemu_args " -nographic " run_genode_until {.*child "test-expat" exited with exit value 0.*} 5 diff --git a/repos/libports/run/ldso.run b/repos/libports/run/ldso.run index c1a526f0c8..a1b0594964 100644 --- a/repos/libports/run/ldso.run +++ b/repos/libports/run/ldso.run @@ -35,7 +35,7 @@ set boot_modules { build_boot_image $boot_modules -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until {child ".*" exited with exit value 123.*\n} 10 diff --git a/repos/libports/run/libc.run b/repos/libports/run/libc.run index a0656f0c1b..f41ce7a51e 100644 --- a/repos/libports/run/libc.run +++ b/repos/libports/run/libc.run @@ -35,7 +35,7 @@ build_boot_image { ld.lib.so libc.lib.so libm.lib.so posix.lib.so } -append qemu_args " -nographic -m 512 " +append qemu_args " -nographic " run_genode_until "child .* exited with exit value 0.*\n" 10 diff --git a/repos/libports/run/libc_block.run b/repos/libports/run/libc_block.run index d8c9b6940c..71d4983f9c 100644 --- a/repos/libports/run/libc_block.run +++ b/repos/libports/run/libc_block.run @@ -134,7 +134,7 @@ catch { exec sh -c $cmd } # # Qemu # -append qemu_args " -m 128 -nographic " +append qemu_args " -nographic " append_if $use_ahci_drv qemu_args " -drive id=disk,file=$disk_image,format=raw,if=none -device ahci,id=ahci -device ide-drive,drive=disk,bus=ahci.0 -boot d" append_if $use_sd_card_drv qemu_args " -drive file=$disk_image,format=raw,if=sd,cache=writeback " diff --git a/repos/libports/run/libc_component.run b/repos/libports/run/libc_component.run index 82ae1afffd..02911a9d6a 100644 --- a/repos/libports/run/libc_component.run +++ b/repos/libports/run/libc_component.run @@ -92,7 +92,7 @@ set boot_modules { build_boot_image $boot_modules -append qemu_args "-nographic -m 128" +append qemu_args "-nographic " # # Execute test case diff --git a/repos/libports/run/libc_counter.run b/repos/libports/run/libc_counter.run index c8f4700208..c567d6aa1f 100644 --- a/repos/libports/run/libc_counter.run +++ b/repos/libports/run/libc_counter.run @@ -74,7 +74,7 @@ set boot_modules { build_boot_image $boot_modules -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " # # Execute test case diff --git a/repos/libports/run/libc_ffat_fs.run b/repos/libports/run/libc_ffat_fs.run index fea38c4180..6bab468a58 100644 --- a/repos/libports/run/libc_ffat_fs.run +++ b/repos/libports/run/libc_ffat_fs.run @@ -142,7 +142,7 @@ catch { exec sh -c $cmd } # # Qemu # -append qemu_args " -m 128 -nographic " +append qemu_args " -nographic " append_if $use_ahci_drv qemu_args " -drive id=disk,file=$disk_image,format=raw,if=none -device ahci,id=ahci -device ide-drive,drive=disk,bus=ahci.0 -boot d" append_if $use_sd_card_drv qemu_args " -drive file=$disk_image,format=raw,if=sd,cache=writeback " diff --git a/repos/libports/run/libc_filesystem_test.inc b/repos/libports/run/libc_filesystem_test.inc index f588ec9825..5e2edf1ee1 100644 --- a/repos/libports/run/libc_filesystem_test.inc +++ b/repos/libports/run/libc_filesystem_test.inc @@ -170,7 +170,7 @@ catch { exec sh -c $cmd } # # Qemu # -append qemu_args " -m 128 -nographic " +append qemu_args " -nographic " append_if $use_ahci qemu_args " -drive id=disk,file=$disk_image,format=raw,if=none -device ahci,id=ahci -device ide-drive,drive=disk,bus=ahci.0 -boot d" append_if $use_sd_card_drv qemu_args " -drive file=$disk_image,format=raw,if=sd,cache=writeback " diff --git a/repos/libports/run/libc_getenv.run b/repos/libports/run/libc_getenv.run index 6c60829e1c..2fa90ac584 100644 --- a/repos/libports/run/libc_getenv.run +++ b/repos/libports/run/libc_getenv.run @@ -41,7 +41,7 @@ build_boot_image { ld.lib.so libc.lib.so libm.lib.so posix.lib.so } -append qemu_args " -nographic -m 64 " +append qemu_args " -nographic " run_genode_until "child .* exited with exit value 0.*\n" 10 diff --git a/repos/libports/run/libc_pipe.run b/repos/libports/run/libc_pipe.run index 3113b39581..2bfe857470 100644 --- a/repos/libports/run/libc_pipe.run +++ b/repos/libports/run/libc_pipe.run @@ -35,7 +35,7 @@ build_boot_image { ld.lib.so libc.lib.so libm.lib.so libc_pipe.lib.so pthread.lib.so } -append qemu_args " -nographic -m 64 " +append qemu_args " -nographic " run_genode_until "child .* exited with exit value 0.*\n" 10 diff --git a/repos/libports/run/libc_select.run b/repos/libports/run/libc_select.run index 613c68066d..689586e1da 100644 --- a/repos/libports/run/libc_select.run +++ b/repos/libports/run/libc_select.run @@ -76,7 +76,7 @@ set boot_modules { build_boot_image $boot_modules -append qemu_args " -m 128 -nographic " +append qemu_args " -nographic " run_genode_until "child \"test-libc_select\" exited with exit value 0.*\n" 120 diff --git a/repos/libports/run/libc_vfs.run b/repos/libports/run/libc_vfs.run index ad27c9e804..efe72e4dd5 100644 --- a/repos/libports/run/libc_vfs.run +++ b/repos/libports/run/libc_vfs.run @@ -68,7 +68,7 @@ build_boot_image { # Execute test case # -append qemu_args " -m 128 -nographic " +append qemu_args " -nographic " run_genode_until {.*child "test-libc_vfs" exited with exit value 0.*} 60 # vi: set ft=tcl : diff --git a/repos/libports/run/libc_vfs_block.run b/repos/libports/run/libc_vfs_block.run index dd8ce110ac..12e7d8ffad 100644 --- a/repos/libports/run/libc_vfs_block.run +++ b/repos/libports/run/libc_vfs_block.run @@ -83,6 +83,6 @@ build_boot_image { # Execute test case # -append qemu_args " -m 128 -nographic " +append qemu_args " -nographic " run_genode_until {.*child "test-libc_vfs_block" exited with exit value 0.*} 60 diff --git a/repos/libports/run/libc_vfs_component.run b/repos/libports/run/libc_vfs_component.run index 0947909ad4..8271e90c37 100644 --- a/repos/libports/run/libc_vfs_component.run +++ b/repos/libports/run/libc_vfs_component.run @@ -103,7 +103,7 @@ set boot_modules { build_boot_image $boot_modules -append qemu_args "-nographic -m 128" +append qemu_args "-nographic " # # Execute test case diff --git a/repos/libports/run/libc_vfs_counter.run b/repos/libports/run/libc_vfs_counter.run index 4e9b0597bc..bdea12d813 100644 --- a/repos/libports/run/libc_vfs_counter.run +++ b/repos/libports/run/libc_vfs_counter.run @@ -86,7 +86,7 @@ set boot_modules { build_boot_image $boot_modules -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " # # Execute test case diff --git a/repos/libports/run/libc_vfs_fs.run b/repos/libports/run/libc_vfs_fs.run index 83072e2a14..178f866c87 100644 --- a/repos/libports/run/libc_vfs_fs.run +++ b/repos/libports/run/libc_vfs_fs.run @@ -71,7 +71,7 @@ build_boot_image { # Execute test case # -append qemu_args " -m 128 -nographic " +append qemu_args " -nographic " run_genode_until {.*child "test-libc_vfs" exited with exit value 0.*} 60 # vi: set ft=tcl : diff --git a/repos/libports/run/libc_vfs_ram.run b/repos/libports/run/libc_vfs_ram.run index 67229ddd4d..2ba67674c0 100644 --- a/repos/libports/run/libc_vfs_ram.run +++ b/repos/libports/run/libc_vfs_ram.run @@ -65,7 +65,7 @@ build_boot_image { # Execute test case # -append qemu_args " -m 128 -nographic " +append qemu_args " -nographic " run_genode_until {.*child "test-libc_vfs" exited with exit value 0.*} 60 # vi: set ft=tcl : diff --git a/repos/libports/run/libc_vfs_select.run b/repos/libports/run/libc_vfs_select.run index a19c434344..5612807886 100644 --- a/repos/libports/run/libc_vfs_select.run +++ b/repos/libports/run/libc_vfs_select.run @@ -85,7 +85,7 @@ set boot_modules { build_boot_image $boot_modules -append qemu_args " -m 128 -nographic " +append qemu_args " -nographic " run_genode_until "child \"test-libc_select\" exited with exit value 0.*\n" 120 diff --git a/repos/libports/run/libc_with_libc.run b/repos/libports/run/libc_with_libc.run index 79e9c78c35..e59281170d 100644 --- a/repos/libports/run/libc_with_libc.run +++ b/repos/libports/run/libc_with_libc.run @@ -56,6 +56,6 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -nographic -m 64 " +append qemu_args " -nographic " run_genode_until ".*finished with_libc tests.*\n" 10 diff --git a/repos/libports/run/lwip.run b/repos/libports/run/lwip.run index 1a7a4594b9..7cd685b7b5 100644 --- a/repos/libports/run/lwip.run +++ b/repos/libports/run/lwip.run @@ -141,7 +141,7 @@ build_boot_image $boot_modules # # qemu config -append qemu_args " -m 128 -nographic " +append qemu_args " -nographic " append_if [have_spec x86] qemu_args " -net nic,model=e1000 " append_if [have_spec lan9118] qemu_args " -net nic,model=lan9118 " diff --git a/repos/libports/run/moon.run b/repos/libports/run/moon.run index bbd8f502bb..8760fc2241 100644 --- a/repos/libports/run/moon.run +++ b/repos/libports/run/moon.run @@ -41,6 +41,6 @@ build_boot_image { ld.lib.so libc.lib.so libm.lib.so } -append qemu_args " -nographic -m 65 " +append qemu_args " -nographic " run_genode_until {.*test-moon.*Finished\..*} 40 diff --git a/repos/libports/run/nic_bridge.run b/repos/libports/run/nic_bridge.run index 5b2335ed8d..a1cdb26031 100644 --- a/repos/libports/run/nic_bridge.run +++ b/repos/libports/run/nic_bridge.run @@ -117,7 +117,7 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 512 -nographic " +append qemu_args " -nographic " append_if [have_spec x86] qemu_args " -net nic,model=e1000 " append_if [have_spec lan9118] qemu_args " -net nic,model=lan9118 " diff --git a/repos/libports/run/nic_bridge_lighttpd.run b/repos/libports/run/nic_bridge_lighttpd.run index 78507634f6..fd9f31429f 100644 --- a/repos/libports/run/nic_bridge_lighttpd.run +++ b/repos/libports/run/nic_bridge_lighttpd.run @@ -156,7 +156,6 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 512 " append_if [have_spec x86] qemu_args " -net nic,model=e1000 " append_if [have_spec lan9118] qemu_args " -net nic,model=lan9118 " diff --git a/repos/libports/run/nic_dump.run b/repos/libports/run/nic_dump.run index 13c979d047..256936d537 100644 --- a/repos/libports/run/nic_dump.run +++ b/repos/libports/run/nic_dump.run @@ -262,6 +262,6 @@ proc nic_qemu_args { } { if {[have_spec x86]} { return "-net nic,model=e1000" } if {[have_spec lan9118]} { return "-net nic,model=lan9118" } } -append qemu_args "-m 384 -nographic -net user -redir udp:5555::1337 [nic_qemu_args]" +append qemu_args "-nographic -net user -redir udp:5555::1337 [nic_qemu_args]" run_genode_until {.*Test done.*\n.*Test done.*\n} 60 diff --git a/repos/libports/run/nic_router.run b/repos/libports/run/nic_router.run index b6b8f4f89c..75b1caff86 100644 --- a/repos/libports/run/nic_router.run +++ b/repos/libports/run/nic_router.run @@ -284,6 +284,6 @@ proc nic_qemu_args { } { if {[have_spec x86]} { return "-net nic,model=e1000" } if {[have_spec lan9118]} { return "-net nic,model=lan9118" } } -append qemu_args "-m 384 -nographic -net user -redir udp:5555::1337 [nic_qemu_args]" +append qemu_args "-nographic -net user -redir udp:5555::1337 [nic_qemu_args]" run_genode_until {.*Test done.*\n.*Test done.*\n.*Test done.*\n.*Test done.*\n.*Test done.*\n.*Test done.*\n} 60 diff --git a/repos/libports/run/pthread.run b/repos/libports/run/pthread.run index ee2fcceb27..7d1121148b 100644 --- a/repos/libports/run/pthread.run +++ b/repos/libports/run/pthread.run @@ -35,6 +35,6 @@ build_boot_image { ld.lib.so libc.lib.so libm.lib.so pthread.lib.so posix.lib.so } -append qemu_args " -nographic -m 128 " +append qemu_args " -nographic " run_genode_until {--- returning from main ---.*\n} 10 diff --git a/repos/libports/run/python.run b/repos/libports/run/python.run index 52f9f4c22c..3ff37ca080 100644 --- a/repos/libports/run/python.run +++ b/repos/libports/run/python.run @@ -81,7 +81,7 @@ build_boot_image $boot_modules # Execute test case # -append qemu_args " -m 128 -nographic " +append qemu_args " -nographic " run_genode_until {.*child "test-python" exited with exit value 0.*} 60 diff --git a/repos/libports/run/qt5.run b/repos/libports/run/qt5.run index e1f26883fd..cac0569c32 100644 --- a/repos/libports/run/qt5.run +++ b/repos/libports/run/qt5.run @@ -113,7 +113,6 @@ append boot_modules { build_boot_image $boot_modules -append qemu_args " -m 512" run_genode_until forever diff --git a/repos/libports/run/qt5_calculatorform.run b/repos/libports/run/qt5_calculatorform.run index fa4beafeae..f94140bcc3 100644 --- a/repos/libports/run/qt5_calculatorform.run +++ b/repos/libports/run/qt5_calculatorform.run @@ -85,7 +85,6 @@ append boot_modules { build_boot_image $boot_modules -append qemu_args " -m 256" run_genode_until forever diff --git a/repos/libports/run/qt5_openglwindow.run b/repos/libports/run/qt5_openglwindow.run index f49c55731d..7576b5a2f8 100644 --- a/repos/libports/run/qt5_openglwindow.run +++ b/repos/libports/run/qt5_openglwindow.run @@ -84,7 +84,6 @@ append boot_modules { build_boot_image $boot_modules -append qemu_args " -m 256" run_genode_until forever diff --git a/repos/libports/run/qt5_qpluginwidget.run b/repos/libports/run/qt5_qpluginwidget.run index 25a069c5da..2ecfccd8c0 100644 --- a/repos/libports/run/qt5_qpluginwidget.run +++ b/repos/libports/run/qt5_qpluginwidget.run @@ -110,7 +110,6 @@ append boot_modules { build_boot_image $boot_modules -append qemu_args " -m 256" run_genode_until forever diff --git a/repos/libports/run/qt5_quicktest.run b/repos/libports/run/qt5_quicktest.run index a2823dcffb..da75a83669 100644 --- a/repos/libports/run/qt5_quicktest.run +++ b/repos/libports/run/qt5_quicktest.run @@ -94,7 +94,6 @@ append boot_modules { build_boot_image $boot_modules -append qemu_args " -m 256" run_genode_until forever diff --git a/repos/libports/run/qt5_samegame.run b/repos/libports/run/qt5_samegame.run index e49069be70..021c8a2b0a 100644 --- a/repos/libports/run/qt5_samegame.run +++ b/repos/libports/run/qt5_samegame.run @@ -94,7 +94,6 @@ append boot_modules { build_boot_image $boot_modules -append qemu_args " -m 256" run_genode_until forever diff --git a/repos/libports/run/qt5_tetrix.run b/repos/libports/run/qt5_tetrix.run index aa195bfe3e..bebe3be135 100644 --- a/repos/libports/run/qt5_tetrix.run +++ b/repos/libports/run/qt5_tetrix.run @@ -86,7 +86,6 @@ append boot_modules { build_boot_image $boot_modules -append qemu_args " -m 256" run_genode_until forever diff --git a/repos/libports/run/qt5_textedit.run b/repos/libports/run/qt5_textedit.run index b24c3c88d8..bde48a596d 100644 --- a/repos/libports/run/qt5_textedit.run +++ b/repos/libports/run/qt5_textedit.run @@ -163,7 +163,7 @@ catch { exec sh -c $cmd } append_if $use_ahci_driver qemu_args " -drive id=disk,file=$disk_image,format=raw,if=none -device ahci,id=ahci -device ide-drive,drive=disk,bus=ahci.0 -boot d" -append qemu_args " -m 256 -usbdevice tablet " +append qemu_args " -usbdevice tablet " run_genode_until forever diff --git a/repos/libports/run/rust.run b/repos/libports/run/rust.run index acd4fe1fcc..37ee35dc35 100644 --- a/repos/libports/run/rust.run +++ b/repos/libports/run/rust.run @@ -23,7 +23,7 @@ install_config { build_boot_image "core init test-rust ld.lib.so libc.lib.so libm.lib.so posix.lib.so" -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until { 42 } 10 diff --git a/repos/libports/run/sdl.run b/repos/libports/run/sdl.run index 0519a668e1..593dc84dd7 100644 --- a/repos/libports/run/sdl.run +++ b/repos/libports/run/sdl.run @@ -98,6 +98,5 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256 " run_genode_until forever diff --git a/repos/libports/run/stdcxx.run b/repos/libports/run/stdcxx.run index 7d8c9efad4..3ccab09898 100644 --- a/repos/libports/run/stdcxx.run +++ b/repos/libports/run/stdcxx.run @@ -32,6 +32,6 @@ build_boot_image { ld.lib.so libc.lib.so libm.lib.so stdcxx.lib.so posix.lib.so } -append qemu_args " -nographic -m 64 " +append qemu_args " -nographic " run_genode_until ".*test-stdcxx finished.*\n" 10 diff --git a/repos/libports/run/test-ping_client.run b/repos/libports/run/test-ping_client.run index 76bebd1f12..518c87e08b 100644 --- a/repos/libports/run/test-ping_client.run +++ b/repos/libports/run/test-ping_client.run @@ -149,7 +149,7 @@ build_boot_image $boot_modules # # qemu config -append qemu_args " -m 128 -nographic " +append qemu_args " -nographic " append_if [have_spec x86] qemu_args " -net nic,model=e1000 " append_if [have_spec lan9118] qemu_args " -net nic,model=lan9118 " diff --git a/repos/libports/run/test-ping_server.run b/repos/libports/run/test-ping_server.run index 22bc38cec5..e1780b0489 100644 --- a/repos/libports/run/test-ping_server.run +++ b/repos/libports/run/test-ping_server.run @@ -123,7 +123,7 @@ build_boot_image $boot_modules # # qemu config -append qemu_args " -m 128 -nographic " +append qemu_args " -nographic " append_if [have_spec x86] qemu_args " -net nic,model=e1000 " append_if [have_spec lan9118] qemu_args " -net nic,model=lan9118 " diff --git a/repos/os/run/ahci_bench.run b/repos/os/run/ahci_bench.run index bbfb9c8911..d85e00cd00 100644 --- a/repos/os/run/ahci_bench.run +++ b/repos/os/run/ahci_bench.run @@ -82,7 +82,7 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -nographic -m 256 " +append qemu_args " -nographic " append qemu_args " -drive id=disk,file=bin/ext2.raw,format=raw,if=none -device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 -boot d" append qemu_args " -drive id=cd,file=[run_dir]/../ahci_bench.iso,if=none,media=cdrom -device ide-cd,drive=cd,bus=ahci.1" diff --git a/repos/os/run/ahci_blk.run b/repos/os/run/ahci_blk.run index 490019849a..1025589c81 100644 --- a/repos/os/run/ahci_blk.run +++ b/repos/os/run/ahci_blk.run @@ -81,7 +81,7 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -nographic -m 256 " +append qemu_args " -nographic " append qemu_args " -drive id=disk,file=bin/ext2.raw,format=raw,if=none -device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 -boot d" append qemu_args " -drive id=cd,file=[run_dir]/../ahci_blk.iso,if=none,media=cdrom -device ide-cd,drive=cd,bus=ahci.1" diff --git a/repos/os/run/audio_out_click.run b/repos/os/run/audio_out_click.run index 3e4feeef94..91a9e5b3f8 100644 --- a/repos/os/run/audio_out_click.run +++ b/repos/os/run/audio_out_click.run @@ -113,6 +113,6 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 128 -nographic -soundhw es1370 " +append qemu_args " -nographic -soundhw es1370 " run_genode_until forever diff --git a/repos/os/run/blk.run b/repos/os/run/blk.run index 4bcf36d7dd..e665b2297d 100644 --- a/repos/os/run/blk.run +++ b/repos/os/run/blk.run @@ -48,5 +48,5 @@ install_config { # build_boot_image { core ld.lib.so init timer test-blk-srv test-blk-cli } -append qemu_args " -nographic -m 64 " +append qemu_args " -nographic " run_genode_until "Tests finished successfully.*\n" 100 diff --git a/repos/os/run/blk_cache.run b/repos/os/run/blk_cache.run index 63b86e80c6..fc056eb7ba 100644 --- a/repos/os/run/blk_cache.run +++ b/repos/os/run/blk_cache.run @@ -66,6 +66,6 @@ build_boot_image { core ld.lib.so init timer test-blk-srv blk_cache test-blk-cli # # Qemu # -append qemu_args " -nographic -m 96 " +append qemu_args " -nographic " run_genode_until "Tests finished successfully.*\n" 60 diff --git a/repos/os/run/bomb.run b/repos/os/run/bomb.run index f28574e51d..57fa012a57 100644 --- a/repos/os/run/bomb.run +++ b/repos/os/run/bomb.run @@ -8,7 +8,7 @@ set sleep 1500 set demand [expr 1*1024*1024] if {[have_include "power_on/qemu"]} { - append qemu_args "-nographic -m 128" + append qemu_args "-nographic " } else { # foc is really slow on native hardware executing this test - limit rounds if {[have_spec foc]} { diff --git a/repos/os/run/cpu_quota.run b/repos/os/run/cpu_quota.run index 8bc30e55ba..687e033c3c 100644 --- a/repos/os/run/cpu_quota.run +++ b/repos/os/run/cpu_quota.run @@ -127,7 +127,7 @@ build_boot_image "core ld.lib.so init timer test-cpu_quota test-sync" # Execution # -append qemu_args "-nographic -m 128" +append qemu_args "-nographic " run_genode_until ".*done.*\n.*done.*\n.*done.*\n" 110 diff --git a/repos/os/run/demo.run b/repos/os/run/demo.run index 413ad05482..d9bff1eed2 100644 --- a/repos/os/run/demo.run +++ b/repos/os/run/demo.run @@ -267,6 +267,5 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256 " run_genode_until forever diff --git a/repos/os/run/dynamic_config.run b/repos/os/run/dynamic_config.run index d52489e61c..007d864444 100644 --- a/repos/os/run/dynamic_config.run +++ b/repos/os/run/dynamic_config.run @@ -41,7 +41,7 @@ install_config { build_boot_image "core ld.lib.so init timer test-dynamic_config test-dynamic_config_server" -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until {obtained counter value 11 from config.*} 100 diff --git a/repos/os/run/dynamic_config_loader.run b/repos/os/run/dynamic_config_loader.run index 86406f836c..d22b5fe3d0 100644 --- a/repos/os/run/dynamic_config_loader.run +++ b/repos/os/run/dynamic_config_loader.run @@ -39,7 +39,7 @@ install_config { build_boot_image "core ld.lib.so init timer loader test-dynamic_config test-dynamic_config_loader" -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until {obtained counter value 11 from config.*} 100 diff --git a/repos/os/run/dynamic_config_slave.run b/repos/os/run/dynamic_config_slave.run index cb03d12fe6..88e5bada2d 100644 --- a/repos/os/run/dynamic_config_slave.run +++ b/repos/os/run/dynamic_config_slave.run @@ -29,7 +29,7 @@ install_config { build_boot_image "core ld.lib.so init timer test-dynamic_config test-dynamic_config_master" -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until {obtained counter value 11 from config.*} 100 diff --git a/repos/os/run/fault_detection.run b/repos/os/run/fault_detection.run index 4562c1de61..22f26937de 100644 --- a/repos/os/run/fault_detection.run +++ b/repos/os/run/fault_detection.run @@ -75,6 +75,6 @@ build_boot_image $boot_modules # Execute test case # -append qemu_args "-nographic -m 96" +append qemu_args "-nographic " run_genode_until "--- finished fault_detection test ---.*\n" 30 diff --git a/repos/os/run/fb_bench.run b/repos/os/run/fb_bench.run index 226fdd5ab0..342c958d0a 100644 --- a/repos/os/run/fb_bench.run +++ b/repos/os/run/fb_bench.run @@ -106,6 +106,6 @@ lappend_if [have_spec gpio] boot_modules [gpio_drv] build_boot_image $boot_modules # disable QEMU graphic to enable testing on our machines without SDL and X -append qemu_args "-nographic -m 128" +append qemu_args "-nographic " run_genode_until {.*--- Framebuffer benchmark finished ---.*\n} 30 diff --git a/repos/os/run/fs_rom_update.run b/repos/os/run/fs_rom_update.run index 71a07e7776..08c0703150 100644 --- a/repos/os/run/fs_rom_update.run +++ b/repos/os/run/fs_rom_update.run @@ -116,6 +116,6 @@ set boot_modules { build_boot_image $boot_modules -append qemu_args " -m 256 -nographic" +append qemu_args " -nographic" run_genode_until {.*child "test-libc_vfs" exited with exit value 0.*} 60 diff --git a/repos/os/run/init_smp.run b/repos/os/run/init_smp.run index c18ba6cd42..0aa9823f5c 100644 --- a/repos/os/run/init_smp.run +++ b/repos/os/run/init_smp.run @@ -96,7 +96,7 @@ install_config $config build_boot_image "core ld.lib.so init bomb timer" -append qemu_args " -m [expr 128 + $init_ram*$cpus] -nographic -smp $cpus" +append qemu_args " [expr 128 + $init_ram*$cpus] -nographic -smp $cpus" if { [get_cmd_switch --autopilot] } { diff --git a/repos/os/run/input.run b/repos/os/run/input.run index 604d5a8408..848ec41d68 100644 --- a/repos/os/run/input.run +++ b/repos/os/run/input.run @@ -127,6 +127,5 @@ lappend_if [have_spec sdl] boot_modules fb_sdl build_boot_image $boot_modules -append qemu_args " -m 256 " run_genode_until forever diff --git a/repos/os/run/kdb_uart_drv.run b/repos/os/run/kdb_uart_drv.run index 57022274fb..cda3243b60 100644 --- a/repos/os/run/kdb_uart_drv.run +++ b/repos/os/run/kdb_uart_drv.run @@ -82,6 +82,6 @@ build_boot_image $boot_modules # # qemu config -append qemu_args " -m 128 -nographic " +append qemu_args " -nographic " run_genode_until forever diff --git a/repos/os/run/loader.run b/repos/os/run/loader.run index 70d075eac2..d944ec3691 100644 --- a/repos/os/run/loader.run +++ b/repos/os/run/loader.run @@ -107,6 +107,5 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256 " run_genode_until forever diff --git a/repos/os/run/mixer.run b/repos/os/run/mixer.run index 74b6485b6a..3178b5eb3a 100644 --- a/repos/os/run/mixer.run +++ b/repos/os/run/mixer.run @@ -183,5 +183,5 @@ append boot_modules { append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args "-m 256 -soundhw es1370 -nographic" +append qemu_args "-soundhw es1370 -nographic" run_genode_until forever diff --git a/repos/os/run/nic_loopback.run b/repos/os/run/nic_loopback.run index 2957f437da..6cadc4edbc 100644 --- a/repos/os/run/nic_loopback.run +++ b/repos/os/run/nic_loopback.run @@ -57,6 +57,6 @@ set boot_modules { build_boot_image $boot_modules -append qemu_args " -nographic -serial mon:stdio -m 256 " +append qemu_args " -nographic -serial mon:stdio " run_genode_until {child .* exited with exit value 0.*} 60 diff --git a/repos/os/run/part_blk.inc b/repos/os/run/part_blk.inc index 2d0bcdc3d2..5fe6ba1001 100644 --- a/repos/os/run/part_blk.inc +++ b/repos/os/run/part_blk.inc @@ -140,7 +140,7 @@ build_boot_image $boot_modules # Qemu # -append qemu_args " -nographic -m 128 " +append qemu_args " -nographic " run_genode_until "Tests finished successfully.*\n.*Tests finished successfully.*\n" 100 exec rm $img_path diff --git a/repos/os/run/pci.run b/repos/os/run/pci.run index 1bb25ba8e3..954bdaaecb 100644 --- a/repos/os/run/pci.run +++ b/repos/os/run/pci.run @@ -62,7 +62,7 @@ set boot_modules { append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until "--- Platform test finished ---.*\n" 10 diff --git a/repos/os/run/ram_fs_chunk.run b/repos/os/run/ram_fs_chunk.run index 699d6cd24a..95a6c7308a 100644 --- a/repos/os/run/ram_fs_chunk.run +++ b/repos/os/run/ram_fs_chunk.run @@ -29,7 +29,7 @@ install_config { build_boot_image "core ld.lib.so init test-ram_fs_chunk" -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until {.*--- RAM filesystem chunk test finished ---.*\n} 10 diff --git a/repos/os/run/report_rom.run b/repos/os/run/report_rom.run index 8ddf6fc4bf..61426cdc3d 100644 --- a/repos/os/run/report_rom.run +++ b/repos/os/run/report_rom.run @@ -45,7 +45,7 @@ install_config { build_boot_image "core ld.lib.so init timer report_rom test-report_rom" -append qemu_args "-nographic -m 128" +append qemu_args "-nographic " run_genode_until {child "test-report_rom" exited with exit value 0.*\n} 30 diff --git a/repos/os/run/resource_request.run b/repos/os/run/resource_request.run index 2625a0cd71..fe8fa31eed 100644 --- a/repos/os/run/resource_request.run +++ b/repos/os/run/resource_request.run @@ -51,6 +51,6 @@ install_config { build_boot_image "core ld.lib.so init timer report_rom test-resource_request" -append qemu_args "-nographic -m 128" +append qemu_args "-nographic " run_genode_until {child "test-resource_request" exited with exit value 0.*\n} 60 diff --git a/repos/os/run/resource_yield.run b/repos/os/run/resource_yield.run index 1c28c2c09c..d9affc32aa 100644 --- a/repos/os/run/resource_yield.run +++ b/repos/os/run/resource_yield.run @@ -33,6 +33,6 @@ install_config { build_boot_image "core ld.lib.so init timer test-resource_yield" -append qemu_args "-nographic -m 96" +append qemu_args "-nographic " run_genode_until {--- test-resource_yield finished ---.*\n} 50 diff --git a/repos/os/run/rom_blk.run b/repos/os/run/rom_blk.run index c6e06dbed8..252ecacb8b 100644 --- a/repos/os/run/rom_blk.run +++ b/repos/os/run/rom_blk.run @@ -30,6 +30,6 @@ install_config { build_boot_image "core ld.lib.so init rom_blk test-rom_blk" -append qemu_args "-m 64 -nographic " +append qemu_args "-nographic " run_genode_until {.*--- ROM Block test finished ---.*\n} 10 diff --git a/repos/os/run/rtc.run b/repos/os/run/rtc.run index cccf560e07..b7b0d3f1d5 100644 --- a/repos/os/run/rtc.run +++ b/repos/os/run/rtc.run @@ -35,6 +35,6 @@ install_config { build_boot_image { core ld.lib.so init timer rtc_drv test-rtc } -append qemu_args " -nographic -m 128 " +append qemu_args " -nographic " run_genode_until ".*--- RTC test finished ---.*\n" 20 diff --git a/repos/os/run/signal.run b/repos/os/run/signal.run index f420ce9418..a25b8fa26d 100644 --- a/repos/os/run/signal.run +++ b/repos/os/run/signal.run @@ -31,7 +31,7 @@ install_config { build_boot_image "core ld.lib.so init timer test-signal" -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until {.*--- Signalling test finished ---.*\n} 200 diff --git a/repos/os/run/tar_rom.run b/repos/os/run/tar_rom.run index 0ea527797b..a7755de7cb 100644 --- a/repos/os/run/tar_rom.run +++ b/repos/os/run/tar_rom.run @@ -79,7 +79,7 @@ exec sh -c "cd bin; tar cfh archive.tar test-timer" build_boot_image "core ld.lib.so init timer tar_rom archive.tar" -append qemu_args "-nographic -m 96" +append qemu_args "-nographic " run_genode_until "--- timer test ---" 10 diff --git a/repos/os/run/terminal_crosslink.run b/repos/os/run/terminal_crosslink.run index 1eb7956750..0dcac29e2a 100644 --- a/repos/os/run/terminal_crosslink.run +++ b/repos/os/run/terminal_crosslink.run @@ -60,7 +60,7 @@ build_boot_image { test-terminal_crosslink } -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " # # Execute test case diff --git a/repos/os/run/thread_join.run b/repos/os/run/thread_join.run index 415641893e..c00d1c04a9 100644 --- a/repos/os/run/thread_join.run +++ b/repos/os/run/thread_join.run @@ -31,6 +31,6 @@ install_config { build_boot_image "core ld.lib.so init timer test-thread_join" -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until {.*--- Thread join test finished ---.*\n} 10 diff --git a/repos/os/run/timed_semaphore.run b/repos/os/run/timed_semaphore.run index c16cf60824..61bd9246c9 100644 --- a/repos/os/run/timed_semaphore.run +++ b/repos/os/run/timed_semaphore.run @@ -53,6 +53,6 @@ set boot_modules { build_boot_image $boot_modules -append qemu_args " -m 64 -nographic " +append qemu_args " -nographic " run_genode_until {.*--- Timed semaphore test finished ---.*\n} 10 diff --git a/repos/os/run/timeout.run b/repos/os/run/timeout.run index 8cf04ca95c..7b41a581aa 100644 --- a/repos/os/run/timeout.run +++ b/repos/os/run/timeout.run @@ -65,7 +65,7 @@ build_boot_image "core ld.lib.so init timer test-timeout" # Execution # -append qemu_args "-nographic -m 350" +append qemu_args "-nographic " run_genode_until "child \"test\" exited with exit value.*\n" 900 grep_output {\[init\] child "test" exited with exit value} diff --git a/repos/os/run/timer.run b/repos/os/run/timer.run index f4877c1203..aa0f2f1887 100644 --- a/repos/os/run/timer.run +++ b/repos/os/run/timer.run @@ -43,7 +43,7 @@ install_config { build_boot_image { core ld.lib.so init timer test-timer } # Configure Qemu -append qemu_args " -m 64 -nographic" +append qemu_args " -nographic" # Execute test in Qemu run_genode_until "--- timer test finished ---" 60 diff --git a/repos/os/run/timer_accuracy.run b/repos/os/run/timer_accuracy.run index 078e4b50b3..440e28a77f 100644 --- a/repos/os/run/timer_accuracy.run +++ b/repos/os/run/timer_accuracy.run @@ -35,7 +35,7 @@ install_config { build_boot_image { core ld.lib.so init timer test-timer_accuracy } # configure Qemu -append qemu_args " -m 64 -nographic" +append qemu_args " -nographic" set err_cnt 0 set test_timeout 20 diff --git a/repos/os/run/trace.run b/repos/os/run/trace.run index 3658f0b138..60b95c9204 100644 --- a/repos/os/run/trace.run +++ b/repos/os/run/trace.run @@ -69,7 +69,7 @@ set boot_modules { build_boot_image $boot_modules -append qemu_args " -nographic -serial mon:stdio -m 256 " +append qemu_args " -nographic -serial mon:stdio " append_if [have_spec x86] qemu_args " -smp 2 " run_genode_until {.*child "test-trace" exited with exit value 0.*} 30 diff --git a/repos/os/run/usb_block.run b/repos/os/run/usb_block.run index 403b6ecf7e..373fceb51f 100644 --- a/repos/os/run/usb_block.run +++ b/repos/os/run/usb_block.run @@ -160,7 +160,7 @@ if {$use_qemu} { # # Qemu opts for EHCI # -append qemu_args " -m 256 -nographic -M pc -boot order=d " +append qemu_args " -nographic -M pc -boot order=d " append qemu_args " -drive if=none,id=disk,file=$disk_image,format=raw " append qemu_args " -device usb-ehci,id=ehci -device usb-storage,bus=ehci.0,drive=disk " diff --git a/repos/os/run/weak_ptr.run b/repos/os/run/weak_ptr.run index bc202f58f8..5034bed90a 100644 --- a/repos/os/run/weak_ptr.run +++ b/repos/os/run/weak_ptr.run @@ -30,7 +30,7 @@ install_config { build_boot_image "core ld.lib.so init timer test-weak_ptr" -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until "--- finished test-weak_ptr ---.*\n" 30 diff --git a/repos/os/run/xml_generator.run b/repos/os/run/xml_generator.run index 443884efb0..c867d6a2d2 100644 --- a/repos/os/run/xml_generator.run +++ b/repos/os/run/xml_generator.run @@ -24,7 +24,7 @@ install_config { build_boot_image "core ld.lib.so init test-xml_generator" -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until "--- XML generator test finished ---.*\n" 30 diff --git a/repos/os/run/xml_node.run b/repos/os/run/xml_node.run index 11dd562b99..8096f5a8d4 100644 --- a/repos/os/run/xml_node.run +++ b/repos/os/run/xml_node.run @@ -23,7 +23,7 @@ install_config { build_boot_image "core ld.lib.so init test-xml_node" -append qemu_args "-nographic -m 64" +append qemu_args "-nographic " run_genode_until {.*child "test-xml_node" exited with exit value 0.*\n} 10 diff --git a/repos/ports/run/arora.run b/repos/ports/run/arora.run index a08f525266..85614fd3e0 100644 --- a/repos/ports/run/arora.run +++ b/repos/ports/run/arora.run @@ -163,7 +163,6 @@ append boot_modules { build_boot_image $boot_modules -append qemu_args " -m 512 " append_if [have_spec x86] qemu_args " -net nic,model=e1000 " append_if [have_spec lan9118] qemu_args " -net nic,model=lan9118 " diff --git a/repos/ports/run/debug_nitpicker.run b/repos/ports/run/debug_nitpicker.run index 30db8c9b05..360f5c472f 100644 --- a/repos/ports/run/debug_nitpicker.run +++ b/repos/ports/run/debug_nitpicker.run @@ -143,7 +143,6 @@ build_boot_image $boot_modules set local_port 5555 # qemu config -append qemu_args " -m 128 " # connect comport 0 to stdio append qemu_args " -serial mon:stdio " diff --git a/repos/ports/run/dosbox.run b/repos/ports/run/dosbox.run index be3949af17..c9c5ea0048 100644 --- a/repos/ports/run/dosbox.run +++ b/repos/ports/run/dosbox.run @@ -138,6 +138,6 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256 -soundhw es1370 " +append qemu_args " -soundhw es1370 " run_genode_until forever diff --git a/repos/ports/run/gdb_monitor.run b/repos/ports/run/gdb_monitor.run index 6dc92045f3..7204af4370 100644 --- a/repos/ports/run/gdb_monitor.run +++ b/repos/ports/run/gdb_monitor.run @@ -113,7 +113,7 @@ build_boot_image $boot_modules set local_port 5555 # qemu config -append qemu_args " -m 128 -nographic " +append qemu_args " -nographic " # connect comport 0 to stdio append qemu_args " -serial mon:stdio " diff --git a/repos/ports/run/gdb_monitor_interactive.run b/repos/ports/run/gdb_monitor_interactive.run index 1192aa4541..b3a704edac 100644 --- a/repos/ports/run/gdb_monitor_interactive.run +++ b/repos/ports/run/gdb_monitor_interactive.run @@ -101,7 +101,7 @@ build_boot_image $boot_modules set local_port 5555 # qemu config -append qemu_args " -m 128 -nographic " +append qemu_args " -nographic " # connect comport 0 to stdio append qemu_args " -serial mon:stdio " diff --git a/repos/ports/run/gdb_monitor_target_config.run b/repos/ports/run/gdb_monitor_target_config.run index cc85857165..918dcf81f4 100644 --- a/repos/ports/run/gdb_monitor_target_config.run +++ b/repos/ports/run/gdb_monitor_target_config.run @@ -100,7 +100,7 @@ build_boot_image $boot_modules set local_port 5555 # qemu config -append qemu_args " -m 128 -nographic " +append qemu_args " -nographic " # connect comport 0 to stdio append qemu_args " -serial mon:stdio " diff --git a/repos/ports/run/netperf.inc b/repos/ports/run/netperf.inc index a33c7f3383..91e5d052fb 100644 --- a/repos/ports/run/netperf.inc +++ b/repos/ports/run/netperf.inc @@ -305,7 +305,7 @@ build_boot_image $boot_modules # # qemu config -append qemu_args " -m 128 -nographic " +append qemu_args " -nographic " append_if [have_spec x86] qemu_args " -net nic,model=e1000 " append_if [have_spec lan9118] qemu_args " -net nic,model=lan9118 " @@ -338,7 +338,7 @@ sleep 3 foreach netperf_test $netperf_tests { puts "\n---------------------------- $netperf_test -----------------------" - spawn netperf-$version -H $ip_addr -P 1 -v 2 -t $netperf_test -c -C -- -m $packet_size $force_ports + spawn netperf-$version -H $ip_addr -P 1 -v 2 -t $netperf_test -c -C -- $packet_size $force_ports set netperf_id $spawn_id set spawn_id_list [list $netperf_id $serial_id] diff --git a/repos/ports/run/noux.run b/repos/ports/run/noux.run index 6015234501..ca5abf35f2 100644 --- a/repos/ports/run/noux.run +++ b/repos/ports/run/noux.run @@ -48,7 +48,6 @@ append qemu_args " -nographic -serial mon:stdio " if {[have_spec x86_64]} { # coreutils.tar is really huge when built for x86_64 - append qemu_args " -m 300 " } run_genode_until {child "noux" exited with exit value 0.*\n} 30 diff --git a/repos/ports/run/noux_bash.run b/repos/ports/run/noux_bash.run index d253edb735..38b9d7c939 100644 --- a/repos/ports/run/noux_bash.run +++ b/repos/ports/run/noux_bash.run @@ -209,7 +209,6 @@ build_boot_image $boot_modules if {[have_spec x86_64]} { # bash.tar is really huge when built for x86_64 - append qemu_args " -m 320 " } run_genode_until forever diff --git a/repos/ports/run/noux_gdb.run b/repos/ports/run/noux_gdb.run index 9d1b0535ec..b8b0f48208 100644 --- a/repos/ports/run/noux_gdb.run +++ b/repos/ports/run/noux_gdb.run @@ -245,7 +245,6 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 256 " run_genode_until forever diff --git a/repos/ports/run/noux_shell_script.run b/repos/ports/run/noux_shell_script.run index ac86da300a..f3cca3bcf6 100644 --- a/repos/ports/run/noux_shell_script.run +++ b/repos/ports/run/noux_shell_script.run @@ -162,6 +162,5 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 300 " run_genode_until forever diff --git a/repos/ports/run/noux_terminal_fs.run b/repos/ports/run/noux_terminal_fs.run index 5922caeb2f..041ed5ad1a 100644 --- a/repos/ports/run/noux_terminal_fs.run +++ b/repos/ports/run/noux_terminal_fs.run @@ -203,6 +203,5 @@ append_platform_drv_boot_modules build_boot_image $boot_modules # bash.tar is really huge when built for x86_64 -if {[have_spec x86_64]} { append qemu_args " -m 300 " } run_genode_until forever diff --git a/repos/ports/run/noux_trace_fs.run b/repos/ports/run/noux_trace_fs.run index 2c972a6ccd..91de237b1f 100644 --- a/repos/ports/run/noux_trace_fs.run +++ b/repos/ports/run/noux_trace_fs.run @@ -226,7 +226,6 @@ append_platform_drv_boot_modules build_boot_image $boot_modules -append qemu_args " -m 512 " run_genode_until forever diff --git a/repos/ports/run/noux_two_terminal_fs.run b/repos/ports/run/noux_two_terminal_fs.run index 45881d6575..eb936837b5 100644 --- a/repos/ports/run/noux_two_terminal_fs.run +++ b/repos/ports/run/noux_two_terminal_fs.run @@ -237,6 +237,5 @@ append_platform_drv_boot_modules build_boot_image $boot_modules # bash.tar is really huge when built for x86_64 -if {[have_spec x86_64]} { append qemu_args " -m 300 " } run_genode_until forever diff --git a/repos/ports/run/noux_uname.run b/repos/ports/run/noux_uname.run index c3017f0af6..a3b139b8ac 100644 --- a/repos/ports/run/noux_uname.run +++ b/repos/ports/run/noux_uname.run @@ -61,6 +61,5 @@ build_boot_image { append qemu_args " -nographic -serial mon:stdio " # coreutils.tar is really huge when built for x86_64 -if {[have_spec x86_64]} { append qemu_args " -m 300 " } run_genode_until {child "noux" exited with exit value 0.*\n} 30 diff --git a/repos/ports/run/seoul-auto.run b/repos/ports/run/seoul-auto.run index 22b07067c0..297f9d5f9e 100644 --- a/repos/ports/run/seoul-auto.run +++ b/repos/ports/run/seoul-auto.run @@ -54,7 +54,6 @@ foreach binary $guest_os_binaries { source ${genode_dir}/repos/ports/run/seoul.inc -append qemu_args " -m 512 " append qemu_args " -cpu phenom " append qemu_args " -net nic,model=e1000 " append qemu_args " -nographic " diff --git a/repos/ports/run/seoul-net.run b/repos/ports/run/seoul-net.run index a89dd9539e..9c38db8ce0 100644 --- a/repos/ports/run/seoul-net.run +++ b/repos/ports/run/seoul-net.run @@ -52,7 +52,6 @@ foreach binary $guest_os_binaries { source ${genode_dir}/repos/ports/run/seoul.inc -append qemu_args " -m 512 " append qemu_args " -cpu phenom " append qemu_args " -net nic,model=e1000 " diff --git a/repos/ports/run/vmm_utils.run b/repos/ports/run/vmm_utils.run index 3f215c886d..518a1a982f 100644 --- a/repos/ports/run/vmm_utils.run +++ b/repos/ports/run/vmm_utils.run @@ -30,7 +30,6 @@ install_config { build_boot_image { core ld.lib.so init timer test-vmm_utils } -append qemu_args " -m 512 " append qemu_args " -cpu phenom " append qemu_args " -nographic " diff --git a/tool/run/power_on/qemu b/tool/run/power_on/qemu index b37651d899..0a637e0465 100644 --- a/tool/run/power_on/qemu +++ b/tool/run/power_on/qemu @@ -72,6 +72,9 @@ proc run_power_on { } { # on x86, we support booting via pxe or iso/disk image if {[have_spec x86]} { + if {![regexp -- {-m} $qemu_args dummy]} { + append qemu_args " -m 512 " + } if {[have_include "load/tftp"]} { append qemu_args " -boot n -tftp [run_dir] -bootp boot/pulsar -no-reboot -no-shutdown " } else {