Drop in Interactive shell #58
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This is currently a PoC, but it does seem functional without being too intrusive. It does help to be able to get a shell in the VM when tests are failure and further troubleshooting is needed. |
|
The error seems unrelated. I believe I had it happening on my computer sporadically too. |
chantra
force-pushed
the
interactive_shell
branch
from
ed04e85
to
bdad8d3
Compare
danobi
reviewed
Jan 26, 2024
| @@ -35,6 +35,7 @@ const COMMAND_TEMPLATE: &str = include_str!("init/command.template"); | |||
| const ROOTFS_9P_FS_MOUNT_TAG: &str = "/dev/root"; | |||
| const SHARED_9P_FS_MOUNT_TAG: &str = "vmtest-shared"; | |||
| const COMMAND_OUTPUT_PORT_NAME: &str = "org.qemu.virtio_serial.0"; | |||
| const MAGIC_INTERACTIVE_COMMAND: &str = "-"; | |||
yeah, good idea. |
We used to let init block on `qemu-qa`, run commands, and then terminate the VM through QMP. By blocking on a bash process, we obtain the same outcome, but then we can also re-use the same init script to get an interactive prompt in the VM, which in turn can help with danobi#54. Signed-off-by: Manu Bretelle <[email protected]>
When the magic command `-` is passed, and we are running in kernel mode, get a shell prompt in the VM. To do this, we can re-use the existing `run` framework with some changes: - standard streams to the qemu command are not changed and instead are inherited - child std is not streamed to the UI anymore. - the command is not sent over qga anymore, we just wait for the qemu command to return (e.g when user exit its bash prompt) and exit Fixes danobi#54 Tested by running ``` RUST_LOG=debug cargo run -- -k kernels/bzImage-x86_64 - ``` and confirming no existing tests are broken. Also could get it to work cross-platform: ``` cargo run -- -k ./kernels/Image-arm64 -r ./rootfs/ubuntu-lunar-arm64 -a aarch64 - ``` Signed-off-by: Manu Bretelle <[email protected]>
Add a test that will boot vmtest with a kernel in interactive shell mode. We need to sleep a bit in order to have vmtest mount shared folder with QGA. Signed-off-by: Manu Bretelle <[email protected]>
Signed-off-by: Manu Bretelle <[email protected]>
chantra
force-pushed
the
interactive_shell
branch
from
bdad8d3
to
e2fed0b
Compare
|
ok, added a |
danobi
approved these changes
Jan 30, 2024
|
The current diff prints: I could make it something like: instead. |
|
Ah, missed that in the final commit. LGTM as is |
hhamed-avx
reviewed
Aug 1, 2024
| /// Interactive mode means we are not running a command and we are not | ||
| /// running in image mode. | ||
| fn interactive(&self) -> bool { | ||
| self.command == MAGIC_INTERACTIVE_COMMAND && !self.image |
There was a problem hiding this comment.
IIRC, but I have not played with images much, the image does not depend on a init file, which is what provides the root prompt here. I don't think it is just a matter of removing the check on whether or not this is running in an image to have it magically work, but I may be wrong.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When the magic command
-is passed, and we are running in kernel mode, get ashell prompt in the VM.
To do this, we can re-use the existing
runframework with some changes:return (e.g when user exit its bash prompt) and exit
Fixes #54
Tested by running
and confirming no existing tests are broken.
Also could get it to work cross-platform: