mirror of
https://github.com/genodelabs/genode.git
synced 2024-12-22 15:02:25 +00:00
Explicitly set Qemu disk-image format to raw
Prevents the annoying warning about WARNING: Image format was not specified for 'bin/test.img' and probing guessed raw. Automatically detecting the format is dangerous for raw images, write operations on block 0 will be restricted. Specify the 'raw' format explicitly to remove the restrictions.
This commit is contained in:
parent
1f719dee26
commit
02f84f98c3
@ -107,7 +107,7 @@ catch { exec sh -c $cmd }
|
|||||||
#
|
#
|
||||||
# Qemu opts for EHCI
|
# Qemu opts for EHCI
|
||||||
#
|
#
|
||||||
append qemu_args "-drive if=none,id=disk,file=$disk_image"
|
append qemu_args "-drive if=none,id=disk,file=$disk_image,format=raw"
|
||||||
append qemu_args { \
|
append qemu_args { \
|
||||||
-m 128 -nographic -M pc \
|
-m 128 -nographic -M pc \
|
||||||
-device usb-ehci,id=ehci \
|
-device usb-ehci,id=ehci \
|
||||||
|
@ -126,8 +126,8 @@ catch { exec sh -c $cmd }
|
|||||||
# Qemu
|
# Qemu
|
||||||
#
|
#
|
||||||
append qemu_args " -m 128 -nographic "
|
append qemu_args " -m 128 -nographic "
|
||||||
append_if $use_ahci_drv qemu_args " -drive id=disk,file=$disk_image,if=none -device ahci,id=ahci -device ide-drive,drive=disk,bus=ahci.0 -boot d"
|
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,if=sd,cache=writeback "
|
append_if $use_sd_card_drv qemu_args " -drive file=$disk_image,format=raw,if=sd,cache=writeback "
|
||||||
|
|
||||||
run_genode_until {.*child "test-libc_block" exited with exit value 0.*} 60
|
run_genode_until {.*child "test-libc_block" exited with exit value 0.*} 60
|
||||||
|
|
||||||
|
@ -134,8 +134,8 @@ catch { exec sh -c $cmd }
|
|||||||
# Qemu
|
# Qemu
|
||||||
#
|
#
|
||||||
append qemu_args " -m 128 -nographic "
|
append qemu_args " -m 128 -nographic "
|
||||||
append_if $use_ahci_drv qemu_args " -drive id=disk,file=$disk_image,if=none -device ahci,id=ahci -device ide-drive,drive=disk,bus=ahci.0 -boot d"
|
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,if=sd,cache=writeback "
|
append_if $use_sd_card_drv qemu_args " -drive file=$disk_image,format=raw,if=sd,cache=writeback "
|
||||||
|
|
||||||
run_genode_until {.*child "test-libc_vfs" exited with exit value 0.*} 60
|
run_genode_until {.*child "test-libc_vfs" exited with exit value 0.*} 60
|
||||||
|
|
||||||
|
@ -163,8 +163,8 @@ catch { exec sh -c $cmd }
|
|||||||
# Qemu
|
# Qemu
|
||||||
#
|
#
|
||||||
append qemu_args " -m 128 -nographic "
|
append qemu_args " -m 128 -nographic "
|
||||||
append_if $use_ahci qemu_args " -drive id=disk,file=$disk_image,if=none -device ahci,id=ahci -device ide-drive,drive=disk,bus=ahci.0 -boot d"
|
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,if=sd,cache=writeback "
|
append_if $use_sd_card_drv qemu_args " -drive file=$disk_image,format=raw,if=sd,cache=writeback "
|
||||||
|
|
||||||
run_genode_until ".*child \"test-libc_$filesystem\" exited with exit value 0.*" 60
|
run_genode_until ".*child \"test-libc_$filesystem\" exited with exit value 0.*" 60
|
||||||
|
|
||||||
|
@ -160,7 +160,7 @@ set cmd "mkfs.vfat -F32 $disk_image"
|
|||||||
puts "formating disk image with vfat file system: $cmd"
|
puts "formating disk image with vfat file system: $cmd"
|
||||||
catch { exec sh -c $cmd }
|
catch { exec sh -c $cmd }
|
||||||
|
|
||||||
append_if $use_ahci_driver qemu_args " -drive id=disk,file=$disk_image,if=none -device ahci,id=ahci -device ide-drive,drive=disk,bus=ahci.0 -boot d"
|
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"
|
append qemu_args " -m 256"
|
||||||
|
|
||||||
|
@ -93,7 +93,7 @@ append_platform_drv_boot_modules
|
|||||||
build_boot_image $boot_modules
|
build_boot_image $boot_modules
|
||||||
|
|
||||||
append qemu_args " -nographic -m 256 "
|
append qemu_args " -nographic -m 256 "
|
||||||
append qemu_args " -drive id=disk,file=bin/ext2.raw,if=none -device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 -boot d"
|
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"
|
append qemu_args " -drive id=cd,file=[run_dir]/../ahci_bench.iso,if=none,media=cdrom -device ide-cd,drive=cd,bus=ahci.1"
|
||||||
|
|
||||||
run_genode_until "Done.*\n" 100
|
run_genode_until "Done.*\n" 100
|
||||||
|
@ -84,7 +84,7 @@ append_platform_drv_boot_modules
|
|||||||
build_boot_image $boot_modules
|
build_boot_image $boot_modules
|
||||||
|
|
||||||
append qemu_args " -nographic -m 256 "
|
append qemu_args " -nographic -m 256 "
|
||||||
append qemu_args " -drive id=disk,file=bin/ext2.raw,if=none -device ahci,id=ahci -device ide-hd,drive=disk,bus=ahci.0 -boot d"
|
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"
|
append qemu_args " -drive id=cd,file=[run_dir]/../ahci_blk.iso,if=none,media=cdrom -device ide-cd,drive=cd,bus=ahci.1"
|
||||||
|
|
||||||
run_genode_until "Tests finished successfully!" 100
|
run_genode_until "Tests finished successfully!" 100
|
||||||
|
@ -79,7 +79,7 @@ lappend_if [have_spec rpi] boot_modules platform_drv
|
|||||||
set disk_image "bin/sd_card.img"
|
set disk_image "bin/sd_card.img"
|
||||||
|
|
||||||
build_boot_image $boot_modules
|
build_boot_image $boot_modules
|
||||||
append qemu_args "-drive file=$disk_image,if=sd,cache=writeback -nographic "
|
append qemu_args "-drive file=$disk_image,format=raw,if=sd,cache=writeback -nographic "
|
||||||
|
|
||||||
if { [file exists $disk_image] == 0 } then {
|
if { [file exists $disk_image] == 0 } then {
|
||||||
# create empty block device file
|
# create empty block device file
|
||||||
|
@ -155,7 +155,7 @@ if {$use_qemu} {
|
|||||||
# Qemu opts for EHCI
|
# Qemu opts for EHCI
|
||||||
#
|
#
|
||||||
append qemu_args " -m 128 -nographic -M pc -boot order=d "
|
append qemu_args " -m 128 -nographic -M pc -boot order=d "
|
||||||
append qemu_args " -drive if=none,id=disk,file=$disk_image "
|
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 "
|
append qemu_args " -device usb-ehci,id=ehci -device usb-storage,bus=ehci.0,drive=disk "
|
||||||
|
|
||||||
run_genode_until {.*child "test-usb" exited with exit value 0.*} 100
|
run_genode_until {.*child "test-usb" exited with exit value 0.*} 100
|
||||||
|
@ -38,7 +38,7 @@ if {[have_include power_on/qemu]} {
|
|||||||
|
|
||||||
append qemu_args " -m 1024 "
|
append qemu_args " -m 1024 "
|
||||||
append qemu_args " -cpu phenom"
|
append qemu_args " -cpu phenom"
|
||||||
append_if $use_block_sata qemu_args " -drive id=disk,file=bin/seoul-disc.raw,if=none -device ahci,id=ahci -device ide-drive,drive=disk,bus=ahci.0 -boot d"
|
append_if $use_block_sata qemu_args " -drive id=disk,file=bin/seoul-disc.raw,format=raw,if=none -device ahci,id=ahci -device ide-drive,drive=disk,bus=ahci.0 -boot d"
|
||||||
}
|
}
|
||||||
|
|
||||||
run_genode_until forever
|
run_genode_until forever
|
||||||
|
Loading…
Reference in New Issue
Block a user