Skip to content

Follow-up to #319 #329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 3 commits into from
Jul 8, 2025
Merged

Follow-up to #319 #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f42db4
main: Remove blank line from default output
cfergeau Jul 8, 2025
06ddc56
doc: Remove double spaces
cfergeau Jul 8, 2025
1689b88
contrib: Add some quoting to start-gvproxy.sh
cfergeau Jul 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion cmd/vfkit/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ func newVMConfiguration(opts *cmdline.Options) (*config.VirtualMachine, error) {

log.Debugf("parsed options: %+v", opts)
log.Debugf("boot parameters: %+v", bootloader)
log.Info()

vmConfig := config.NewVirtualMachine(
opts.Vcpus,
Expand Down
2 changes: 1 addition & 1 deletion contrib/scripts/start-gvproxy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ set -exuo pipefail
DISK_IMAGE="${1?Usage: $0 diskimage}"
VM_NAME="$(basename ${DISK_IMAGE})"

${GVPROXY} --mtu 1500 --ssh-port 2223 --listen-vfkit unixgram://$(pwd)/${VM_NAME}.sock --log-file ${VM_NAME}.gvproxy.log --pid-file ${VM_NAME}.gvproxy.pid &
"${GVPROXY}" --mtu 1500 --ssh-port 2223 --listen-vfkit "unixgram://$(pwd)/${VM_NAME}.sock" --log-file "${VM_NAME}.gvproxy.log" --pid-file "${VM_NAME}.gvproxy.pid" &

TO_REMOVE="${VM_NAME}.sock ${VM_NAME}.gvproxy.pid ${VM_NAME}.overlay.img ${VM_NAME}.efistore.nvram"
trap 'if [[ -f "${VM_NAME}.gvproxy.pid" ]]; then kill $(cat ${VM_NAME}.gvproxy.pid); fi; rm -f ${TO_REMOVE}' EXIT
Expand Down
8 changes: 4 additions & 4 deletions doc/usage.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ Device configuration is optional, but most VM will need a disk image and a netwo

- `--log-level`

Set the log-level for VFKit. Supported values are `debug`, `info`, and `error`.
Set the log-level for VFKit. Supported values are `debug`, `info`, and `error`.

- `--restful-uri`

The URI (address) of the RESTful service. By default it’s disabled. Valid schemes are
`tcp`, `none`, or `unix`. In the case of unix, the "host" portion would be a path to where the unix domain socket will be stored. A scheme of `none` disables the RESTful service.
The URI (address) of the RESTful service. By default it’s disabled. Valid schemes are
`tcp`, `none`, or `unix`. In the case of unix, the "host" portion would be a path to where the unix domain socket will be stored. A scheme of `none` disables the RESTful service.

### Virtual Machine Resources

Expand Down Expand Up @@ -66,7 +66,7 @@ Requirement: OPTIONAL

The AArch64 kernel does not currently provide a decompressor and therefore
requires decompression (gzip etc.) to be performed by the boot loader if a
compressed Image target (e.g. Image.gz) is used. For bootloaders that do not
compressed Image target (e.g. Image.gz) is used. For bootloaders that do not
implement this requirement, the uncompressed Image target is available instead.
```

Expand Down
Loading