Update Solo5 to v0.6.6 #29
Conversation
Signed-off-by: Akira Moroo <[email protected]>
Signed-off-by: Akira Moroo <[email protected]>
|
Also, I found that the old version of CMake (3.10.2) fails to build the cmake test even it satisfies the version requirement: Since Travis CI uses 3.12.4, the version should be updated. |
| [ "$status" -eq 0 ] | ||
| [[ "$output" == *"=== main() of \"cwd_test\" returned 0 ==="* ]] | ||
| } | ||
|
|
||
| @test "cwd hvt" { | ||
| touch dummy | ||
| dd if=/dev/zero of=dummy bs=512 count=1 > /dev/null 2>&1 |
There was a problem hiding this comment.
just curious, do tests fail with an empty file (dummy's size of 0)?
There was a problem hiding this comment.
The spt tender says:
solo5-spt: dummy: Backing storage must be at least 1 block (512 bytes) in size
| # notyet | ||
| # img2=$3 | ||
|
|
||
| [ -n "${img1}" ] || die runtest without a disk image | ||
| case "${STACK}" in | ||
| spt) | ||
| cookie=$(${SOLO5_SPT} --disk=${img1} ${testprog} '{"cmdline":"testprog __test","blk":{"source":"etfs","path":"ld0d","fstype":"blk"}}') | ||
| cookie=$(${SOLO5_SPT} --block:rootfs=${img1} --net:tap=tap100 ${testprog} '{"cmdline":"testprog __test","blk":{"source":"etfs","path":"ld0d","fstype":"blk"}}') |
There was a problem hiding this comment.
question. It won't be possible to run with a disk and not tap right?
There was a problem hiding this comment.
It is a current design issue. As I wrote in the comment, the rumprun system creates an object file from pre-defined manifest.json when running build-rr.sh. The gcc wrapper includes it when linking an application. The Solo5 tender expects all defined devices will be attached on run-time (Once a device is defined, it cannot be optional.) This is why the tests supply unnecessary devices.
There was a problem hiding this comment.
got it, thanks for the clarification.
This commit updates solo5 to the tagged latest v0.6.6. The update has large side effects because of the Solo5 API changes. The following files are imported from Solo5 for the update. * kern.ldscript * mft_abi.h * solo5.h The recent version of Solo5 requires manifest.json to define devices at compile-time. To follow this change, it adds manifest.json that defines "rootfs" block device and "tap" network device. The naming comes from my LKL Nabla port. Signed-off-by: Akira Moroo <[email protected]>
Signed-off-by: Akira Moroo <[email protected]>
Signed-off-by: Akira Moroo <[email protected]>
Signed-off-by: Akira Moroo <[email protected]>
Signed-off-by: Akira Moroo <[email protected]>
Signed-off-by: Akira Moroo <[email protected]>
Signed-off-by: Akira Moroo <[email protected]>
|
Thank you for reviewing. I added replies to the comments. |
|
all good, merging |
The current rumprun port uses solo5@120848b, which is committed over 2 years ago. This PR proposes updates Solo5 to the latest tagged version, v0.6.6. There are several differences between the current and v0.6.6.
Commandline option changes:
The newer version of Solo5 accepts multiple block devices and network devices. This change causes the command line option changes.
manifest.jsonintroduced:The newer version of Solo5 requires
manifest.jsonto define attached devices at runtime. This file is compiled to an object file via a C file on compile-time. Thus, the rumprun port has to have predefinedmanifest.jsonand the pre-compiled object file before run. I added the "rootfs" block device and the "tap" network device for this PR. The devices cannot be optional, so we have to supply them as run-time arguments even if they are not used in the application.I think issue #28 can be fixed once this PR merged.