Skip to content

Commit

Permalink
[lit-on-qemu] Remove overzealous check for mounted path and disable n…
Browse files Browse the repository at this point in the history
…etworking for now

* Checking for the existence of the mount path is reasonable if we're
  starting from a blank slate each time, but is too limiting for the
  current config.
* The current appliance image doesn't contain an sshd anyway, so there's
  no point forwarding a port (which runs the risk of clashing with
  another port on the host). It would be helpful to add this back later
  as a debug aid.
  • Loading branch information
asb committed Jan 16, 2025
1 parent 9a1ceb9 commit 3459d40
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions buildbot/riscv-rise/lit-on-qemu
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ error() {{
printf "!!!!!!!!!! Error: %s !!!!!!!!!!\\n" "$*" >&2
exit 1
}}
[ -e "{base_mount_path}" ] && error "Can't mount path, already exists"
mkdir -p "{base_mount_path}" || error "Can't make mount path"
chown {target_uid}:{target_gid} "{base_mount_path}" || error "Chown failed"
mount -t ext4 /dev/vdb "{base_mount_path}" || error "Mount failed"
Expand Down Expand Up @@ -110,8 +109,6 @@ qemu_command = [
"-virtfs", "local,path=hgcomm,mount_tag=hgcomm,security_model=none,id=hgcomm",
"-device", "virtio-blk-device,drive=hdb",
"-drive", "file=llvm-project.img,format=raw,if=none,id=hdb",
"-device", "virtio-net-device,netdev=net",
"-netdev", "user,id=net,hostfwd=tcp:127.0.0.1:10222-:22",
"-bios", "/usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.bin",
"-kernel", f"{os.getenv('BB_IMG_DIR')}/kernel",
"-initrd", f"{os.getenv('BB_IMG_DIR')}/initrd",
Expand Down

0 comments on commit 3459d40

Please sign in to comment.